EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 22:26:46 +01:00
Code Issues Projects Releases Wiki Activity
6,375 Commits 48 Branches 45 Tags 34 MiB
1c63e34dbb
Commit Graph

5199 Commits

Author SHA1 Message Date
nossr50
05f07c174b Change readChunkStore to Nullable 2021-01-02 15:30:00 -08:00
nossr50
eff016c0a6 More nullability in blockmeta classes 2021-01-02 15:27:51 -08:00
t00thpick1
5b41b04777 Use @NotNull in methods rather than @Nullable 
Separate safe external methods from internal only methods
Remove unnecessary methods
 2021-01-02 17:29:15 -05:00
t00thpick1
10694042e9 Move legacy Serializable usage into a subclass. 2021-01-02 16:54:11 -05:00
nossr50
d08c9391b0 Add nullability annotations to blockmeta 2021-01-02 13:36:59 -08:00
t00thpick1
e0d85f842b Fix exception thrown when plants fake grow at max world height. 2021-01-02 11:18:32 -05:00
nossr50
bec54d93ac Fix dupe bug 2021-01-01 22:15:44 -08:00
Shane Freeder
67a4b6c7c1 Experience PreGain event 2021-01-02 01:05:28 +00:00
Shane Freeder
556515eefd Add SkillActivationPerkEvent 2021-01-02 01:05:27 +00:00
nossr50
fbecbc167a Optimizations and potentially fixing a ConcurrentModificationException involving the TransientEntityTracker 
Fixes #4368
 2021-01-01 14:04:36 -08:00
nossr50
959d1e4a05 Remove music discs from the default loot table 2021-01-01 12:46:08 -08:00
nossr50
42d3dc3925 Master Angler now mentions it works better with a boat in its hover tip 2020-12-31 16:58:46 -08:00
nossr50
e4af53a535 Use boolean over Boolean 2020-12-31 16:46:49 -08:00
nossr50
9ba8af9f6e Forgot to register the intended tool set 2020-12-31 16:42:37 -08:00
nossr50
56b376eb54 SuperBreaker will always activate if the fastest tool for the block is a PickAxe 
Fixes #4362
 2020-12-31 16:41:08 -08:00
nossr50
c408c7d057 avoid concurrent exceptions on TransientEntityTracker 2020-12-31 16:26:37 -08:00
nossr50
c05c8e1b1d Fix init player in TransientyEntityTracker 2020-12-31 16:08:23 -08:00
nossr50
3f6de1c4ba Fix giving double treasures if the setting to give extra fish is on 
Fixes #4363
 2020-12-31 15:53:01 -08:00
nossr50
8ee405fbfd Ignore "fake player" npcs in EntityPickupItemEvent 2020-12-31 15:49:32 -08:00
nossr50
2664ae4bd6 Optimize ChunkUnloadEvent & Partial rewrite to COTW entity tracking + some tweaks to COTW entity removal 2020-12-31 15:25:21 -08:00
nossr50
aed4cb87be Fix enchanted books not being created with the proper data 2020-12-31 13:21:55 -08:00
nossr50
5b898049a3 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-12-30 15:49:16 -08:00
nossr50
006a7bf277 Add back missing cooldown locale message 
Fixes #4361
 2020-12-30 15:41:14 -08:00
nossr50
01f31e76f5 new chunkstore 
Co-authored-by: t00thpick1 <t00thpick1dirko@gmail.com>
 2020-12-30 15:24:21 -08:00
nossr50
7802d54ebd 2.1.164 
Closes #4358 #4342 #3812 #3643 #3540
 2020-12-29 13:47:40 -08:00
