Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-22 15:05:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,868 Commits 7 Branches 275 Tags 22 MiB
8a2392676c
Commit Graph

742 Commits

Author SHA1 Message Date
Auxilor
96d67bfe81 Updated string getters 2021-11-19 09:11:00 +00:00
Auxilor
7c92ec8efe Fixed essentials registration failing stopping the plugin from loading 2021-11-16 15:11:30 +00:00
Auxilor
98d8f6f9d6 Removed data.yml and redundant dependencies 2021-11-14 11:47:27 +00:00
Auxilor
93c7705d96 Fixed lumberjack 2021-11-13 13:20:12 +00:00
Auxilor
e7788403e5 Optimized most mining enchantments 2021-11-13 10:32:41 +00:00
Auxilor
20c9f4bb0e Optimized Artifacts and Blast Mining 2021-11-12 18:14:15 +00:00
Auxilor
3f4da966c9 Merge remote-tracking branch 'origin/master' 2021-11-11 18:14:47 +00:00
Auxilor
68f6a27d91 Removed legacy permissions 2021-11-11 18:14:40 +00:00
Auxilor
988894fba0 Removed (now unneeded) /ecoenchants debug full 2021-11-10 17:48:46 +00:00
Auxilor
9adeaef96d Added %time% placeholder to reload message 2021-11-09 08:33:35 +00:00
Auxilor
4d7e1ee20f Codestyle fixes 2021-11-09 08:32:10 +00:00
Auxilor
8bf6a08e61 Fixed MythicMobs integration not working 2021-11-08 19:22:15 +00:00
Auxilor
b22d36ef71 Fixed PR codestyle 2021-11-07 15:34:36 +00:00
_OfTeN_
c6bd5c894c Fixed xp dupe bug with vanilla curse enchantments 2021-11-07 15:40:52 +03:00
Auxilor
679c5ff3c3 Fixed softdepends 2021-11-06 18:53:09 +00:00
Auxilor
e807950e5d PR changes and updated to 8.14.10 2021-11-06 18:52:09 +00:00
_OfTeN_
7ca5c7300a Added blacklisted-blocks config option to Instantaneous enchantment 2021-11-05 20:18:04 +03:00
_OfTeN_
b145d3d525 Added MythicMobs integration to prevent Telekinesis from giving drop items from mobs with disabled drops. 2021-11-02 14:34:35 +03:00
_OfTeN_
d874d75c63 Fixed Famine enchantment giving slow digging effect 2021-11-02 14:25:17 +03:00
_OfTeN_
37090c9a27 Added "ticks-per-level" and "amplifier-per-level" config options for Famine enchantment 2021-11-02 14:25:16 +03:00
Auxilor
d3594f460e Fixed streamlining 2021-11-02 08:40:31 +00:00
Auxilor
8ae4964d2e Fixed migration 2021-11-01 21:29:38 +00:00
Auxilor
e4d2a20eb8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/data/storage/PlayerProfile.kt
#	gradle.properties
 2021-11-01 21:26:13 +00:00
Auxilor
3ea11ce6d9 Removed kotlin and data storage system in favour of eco 6.12.0 2021-11-01 21:25:51 +00:00
_OfTeN_
3bea8c711d Revert to Auxilors way of fixing grindstoneable: false 2021-11-01 14:16:03 +03:00
_OfTeN_
18f7794dd4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java
 2021-11-01 14:14:29 +03:00
_OfTeN_
6fb4e1b321 Fixed Streamlining enchantment (who could know that higher speed is slower in spigot api world) 2021-11-01 14:13:44 +03:00
_OfTeN_
86eec1b706 - Fixed descriptions saving as false for default 
- Fixed not grindstoneable enchantments still being grindstoned
 2021-11-01 13:39:44 +03:00
Auxilor
ec54b9e8a1 Fixed grindstoneable option not working 2021-10-31 13:12:35 +00:00
_OfTeN_
a01b3d37f3 - Fixed descriptions saving as false for default 
- Fixed not grindstoneable enchantments still being grindstoned
 2021-10-30 23:49:00 +03:00
Auxilor
55d9b16986 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gradle.properties
 2021-10-30 10:52:31 +01:00
