Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-12-26 20:27:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,309 Commits 7 Branches 275 Tags 22 MiB
9540d8fbb1
Commit Graph

409 Commits

Author SHA1 Message Date
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
Auxilor
ffe113d29d Prevented potential errors when trying to break blocks above world height 2021-02-08 21:38:53 +00:00
Auxilor
fe5fbd4424 Merge remote-tracking branch 'origin/master' into master 2021-02-07 20:28:44 +00:00
Auxilor
265064759f Updated config system to eco 3.6.0 2021-02-07 20:28:09 +00:00
Auxilor
1f2f56f0bd Added randomenchant bypasshardcap permission 2021-02-06 17:19:02 +00:00
Auxilor
df7c2d23c9 Changed fortune logic in infernal touch (Thanks Markster!) 2021-02-06 17:10:59 +00:00
Auxilor
9e0842dee6 Added Introversion 2021-02-05 16:48:25 +00:00
Auxilor
bcd429419f Fixed aversion 2021-02-05 16:45:35 +00:00
Auxilor
d94dc83e51 Added aversion 2021-02-05 16:39:17 +00:00
Auxilor
8ffa051c0f Removed dodgy instantiation for TabCompleterEnchantinfo 2021-02-05 12:56:16 +00:00
Auxilor
1ef8c7d0e5 Fixed /randomenchant 2021-02-05 11:46:35 +00:00
Auxilor
161e0302c9 Registered /randomenchant 2021-02-05 11:42:22 +00:00
Auxilor
83d951c850 Updated lang prefix 2021-02-05 11:38:46 +00:00
Auxilor
9935a7b2d1 Added /randomenchant 2021-02-05 11:38:12 +00:00
Auxilor
0a95a8dba5 Fixed dyamite triggering on air click 2021-02-04 21:40:08 +00:00
Auxilor
7b1768f64c Fixed deflection stack overflow 2021-02-03 08:30:57 +00:00
Auxilor
7c2ccc95a6 Fixed magma artifact config 2021-02-01 17:18:29 +00:00
Auxilor
b6fec985e0 Added double helix options to artifacts 2021-02-01 15:56:23 +00:00
Auxilor
7a444e4d87 Cleaned up configs 2021-02-01 15:45:31 +00:00
Auxilor
7b9fca999d Optimised future WorldGuard integration 2021-02-01 09:19:41 +00:00
Auxilor
92352215fe Javadoc fix 2021-01-31 16:20:58 +00:00
Auxilor
907cda168a Potential HidePotionEffects fix 2021-01-31 16:19:24 +00:00
Auxilor
12f89c7d91 Re-added revert 2021-01-31 15:59:44 +00:00
Auxilor
811488244a Fixed double static EnchantmentTarget 2021-01-31 14:02:11 +00:00
Auxilor
3b2677edd3 Updated to new eco display system 2021-01-30 14:49:45 +00:00
Auxilor
0f91aa8a75 Added color support to anvils 2021-01-30 10:55:50 +00:00
Auxilor
129b5ce7aa Improved /enchantinfo tabcompletion and fixed errors with colorized names, allowing support for case insensitivity 2021-01-29 09:43:50 +00:00
Auxilor
3ed9ac0cd9 Added passive-aggressive cache message for braindead developers who don't know how to code 2021-01-25 18:56:34 +00:00
Auxilor
ebbf40d9a2 Added option to not drop xp in InfernalTouch 2021-01-24 16:11:47 +00:00
Auxilor
3151430dcb Added support for mcmmo double drops within telekinesis 2021-01-24 16:09:27 +00:00
Auxilor
8259123d98 Added empty line check 2021-01-23 16:56:46 +00:00
Auxilor
5f26c992ab Fixed lore getter 2021-01-23 16:28:24 +00:00
Auxilor
a810f4262c Merge remote-tracking branch 'origin/master' 2021-01-23 16:20:57 +00:00
Auxilor
21fd92ef58 Added support for lore conversion on enchanted books 2021-01-23 16:20:42 +00:00
Auxilor
317dfdef09 Fixed addV 2021-01-22 16:07:15 +00:00
Auxilor
8ee6a6d2a9 Removed getEnchantmentLevel call 2021-01-21 13:15:07 +00:00
Auxilor
58b7e22769 Fixed LuckyCatch 2021-01-20 20:58:01 +00:00
Auxilor
423b092a3a Updated to eco 3.1.0 2021-01-19 17:46:29 +00:00
Auxilor
cd33d28b32 Removed unneeded getInstance calls 2021-01-18 18:28:22 +00:00
Auxilor
15d5afd74b Updated to eco 3 2021-01-17 16:22:04 +00:00
Auxilor
00346013fa Updated to 6.2.0, using new eco jar system 2021-01-17 11:04:40 +00:00
Auxilor
152d12a97e Improved pull request codestyle 2021-01-16 18:00:47 +00:00
kireevm96
bd4d65f2c5 Fix dupa at tKeepInventory 2021-01-16 17:35:54 +03:00
Auxilor
e1c0c28a00 Fixed shockwave 2021-01-16 13:14:30 +00:00
Auxilor
348c4161ee Fixed RarityTypeLengthSorter 2021-01-15 19:01:27 +00:00
Auxilor
7165e9be6e Added error detection to sorter implementation 2021-01-15 18:51:29 +00:00
Auxilor
70b7765bc3 Added Lucky Catch enchantment 2021-01-13 20:59:38 +00:00
Auxilor
a2151fbc06 Fixed soulbound dupe 2021-01-13 12:03:49 +00:00
Auxilor
363aa37fa8 Fixed name being null occasionally in anvils 2021-01-12 19:32:45 +00:00
Auxilor
c737474119 Fixed AnvilGUI 2021-01-12 19:31:01 +00:00
Auxilor
61a913b178 Fixed severe anvil bug 2021-01-12 19:12:42 +00:00
Auxilor
ecda560a56 Fixed meta duplication 2021-01-12 18:54:23 +00:00
Auxilor
5e299d9d4a Fixed ArrayIndexOutOfBoundsException 2021-01-12 18:53:11 +00:00
Auxilor
307b57bf6e Probably didn't, but at least tried to fix soulbound 2021-01-12 18:49:01 +00:00
Auxilor
5fabc5ff91 Updated eco and cleaned up builds, should improve Magma Walker performance 2021-01-12 14:56:19 +00:00
Auxilor
60d1f1f2a2 Fixed compile errors 2021-01-12 14:36:08 +00:00
Auxilor
c7e61a2f1e Changed lore-getter description 2021-01-10 19:32:24 +00:00
Auxilor
13c922cb61 Added option to convert enchantments from lore 2021-01-10 19:31:44 +00:00
Auxilor
91d175282d Updated eco version 2021-01-08 22:19:02 +00:00
Auxilor
42283117c8 Fixed sorting by rarity not showing enchantments sometimes 2021-01-08 22:17:12 +00:00
Auxilor
343bafe4f6 Enabled collate by default 2021-01-08 17:16:10 +00:00
Auxilor
c7c949f990 Prevented spells activating on block click 2021-01-08 17:14:42 +00:00
Auxilor
1559cb5c05 Optimised cache 2021-01-08 16:25:16 +00:00
Auxilor
6e485ca34a Reset packet priorities 2021-01-08 10:06:05 +00:00
Auxilor
bcbffe94ec Removed redundant suppression 2021-01-08 09:48:14 +00:00
Auxilor
1e9c51be2e Updated packet adapters 2021-01-08 08:11:05 +00:00
Auxilor
e050050c68 Updated eco version 2021-01-08 08:10:27 +00:00
Auxilor
c28e4d94bd Added support for HideEnchants in ChatComponent 2021-01-07 16:16:22 +00:00
Auxilor
e261c7aafe Updated all packet listeners 2021-01-07 08:50:39 +00:00
Auxilor
c2bc01b999 Fixed codestyle 2021-01-06 12:59:35 +00:00
Auxilor
33a9829ecc Fixed enchantments triggering on thorns 2021-01-06 12:58:59 +00:00
Auxilor
80f740cdea Added permission names to essentials 2021-01-06 12:56:16 +00:00
Auxilor
ca09e91f71 Fixed combining levels 2021-01-05 18:26:18 +00:00
Auxilor
f69d6cef18 Fixed accidental character in startup 2021-01-05 14:21:22 +00:00
Auxilor
9ee07fc40e Updated eco and reduced startup info 2021-01-05 14:19:35 +00:00
Auxilor
697701801a Added debug enchantment classes and updated eco 2021-01-05 09:10:01 +00:00
Auxilor
266c18497b Updated to eco 1.0.3 2021-01-04 11:24:04 +00:00
Auxilor
6d7b4077af Updated eco-core to eco 1.0.2 2021-01-01 17:01:28 +00:00
Auxilor
d54582333a Updated to eco 1.0.2 2021-01-01 17:00:51 +00:00
Auxilor
6f547f21dd Reworked eco-util into it's own project 2020-12-31 19:09:32 +00:00
Auxilor
4b115b8334 Reworked proxy package 2020-12-31 17:37:45 +00:00
Auxilor
3292cf8447 Fixed EnchantingListeners 2020-12-31 14:27:05 +00:00
Auxilor
a1c92898ea Fixed random number generation 2020-12-31 13:54:08 +00:00
Auxilor
d87abbece6 Moved villager trade display off to NMS proxy 2020-12-30 14:02:28 +00:00
Auxilor
c6fef37fb9 Fixed grit 2020-12-30 13:39:47 +00:00
Auxilor
06e4505008 Fixed disabled in worlds not working 2020-12-30 13:37:05 +00:00
Auxilor
bc707fb80d Fixed terrible Repairing and DecayCurse performance 2020-12-30 13:32:10 +00:00
Auxilor
ec7c103081 Fixed variable scope CallingCurse, Forcefield 2020-12-30 13:16:18 +00:00
Auxilor
a89598a075 Fixed Forcefield package-private 2020-12-30 13:13:55 +00:00
Auxilor
bf4d681332 Fixed CallingCurse, DecayCurse, Forcefield, Magnetic, Repairing 2020-12-30 13:13:23 +00:00
Auxilor
0f531665b1 Moved Xray off to an extension 2020-12-30 12:30:27 +00:00
Auxilor
d919a079cb Fixed AAC integration 2020-12-30 00:34:34 +00:00
Auxilor
229b6f91d0 Minor eco-util config refactor 2020-12-29 23:24:16 +00:00
Auxilor
10b0770286 Fixed field name and broken javadoc in AbstractEcoPlugin 2020-12-29 22:52:39 +00:00
Auxilor
f0dae061b1 Reworked TelekinesisUtils 2020-12-29 22:47:22 +00:00
Auxilor
45c9db8507 Minor eco-util refactor 2020-12-29 22:33:03 +00:00
Auxilor
ef65fc35d1 Removed java.lang FunctionalInterface clones 2020-12-29 22:26:21 +00:00
Auxilor
0940a56b4c Optimised Xray 2020-12-29 17:32:25 +00:00
Auxilor
09dd679079 Changed xray 2020-12-29 16:39:45 +00:00
Auxilor
9391e7dd3d Tweaks to arborist and xray 2020-12-29 16:24:22 +00:00
Auxilor
cc24dc6c4c Changed default xray config 2020-12-29 16:10:27 +00:00
Auxilor
726654f5b8 Created Xray, Arborist, Fixed ArmorListener, Fixed Display Error. 2020-12-29 16:06:32 +00:00
Auxilor
a20c3d8b1f Fixed config updater system 2020-12-29 14:16:56 +00:00
Auxilor
39c725cd65 Revert "Reworked Updatable system" 
This reverts commit aa3816a2
 2020-12-29 14:14:55 +00:00