nossr50
dd3d324415 update notes and default fishing treasures 2020-12-29 13:38:03 -08:00
nossr50
8ff345af38 fix array out of bounds 2020-12-29 13:20:10 -08:00
nossr50
bab13f32e7 update notes 2020-12-29 13:15:15 -08:00
nossr50
3c9c8556dd Allow vanilla block interaction with sneak if the block is set to be a mcMMO repair/salvage anvil 2020-12-29 12:58:39 -08:00
nossr50
d9f98b1aa9 Fix a bug where books weren't registered + tweaked how treasures were loaded 2020-12-29 12:39:06 -08:00
nossr50
0f4455d5a8 remove unused settings from fishing treasures and add enchantment section for mythic 2020-12-29 12:12:03 -08:00
nossr50
bdee0278a5 Fix Fishing using values from the wrong config 2020-12-29 12:03:57 -08:00
nossr50
ac31a3dc0e Fixing start up errors when loading treasures.yml 2020-12-28 17:37:14 -08:00
nossr50
8b62c0b693 Better message for items not found in current version of MC from Fishing Config 2020-12-28 16:58:57 -08:00
nossr50
31e0f1e4da less verbose enchantment book log 2020-12-28 16:47:33 -08:00
nossr50
14a6e5c603 Comment out whitelist in fishing_treasures.yml 2020-12-28 16:45:16 -08:00
nossr50
652a9519c1 Move fishing treasues to new file fishing_treasures.yml, replace Records rarity with Mythic, and allow for Enchanted_Book in the treasures list with new optional whitelist/blacklist parameters 
read the changelog for information about this
 2020-12-28 16:42:00 -08:00
nossr50
a4ef322fa5 Add ExploitFix.PreventPluginNPCInteraction to experience.yml 
Read the changelog for why
 2020-12-28 12:58:03 -08:00
nossr50
6f88c282cf minor cleanup on skill register impl 2020-12-24 16:43:27 -08:00
nossr50
21ac44ee61 More work on skill API impl/migration 2020-12-24 16:41:09 -08:00
nossr50
9b9ffbb982 More work on migrating commands to new API 2020-12-23 15:29:39 -08:00
nossr50
537b120ffc Updating command classes to new API 2020-12-23 14:58:32 -08:00
nossr50
25f7dd223d More API migration on the DB impl 2020-12-23 12:00:05 -08:00
nossr50
843e3ace99 API migration on DBs 2020-12-23 11:08:57 -08:00
nossr50
8a507de8d6 brain getting tired, time for break, more api migration included 2020-12-22 19:28:47 -08:00
nossr50
7e756c4438 More API migration 2020-12-22 19:23:03 -08:00
nossr50
4199ea0095 More API migration, feels like a mountain of work left lol 2020-12-22 17:27:25 -08:00
nossr50
73bc12841a Add Override annotations, remove redundant javadocs 2020-12-22 14:28:23 -08:00
nossr50
35be5bc17d Generify the maps 2020-12-22 14:24:37 -08:00
nossr50
b7f713a50f Use OnlineMMOPlayer over McMMOPlayer 2020-12-22 13:43:12 -08:00
nossr50
573d9d014e More work on Skill API migration 2020-12-17 16:22:22 -08:00
nossr50
abcf6413f5 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-12-17 15:10:53 -08:00
nossr50
2de52c7955 register new chunk listener 2020-12-16 16:30:05 -08:00
nossr50
8c52884ac6 Remove COTW entities on chunk unload 
Fixes #4289
 2020-12-16 16:29:05 -08:00
nossr50
22a738bace mcMMO no longer throws errors on below 0 xp gains 
Fixes #4346
 2020-12-16 16:15:19 -08:00
Robert Alan Chapton
16aa6d65ac
Update McMMOUrl.java 
fixed translate link, thanks chew
 2020-12-16 12:46:17 -08:00
