Commit Graph

5129 Commits

Author SHA1 Message Date
nossr50
726369077e Fixing some issues with reloading 2019-06-16 05:57:52 -07:00
nossr50
2d1472b913 Fix Blast Mining and /mining command 2019-06-16 05:17:12 -07:00
nossr50
a1e3bb18a4 Fix double drops for mining 2019-06-16 04:59:34 -07:00
nossr50
43ca43cc48 Fix repair command 2019-06-16 01:42:30 -07:00
nossr50
278efc8e37 Fix repair logic 2019-06-16 01:13:39 -07:00
nossr50
3cde1400d1 Skill Ceiling removed 2019-06-16 00:17:21 -07:00
nossr50
3e01b413b4 Fix Salvage section in exploit conf 2019-06-16 00:07:34 -07:00
nossr50
8320b89b9f Add Herbalism subskill properties to config 2019-06-16 00:05:36 -07:00
nossr50
fb08bbb79d Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-15 23:51:36 -07:00
nossr50
c3f38cdabd A few typos in javdocs 2019-06-15 21:22:21 -07:00
nossr50
8f55a6277a Fix Repair enchant logic 2019-06-14 20:44:33 -07:00
nossr50
ef71661db1 2.1.81 2019-06-14 20:39:57 -07:00
nossr50
4f2e3f4399 Update axes to the new naming scheme 2019-06-14 15:51:26 -07:00
nossr50
dac447f381 Add missing skill properties to archery config 2019-06-14 15:46:13 -07:00
nossr50
8eba1dda1f Add Set<?> serializer + fix some errors 2019-06-14 13:49:01 -07:00
nossr50
ffa35d0179 Fix leveling + Fix Roll 2019-06-14 12:00:47 -07:00
nossr50
e7e28ec3cb Wire up unarmed config 2019-06-14 11:36:21 -07:00
nossr50
ab56464bc4 Add disarm config settings 2019-06-14 11:16:46 -07:00
nossr50
43600ef800 Add and wire up Herbalism AFK exploit toggle 2019-06-13 18:12:10 -07:00
nossr50
b4e612b15b Fix skill property registration method 2019-06-13 16:48:49 -07:00
nossr50
9e336c8a6f Reduce console spam 2019-06-13 16:19:59 -07:00
nossr50
29a712ca80 Fixing some mistakes with FQNs 2019-06-13 16:14:59 -07:00
nossr50
18a28a87b1 Fix mistake when registering fully qualified names 2019-06-13 15:57:44 -07:00
nossr50
307bf8b332 SoundSettingSerializer 2019-06-13 15:28:06 -07:00
nossr50
86a4b74eb3 Wire up sound config 2019-06-13 14:02:15 -07:00
nossr50
6f3b90d0dd Sound Config 2019-06-13 13:43:10 -07:00
nossr50
f0cce29d71 Rewrite NotificationManager to handle more flexible config options 2019-06-13 12:43:51 -07:00
nossr50
8abccfc9cd Rewrite of McMMOPlayerNotificationEvent 2019-06-13 11:28:10 -07:00
nossr50
9c04054017 2.1.80 2019-06-12 12:23:58 -07:00
nossr50
bdd0335d0b Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-12 11:07:54 -07:00
nossr50
7ab70ba597 2.1.79 2019-06-12 11:05:16 -07:00
nossr50
a97f1b208f NotificationManager now uses a getter in mcMMO 2019-06-12 10:54:05 -07:00
nossr50
473e4586c9 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-12 10:40:04 -07:00
SNAKE0053
15b34e2056 Update locale_ja_JP.properties 2019-06-13 02:35:39 +09:00
nossr50
98f6eac50c Super Abilities don't do extra durability damage to tools with the
unbreaking enchantment
2019-06-12 10:18:43 -07:00
nossr50
b0f09c8e7b Add PlayerNotificationSerializer 2019-06-12 10:01:18 -07:00
nossr50
b03abcdee8 Add notification settings 2019-06-12 09:51:22 -07:00
nossr50
963d0a1897 Fixed a bug where shovels took too many materials to repair 2019-06-12 06:20:20 -07:00
nossr50
b29d87df8c Add ScrapCollector and wire up profile loading message toggle 2019-06-12 05:44:25 -07:00
nossr50
a654762f4d Yikes that was a lot of merge conflicts. 2019-06-12 05:26:45 -07:00
nossr50
705285878f Diagnosing myself with dyslexia 2019-06-11 03:57:28 -07:00
nossr50
e1dcb65888 Add back in the comment about min quantity 2019-06-11 03:52:45 -07:00
nossr50
9062dbcaae Add minimum quantity back to the repair config 2019-06-11 03:50:13 -07:00
nossr50
3fe47c939a You can not salvage without 1 rank in Scrap Collector now (unlocks at
level 2)
2019-06-10 22:46:03 -07:00
nossr50
46dee3c9b6 Numerous tweaks to salvage + fixing repair bugs 2019-06-10 22:37:20 -07:00
nossr50
8e67e2d158 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2019-06-10 16:33:30 -07:00
nossr50
f5f4182a90 2.1.75 2019-06-10 16:14:24 -07:00
89009332
77bde61f4b
Update locale_zh_CN.properties 2019-06-10 09:17:07 +08:00
nossr50
1297b45ef8 2.1.74 2019-06-09 07:08:26 -07:00
nossr50
83b55db4f8 2.1.73 2019-06-09 05:53:39 -07:00
nossr50
caec01e9fa 2.1.72 2019-06-09 05:12:56 -07:00
nossr50
2be67bae19 Fixed a NPE that could occur if Roll was disabled in coreskills.yml 2019-06-09 05:10:30 -07:00
nossr50
a677450d50 Fix NPE on server shutdown with no user data 2019-06-09 05:07:34 -07:00
nossr50
a132172507 You can no longer repair/salvage item stacks with more than one item 2019-06-08 10:20:22 -07:00
nossr50
549ef5734e Repair now always requires confirmation 2019-06-07 10:32:55 -07:00
nossr50
77fbf7f51e Salvage always asks for confirmation before breaking an item 2019-06-07 10:26:49 -07:00
nossr50
00bee60151 Prevent tool ready messages on shulker boxes 2019-06-07 05:13:37 -07:00
nossr50
c58a36e604 Most the functionality of SkillPropertiesManager is in place, but not
yet complete
2019-06-07 04:07:43 -07:00
nossr50
3c3bc338f2 Add serializer for MaxBonusLevel 2019-06-07 01:24:11 -07:00
nossr50
80beb92a06 Rewrote how Arrow Retrieval subskill is handled 2019-06-07 01:18:14 -07:00
nossr50
39b5719e12 Fill in Daze/Skill Shot for Archery config 2019-06-07 00:31:59 -07:00
nossr50
7679afd3e0 Add new DatabaseAPI 2019-06-06 23:15:18 -07:00
nossr50
5eb80f9277 Add skill shot config settings 2019-06-06 08:09:27 -07:00
nossr50
d879575d5f Wire up PVP/PVE settings 2019-06-06 06:07:05 -07:00
nossr50
51a57429b6 Add PVP/PVE settings to core skill config 2019-06-06 05:58:44 -07:00
nossr50
3e75026281 Wire up Hardcore/Vampirism 2019-06-06 05:31:13 -07:00
nossr50
c698bed05e Setup the hardcore/vampirism config 2019-06-06 05:25:37 -07:00
nossr50
237311a98f Fix spelling mistake + Wire up ChimaeraWing 2019-06-06 04:19:01 -07:00
nossr50
240ab0a0af Add Chimaera Wing to the items config 2019-06-06 03:38:09 -07:00
nossr50
582c9a6726 Correct the name of FastFoodService for rank config 2019-06-06 02:03:31 -07:00
nossr50
fc2077ffdb Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-06 01:58:52 -07:00
nossr50
0638f4c437 2.1.69 2019-06-05 23:50:39 -07:00
nossr50
426b2d27e7 Fix NPE for new data tracker 2019-06-05 21:43:07 -07:00
nossr50
3ce3ac5350 mcMMO should no longer lose a few minutes of player data from shutting
down the server
2019-06-05 21:11:44 -07:00
nossr50
94df19bdb4 Converting some remaining float literals to double literals 2019-06-04 21:18:51 -07:00
nossr50
fc6c6ed2c4 Using doubles in most places again to avoid precision loss 2019-06-04 21:12:10 -07:00
nossr50
32fa6cee96 Fix some issues with the CustomXPPerkSerializer 2019-06-04 20:00:25 -07:00
nossr50
ffe27326e3 Move serializers 2019-06-04 19:33:29 -07:00
nossr50
97b70ec2a1 Correcting issues with deserializing SkillRankProperty 2019-06-04 19:03:20 -07:00
nossr50
e5592919b7 Add SkillRankProperty serializer 2019-06-04 14:58:17 -07:00
nossr50
b2dc322a2b Remove the old rank config file 2019-06-04 13:13:41 -07:00
nossr50
cf6a4c804a Rewrote how SkillRanks were pulled for the new config system 2019-06-04 13:11:45 -07:00
nossr50
b62bd0e620 Fill in Excavation rank config 2019-06-03 06:13:35 -07:00
nossr50
86a46babc1 Fill in Woodcutting rank config 2019-06-03 06:09:20 -07:00
nossr50
0bafcb659b Fill in Unarmed rank config 2019-06-03 05:56:03 -07:00
nossr50
9db152ebc8 Fill in Swords rank config 2019-06-03 05:52:53 -07:00
nossr50
ef44a43bd2 Fill in rank configs for Fishing 2019-06-03 05:48:15 -07:00
nossr50
bdc44f6ede Fill in rank config for Herbalism 2019-06-03 05:44:22 -07:00
nossr50
0e70c9ce75 Fill in Mining rank info 2019-06-03 05:42:42 -07:00
nossr50
2d1d2693ed Fill in Salvage rank information 2019-06-03 04:44:16 -07:00
nossr50
c33d6e62b7 Fill in Smelting rank information 2019-06-03 04:39:50 -07:00
nossr50
fd78ce278e Fill in Taming subskill rank information 2019-06-03 04:34:54 -07:00
nossr50
5ca027650e Add ConfigRanks WIP (axes, acrobatics, archery so far) 2019-06-03 04:17:23 -07:00
nossr50
e05078b280 Some misc cleanup, including removing some leftover April Fools stuff 2019-06-03 02:36:29 -07:00
nossr50
12c0b19776 Stringify ConfigExperienceWoodcutting 2019-06-03 02:01:28 -07:00
nossr50
f898525362 Stringify ConfigExperienceMining 2019-06-03 01:57:25 -07:00
nossr50
f53bd1ab03 Stringify ConfigExperienceHerbalism 2019-06-03 01:51:58 -07:00
nossr50
c82f60e08b Custom serializer for SkillCeiling 2019-06-03 01:09:06 -07:00
nossr50
8c1c17fa17 Custom Serializer for DamageProperty 2019-06-03 01:02:45 -07:00
nossr50
7a0ef0d4ed Making the compiler happy 2019-06-03 00:31:46 -07:00
nossr50
29876b4a20 SkillProperty no longer has an identifier for SubSkillType 2019-06-02 23:24:30 -07:00
nossr50
fc7455354f Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-02 23:04:52 -07:00
nossr50
4048ecc764 Fixing some imports 2019-06-02 22:42:03 -07:00
nossr50
f93a1aa151 2.1.68 - You can use food in the off hand with the diet abilities now. 2019-06-02 22:41:13 -07:00
SNAKE0053
3832ef3547 Update locale_ja_JP.properties 2019-06-02 05:50:26 +09:00
nossr50
8b4cea5dab Chimaera Wing should not be disabled by default 2019-06-01 12:26:11 -07:00
nossr50
4e7e2daf3c Fix issues in the ExperienceBarWrapper 2019-06-01 03:23:08 -07:00
nossr50
9dfbb14c39 Wire up the new Axes config 2019-06-01 03:16:30 -07:00
nossr50
cb9a4e5e5d Greater Impact settings & some refactoring for Axes config 2019-06-01 02:11:31 -07:00
nossr50
5af60e2fe1 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-01 01:58:21 -07:00
nossr50
9111590dc2 2.1.67 2019-05-31 19:46:14 -07:00
nossr50
9d47234918 Add private keyword 2019-05-31 18:52:28 -07:00
nossr50
299c989dd4 Add Axes Critical Strikes to new configs 2019-05-31 18:49:24 -07:00
nossr50
00131bb412 DamageProperty for skills 2019-05-31 18:42:23 -07:00
nossr50
186ad2cd59 Add MaximumProgressLevel interface and implementation 2019-05-31 01:45:57 -07:00
nossr50
19acf47f1e Add Armor Impact settings to Axes config 2019-05-30 18:59:50 -07:00
nossr50
01bffc6670 Fixing a typo of sorts 2019-05-30 16:17:02 -07:00
nossr50
1532791c3f Still some work to do, but now the convert XP command is less clunky 2019-05-30 16:12:32 -07:00
nossr50
84b9b255aa Parties now use the same formula for leveling as players 2019-05-30 15:52:13 -07:00
nossr50
61e46b6f10 Fixing some tab completion bugs for mcconvert 2019-05-30 15:48:29 -07:00
nossr50
8d10f8053f Removing the clunky previous formula file design 2019-05-30 15:33:57 -07:00
nossr50
b27d46f0cc Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-29 14:06:55 -07:00
nossr50
4795143fca Fixed a memory leak in MySQL that would cause errors if users were
removed from the DB
2019-05-29 10:14:04 -07:00
nossr50
54eca5b8ba Fixed a bug where RetroMode would always use Linear formula 2019-05-27 20:13:22 -07:00
nossr50
1cda612e86 Fixed a bug that would spam other players when someone used an ability 2019-05-27 19:25:36 -07:00
nossr50
50e4e971d9 Standard level scaling now mirrors RetroMode in a true 1:10 parity 2019-05-27 17:37:54 -07:00
Robert A. C
d7b2a98723
Merge pull request #3934 from andris155/patch-6
Update locale_hu_HU.properties
2019-05-21 13:27:34 -07:00
nossr50
bfb48ccea3 Buffed Impact durability damage and fixed it 2019-05-21 13:13:17 -07:00
András Marczinkó
8cd39301a3
Update locale_hu_HU.properties 2019-05-21 19:11:28 +02:00
nossr50
321684e5f6 Fixed a bug where creative players could gain XP if they qualified for
early game XP boosts
2019-05-19 17:34:51 -07:00
nossr50
04fb4c30fe Fix compiler errors 2019-05-18 16:25:52 -07:00
nossr50
04b4a8e069 Remove redundant operations on LimitedSizeList 2019-05-18 15:49:14 -07:00
nossr50
1e1b803cce Wire up mining exploit toggle 2019-05-18 15:47:36 -07:00
nossr50
3d576eaa6a Add mining exploit settings + delegate methods to exploit config 2019-05-18 15:45:43 -07:00
nossr50
087df05e77 Add wandering trader xp 2019-05-18 15:38:39 -07:00
nossr50
05936b3c75 Add missing chiseled_* xp values 2019-05-18 15:35:02 -07:00
nossr50
c10853def9 Add missing mossy_* xp values 2019-05-18 15:33:39 -07:00
nossr50
08baa5993e Remove duplicate mossy cobblestone entry 2019-05-18 15:02:02 -07:00
nossr50
0396039d50 Add missing stone_brick_* xp values 2019-05-18 14:57:42 -07:00
nossr50
4aa81f1023 Add bamboo XP 2019-05-18 14:55:17 -07:00
nossr50
4bd3f8d6bd Add wither rose XP 2019-05-18 14:54:07 -07:00
nossr50
4627df1160 Add lilly of the valley xp 2019-05-18 14:53:32 -07:00
nossr50
a72c45766f Add cornflower xp 2019-05-18 14:52:56 -07:00
nossr50
4ced61e4fc Add sweet berry bush 2019-05-18 14:52:02 -07:00
nossr50
c237601af6 Lower guardian XP 2019-05-18 14:48:41 -07:00
nossr50
3a88193459 Add magma block 2019-05-18 14:47:38 -07:00
nossr50
65a234c6b3 Wire up admin notification toggle 2019-05-18 14:46:48 -07:00
nossr50
9fb9228869 Wire up events config 2019-05-18 14:08:33 -07:00
nossr50
ca8293bc35 Add new config for events 2019-05-18 13:57:23 -07:00
nossr50
9c5ec234d9 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-18 13:21:36 -07:00
SNAKE0053
d46fae2d1a Update locale_ja_JP.properties 2019-05-19 03:46:48 +09:00
nossr50
66425ba48d Add UUID to admin notifications 2019-05-18 10:59:52 -07:00
nossr50
2433ef5db7 Move admin notification toggle check 2019-05-18 10:47:37 -07:00
nossr50
663757352a Tweak xp rate admin notification messages 2019-05-18 10:45:50 -07:00
nossr50
1ced5d8ffc Confirmation messages for admin commands are now moved into the
convenience methods in NotificationManager
2019-05-18 10:40:06 -07:00
nossr50
04c6bd8750 Admin notifications convenience methods handled by NotificationManager 2019-05-18 10:09:45 -07:00
nossr50
b0dc41b4d9 Encapsulate admin notifications + add prefix 2019-05-18 08:12:32 -07:00
nossr50
92e6cedb14 This is why you don't program when you haven't slept in 20 hours 2019-05-18 08:04:55 -07:00
nossr50
447ce97f24 Send message to correct player 2019-05-18 08:03:39 -07:00
nossr50
2a471e409c Fix mistake in new admin notification locale 2019-05-18 08:02:16 -07:00
nossr50
08223bd320 Hotfix for repairing diamond, nerf guardian xp rate 2019-05-18 08:01:15 -07:00
nossr50
90480ca626 Add missing Magma_Block xp value 2019-05-17 15:45:07 -07:00
Robert A. C
56b031b99d
Merge pull request #3930 from andris155/patch-1
Update locale_hu_HU.properties
2019-05-17 04:28:15 -07:00
nossr50
f3cbd450d0 Admin chat now sends useful information to admins/adminchat permissible
players
2019-05-17 04:27:27 -07:00
András Marczinkó
b176fd9bca
Update locale_hu_HU.properties 2019-05-17 13:08:49 +02:00
nossr50
1c130aad42 2.1.61 - Some fixes + Exploit prevention 2019-05-16 13:30:43 -07:00
nossr50
734dfcdec5 Add toggle to disable event information on player join 2019-05-16 11:40:47 -07:00
nossr50
c8a32b8b38 Add toggle for event broadcasts - General.EventBroadcasts 2019-05-16 11:34:26 -07:00
nossr50
88d8d0e6bb Fix the Double Drop string in the mining command 2019-05-16 11:20:51 -07:00
nossr50
b532b42db3 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-15 16:39:49 -07:00
Robert A. C
a763f7f025
Merge pull request #3928 from snake0053/translate
Update locale_ja_JP.properties
2019-05-15 09:52:54 -07:00
SNAKE0053
357e9cc08f Update locale_ja_JP.properties 2019-05-16 01:11:25 +09:00
nossr50
f0d6f7077b Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-14 23:01:05 -07:00
nossr50
95652efbaa Fix bonus drops on multi-block crops 2019-05-14 16:14:01 -07:00
nossr50
e70e5b04b5 Remove unecessary parameter 2019-05-14 15:29:15 -07:00
nossr50
34869914c4 Wolfs no longer kill themselves + tamed mob heart death message bug 2019-05-14 15:14:30 -07:00
nossr50
a53505ee0b Raised overfishing limit + improved tips 2019-05-13 08:53:22 -07:00
nossr50
f0e64d992b Remove unecessary check 2019-05-13 08:45:00 -07:00
nossr50
c61c55031d Core skill config is now converted 2019-05-13 08:36:37 -07:00
nossr50
39d10855d8 Temporarily add them back in :juice: 2019-05-13 08:21:24 -07:00
nossr50
aeb518f38c Don't make unecessary folders 2019-05-13 08:18:28 -07:00
nossr50
d3a719eb8d Experience configs are now fully converted 2019-05-13 05:32:49 -07:00
nossr50
ab4b4edb1a Wire up Repair XP values 2019-05-13 05:31:34 -07:00
nossr50
591c9e67a3 Wire up XP bar settings 2019-05-13 05:25:40 -07:00
nossr50
59c8d16374 XP Bar settings 2019-05-13 05:17:00 -07:00
nossr50
3a6d94e682 Cleanup 2019-05-13 04:00:08 -07:00
nossr50
2b0931314a Wire up smelting XP values 2019-05-13 03:57:23 -07:00
nossr50
d1298c0cd2 Further cleanup 2019-05-13 03:49:33 -07:00
nossr50
3f6a33dea6 Refactoring experience manager 2019-05-13 03:39:24 -07:00
nossr50
d8841c6ae7 Add + Wire up Combat XP Multipliers 2019-05-13 03:33:33 -07:00
nossr50
2e3f9b4a96 Add + Wire DiminishingReturn config values
Removed the experience multiplier from the xp conversion task, it just
seems like something very unecessary
2019-05-13 02:55:20 -07:00
nossr50
6425cd18b8 Temporarily hold party settings in DSM (will be removed later) 2019-05-13 02:05:44 -07:00
nossr50
86b98368bc Move API checks into their own class 2019-05-13 01:58:27 -07:00
nossr50
b5eb942682 Catch all exceptions not just NPE 2019-05-13 01:40:54 -07:00
nossr50
ca4f15df46 More refactoring, made the changelog less noisy 2019-05-13 01:32:52 -07:00
nossr50
2c8b8658a3 Update classes to use DSM over CM 2019-05-13 01:27:48 -07:00
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