Auxilor
9a0a02c730 Added drop modifier to InfernalTouch 2021-10-24 20:08:53 +01:00
Auxilor
99a84dab44 Suppressed splash warning 2021-10-23 18:59:11 +01:00
Auxilor
fc0b9d8ed4 Added extra safety checks to TargetYml 2021-10-23 18:57:59 +01:00
Auxilor
a2e3be13cc Fixed weird null pdc bugf 2021-10-20 20:35:56 +01:00
_OfTeN_
717c2a87ba Fixed grindstone dupe bug 2021-10-18 20:01:43 +03:00
_OfTeN_
e55ba7d6c1 Fixed grindstone dupe bug 2021-10-18 19:57:51 +03:00
_OfTeN_
184938b579 Added time-to-exempt config option for Tornado enchantment and started exempting players that were hit by Tornado from being detectedf by AntiCheats. 2021-10-18 19:54:59 +03:00
Auxilor
b713c60957 Delomboked EcoEnchantsPlugin 2021-10-18 17:43:57 +01:00
Auxilor
a659621d43 Delomboked getInstance() 2021-10-18 17:42:29 +01:00
Auxilor
0de4fd2e04 Added in /ecoenchants toggledescriptions 2021-10-18 17:40:54 +01:00
Auxilor
a93e71724e Merge remote-tracking branch 'origin/master' 2021-10-18 17:33:00 +01:00
Auxilor
d7b503f3f1 Added persistent data storage and kotlin 2021-10-18 17:32:03 +01:00
0ft3n
9ae48463df
Merge branch 'Auxilor:master' into master 2021-10-18 11:04:29 +03:00
Auxilor
8dd54ca083 Fixed thor 2021-10-16 16:31:12 +01:00
Auxilor
0677a80c1b Removed unneeded NMS hook 2021-10-16 10:31:09 +01:00
Auxilor
99e4e98484 Improved /ecoenchants locale download 2021-10-15 14:40:04 +01:00
Auxilor
c564f4dea4 Display optimisation 2021-10-13 15:25:48 +01:00
_OfTeN_
b19220e1c3 Removed Diurnal dix for the PR 2021-10-12 13:15:09 +03:00
Auxilor
b4f733bf39 Fixed diurnal 2021-10-12 10:53:22 +01:00
_OfTeN_
6295aaec0d Added data.yml file and its handler to store descriptions state per player (and something else if needed, storage is per uuid). 
Added /ecoenchants toggledescriptions subcommand to disable descriptions for sender.

Added new messages to lang.yml for ToggleDescriptions command.
 2021-10-11 22:27:30 +03:00
_OfTeN_
f49e9e11ab Fixed Diurnal enchantment 2021-10-11 15:00:45 +03:00
_OfTeN_
f80bb79664 Fixed Diurnal enchantment 2021-10-11 14:58:24 +03:00
_OfTeN_
06e1ebd1e8 Fixed Diurnal enchantment 2021-10-11 14:55:34 +03:00
Auxilor
7645e71a6b Updated tornado to improve anticheat compatibility and updated to 8.13.5 2021-10-11 09:50:44 +01:00
_OfTeN_
f1e5173b12 Added time-to-exempt config option for Tornado enchantment and started exempting players that were hit by Tornado from being detectedf by AntiCheats. 2021-10-11 11:44:35 +03:00
Maxmilite
f23f9a7c3f
Update Transfuse.java 2021-10-10 06:55:33 +08:00
Auxilor
628bc19cd7 Added minimumEcoVersion 2021-10-08 11:07:05 +01:00
Auxilor
ef6ef44a55 Removed PaperHelper 2021-10-08 11:06:39 +01:00
kireevm96
ea88aaeb0d fix dupe grindstoned 2021-10-06 22:13:27 +03:00
kireevm96
2251a4d8fc fix dupe grindstoned 2021-10-06 22:10:45 +03:00
Will FP
cf2b743e2d
Merge pull request #84 
Fix error hard-disable
 2021-10-06 10:43:19 +01:00
kireevm96
ebcc5bb19a Fix REAPER 
Fix REAPER if kill Arrow
 2021-10-06 12:23:51 +03:00
