EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-17 09:33:39 +02:00
Code Issues Projects Releases Wiki Activity
5,804 Commits 48 Branches 45 Tags 34 MiB
65a234c6b3
Commit Graph

4833 Commits

Author SHA1 Message Date
nossr50
80163c0d8f Cleaning up mcMMO.java 2019-05-13 01:15:53 -07:00
nossr50
72fc3efa78 DynamicSettingsManager - Handles platform specific datasets 
Converts datasets from the config into ready to use platform specific
ones
Currently only supports Bukkit, that will change later
Expect API breakages if you hook into this class
 2019-05-13 00:53:29 -07:00
nossr50
d614df65a7 unbox some floats 2019-05-12 03:48:25 -07:00
nossr50
3123f69aec Setup combat XP map - Use float in more places 2019-05-12 03:46:23 -07:00
nossr50
1c6b0363ce Step 1 of rewriting Alchemy - Removing all the old code 2019-05-12 00:53:15 -07:00
nossr50
ddb92af400 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-11 20:54:29 -07:00
nossr50
ed1831da78 Fixed the wrong locale string being used for Mining DD 2019-05-11 12:45:00 -07:00
nossr50
774ee65677 Fixing Alchemy Part 1 2019-05-10 17:23:02 -07:00
nossr50
61ae372694 Collection manager init now handles mapping values from collections 2019-05-10 12:30:59 -07:00
nossr50
945359b408 Add failsafes to repairables 2019-05-10 12:17:31 -07:00
nossr50
06bf814fcf Add failsafes to Salvageables 2019-05-10 12:16:26 -07:00
nossr50
cc1eae150a Fixed salvage deserializer swapping signature parameters 2019-05-10 11:30:50 -07:00
nossr50
7ad0a61c53 Fix casting, remove unused mod configs 2019-05-10 11:20:16 -07:00
nossr50
48a3621ac6 Avoid race conditions 2019-05-10 09:49:43 -07:00
nossr50
4ab688b302 Add custom serializer registration for CustomXPPerk 2019-05-08 12:14:09 -07:00
nossr50
8cfeaf34f3 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-08 12:10:31 -07:00
nossr50
ad550759e6 Fixed an incredibly rare and difficult to perform dupe bug 2019-05-08 10:24:34 -07:00
nossr50
ca7cf5cc58 Unlimited custom XP perks part 2 2019-05-08 09:50:19 -07:00
nossr50
40598a0e96 Unlimited custom xp perks Part 1 2019-05-08 06:44:19 -07:00
nossr50
0331c98c9b Add and wire up skill specific xp formula multipliers 2019-05-07 00:18:50 -07:00
nossr50
c968b9f94a Add and wire up Early Game Boost settings 2019-05-07 00:09:31 -07:00
nossr50
8033bc577c Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-06 19:46:58 -07:00
89009332
31ccf2ca02
Update locale_zh_CN.properties 2019-05-06 15:25:41 +08:00
nossr50
08269cab5b Add back in the UUID upgrade classes just in case anyone from 2014 shows 
up
 2019-05-06 00:19:42 -07:00
nossr50
71a2ea2a2e Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-05 23:50:40 -07:00
nossr50
23b7e11dd1 Fixed bugs that could occur while updating old DBs to have UUIDs 2019-05-05 16:41:42 -07:00
nossr50
ecac8d00ee Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-04 05:31:44 -07:00
nossr50
588b6f3692 Fixed the furnace XP bug 2019-05-04 04:08:56 -07:00
nossr50
620f2fc4f8 Revert some state changes 2019-05-04 01:09:25 -07:00
nossr50
3e61dc6c5f Some cleanup to BonusDrops & reducing expensive state calls 2019-05-04 00:48:35 -07:00
nossr50
a919c45b09 Fixing Java naming conventions for constants in mcMMO.java also added 
some Javadocs
 2019-05-03 23:39:49 -07:00
nossr50
8a312da0f5 Merge 2.1.53 2019-05-03 23:31:08 -07:00
nossr50
cdf6e607de 2.1.53 - Fixed critical XP bug 2019-05-03 15:04:40 -07:00
nossr50
29835a3316 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-03 03:46:28 -07:00
nossr50
f61917e8fe 2.1.52 2019-05-03 01:08:29 -07:00
Robert A. C
661564df36
Merge pull request #3914 from snake0053/master 
Update locale_ja_JP.properties
 2019-05-01 14:39:56 -07:00
