Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity
5,718 Commits 46 Branches 44 Tags 36 MiB
ecac8d00ee
Commit Graph

4721 Commits

Author SHA1 Message Date
nossr50
81d648f94d setup typed references to skill configs 2019-04-04 23:46:48 -07:00
nossr50
42a7673ad7 Init and register skill configs to a map to make traversing the root node for a specific skill given the same structure easier 2019-04-04 22:47:40 -07:00
nossr50
51291f7c49 more work on notifications config 2019-04-04 19:53:06 -07:00
nossr50
4068d61246 Merge master 2019-04-04 19:20:24 -07:00
nossr50
af744fa088 Villagers give XP now 2019-04-04 18:55:25 -07:00
nossr50
8538ac4e50 mcnotify will now squelch notifications from mcMMO & players who are squelched will be reminded of their squelch status at least once an hour (you can disable this in advanced.yml) 2019-04-04 17:27:17 -07:00
OverCrave
43dd382541 fix concoction name inconsistency 2019-04-04 13:12:55 +02:00
OverCrave
cdb81e961e fix herbalism name inconsistency 2019-04-04 13:11:24 +02:00
OverCrave
51ced83301 mining guide update 2019-04-04 13:09:57 +02:00
OverCrave
09bca96af3 Merge remote-tracking branch 'upstream/master' 2019-04-04 13:05:37 +02:00
nossr50
f1d9f787f4 2.1.35 2019-04-04 00:39:00 -07:00
nossr50
6cad982969 Merge conflicts 2019-04-04 00:24:34 -07:00
nossr50
b8b0be71b1 2.1.34 2019-04-03 22:01:45 -07:00
nossr50
ac10261803 Blast Mining uses Pickaxe + Missing Taming XP entries 2019-04-03 21:54:49 -07:00
nossr50
5b2720a04f Taming Cleanup + Compiler Error fix 2019-04-03 21:07:12 -07:00
nossr50
0ca0140348 Code Cleanup pt 3 2019-04-03 19:55:52 -07:00
nossr50
43037f8c13 Code Cleanup Pt 2 2019-04-03 19:25:14 -07:00
nossr50
0e39656c88 Code cleanup and new settings for Database config 2019-04-03 18:42:58 -07:00
nossr50
8991c2bf2c Fixing merge conflicts 2019-04-03 17:25:18 -07:00
nossr50
7bbf1acd5d minor cleanup 2019-04-03 16:11:35 -07:00
OverCrave
dc018be6bb overhaul part 2 
- fixed/changed punctuation and grammar in some of the skills
- fixed some skills commands not having the same name as their shown name
 2019-04-03 22:20:59 +02:00
OverCrave
832b653a88 change usage of word 'wahrscheinlichkeit/chance' for consistency 2019-04-03 21:50:38 +02:00
OverCrave
1fddaf15cc add last missing new translations 2019-04-03 21:49:16 +02:00
nossr50
9acf597eb9 Fixing PlayerListener 2019-04-02 23:35:33 -07:00
nossr50
d2faac3b0d Code cleanup part 1 2019-04-02 23:28:12 -07:00
nossr50
b68feb6992 rogue import spotted 2019-04-02 23:07:52 -07:00
nossr50
f3837265db 2.1.33 2019-04-02 23:03:48 -07:00
nossr50
ecce631527 Mining Bonus Drop registration 2019-04-02 21:52:07 -07:00
nossr50
5c6f0e8cbf BonusDrops (Double/Triple) are now managed by BonusDropManager 2019-04-02 18:59:48 -07:00
nossr50
ac67e006d8 Kill the MultiConfigs 2019-04-02 18:30:06 -07:00
nossr50
661c63a8aa Unnecessary factory... 2019-04-02 18:11:05 -07:00
nossr50
eb43dc4460 Refactoring Salvageables/Repairables, removing Simple from the naming schemes 2019-04-02 17:42:35 -07:00
nossr50
9514b200cd unnecessary interfaces 2019-04-02 16:35:05 -07:00
nossr50
c428aff251 Anti-Exploit config pt 1 2019-04-01 18:16:20 -07:00
nossr50
c6e8e63088 Scoreboard config part 1 2019-04-01 18:12:18 -07:00
nossr50
8f33b378bf mod configs are taking a break 2019-04-01 18:02:36 -07:00
nossr50
67f95d3343 child.yml was a mistake 2019-04-01 16:50:35 -07:00
nossr50
5e1c12d8ec new config pt 9 2019-04-01 16:44:59 -07:00
nossr50
09c91f3b4b 2.1.32 2019-04-01 16:22:43 -07:00
nossr50
8d9f6c14a7 Completely remove Fireworks from mcMMO 2019-04-01 16:21:50 -07:00
nossr50
456e64456d Fixing an issue with mmoedit triggering notifications for skills already unlocked 2019-04-01 16:15:53 -07:00
nossr50
f1ecef310c Fixed a bug involving SubSkill notifications 
Fixes #3808, also fixed the notification timer
 2019-04-01 16:15:52 -07:00