kireevm96
c4c7b7d823 fix space 2021-10-06 12:12:54 +03:00
kireevm96
5678743530 Fix error hard-disable 2021-10-06 12:11:11 +03:00
Auxilor
b696e7e863 Added ability to define your own secondary enchantable items 2021-10-05 09:03:30 +01:00
Auxilor
9f5d84d81c Changed color system to remove terrible {} syntax and replace with minimessage 2021-10-05 09:00:08 +01:00
Auxilor
a39b36870d Added experience orb summoning to Grindstone 2021-10-04 09:44:29 +01:00
Auxilor
b8127c244c Fixed bug 2021-10-02 13:42:06 +01:00
Auxilor
03ca796b27 Updated to eco 6.9.0 and used minimessage formatting 2021-10-01 15:46:25 +01:00
Dean
8b12bdc633
Allow other plugin to use event anvil 2021-10-01 19:49:11 +07:00
Auxilor
d639eef779 Fixed villager trade bug 2021-09-30 15:39:57 +01:00
Auxilor
af5734202e Fixed chyzman's python code 2021-09-26 17:40:08 +01:00
Auxilor
bfec9a26e6 Fixed buckshot 2021-09-26 17:39:39 +01:00
Auxilor
241eb0eadd Javadoc 2021-09-26 13:48:46 +01:00
Akiranya
9e07aedcc3 Added more javadoc 2021-09-26 11:44:49 +08:00
Akiranya
9792ee23b5 Added author information /w\ 2021-09-26 11:40:59 +08:00
Akiranya
d506276bd5 Resolved conflicts and refactored code 2021-09-26 11:19:03 +08:00
Auxilor
854e5193c0 PR Refactor 2021-09-25 15:22:15 +01:00
Akiranya
361fbf89bf Fixed potential memory leak 2021-09-25 21:56:13 +08:00
Auxilor
bdce57a4ba Fixed missing build.gradle 2021-09-24 09:37:51 +01:00
Auxilor
a576525ca4 Don't look into this commit 2021-09-24 09:37:05 +01:00
Will FP
b855c3dc6d
Merge pull request #68 
Update Buckshot.java
 2021-09-23 09:43:08 +01:00
ryzech
2038ecbcdb Fixed artifacts not working with 1.17 blocks (would that break 1.165 support?) and made an artifact rarity so artifacts are less likely to get than normal enchants. 2021-09-22 23:40:21 -05:00
chyzman
34850d4296
Update Buckshot.java 2021-09-21 17:10:38 -04:00
_OfTeN_
abc9648b16 We don't wanna talk about this, are we? 2021-09-19 18:54:11 +03:00
Auxilor
540bd0e8b8 Updated to use polymart resource checker 2021-09-19 11:22:15 +01:00
Will FP
975d6ee3a1
Merge pull request #66 
New enchant Dousing
 2021-09-19 11:21:07 +01:00
Sam Ryan
8be794d78d Add Requirement keys to dousing config 2021-09-18 18:50:46 -04:00
samerbam
25a9e34f84
Merge branch 'Auxilor:master' into master 2021-09-18 18:49:10 -04:00
Sam Ryan
c09e7e6c60 Added Dousing Enchant. 2021-09-18 18:48:24 -04:00
_OfTeN_
8213279aeb Added ability to use enchantment types as an argument for /ecoenchants giverandombook 2021-09-18 19:13:13 +03:00
Auxilor
a5cb56dd6d Fixed weird NoClassDefFound error 2021-09-18 15:58:22 +01:00
Auxilor
06c69b82a0 Added SuppressWarnings for all ItemStack deprecations due to paper 2021-09-18 15:49:48 +01:00
Auxilor
b2135beae9 Changes for Paper enchantment API support; renaming EcoEnchant#getRarity to EcoEnchant#getEnchantmentRarity 2021-09-18 15:39:51 +01:00
Auxilor
67ed1f8294 Updated EssentialsX to use proper API (several months after it was introduced) 2021-09-18 14:51:11 +01:00
Auxilor
0bd73ea2ec Fixed eco 6.8.0 changes 2021-09-17 20:03:36 +01:00
Auxilor
0312915d33 Updated to eco 6.8.0 2021-09-17 19:58:52 +01:00
Auxilor
0178a2b11d Merge remote-tracking branch 'origin/master' 2021-09-16 20:09:03 +01:00
Auxilor
172157c3fc Moved more artifact math to separate thread 2021-09-16 20:07:39 +01:00
_OfTeN_
a92108d099 Added "local-lightning-sound: true/false" option for Electroshock, Thor, Zeus and Bolt enchantments 2021-09-14 11:31:27 +03:00
Auxilor
28bc9846f5 Merge remote-tracking branch 'origin/master' 2021-09-12 19:58:40 +01:00
Auxilor
d0e8969178 Moved melee particles to new thread 2021-09-12 19:58:30 +01:00
Auxilor
431581942d Reverting lore now uses FastItemStack 2021-09-09 13:04:50 +01:00
Will FP
74c019ebb8
Merge pull request #59 
Fixes some bugs
 2021-09-09 12:41:01 +01:00