Auxilor
aa3816a21d Reworked Updatable system 2020-12-29 14:00:39 +00:00
Auxilor
ac2ad97d2e Suppressed redundant suppressions 2020-12-28 22:59:09 +00:00
Auxilor
6869f1f680 Finally fixed plexus-utils shading in 2020-12-28 22:57:32 +00:00
Auxilor
e86c7d67fa Added comment for why EcoEnchant#getName isn't deprecated. 2020-12-28 22:43:29 +00:00
Auxilor
e238b91731 Fixed lombok from getName 2020-12-28 22:42:11 +00:00
Auxilor
cde358e6ce Finished Javadoc 2020-12-28 22:40:45 +00:00
Auxilor
0d103ee2a5 Javadoc (4/?) 2020-12-28 22:28:14 +00:00
Auxilor
9379e91011 Javadoc + Lombok (3/?) 2020-12-28 22:18:42 +00:00
Auxilor
d3f76ad128 Javadoc (2/?) 2020-12-28 21:49:37 +00:00
Auxilor
6c47f38cb7 Javadoc (1/?) 2020-12-28 17:27:48 +00:00
Auxilor
c3b053bd47 Improved Codestyle (12/?) 2020-12-28 16:50:30 +00:00
Auxilor
bb27dd38ea Improved Codestyle (11/?) 2020-12-28 16:34:27 +00:00
Auxilor
931d35495a Improved codestyle (10/?) 2020-12-28 16:31:03 +00:00
Auxilor
c97ca2f9c2 Improved codestyle (9/?) 2020-12-28 15:31:02 +00:00
Auxilor
cb191af310 Improved codestyle (8/?) 2020-12-28 15:20:51 +00:00
Auxilor
186999a701 Improved codestyle (7/?) 2020-12-28 15:03:53 +00:00
Auxilor
4c9df0ee9f Improved codestyle (6/?) 2020-12-28 14:43:16 +00:00
Auxilor
349026329c Misc changes 2020-12-27 18:15:42 +00:00
Auxilor
6ab858651e Improved util codestyle 2020-12-27 18:14:56 +00:00
Auxilor
e5baa4f895 Improved Codestyle (5/?) 2020-12-26 16:57:17 +00:00
Auxilor
d3f59c7f23 Improving Codestyle (4/?) 2020-12-26 14:54:25 +00:00
Auxilor
55fa3a21e2 Improving Codestyle (3/?) 2020-12-26 14:28:50 +00:00
Auxilor
25d6231e44 Continued improving codestyle 2020-12-26 12:31:07 +00:00
Auxilor
c387f06cfc Began improving core-plugin codestyle 2020-12-26 12:27:27 +00:00
Auxilor
f0fae2ccbd Implemented new config updater system 2020-12-25 14:07:05 +00:00
Auxilor
6fa3330fc2 Documented EcoEnchantsPlugin 2020-12-23 23:12:26 +00:00
Auxilor
68cc46f014 Improved ProxyFactory codestyle 2020-12-23 23:07:59 +00:00
Auxilor
7a36872ab3 Documented and improved the codestyle of Proxies and Proxy Implementation 2020-12-23 23:06:46 +00:00
Auxilor
311251686d Renamed method in EntityDeathByEntityEvent 2020-12-23 22:46:50 +00:00
Auxilor
90dbdcb5d9 Almost finished documenting and lombokifying eco-util 2020-12-23 19:37:31 +00:00
Auxilor
195a1e1fff Removed unused method from DropQueue 2020-12-23 00:04:46 +00:00
Auxilor
04a509f04f Documented drop and config systems 2020-12-22 23:42:31 +00:00
Auxilor
1fb3d56ebf Documented AbstractTabCompleter 2020-12-22 21:49:19 +00:00
Auxilor
eb032f2483 Began documenting 2020-12-22 21:41:55 +00:00
Auxilor
665fbbf55b Removed unneeded reflection from ChatComponent implementations 2020-12-22 20:25:26 +00:00
Auxilor
bae63f00b8 Optimised imports 2020-12-22 19:58:59 +00:00
Auxilor
07e1848054 Moved BukkitRunnables into internal runnable factory 2020-12-22 19:43:40 +00:00
Auxilor
f9a186f58f Removed Bukkit.getScheduler calls 2020-12-22 19:11:32 +00:00
Auxilor
7f0ea0a5dd Moved Anticheat + Antigrief integrations into eco-util 2020-12-22 16:10:49 +00:00
Auxilor
668db3ed12 Cleaned up code 2020-12-22 14:50:57 +00:00
Auxilor
cea8e090bb Finished moving ecoenchants to new structure 2020-12-22 13:59:53 +00:00
Auxilor
012f952c99 Abstracted ProxyFactory creation into ProxyUtils 2020-12-22 13:18:11 +00:00
Auxilor
11561529f6 Continued 6.0.0 rework 2020-12-22 13:07:17 +00:00
Auxilor
1f4b54daca Continued overhaul 2020-12-22 02:50:27 +00:00
Auxilor
52b6744c0d Reimplmented plugin code 2020-12-22 02:32:28 +00:00
Auxilor
a872a7586b Began 6.0.0 Rework 2020-12-22 01:41:37 +00:00