BuildTools
1f2eae0799 Don't load the players profile just to get their name 2019-04-01 16:10:49 -07:00
nossr50
0d3551c84b Adding missing Double Drop entries for Woodcutting 2019-04-01 16:06:16 -07:00
nossr50
dc4401ffb0 Add missing Herbalism entries to config 2019-04-01 16:04:30 -07:00
nossr50
9568c0f85c Fixing Mining Double Drops (update configs) 2019-04-01 16:04:29 -07:00
nossr50
3f30f6950b unused imports 2019-04-01 15:45:40 -07:00
OverCrave
8182249641 Update locale_de.properties 2019-04-01 15:41:24 -07:00
OverCrave
b36c1376cf Update locale_de.properties 2019-04-01 15:38:37 -07:00
OverCrave
e4c911869d Update locale_de.properties 2019-04-01 15:38:37 -07:00
OverCrave
457b7f9d14 Update locale_de.properties 2019-04-01 15:38:36 -07:00
nossr50
ae551e17cd 2.1.32 2019-04-01 10:16:43 -07:00
nossr50
c6d055cb48 Completely remove Fireworks from mcMMO 2019-04-01 10:04:45 -07:00
nossr50
b125600dac Fixing an issue with mmoedit triggering notifications for skills already unlocked 2019-03-30 17:44:06 -07:00
Robert A. C
57b31b60b3
Merge pull request #3843 from Ineusia/master 
Minor API fix
 2019-03-30 17:09:27 -07:00
nossr50
7757e187be Fixed a bug involving SubSkill notifications 
Fixes #3808, also fixed the notification timer
 2019-03-30 16:56:00 -07:00