Akiranya
1f0c9d8a87 BukkitScheduler#runTask() already runs the task on next tick 2021-09-09 17:16:32 +08:00
Akiranya
b9cd266d0e Fixed Soulbound bug 
There are some cases where the player's inventory is not empty right after respawning. For example, ItemsAdder gives a death map right after the player respawns. In this case, EcoEnchants won't give back soulbound items to the player, causing the items just disappeared.

I fix this by checking if there is any soulbound items right after respawning, instead of simply checking whether the player's inventory is empty or not.

More robust logic to handle such case is expected. My solution is just a workaround.
 2021-09-09 17:05:49 +08:00
Akiranya
a9c345317c Fixed Necrotic 2021-09-09 16:38:50 +08:00
_OfTeN_
966ab49af1 Added disable-on-players option for Razor, Bladed and Force enchantments 2021-09-08 18:47:30 +03:00
Auxilor
59b098b7e8 Fixed rapid fastbow anticheat trigger 2021-09-08 10:36:36 +01:00
Auxilor
6efacc4f56 Merge remote-tracking branch 'origin/master' 2021-09-06 12:53:24 +01:00
Auxilor
d6d7b567aa Added 'none' option to remove all conflicts for a vanilla enchantment 2021-09-06 12:51:13 +01:00
Auxilor
67caf9c374 Fixed instantaneous placeholder 2021-09-04 13:08:32 +01:00
Will FP
828557e5e1
Merge pull request #57 
Fixed a NPE and added a simple rarity placeholder
 2021-09-03 11:08:54 +01:00
