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,465 Commits 7 Branches 275 Tags 22 MiB
06c69b82a0
Commit Graph

499 Commits

Author SHA1 Message Date
Auxilor
3542c1a62b Fixed natural loot generated items going above hard cap 2021-07-04 19:13:36 +02:00
Auxilor
8abd254270 Fixed level-clamp removing the enchantment rather than clamping it 2021-07-04 00:49:48 +02:00
Auxilor
b65ecc4e29 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gradle.properties
 2021-07-01 22:33:13 +01:00
Auxilor
356b723988 eco 5.6.0 changes 2021-07-01 22:32:52 +01:00
Auxilor
0b4899d3e2 Fixed deprecation 2021-07-01 22:31:59 +01:00
Auxilor
1cfe3cc179 Fixed Vanilla Enchantment#conflictsWith behaviour being incorrectly overridden 2021-06-30 09:44:37 +01:00
Auxilor
296d52e4e7 Fixed bug 2021-06-28 20:18:09 +01:00
Auxilor
a4741283dd Code cleanup 2021-06-28 20:17:01 +01:00
Auxilor
358d3434b7 Added more items to spell blacklist 2021-06-26 22:39:38 +01:00
Auxilor
ee22be25f4 Blacklisted beacon from spell 2021-06-25 22:44:40 +01:00
Auxilor
5998bf3aba Added more blacklisted click blocks to spell 2021-06-25 22:44:23 +01:00
Auxilor
fc40d21603 API change for bukkit parity 2021-06-25 09:10:13 +01:00
Auxilor
a15a924565 /ecodebug external fix 2021-06-24 13:29:23 +01:00
Auxilor
b371261018 Fixed changes from reverting 2021-06-23 15:52:56 +01:00
Auxilor
1adec8c753 Revert "Fixed two minor bugs" 
This reverts commit 9b3763bb
 2021-06-23 15:50:50 +01:00
Auxilor
a934251dce Changed deprecated reference 2021-06-22 09:47:43 +01:00
Auxilor
b0e7131111 Updated to eco 5.5.1 2021-06-22 09:46:30 +01:00
Auxilor
ba44595221 Fixed Vein 2021-06-20 12:24:11 +01:00
Auxilor
a37ae00b74 Removed skulk artifact 2021-06-19 20:34:57 +01:00
Auxilor
c3eb825381 Code Quality improvements 2021-06-16 15:38:24 +01:00
Auxilor
8e1b5a022e Merge remote-tracking branch 'origin/master' 2021-06-16 13:35:45 +01:00
Auxilor
67cf787552 Fixed enchanting table bug 2021-06-16 13:35:38 +01:00
Auxilor
633da45df2 Updated to use more Java 16 feature 2021-06-15 21:18:40 +01:00
Auxilor
c3c158207d Fixed tabs instead of spaces after PR 2021-06-13 20:46:51 +01:00
Auxilor
47ea297468 Added 1.17 particles 2021-06-13 10:54:24 +01:00
Auxilor
3c83c677ca Added copper-ore to all artifacts and mining enchantments 2021-06-12 19:22:43 +01:00
Auxilor
41d11bab30 Removed pointless reference 2021-06-12 10:51:48 +01:00
Auxilor
e0e463dffc Removed pointless reference 2021-06-12 10:50:36 +01:00
Auxilor
c00834fd62 Added flags 2021-06-12 10:47:55 +01:00
Auxilor
ca8169d46b Cleaned up registration code 2021-06-12 10:37:22 +01:00
Auxilor
bde29c9120 Added 1.17 support and updated to Java 16 2021-06-11 12:24:24 +01:00
Auxilor
c0f240d254
Merge pull request #47 
Fixed two minor bugs
 2021-06-10 20:32:54 +01:00