OverCrave
d44b6e0afb readd other locales 2019-03-30 17:59:25 +01:00
OverCrave
629d882831 Merge remote-tracking branch 'upstream/master' 2019-03-30 17:57:14 +01:00
OverCrave
947018c0f1 remove other languages temporarily 2019-03-30 17:56:40 +01:00
BuildTools
ca2e1c11e6 Don't load the players profile just to get their name 2019-03-29 23:56:40 -05:00
nossr50
b7d33f0227 Adding missing Double Drop entries for Woodcutting 2019-03-29 18:11:32 -07:00
nossr50
28c7fdd4e2 Add missing Herbalism entries to config 2019-03-29 17:57:48 -07:00
nossr50
53534e0f1d Fixing Mining Double Drops (update configs) 2019-03-29 17:44:54 -07:00
nossr50
8d477a5cf5 unused imports 2019-03-29 11:33:40 -07:00
nossr50
74908cdcf5 2.1.29 - Double Drop Fix 2019-03-29 11:27:49 -07:00
nossr50
c5f87e17f6 import cleanup 2019-03-29 00:04:51 -07:00
nossr50
7d1cbe4c45 notifications pt 1 2019-03-29 00:03:51 -07:00
nossr50
dc5766035b one last set of tweaks to repair config... I swear 2019-03-29 00:03:51 -07:00
nossr50
d144409673 even more comment restyling on repair 2019-03-29 00:03:51 -07:00
nossr50
07ebf12ae2 Tweaking Repair Comments + Anvils now use Name ID 2019-03-29 00:03:50 -07:00
nossr50
6e83763f22 Finishing touches on Repair Config 2019-03-29 00:03:50 -07:00
nossr50
e232bb3699 finished default repairables, diamond armor gives less xp by default 2019-03-29 00:03:50 -07:00
nossr50
968636b8d4 Repairables can now specify multiple items that can be used for repairs 2019-03-29 00:03:50 -07:00
nossr50
0f98d9babe Add Serializer for Repairable 2019-03-29 00:03:49 -07:00
nossr50
bf8e3d5a08 Removing unecessary interfaces 2019-03-29 00:03:49 -07:00
nossr50
7aea4e1d92 Repair Config pt 5 2019-03-29 00:03:48 -07:00
nossr50
68b32e0b9e Repair Config Pt 4, Salvage Config pt 1 2019-03-29 00:03:11 -07:00
nossr50
ef6bec4ffc Repair Config Pt 3 2019-03-29 00:03:11 -07:00
nossr50
ff986ec97d parent node renamed to something more specific 2019-03-29 00:03:11 -07:00
nossr50
0c58f5073c Acrobatics config pt 1 2019-03-29 00:03:11 -07:00
nossr50
579109b2f5 Configurable XP cooldowns for Roll 2019-03-29 00:03:10 -07:00
nossr50
d4d8cbbc03 arcane forging config 2019-03-29 00:03:10 -07:00
nossr50
d8b540cad8 actual last try 2019-03-29 00:03:10 -07:00
nossr50
1ff3e55c7e one last try then I give up :D 2019-03-29 00:03:10 -07:00
nossr50
17cb2c2615 try this 2019-03-29 00:03:10 -07:00
nossr50
3d21591830 update assembly plugin 2019-03-29 00:03:10 -07:00
nossr50
121c54b802 Repair Config Pt 2 2019-03-29 00:03:09 -07:00
nossr50
e709f04004 Skill Configs pt 1 2019-03-29 00:03:08 -07:00
nossr50
2cdb0395ee wire up alerting admins to over-fishing repeated abuse 2019-03-29 00:03:08 -07:00
nossr50
8f6f0e4a0f Expanding fishing exploit options 2019-03-29 00:03:07 -07:00
nossr50
133dadccec Custom Serializer Attempt #2 2019-03-29 00:01:39 -07:00
nossr50
c01b8e4ad4 Update changelog 2019-03-29 00:01:39 -07:00
nossr50
ac04ca5c27 Exploit Config Tweaks 2019-03-29 00:01:38 -07:00
nossr50
956b01a28e wire up creatures config 2019-03-29 00:01:38 -07:00
nossr50
7cd8099d3c new mob config "creatures.conf" 2019-03-29 00:01:38 -07:00
nossr50
bd0a4c75c0 Wire up backup config 2019-03-29 00:01:38 -07:00
nossr50
883fca3cf3 Wire up locale config 2019-03-29 00:01:37 -07:00
nossr50
45430d9c25 Wire up Super Ability config pt 1 2019-03-29 00:01:37 -07:00
nossr50
e933efcee0 Wire up Language config 2019-03-29 00:01:36 -07:00
nossr50
b9a37614b2 Add missing annotation 2019-03-29 00:01:36 -07:00
nossr50
7c0469dce1 Fix fishing exploit toggle 2019-03-29 00:01:36 -07:00
nossr50
7d2e76e464 Super Ability config pt 2 2019-03-29 00:00:26 -07:00
nossr50
3a21a913c6 Added toggle to disable party system 2019-03-29 00:00:26 -07:00
nossr50
b0b326d080 Convert Party data to HOCON serialization 2019-03-29 00:00:26 -07:00
nossr50
16d4c160c6 fix imports 2019-03-29 00:00:25 -07:00
nossr50
f299f84a6f Wire up party config pt 5 - Actually need to redo how I'm deserializing maps, gonna do that tomorrow 2019-03-29 00:00:25 -07:00
nossr50
80df1dd4bd Wire up party config pt 4 2019-03-29 00:00:24 -07:00
nossr50
8a6ed2f076 Party Config Pt 5 2019-03-29 00:00:24 -07:00
nossr50
d11f8fcdce Wire up Party Config pt 3 2019-03-29 00:00:24 -07:00
nossr50
6be936972f Party Config pt 4 2019-03-29 00:00:23 -07:00
nossr50
82dec38e5c Wire up Party Config pt 2 2019-03-29 00:00:23 -07:00
nossr50
70b3ca3094 Wire up Party Config pt 1 2019-03-29 00:00:23 -07:00
nossr50
f0455b28dc tweak Party Level unlocks 2019-03-29 00:00:23 -07:00
nossr50
f96c4bc063 Party Config pt 3 2019-03-29 00:00:22 -07:00
nossr50
a812ca42f7 Party config pt 2 2019-03-29 00:00:22 -07:00
nossr50
fb1467551f World Blacklist cleanup, metric config pt 2 2019-03-29 00:00:22 -07:00
nossr50
96b781ab0a Add super ability config 2019-03-29 00:00:22 -07:00
nossr50
a710893e2a Add chat and hud notification config 2019-03-29 00:00:21 -07:00
nossr50
0bed8898bf Add automated backup config 2019-03-29 00:00:21 -07:00
nossr50
4c78afc04b Add party config 2019-03-29 00:00:21 -07:00
nossr50
cb21c0bf24 Add particles config 2019-03-29 00:00:21 -07:00
nossr50
eb14d14e05 Add language config 2019-03-29 00:00:21 -07:00
nossr50
7c0a741b47 Add item config 2019-03-29 00:00:20 -07:00
nossr50
2acc230895 Add command config 2019-03-29 00:00:19 -07:00
nossr50
e57bf35e5e new settings for showing patreon, paypal 2019-03-29 00:00:19 -07:00
nossr50
2001ef30ee new config author_support_advertisements.conf 2019-03-29 00:00:19 -07:00
nossr50
b2c1358a84 Better config file organization for exploit prevention config 2019-03-29 00:00:19 -07:00
nossr50
efdd56684b Add options for Fishing exploit prevention 2019-03-29 00:00:18 -07:00
nossr50
0d8b4c5f5f Add Acrobatics exploit prevention config settings 2019-03-29 00:00:18 -07:00
nossr50
04fdd3270a MOTD Config 2019-03-29 00:00:18 -07:00
nossr50
094850ab85 Exploit Prevention config pt 2 2019-03-28 23:59:49 -07:00
nossr50
d272d60112 Anti-Exploit config pt 1 2019-03-28 23:59:48 -07:00
nossr50
f5c1e0952b World Blacklist Config 2019-03-28 23:59:26 -07:00
nossr50
0e61557812 Player Leveling config pt 3 2019-03-28 23:59:26 -07:00
nossr50
7a7dd7002e Hypens instead of Underscores because the serializer is a dumbo 2019-03-28 23:59:25 -07:00
nossr50
0046c47163 Expanded level cap settings, Player Leveling config pt 2 2019-03-28 23:59:25 -07:00
nossr50
8660d86306 Expanding DB cleanup settings, Player Leveling config pt 1 2019-03-28 23:57:21 -07:00
nossr50
d139d520e7 Move generic Scoreboard settings to General section 2019-03-28 23:57:21 -07:00
nossr50
8578d923d6 Fix imports 2019-03-28 23:57:21 -07:00
nossr50
307340bea3 Scoreboard config pt 2 2019-03-28 23:57:20 -07:00
nossr50
bbe9b92c15 Refactoring mistake 2019-03-28 23:57:20 -07:00
nossr50
f00601931d Scoreboard config part 1 2019-03-28 23:57:20 -07:00
nossr50
1c289cfcdf Refactoring SQL config class names again 2019-03-28 23:57:19 -07:00
nossr50
a8bf6357aa Fixed the loading of the Serialized configs 2019-03-28 23:57:19 -07:00
nossr50
77b4ade885 On second thought lets not use an empty class as a parent idk 2019-03-28 23:57:19 -07:00
nossr50
d3b437f6d3 Renaming config classes 2019-03-28 23:57:19 -07:00
nossr50
45e785bd1f Rewiring SQL to the new config pt 2 2019-03-28 23:57:19 -07:00
nossr50
be69f0d6a7 Rewiring the SQL code to the new configs 2019-03-28 23:57:18 -07:00
nossr50
e94005df34 Move user settings to new User category for MySQL 2019-03-28 23:57:18 -07:00
nossr50
88cd8e64bb Database Config getter boilerplate 2019-03-28 23:57:18 -07:00
nossr50
948837546a Move config loading outside of constructors 2019-03-28 23:57:17 -07:00
nossr50
8bc49e8bfb Add typesafe library to maven, cleanup config directory code 2019-03-28 23:57:17 -07:00
nossr50
55b1da0341 no more MultiConfigContainers, updating existing config classes for HOCON (WIP) 2019-03-28 23:57:16 -07:00
nossr50
132b908eee Added some more missing defaults to database config 2019-03-28 23:57:16 -07:00
nossr50
7d152794ba add missing defaults and constructor for database config 2019-03-28 23:57:16 -07:00
nossr50
e757dd10c8 import cleanup 2019-03-28 23:57:15 -07:00
nossr50
d5ea196840 added hocon configurate libs to maven 2019-03-28 23:57:14 -07:00
nossr50
f772b39eda add missing db config options 2019-03-28 23:57:14 -07:00
nossr50
493d6b0a67 Starting the conversion to HOCON, splitting up configs, and more 2019-03-28 23:57:14 -07:00
nossr50
76472a2b9f Most Experience related maps are now tracked via a new ExperienceMapManager to simplify loading/unloading of registered values 2019-03-28 23:56:27 -07:00
nossr50
f0e8eb35c4 Most Super Abilities which increase gathering speed now check both XP registers and new hardcoded lists to determine whether or not the block should be affected by the super ability, if the block is found on either the xp registers or our own internal list then it will be considered compatible with that super ability. 
This prevents weird behavior from a server admin removing XP from something like Stone
 2019-03-28 23:56:27 -07:00