Auxilor
868c254e16 Fixed replenish on 1.16.5 2021-08-31 16:27:54 +01:00
Auxilor
6217f4588d Optimized display (hopefully this doesn't break things again) 2021-08-31 16:26:57 +01:00
Auxilor
aa535375f4 Extracted rehandleBreaking and fixed unbreaking 2021-08-30 15:54:14 +01:00
bananasmoothii
40e0dc15ce
Actually used the rarity placeholder 2021-08-30 15:41:27 +02:00
bananasmoothii
9ec4c5b04a
Added a rarity placeholder 2021-08-30 15:30:16 +02:00
Auxilor
4b9dd25fdb Revert "Updated to eco 6.6.0" 
This reverts commit 150cf3e2
 2021-08-30 11:21:52 +01:00
Auxilor
150cf3e277 Updated to eco 6.6.0 2021-08-29 16:41:04 +01:00
Auxilor
4c8b330464 Fixed cache clearing task being cancelled 2021-08-29 12:15:44 +01:00
Auxilor
a82aa95c20 Changed cached requirements to update every 15 seconds 2021-08-29 11:56:34 +01:00
Auxilor
c850f254d8 Added requirement keys to configs 2021-08-28 22:00:55 +01:00
Auxilor
804246d360 Implemented the requirement system on all enchantments 2021-08-28 21:57:57 +01:00
Auxilor
385e186066 Removed debug messages 2021-08-28 21:40:52 +01:00
Auxilor
8bf70bb0fc Lots of painful requirement display changes 2021-08-28 21:27:41 +01:00
Auxilor
fbefc1c2cc Added backend to requirement system 2021-08-28 21:01:12 +01:00
Auxilor
f6ad640df1 Fixed replenish on glow berries 2021-08-28 15:46:49 +01:00
Auxilor
a76c16aad9 Hopefully fixed display bug 2021-08-28 14:39:48 +01:00
Auxilor
af8db80813 Added magnetic disable-while-sneaking 2021-08-25 18:13:36 +01:00
Sam Ryan
3664cc011a Disable Magnetic while shifting. 2021-08-25 00:32:58 -04:00
Auxilor
19550dc800 Fixed forcefield saving silverfish instead of endermites 2021-08-23 20:06:04 +01:00
Auxilor
2cc6544e53 Fixed forcefield and named mobs 2021-08-23 20:05:49 +01:00
Auxilor
d9d62288fa Fixed proximity distance bug 2021-08-22 18:30:41 +01:00
Auxilor
3917f1430c Fixed blast mining and lumberjack using durability in creative 2021-08-21 20:18:10 +01:00
Auxilor
5c2107c122 Nerfed razor 2021-08-21 15:46:12 +01:00
Auxilor
f2ca643c9b Removed magma walker due to performance 2021-08-19 16:54:53 +01:00
Auxilor
0dbe87e050 Removed ShopGUIPlus 2021-08-18 17:32:59 +01:00
Auxilor
4001d7ca46 Added hard cap clamp 2021-08-18 17:32:16 +01:00
Auxilor
f7d47fa624 Renamed EssentialsManager to RegistrationManager 2021-08-18 17:23:44 +01:00
Auxilor
ba758312c0 Fixed the fix for the fix 2021-08-15 20:12:54 +01:00
Auxilor
ea54a86efe You can't see him 2021-08-15 20:01:33 +01:00
Auxilor
7cdb87f981 Fixed broken Blast Mining / Lumberjack durability 2021-08-15 19:58:19 +01:00
Auxilor
923775bca1 Fixed unformatted above max level descriptions on ecoenchants enchantments 2021-08-15 19:55:34 +01:00
Auxilor
c7cf4d6d76 Fixed blast mining durability bug 2021-08-15 14:23:34 +01:00
Auxilor
45e468bc90 Fixed anvil bug 2021-08-14 19:04:21 +01:00
Auxilor
f63f0dded8 Fixed anvil dupe bug 2021-08-13 13:37:20 +01:00
Auxilor
685c4f801a Fixed anvil dupe bug 2021-08-13 13:37:12 +01:00
Auxilor
ef5fcc8869 Fixed unbreakable bugs 2021-08-13 13:29:08 +01:00
Auxilor
2c4ee1c022 Lumberjack and BlastMining performance workaround 2021-08-12 23:48:23 +01:00
Auxilor
c3a8fea3fd Minor anvil changes. I may regret this 2021-08-12 22:50:47 +01:00
Auxilor
79e42715e3 Updated spell gradient 2021-08-11 20:33:46 +01:00
Auxilor
403f772a37 Added more blocks to xray.yml 2021-08-11 20:31:04 +01:00
Auxilor
66d0b34bae Fixed config.yml 2021-08-11 13:47:33 +01:00
Auxilor
792684ecec Added numbers-only to above-max-level reformatting 2021-08-11 13:45:46 +01:00
Auxilor
1eac3022e4 Reverted reversion code 2021-08-11 13:35:20 +01:00
Auxilor
1e0002484e Added option to display enchantments below item lore 2021-08-10 18:39:53 +01:00
Auxilor
63bd87ff66 More formatting changes 2021-08-10 14:47:29 +01:00
Auxilor
cf47b0a480 Fixed above max level format 2021-08-10 14:37:51 +01:00
Auxilor
fbc3a0418b Changed unsafe behaviour 2021-08-10 14:34:35 +01:00
Auxilor
d3dd673fb6 Added above-max-level-color 2021-08-10 14:32:34 +01:00
Auxilor
2ec52f59cf Fixed stackoverflow 2021-08-09 13:20:17 +01:00
Auxilor
013adcc974 Buffed bladed and serrated 2021-08-08 19:24:02 +01:00
Auxilor
66afc6d9ab Removed Aversion due to awful performance 2021-08-07 22:30:22 +01:00
Auxilor
3f06975775 Added spell messages 2021-08-07 19:23:27 +01:00
Auxilor
26795ce9b8 Switched out ArmorEquipEvent for ArmorChangeEvent 2021-08-07 15:04:03 +01:00
Auxilor
1afb803494 Updated to eco 6.3.0 and began using FastItemStack 2021-08-07 15:00:34 +01:00
Auxilor
2c3e401e07 Fixed no specified locale NPE 2021-08-06 23:34:12 +01:00
Auxilor
4f39736dc1 Added %value% placeholders for all curses and Abattoir, Abrasion, Aquatic, Arachnid, Atmospheric, Aerial, and Backstab 2021-08-05 15:57:21 +01:00
Auxilor
861df9a067 Fixed spring anticheat integration 2021-08-05 14:53:31 +01:00
Auxilor
7a2aa52813 Fixed description wrapping 2021-08-04 19:10:00 +01:00
Auxilor
3b94288434 Fixed description wrapping 2021-08-04 19:08:55 +01:00
Auxilor
31f0709753 Updated criticals desc and fixed formatting bug 2021-08-04 19:07:47 +01:00
Auxilor
29d41cc284 Added chance placeholders to all chance-based enchantments 2021-08-04 19:02:35 +01:00
Auxilor
ef0379900f Fixed load-order bug 2021-08-04 18:40:33 +01:00
Auxilor
352e2ab43c Criticals desc 2021-08-04 18:38:41 +01:00
Auxilor
ae660188e4 Fixed description &r characters 2021-08-04 18:38:31 +01:00
Auxilor
673becb3e7 Fixed bug 2021-08-04 18:35:47 +01:00
Auxilor
2cdb01457f Updated criticals description 2021-08-04 18:23:35 +01:00
Auxilor
566dce4fdd Fixed deprecation 2021-08-04 18:23:25 +01:00
Auxilor
18ae8661c0 Added description placeholders to criticals 2021-08-04 18:22:18 +01:00
Auxilor
df6d724950 Added description placeholder support 2021-08-04 18:20:24 +01:00
Auxilor
a883cab6b8 Fixed concurrentmod 2021-08-03 15:32:25 +01:00
Auxilor
10b4ed559c Added particle-amount option to villagers 2021-08-02 14:45:28 +01:00
Auxilor
b900a14274 Added particle-amount option to enchanting table 2021-08-01 19:18:27 +01:00
Auxilor
362166d3b2 Added particles to notify-on-special 2021-07-31 17:13:30 +01:00
Auxilor
679ea6e46a Added special obtaining sound 2021-07-31 17:10:46 +01:00
Auxilor
47cc339b7d Added {} formatting support to custom rarity colors 2021-07-31 17:03:48 +01:00
Auxilor
c8d900041c Added default gradients to artifacts and spells 2021-07-31 01:30:15 +01:00
Auxilor
553e69c39c Fixed config values bug 2021-07-31 01:28:53 +01:00
Auxilor
34901e8929 Changed default special gradient 2021-07-30 00:33:32 +01:00
Auxilor
a0ef0b41e1 Added support for gradients / formatting in type colors 2021-07-30 00:27:53 +01:00
Auxilor
56f47c614b Added config option to special particles 2021-07-30 00:21:06 +01:00
Auxilor
2aaaa3e524 Added particles to villagers when it gets a special enchantment 2021-07-30 00:16:59 +01:00
Auxilor
699ecfa290 Renamed remove-invalid to remove-disabled 2021-07-28 23:32:34 +01:00
Auxilor
6dddbfc91b Fixed config values 2021-07-27 18:25:44 +01:00
Auxilor
ccfe466793 Fixed ItemConversions constructor 2021-07-27 18:24:47 +01:00
Auxilor
88a683a01a Added option to remove disabled enchantments server-side 2021-07-27 18:23:32 +01:00
Auxilor
6321b47182 Added DescriptionOptions#isShowingAtBottom, cleaned up display and misc changes 2021-07-27 18:07:48 +01:00