Auxilor
658cf55190 Fixed slicing 2021-06-10 14:15:51 +01:00
Auxilor
649d69a203 Fixed breaking indestructible blocks when hardness check is disabled 2021-06-10 10:42:04 +01:00
kireevm96
9b3763bb1f Fixed two minor bugs 2021-06-04 00:03:47 +03:00
Auxilor
882a7f622b Fixed improved vanilla conflictsWith code not working on 1.16.0 - 1.16.3 2021-05-27 11:59:50 +01:00
Auxilor
7f1a12a496 Codestyle 2021-05-27 11:54:57 +01:00
Auxilor
4fff42d46d Fixed Cleave/Carve stack overflow 2021-05-23 19:06:00 +01:00
Auxilor
fbafda9f43 Fixed spell right click blacklist 2021-05-22 17:13:13 +01:00
Auxilor
22b6e79afc Added rarity option to /giverandombook 2021-05-20 21:34:47 +01:00
Auxilor
7db7b5ec59 Removed redundant display check 2021-05-17 19:23:41 +01:00
Auxilor
00efb2f30f Optimised display + fixed codestyle from PR 2021-05-16 23:02:55 +01:00
Sceri
6a14feadc8 Fix FastGetEnchants for Enchanted Book 2021-05-16 22:59:42 +01:00
Auxilor
d61169f29e Fixed /randomenchant and added support for modifying vanilla conflictsWith behaviour 2021-05-15 17:17:39 +01:00
Auxilor
bb3f897312 Fixed rare NPE 2021-05-11 21:14:09 +01:00
Auxilor
b556980bc0 Disabled level-clamp by default 2021-05-09 12:22:13 +01:00
Auxilor
62a05a3c21 Added level clamp option 2021-05-07 19:17:43 +01:00
Auxilor
38737de455 Added level clamp option 2021-05-07 19:17:26 +01:00
Auxilor
1120f8455b Fixed formatting 2021-05-07 19:07:38 +01:00
Auxilor
8c83be123f Fixed formatting 2021-05-07 19:07:16 +01:00
Auxilor
301cb085b8 Hopefully fixed hard cap bypass 2021-05-05 21:33:38 +01:00
Auxilor
3c8b39d7ac Added on-books for soulbound 2021-05-04 10:24:55 +01:00
Auxilor
5b59174bb8 Fixed rare ConcurrentMod in Forcefield 2021-05-03 16:04:46 +01:00
Auxilor
bdb012ae3d Removed unused class 2021-05-01 18:29:33 +01:00
Auxilor
c407b51071 Added player_head as a target 2021-04-30 11:27:29 +01:00
Auxilor
cea2f97259 Refactor 2021-04-29 19:10:18 +01:00
Auxilor
0762a209b4 Enabled dual registration by default 2021-04-29 11:40:17 +01:00
Auxilor
e3861990a2 Added dual registration option for users using old versions prior to 7.3.0 2021-04-29 08:48:39 +01:00
Auxilor
280de8bd1e Added option to disable re-registering vanilla enchantments 2021-04-29 08:44:22 +01:00
Auxilor
ced4c560ed Fixed vanillaenchants.yml 2021-04-27 18:13:54 +01:00
Auxilor
39d8278684 Fixed /ecodebug not working with new EcoCraftEnchantment 2021-04-27 13:04:25 +01:00
Auxilor
00ae789a38 Added vanilla enchantment support for 1.16.0-3 2021-04-27 13:02:04 +01:00
Auxilor
2eeff1c369 Merge branch 'master' into develop 2021-04-27 12:59:30 +01:00
Auxilor
48a400a30e Added loading for vanilla enchantment metadata 2021-04-27 12:59:18 +01:00
Auxilor
d63e0ead6f Fixed NPE from ItemConversions when plugin hasn't finished loading 2021-04-27 12:35:20 +01:00
Auxilor
1076d210f5 Added new CraftEnchantment management system and added vanillaenchants.yml 2021-04-27 12:33:46 +01:00
Auxilor
0784e12496 Changed EcoEnchant#getName to EcoEnchant#getDisplayName for bukkit parity 2021-04-27 10:45:04 +01:00
Auxilor
77053e71f8 Added VanillaEcoEnchantWrapper 2021-04-27 10:35:55 +01:00
Auxilor
186237abd9 Merge remote-tracking branch 'origin/master' 2021-04-22 18:30:16 +01:00
Auxilor
375ba8a7f0 Fixed sycophant healing the attacker 2021-04-22 18:30:09 +01:00
Auxilor
a1b9ceafc7 Fixed reverting modifying non-target items leading to *all* items with HideFlags being modified 2021-04-22 12:06:39 +01:00
Auxilor
1c35d35bd4 Revert "Cleaned up EnchantDisplay to work with eco 5.3.0" 
This reverts commit 2f3e210b
 2021-04-21 18:38:54 +01:00