nossr50
59f3835554 set configurate user file builder to dump block style formatting 2019-03-28 23:55:56 -07:00
nossr50
38c11d1601 Fixing zero initalize for entity xp + party share 2019-03-28 23:55:56 -07:00
nossr50
608a523996 Fix zero initialize for Swords config options 2019-03-28 23:55:55 -07:00
nossr50
a2e0ca0f84 Flux Mining Cleanup 2019-03-28 23:54:47 -07:00
nossr50
a3b8ab81be Fixed zero initialize for Smelting's Fuel Efficiency 2019-03-28 23:54:47 -07:00
nossr50
07db198a67 Whoops 2019-03-28 23:54:08 -07:00
nossr50
234a31d283 Fix Repair Mastery zero initialize 2019-03-28 23:50:11 -07:00
nossr50
f2945569fb Fixed zero initialize for SkullSplitter. config nodes 2019-03-28 23:47:26 -07:00
nossr50
72663ae2d3 Solved zero initialize for Party.Sharing.ExpSharing_bonus_base 2019-03-28 23:47:25 -07:00
nossr50
22eead18dd Add warning about 2.1.13 snapshot releases 2019-03-28 23:47:25 -07:00
nossr50
35d1e1ebd9 Removing test files 2019-03-28 23:47:25 -07:00
nossr50
4418d34930 add register to constructor of repair/salvage 2019-03-28 23:47:25 -07:00
nossr50
ed8611585f remove reflection code from MultiConfigContainer 2019-03-28 23:47:25 -07:00
nossr50
b3ed05eb09 forgot the other super constructor for configcollection 2019-03-28 23:47:24 -07:00
nossr50
9d0dd7ecd6 do not call register() in super 2019-03-28 23:47:24 -07:00
nossr50
e354e7b89b add unload to potion config 2019-03-28 23:47:24 -07:00
nossr50
714d9c0ca7 init potion ingredient lists in constructor 2019-03-28 23:47:24 -07:00
nossr50
53f06832f1 Locale NPE 2019-03-28 23:47:24 -07:00
nossr50
562066311b Always grab the Localized name of a skill 2019-03-28 23:47:23 -07:00
nossr50
b5b9a223a7 better error reporting on enabling mcMMO 2019-03-28 23:47:23 -07:00
nossr50
049b76f651 Only grab List<String> if it's a proper list 2019-03-28 23:47:23 -07:00
nossr50
4ab5e5e925 Changing iteration over a nodes children to be based on a list of its children rather than a returned type of String 2019-03-28 23:47:21 -07:00
nossr50
22ca1863fd fix NPE for anvil, salvage block, detonator item 2019-03-28 23:47:21 -07:00
nossr50
bdbda5587f fix NPE for ChimaeraWing 2019-03-28 23:47:21 -07:00
nossr50
a344e43e2e fix configManager NPE 2019-03-28 23:47:21 -07:00
nossr50
198b7e3f46 xpratemultiplier fix 2019-03-28 23:47:20 -07:00
nossr50
5647eebe99 Multiplier to camelcase 2019-03-28 23:47:20 -07:00
nossr50
367fabf70c fixing many compiler errors for configs 2019-03-28 23:47:19 -07:00
nossr50
2f804de36f fishing treasures pt 4 (enchantments) 2019-03-28 23:46:43 -07:00
nossr50
677e45a811 fishing treasures pt 3 (shake) 2019-03-28 23:46:43 -07:00
nossr50
99f0e029c2 fishing treasures pt 2 2019-03-28 23:46:43 -07:00
nossr50
3fc9f26b8b fishing treasures pt 1 2019-03-28 23:46:42 -07:00
nossr50
e75170f576 need to rewrite this mess 2019-03-28 23:46:42 -07:00
nossr50
3158ba591b Hylian Treasure pt 2 2019-03-28 23:46:42 -07:00
nossr50
31402d97c4 Hylian Treasure pt 1 2019-03-28 23:46:42 -07:00
nossr50
bef86f0e97 add CustomName and Lore fields to default treasure configs 
the functionality for these keys has always been here but this change should help make it more obvious
 2019-03-28 23:46:42 -07:00
nossr50
811b90bc31 fixing imports 2019-03-28 23:46:41 -07:00
nossr50
ef6b70f686 Some more comments 2019-03-28 23:46:41 -07:00
nossr50
2c752dc470 Removing the oopsies 2019-03-28 23:46:41 -07:00