nossr50
306b8cfac4 more work on migrating the API 2020-12-15 16:24:11 -08:00
nossr50
407b6fb343 more API migration 2020-12-15 09:31:51 -08:00
nossr50
d8f8d541fc more work on migrating API 2020-12-14 15:20:01 -08:00
nossr50
64e1d1a9d7 more refactoring/rewrites for player data loading stuff 2020-12-10 17:15:14 -08:00
nossr50
0e22583df4 fix skill commands 2020-12-10 16:15:47 -08:00
Wolf2323
0e09ac397d
fix BrewingStand inventory is updated immediately instead of after firing the event. Now the event can be canceled correct. (#4351) 2020-12-10 13:24:08 -08:00
nossr50
1c132ddb12 slow refactoring over skill commands 2020-12-09 18:42:48 -08:00
nossr50
81d184c19e slowly refactoring stuff 2020-12-09 18:33:16 -08:00
nossr50
8491d0f4e5 annotate messaging classes + update more things to use mmoPlayer 2020-12-09 18:09:04 -08:00
nossr50
a2a41e77ea Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-12-09 17:37:30 -08:00
nossr50
7f213ee305 exploit fix 2020-12-09 15:34:32 -08:00
nossr50
8e17090cc7 these javadocs are straight up wrong 2020-12-08 15:36:24 -08:00
nossr50
3cb63202a3 more work on parties and user data 2020-12-08 15:34:16 -08:00
nossr50
0bb65e66e8 add rank edit on forced party leader 2020-12-08 14:32:45 -08:00
nossr50
17268ca4ad forced promotion on a random player in a party if party leader is ever null 2020-12-08 14:31:54 -08:00
nossr50
29fffbcc2a don't forget to init partyLeaderRef 2020-12-08 14:20:36 -08:00
nossr50
a8257f3d6e more work towards party stuff 2020-12-08 14:18:46 -08:00
nossr50
85ad0ddd17 More work on parties 2020-12-07 16:40:24 -08:00
nossr50
4e81d4ddb6 some work on experience rewrites 2020-12-04 15:36:22 -08:00
nossr50
704e24d58b SkillIdentity will be used to ID skills, establish relationships, and avoid name conflicts 
Will probably move this into the mcMMO API which I might just get started on depending on my motivation
 2020-12-03 13:57:46 -08:00
nossr50
958fb6f044 Silenced a mostly harmless error that can happen when using plugins like crazyenchantments 2020-12-01 13:08:33 -08:00
nossr50
0ce316e428 update adventure (used for chat) 2020-11-27 16:55:40 -08:00
nossr50
bcd260d9c1 Memory leak fix 2020-11-27 16:26:24 -08:00
nossr50
bc53714ac8 URL style adjust 2020-11-16 16:00:01 -08:00
nossr50
db8086d6ad Allow URLs in chat again 2020-11-16 14:56:48 -08:00
Momshroom
c22a65f9f3
Adding crossbows, shields, elytra, and tridents to default repair.vanilla.yml and fixing minor typo. (#4308) 
* Changed comment over netherite items to say "Netherite repairables" instead of "Diamond repairables"
Added Crossbow to string repairables
Added Shield to wood repairables, with oak planks as material
Added Elytra and Trident to Other repairables, using phantom membrane and prismarine crystals respectively.

* Changed comment over netherite items to say "Netherite repairables" instead of "Diamond repairables"
Added Crossbow to string repairables
Added Shield to wood repairables, with oak planks as material
Added Elytra and Trident to Other repairables, using phantom membrane and prismarine crystals respectively.
Added warped fungus on a stick as a string repairable.

Signed-off-by: Momshroom <Momshroom@gmail.com>

* Added warped fungus on a stick as a string repairable.

Signed-off-by: Momshroom <Momshroom@gmail.com>
 2020-11-16 14:42:24 -08:00
Tim
4fd8f6d647
Update locale_nl.properties (#4336) 
Fixed small translation errors
 2020-11-16 14:39:07 -08:00
nossr50
cfcdcd1676 Fix Lure above 3 breaking fishing 2020-11-16 14:36:59 -08:00
nossr50
450d09e9e4 wip expmanager/party/mcmmo player rewrites 2020-11-16 13:43:47 -08:00
nossr50
5dc95b1fca Merge branches 'tridentsxbows' and 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-11-13 13:53:12 -08:00
nossr50
f346d3b758 2.1.157 2020-11-11 16:50:21 -08:00
nossr50
148647709a Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-11-11 16:42:53 -08:00
nossr50
477d6932cd 2.1.156 2020-11-10 15:21:45 -08:00
nossr50
b31e1e533b New skill 'Knock On Wood', changes to axe readying messages 2020-11-10 15:17:52 -08:00
nossr50
8f6819edc5 Fix GT replant sometimes planting floating plants 2020-11-10 13:17:58 -08:00
nossr50
7887232d93 Update locales 2020-11-10 12:19:23 -08:00
nossr50
b0afdccfa5 skillranks.yml will automatically fix itself if it finds certain issues 2020-11-10 12:05:42 -08:00
nossr50
592851e80b Throw errors for child skill leaderboard requests 2020-11-10 11:22:02 -08:00
nossr50
c9b950d0c8 Fix chat.yml chat channel toggles 2020-11-10 11:07:07 -08:00
nossr50
ba7e235e64 Master Angler reworked 2020-11-09 16:46:52 -08:00
nossr50
da06d5c075 Fixed a bug where Spectral arrow awarded too much XP 2020-11-09 13:53:17 -08:00
nossr50
34d9f70ac0 Fixed a bug where party members didn't have properly colored names, added some optimization and removed some unnecessary API 2020-11-09 13:19:54 -08:00
nossr50
4abf64f625 Full hex color support in admin/party chat 2020-11-06 15:16:26 -08:00
nossr50
1383457eba Update javadocs 2020-11-06 14:16:24 -08:00
nossr50
bd48680125 Use legacy serializer instead 2020-11-06 14:13:46 -08:00
nossr50
5b6a57d7a8 Tree Feller drops saplings again 2020-11-06 14:04:40 -08:00
nossr50
a4fd632d53 Fix Hex-Colored names in parties/admin chat 2020-11-06 14:01:07 -08:00
nossr50
15578bb84e Some refactoring 2020-11-04 12:12:51 -08:00
nossr50
96ed228d7c Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-11-04 12:05:45 -08:00
nossr50
cb9c7acceb Fixing a major bug with sub-skills not being shown when using commands 2020-11-04 12:05:29 -08:00
Vlammar
95c9daebe1
Update locale_fr.properties (#4324) 
Fixed a small translation error
 2020-11-04 09:59:56 -08:00
nossr50
1f3a2baa6b Some BlockMultiPlaceEvent optimization 2020-11-02 14:10:17 -08:00
nossr50
28b6a457f2 Add back the pc and ac command aliases 2020-11-02 14:03:58 -08:00
TheBusyBiscuit
01ebba4443
Two small fixes (#4321) 
* Fixed armor counting in BleedTimerTask

* Key instead of Name for Piercing
 2020-11-02 13:57:53 -08:00
nossr50
65fba3e20e Expanding McMMOItemSpawnEvent & Fixing a bug with Tree Feller drops 2020-11-02 13:51:43 -08:00
András Marczinkó
9529bbf898
Update locale_hu_HU.properties (#4322) 
* Update locale_hu_HU.properties
 2020-11-02 11:56:24 -08:00
nossr50
523d10ef29 dev mode 2.1.152-snapshot 2020-11-02 11:30:35 -08:00
nossr50
bae9783123 2.1.151 2020-10-29 14:38:09 -07:00
nossr50
5a8e607a39 party leader has unique chat style 2020-10-29 14:30:29 -07:00
nossr50
1f02d9a5a0 online leaders will be gold 2020-10-29 14:13:39 -07:00
nossr50
4e8f49db5b avoid null party names 2020-10-29 14:06:34 -07:00
nossr50
c6ecf30d1f new party member list format/style 2020-10-29 13:54:12 -07:00
nossr50
449407439a Added 'Chat.Channels.Party.Spies.Automatically_Enable_Spying' which allows chat spys to join servers with spying toggled on instead of off 
its a QOL feature for people who are always spying on chat
 2020-10-29 13:12:26 -07:00
nossr50
8856d2b071 move chat config options from config.yml -> chat.yml 2020-10-29 13:06:22 -07:00
nossr50
4bac586253 Add missing party chat permission check to the party chat command 2020-10-29 12:20:52 -07:00
nossr50
ca93dc02df Fix missing party chat permission node check 2020-10-28 10:53:47 -07:00
nossr50
8aff138954 import cleanup 2020-10-27 13:37:08 -07:00
nossr50
2f506b72bb Better party chat logging in console, some style changes to admin/party chat as well 2020-10-27 13:09:01 -07:00
nossr50
d183d1217c Players & Console can now use color codes in party or admin chat (new permission node mcmmo.chat.colors) 2020-10-27 11:55:59 -07:00
nossr50
1d55c4c2bc fix message spam bug 2020-10-27 11:08:50 -07:00
nossr50
05f2763311 You can now silence mmoedit, addlevels, and addxp with -s 2020-10-27 11:03:47 -07:00
nossr50
33287b650f Add NMS definition for 1.16.4 2020-10-26 16:52:43 -07:00
nossr50
e6e9fdca31 Fix ArrayIndexOutOfBoundsException for Skill Reset command 2020-10-26 16:42:56 -07:00
nossr50
8372fae6f8 remove some unwanted code comments 2020-10-26 16:34:31 -07:00
nossr50
f976302cf0 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-10-26 16:33:15 -07:00
nossr50
749c83ac59 Complete rewrite of Admin & Party chat code 
There are some API breaks as a result of these rewrites, I tried to keep it minimal, but I'm sure some plugins will need to update.
 2020-10-26 16:31:02 -07:00
nossr50
cf6a2e9e97 Update all locale files to use & codes instead of [[color]] codes 2020-10-26 16:04:56 -07:00
TheBusyBiscuit
8240cff0d5
Some small optimizations (#4305) 
some improvements to itemmeta calls and misc changes
 2020-10-23 08:21:47 -07:00
怠惰
7e057792f5
Fix locale (#4275) 
"1 is needed" is obvious mistranslation.
 2020-10-22 13:56:36 -07:00
Patrick
5f0c4b1dd3
Update locale_pt_BR.properties (#4276) 
add time left to use the skill again
 2020-10-22 13:55:48 -07:00
nossr50
cf245b02a5 WIP of reworking classes involved in querying data, also some work done to the party code rewrite 2020-10-15 16:19:47 -07:00
TheBusyBiscuit
f29370a1c8
Added Fake Event check (#4296) 
Thanks you @TheBusyBiscuit
 2020-10-14 12:11:15 -07:00
nossr50
508c256aa4 2.1.149 2020-10-12 12:57:15 -07:00
nossr50
bc71f586d7 Messy fix for now, code cleanup will happen later 2020-10-12 12:50:18 -07:00
nossr50
29722511b7 new config persistentdata.yml 2020-10-12 12:40:54 -07:00
nossr50
916eb76553 2.1.148 2020-10-08 19:30:36 -07:00
nossr50
80f910fc67 Add setting for enable/disable triple drops on super breaker 2020-10-08 19:21:39 -07:00
nossr50
d4699c0e20 Add player tamed experience multiplier 2020-10-08 19:14:44 -07:00
nossr50
80c89fe1e5 Revert this change for now 2020-10-08 19:07:42 -07:00
nossr50
f5294387b0 oopsy 2020-10-08 16:34:59 -07:00
nossr50
20c69b63af Memory leak fixes, optimizations, and persistence 2020-10-08 15:25:40 -07:00
nossr50
0767e62965 Only ignore 0 dmg if specific plugins are detected 2020-10-05 14:52:49 -07:00
nossr50
a6586e07cc final damage values of 0 are only ignored in certain circumstances, fixes a few bugs 2020-10-05 14:14:49 -07:00
nossr50
ee17707c6c Alchemy progression through ranks improved 2020-09-30 13:12:28 -07:00