Auxilor
2f3e210b64 Cleaned up EnchantDisplay to work with eco 5.3.0 2021-04-20 21:37:31 +01:00
Auxilor
01733208b6 Fixed class from massive error 2021-04-18 12:17:24 +01:00
Auxilor
9b61d073d4 Merge remote-tracking branch 'origin/master' 2021-04-18 12:16:55 +01:00
Auxilor
e62c12b99d Fixed grindstone giving experience when no enchantments were removed 2021-04-18 12:16:33 +01:00
Auxilor
17ef81268e Fixed everything 2021-04-16 16:37:13 +01:00
Auxilor
8b5139a1b0 Revert "Started EcoSkills" 
This reverts commit dba5d455
 2021-04-16 16:36:41 +01:00
Auxilor
2bc70e53aa Reverted accidental commits 2021-04-16 16:31:03 +01:00
Auxilor
2cbb718ddd Removed references to EcoEnchants 2021-04-16 16:29:28 +01:00
Auxilor
35f0bd3f63 Fixed SkillClass 2021-04-16 16:25:15 +01:00
Auxilor
dba5d45508 Started EcoSkills 2021-04-16 16:24:56 +01:00
Auxilor
a650c48dae Fixed /giverandombook 2021-04-16 10:01:45 +01:00
Auxilor
a29fa8c7e7 Cleaned up hard disable option 2021-04-15 18:39:47 +01:00
Auxilor
13df35a22b Added hard disable option 2021-04-15 18:37:34 +01:00
Auxilor
6a03795cf1 Fixed imports 2021-04-15 14:04:50 +01:00
Auxilor
d62984d79e Fixed armor listener 2021-04-15 14:02:35 +01:00
Auxilor
f1b6b33ef6 Optimised armor listener 2021-04-15 14:01:21 +01:00
Auxilor
43dcd427f4 Fixed shield code being slow 2021-04-15 13:59:44 +01:00
Auxilor
63719ebce7 Nerfed rebounding 2021-04-14 16:22:58 +01:00
Auxilor
e531fc6b93 Fixed rebounding going in an opposite direction 2021-04-14 16:20:22 +01:00
Auxilor
acb91725fe Spell permission now accepts any percentage 2021-04-14 12:28:52 +01:00
Auxilor
64ae9f3de2 Fixed /giverandombook with full inventory 2021-04-14 12:23:37 +01:00
Auxilor
f1ce2f4ce3 Fixed /giverandombook not working 2021-04-13 18:26:04 +01:00
Auxilor
8443a6add2 Cleaned EnchantChecks 2021-04-13 18:25:01 +01:00
Auxilor
3b24f68415 Added /giverandombook 2021-04-12 22:15:01 +01:00
Auxilor
3be5866075 Fixed Aiming 2021-04-11 20:58:14 +01:00
Auxilor
ed5a82393d Fixed many enchantments not working since arrow meta update 2021-04-10 22:38:16 +01:00
Auxilor
445cc9e7e7 Fixed enchant configs not being updated on /ecoreload 2021-04-09 14:28:41 +01:00
Auxilor
4d604fef76 Fixed rebounding 2021-04-09 01:39:38 +01:00
Auxilor
2259fd7744 Fixed bug from config refactor 2021-04-08 20:01:37 +01:00
Auxilor
7efbe8220f Added Rebounding 2021-04-08 00:18:46 +01:00
Auxilor
39f4353f44 Removed redundant config classes and fixed package 2021-04-08 00:10:07 +01:00
Auxilor
3e9fcca246 Reduced internal minimum spell cooldown from 5 to 2 ticks 2021-04-08 00:06:10 +01:00
Auxilor
d54c499cf5 Fixed players in spectator mode being able to use spells 2021-04-06 00:22:54 +01:00
Auxilor
cbb58381cc Fixed arrow check 2021-04-04 17:15:54 +01:00
Auxilor
bdb6da6d5b Fixed display and cache 2021-04-04 16:50:27 +01:00
Auxilor
91cbdde1e5 Fixed EcoEnchants 2021-04-04 16:38:26 +01:00
Auxilor
5da36aaaba Fixed EnchantmentType 2021-04-04 16:37:08 +01:00
Auxilor
fb6ee6b14d Finished eco 5.0.0 rework 2021-04-04 16:24:52 +01:00
Auxilor
b3c1ebe79c Began eco 5.0.0 rework 2021-04-04 16:11:02 +01:00
Auxilor
230cdc7163 Added wood switcher 2021-04-03 18:42:04 +01:00
Auxilor
ea6521ee9b Made EnchantmentRarity#register private 2021-04-03 18:31:11 +01:00
Auxilor
b72046440a Fixed FastTrig codestyle 2021-04-03 18:29:43 +01:00
Auxilor
17adc3a1c3 Added %ecoenchants_<spell>_cooldown% placeholder 2021-04-03 15:17:57 +01:00
Auxilor
bca7461101 Removed pointless placeholders 2021-04-03 15:16:37 +01:00
Auxilor
7e6265076e Added fast trig with lookup tables for artifacts. 2021-04-02 22:19:07 +01:00
Auxilor
242cb16ee6 Removed more deprecated config getters 2021-04-02 12:44:23 +01:00
Auxilor
81426795bd Removed deprecated config getters 2021-04-02 12:43:43 +01:00
Auxilor
a27a8fa1d2 Updated to eco 4.3.1 configs 2021-04-02 12:42:22 +01:00
Auxilor
cafb73f2e7 Added antigrief check to aiming 2021-04-01 15:17:50 +01:00
Auxilor
b1ccd9ab31 Added /randomenchant for other players 2021-03-31 19:12:14 +01:00
Auxilor
00c6f6d494 Added checker for invalid targets 2021-03-29 21:13:30 +01:00
Auxilor
e7d9b8055a Missile should no longer damage the shooter 2021-03-27 18:07:48 +00:00
Auxilor
d2af2bf31e Merge remote-tracking branch 'origin/master' into master 2021-03-26 22:43:48 +00:00
Auxilor
c03881db10 Added spell check for smithing table 2021-03-26 22:43:39 +00:00
Auxilor
aa56f2cb46 Fixed allowonnpc not doing anything 2021-03-24 21:15:41 +00:00
Auxilor
f50926e865 Removed potentially confusing comment in config 2021-03-24 18:41:02 +00:00
Auxilor
a5cef9c1ff Updated config and allowed enchantments to work on npcs with a config optoin 2021-03-24 18:40:20 +00:00
Auxilor
ef7189c89e Merge remote-tracking branch 'origin/master' into master 2021-03-21 19:00:30 +00:00
Auxilor
c10fe6044d Switched artifacts to use watchers 2021-03-21 19:00:12 +00:00
Auxilor
2288be888e Added option to have blast mining be chanced based 2021-03-20 18:19:55 +00:00
Auxilor
699d4b1e98 conflictsWith now checks two ways 2021-03-19 16:52:31 +00:00
Auxilor
dc697a266f Added bonus check to prevent loot populator from triggering while disabled. 2021-03-18 20:47:39 +00:00
Auxilor
f894572e34 Prevented Incandescence working from thorns damage 2021-03-17 20:55:08 +00:00
Auxilor
6d4ae7bac8 Made boss hunter work with ecobosses 2021-03-13 22:07:43 +00:00
Auxilor
33e6edd0dd Removed unneeded lang messages 2021-03-12 22:35:44 +00:00
Auxilor
9560b446eb Merge remote-tracking branch 'origin/master' into master 2021-03-11 17:38:06 +00:00
Auxilor
280eb1c78f Fixed SpellCancellationInterrupt 2021-03-11 17:37:42 +00:00
kireevm96
fa0268fa37 Removed extra spaces 2021-03-11 11:12:31 +03:00
kireevm96
6b39894089 Fix conflict enchantment 2021-03-11 11:09:21 +03:00
Auxilor
d970ce08f9 Added janky way to cancel spells 2021-03-10 21:23:12 +00:00
Auxilor
25f9f4e030 Added require-target option to display 2021-03-09 19:12:49 +00:00
Auxilor
cba6784eea Added force option to hide fixer 2021-03-09 19:10:55 +00:00
Auxilor
46542a5ce5 Fixed spells never being able to activate 2021-03-09 19:05:21 +00:00
Auxilor
2ccb1efd73 Continued working on spell recode 2021-03-09 19:01:12 +00:00
Auxilor
4b058ab73a Began spell cooldown recode 2021-03-09 18:57:23 +00:00
Auxilor
6f61c48420 Improved lore readability on /ecodebug 2021-03-08 20:16:16 +00:00
Auxilor
448ccc215d Fixed Butchering, Abattoir, and Slaughter working on players (for some reason) 2021-03-07 21:14:06 +00:00
Auxilor
bb64f94399 Fixed combining items of different amounts 2021-03-07 10:28:05 +00:00
Auxilor
324a6362f7 Fixed Thrive and Prosperity for players wearing armor from older versions 2021-03-06 19:20:20 +00:00
Auxilor
d4918868ea Fixed casting the wrong var 2021-03-06 10:58:47 +00:00
Auxilor
893d3eefb5
Merge pull request #39 
updated to 6.9.1
 2021-03-05 20:07:12 +00:00