SNAKE0053
0a7c852d89 Update locale_ja_JP.properties 2019-05-01 16:57:58 +09:00
nossr50
9157a08a3b Stashing changes.. oh wait 2019-04-30 17:02:08 -07:00
nossr50
3997a44fce Merge 2.1.51 2019-04-30 17:01:45 -07:00
Mark Vainomaa
40ea101bf6 Add a command to reload locale 2019-04-30 21:19:55 +03:00
Mark Vainomaa
5dc9c3f732 Note user that locale is loaded from locales directory 2019-04-30 20:14:42 +03:00
Mark Vainomaa
ec574a6b63 Cache raw messages from resource bundles 
Should speed things up a bit as next message lookups are from single
hashmap instead
 2019-04-30 17:58:37 +03:00
Mark Vainomaa
1ca48051ad Dedicated directory for locales 2019-04-30 14:08:43 +03:00
nossr50
4d8e4d0e70 Wire up Mining/Excavation/Herbalism/Woodcutting XP values 2019-04-30 02:08:11 -07:00
nossr50
2efa64ae17 wire up taming XP 2019-04-30 01:46:59 -07:00
nossr50
e5441f2a96 Taming XP values are now converted to an enum mpa and managed by ExperienceMapManager 2019-04-30 01:39:06 -07:00
nossr50
06016f4ada Wire up special combat XP multipliers 2019-04-30 00:57:50 -07:00
nossr50
6932abc9d8 Create fully qualified name : integer maps from user configs, wiring up some global xp settings 2019-04-30 00:42:09 -07:00
Mark Vainomaa
0f2e1ea740 Fall back to locale loaded from JAR when filesystem one doesn't have requested key 2019-04-30 09:29:04 +03:00
Mark Vainomaa
c2d4aeaf85 Try to load locale from plugin data folder first 2019-04-30 09:29:04 +03:00
nossr50
faed690602 Add mcMMO reload command "/mcmmoreload" 2019-04-29 22:55:39 -07:00
nossr50
7b3f69aee6 Add config reload 2019-04-29 22:37:46 -07:00
nossr50
6e173c0d4e Add per-skill global multiplier default values 2019-04-29 22:09:38 -07:00
nossr50
d0259d73c5 Gloabl XP multiplier is now tracked by the ExperienceMapManager 
Added method to grab original value to ExperienceMapManager
Moved skill xp values/mults into their own section
 2019-04-29 21:59:01 -07:00
nossr50
7f64fe11b8 Put special combat xp multipliers in their own section 2019-04-29 21:34:29 -07:00
nossr50
437bac1324 Revert "Add missing XP tables to 2.2" 
This reverts commit d1085aa8f8.
 2019-04-28 06:15:08 -07:00
nossr50
7c4481f099 removing unused classes 2019-04-28 06:08:15 -07:00
nossr50
d1085aa8f8 Add missing XP tables to 2.2 2019-04-28 06:05:39 -07:00
nossr50
986162803b Merge 2.1.50 2019-04-28 05:46:49 -07:00
nossr50
f7eb06e80b 2.1.50 2019-04-27 06:39:06 -07:00
Robert A. C
fd8712ee61
Merge pull request #3905 from Zed-I/patch-6 
Added some missing blocks to Herbalism/Mining
 2019-04-26 23:50:43 -07:00
BuildTools
f904ac7019 Fixing 1.13.2 bamboo material errors 2019-04-26 23:26:00 -07:00
Robert A. C
3c08af363f
Merge pull request #3904 from OverCrave/master 
Minor German Locale Update
 2019-04-26 14:17:54 -07:00
Zed-I
aee81f87f5
Added bamboo to the non-2 high plant blocks 2019-04-26 18:16:42 +02:00
Zed-I
43d08ec21d
Added some missing blocks to Herbalism/Mining 
Added some missing entries to herbalism mining and one to combat.
Reasoning for each xp below:

bamboo - 10 Cant grow nearly as tall as kelp
cornflower - 150 same as the other 1 high tall flowers (excluding poppy, dandelion and allium)
lily_of_the_valley - 150 same as the other 1 high tall flowers (excluding poppy, dandelion and allium)
wither_rose - 500. Quite hard to harvest. You need a wither to kill a mob and have the block not get destroyed by the wither blast. If the block where to get destroyed the flower just drops instead and you dont get any xp.

The whole stone brick family get the same xp as nether brick, 50
stone_bricks
cracked_stone_bricks
mossy_stone_bricks
chiseled_stone_bricks