Auxilor
61388bb14d Improved Prosperity and Thrive 2021-03-05 19:41:37 +00:00
Auxilor
aec9de30c2 Reworked Thrive and Prosperity to use attribute modifiers 2021-03-05 19:36:12 +00:00
chyzman
39716824c6 updated to 6.9.1 
made marksman work with any projectile (hint to future enchants?)
 2021-03-05 14:33:44 -05:00
Auxilor
d5d1250540 Added isFullyChargedIfRequired to enchantments 2021-03-04 18:33:32 +00:00
Auxilor
fe5e243b86 Fixed life steal 2021-03-04 18:24:10 +00:00
Auxilor
df2191f0e7 Added option for soulbound to be 1-time use 2021-03-04 18:20:12 +00:00
Auxilor
dd9181f615 Improved reaper 2021-03-04 18:16:30 +00:00
Auxilor
eb87c1dc06 Merge remote-tracking branch 'origin/master' into master 2021-03-04 18:12:37 +00:00
Auxilor
3eaf7e682d
Merge pull request #35 
Add new enchant reaper
 2021-03-04 18:12:25 +00:00
Auxilor
3d5e249e3a Improved pentashot settings 2021-03-04 18:11:02 +00:00
Auxilor
b99a894324 Added attack cooldown check to life steal 2021-03-04 18:08:13 +00:00
chyzman
a84e83ab9e nerfed leeching 
made succession scaleable
made pentashot scaleable
updated to 6.9.0 funny number
 2021-03-04 12:59:10 -05:00
kireevm96
ada2cfd015
Changed functions EnchantChecks 2021-03-04 16:50:19 +03:00
kireevm96
e9236f97de
Update Soulbound.java 2021-03-04 16:43:07 +03:00
kireevm96
c5898f13d9
rename Reaper 2021-03-04 16:42:35 +03:00
Auxilor
bb23655af8 Changed /ecodebug to only send the held item - /ecodebug full now sends full output 2021-03-03 14:23:40 +00:00
Auxilor
200e60467f Made aggressive conversions only affect block inventories 2021-03-03 14:21:13 +00:00
Auxilor
242882d736 Removed redundant collation option (collation has been enabled in eco for a while) 2021-03-03 14:17:57 +00:00
Auxilor
c45a9e3aa4 Added aggressive option to lore getter 2021-03-03 14:17:16 +00:00
Auxilor
dbdce95220 Added hide fixer 2021-03-03 14:13:25 +00:00
Auxilor
1e639fb8f7 Changed logger in /ecodebug due to rare server crash 2021-03-02 19:14:41 +00:00
Auxilor
5c2d6b959f Fixed LootPopulator 2021-03-02 12:54:57 +00:00
kireevm96
951e04b189 fix Codacy for reaper 2021-03-02 14:44:35 +03:00
kireevm96
53d45d603b
Update reaper.yml 2021-03-02 13:56:30 +03:00
kireevm96
2878446808 Add new enchant reaper 2021-03-02 13:51:26 +03:00
Auxilor
a99eb54e55 Fixed Introversion 2021-03-01 21:17:35 +00:00
Auxilor
8e4b9de517 Removed redundant unused integration 2021-02-27 16:01:09 +00:00
Auxilor
78c6420db6 Removed redundant EnchantmentYamlConfig class 2021-02-27 15:58:11 +00:00
Auxilor
bf7f3aac4d Legacy display support 2021-02-27 11:49:21 +00:00
Auxilor
4d0eac235e Fixed display and sweep artifact not being registered 2021-02-26 10:14:55 +00:00
Auxilor
23f6a657c0 Added barrier, villager, anger, and nautlius artifacts 2021-02-25 21:48:42 +00:00
Auxilor
6d0ac359a7 Fixed HideEnchants (requires eco 4.2.0) 2021-02-25 18:02:26 +00:00
Auxilor
6a36a98a13 Added barrier artifact 2021-02-24 21:34:13 +00:00
Auxilor
8eef4b6449 Fixed shockwave and infernal touch 2021-02-23 19:10:47 +00:00
Auxilor
045e60715e Removed legacy lore lines from before eco 4.0.0 2021-02-23 17:40:04 +00:00
Auxilor
3d1dd8e02d Fixed removeIf in telekinesis 2021-02-20 11:59:09 +00:00
Auxilor
953091bc6c Fixed lore getter 2021-02-19 18:58:07 +00:00
Auxilor
16de0f9630 Fixed lingering codestyle issues 2021-02-19 18:44:08 +00:00
Auxilor
9dc2c08e43 Fixed updating 2021-02-17 15:52:01 +00:00
Auxilor
81c104fc15 Fixed EnchantDisplay 2021-02-17 15:42:40 +00:00
Auxilor
6a1db845b5 Updated to eco 4.0.0, updated to 6.6.0, reworked for 4.0.0 compatibility 2021-02-17 15:11:09 +00:00
Auxilor
bcb774bfd3 Re-added worldguard compileOnly 2021-02-16 20:16:37 +00:00
Auxilor
352f3dd4dd Removed unused mcMMO compileOnly dependency 2021-02-16 20:15:15 +00:00
Auxilor
9787cde593 Updated to eco 3.8.0 and removed unneeded code 2021-02-16 20:14:48 +00:00
Auxilor
0e92c2479a Fixed Incandescence 2021-02-15 16:29:50 +00:00
Auxilor
af174f0912 Added checker for invalid rarities 2021-02-14 15:01:11 +00:00
Auxilor
8bc7062761 Fixed for below-world blocks 2021-02-08 21:45:43 +00:00