The rest of the prismarine family continue with the same xp as their main block, 70
prismarine_bricks
dark_prismarine
sea_lantern

wandering_trader  - 1.0 same as normal villagers
 2019-04-26 18:08:12 +02:00
OverCrave
15e3ad8876 add missing translations 2019-04-26 17:58:23 +02:00
OverCrave
a583f557d7 remove unused translations 2019-04-26 17:49:35 +02:00
nossr50
8efee39f7e Add sweet berrys to Herbalism XP tables (update configs) 2019-04-25 18:54:41 -07:00
Robert A. C
307b807b38
Merge pull request #3788 from LogGits/patch-5 
Herbalism compatibility with PlayerAnimationEvent
 2019-04-25 18:50:27 -07:00
nossr50
be8a2a4b07 Fixes #3902 - NPE in Inventory Listener 2019-04-25 18:49:18 -07:00
nossr50
30df57fa35 Fix async tool lower 2019-04-25 18:46:49 -07:00
nossr50
467025888c Fixed #3858 - Falling blocks in water not getting tracked 2019-04-25 18:28:24 -07:00
nossr50
02a69cbb05 Update code style 2019-04-24 22:52:53 -07:00
nossr50
dc758a6dfc Wire up XP formula settings 2019-04-24 22:44:24 -07:00
nossr50
9fcedcad76 Add linear/exponential formula config options to defaults 2019-04-24 22:11:11 -07:00
nossr50
9d9b5464c3 fixing some serializer errors 2019-04-24 21:38:32 -07:00
nossr50
63e905db6c use a custom collection of serializers instead of the default list 2019-04-24 21:01:33 -07:00
nossr50
e8ea502f77 Add delegates to player level conf and wire up xp formula setting 2019-04-24 19:46:06 -07:00
nossr50
ba8b73ad4d add some missing delegates to xp config 2019-04-24 19:36:46 -07:00
nossr50
df2a52984e add combat default xp values 2019-04-24 19:30:15 -07:00
nossr50
b8ad722e9e Taming default XP values + updated acrobatics XP values 2019-04-24 18:58:29 -07:00
nossr50
7928ababf6 add smelting default xp values 2019-04-24 18:51:52 -07:00
nossr50
0a63e6674a merge prs 2019-04-24 18:24:29 -07:00
Robert A. C
b5930fc35d
Merge pull request #3897 from Zed-I/patch-4 
Added excavation treasure to coarse dirt
 2019-04-24 18:23:29 -07:00
nossr50
7f233b8e77 Tweaking some merge mistakes / bugs 2019-04-24 17:19:04 -07:00
nossr50
17c193f984 Merge branch 'configurable' of https://github.com/mcMMO-dev/mcmmo into configurable 2019-04-24 17:17:26 -07:00
nossr50
176b5db83e 2.1.48 2019-04-24 17:17:14 -07:00
Leomixer17
3329a6c49e
Update locale_it.properties 2019-04-24 23:09:03 +02:00
nossr50
c07a29ba86 mcMMO should work on both 1.13 and 1.14 now 2019-04-23 08:20:00 -07:00
nossr50
b36c4b56c3 first 5 levels in all skills are now much easier to level 2019-04-23 04:21:25 -07:00
nossr50
cee0025147 Bonus XP for early combat levels 2019-04-23 03:52:48 -07:00
nossr50
372ad1fac3 Experience settings for 114 are now under Experience_114 in experience.yml 2019-04-23 03:37:43 -07:00
nossr50
09cba965d3 Switch to GSON since mojang lib does not exist in 1.14 2019-04-23 02:12:22 -07:00
nossr50
d862f7f779 Tool lower task sync 2019-04-23 01:13:21 -07:00
nossr50
0adaa0ba66 PlayerNotification now marked async 2019-04-23 01:10:09 -07:00
nossr50
432a4aa330 1.14 is required for this version of mcMMO 2019-04-23 00:54:49 -07:00
nossr50
1c490cd463 1.14 Compatibility (this build won't run on 1.13 anymore) 2019-04-22 23:54:02 -07:00
nossr50
7506646862 Party NPE fix 2019-04-21 16:56:26 -07:00
Zed-I
570ab49e55
Added excavation treasure to coarse dirt 
Added coarse dirt to all drops that dirt can drop.
Also added grass block to the quartz drop since there is no reason not to.
 2019-04-20 16:35:01 +02:00
nossr50
78fdfc1c35 Made improvements to the Party member list from /party 2019-04-19 17:56:59 -07:00