Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-26 15:45:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,390 Commits 7 Branches 275 Tags 22 MiB
a384050471
Commit Graph

1137 Commits

Author SHA1 Message Date
Auxilor
2a4ff69678 Fixed tabcompletion 2022-04-29 17:39:45 +01:00
Auxilor
1c72a24021 Removed any ItemMeta use in EnchantDisplay 2022-04-29 14:19:30 +01:00
Auxilor
7809d16217 Updated libreforge 2022-04-29 10:17:49 +01:00
Auxilor
7dea3e11ba Fixed libreforge 2022-04-27 19:13:09 +01:00
Auxilor
faea9b9589 Updated libreforge 2022-04-27 19:11:22 +01:00
Auxilor
a27b336299 Updated libreforge 2022-04-26 21:39:19 +01:00
Auxilor
5415988a96 Updated libreforge 2022-04-24 19:09:11 +01:00
Auxilor
6fc2fa26fa Fixed broken custom enchants since last version 2022-04-23 15:16:40 +01:00
Auxilor
3a2d9fc37b Fixed disabled worlds and requirements not working for custom enchants 2022-04-22 09:10:24 +01:00
Will FP
f00ed90b76
Merge pull request #203 
Updated Aiming (added configurable targets)
 2022-04-21 14:10:52 +01:00
_OfTeN_
6b84a23719 Updated Aiming (added configurable targets) 2022-04-21 00:30:10 +03:00
Auxilor
cb4d99f338 Updated eco/libreforge 2022-04-20 11:52:13 +01:00
Auxilor
14c09ce3ac Fixed more deprecated use 2022-04-17 13:05:47 +01:00
Auxilor
728aea2667 Removed deprecated use 2022-04-17 13:04:41 +01:00
Auxilor
95604abff8 Updated libreforge 2022-04-16 15:40:43 +01:00
Auxilor
d080e0232f Updated libreforge 2022-04-12 11:35:45 +01:00
Auxilor
6c2a6a5a58 Fixed grindstone NPE 2022-04-11 20:17:21 +01:00
Auxilor
d7d66b8659 Updated libreforge 2022-04-09 14:15:07 +01:00
Auxilor
7f9f8288a1 Updated libreforge 2022-04-06 14:16:16 +01:00
Auxilor
3361bee43a Updated libreforge 2022-04-04 10:21:02 +01:00
Auxilor
ea6035fcb7 Updated libreforge 2022-04-02 14:00:14 +01:00
Auxilor
dadd20cbf7 Updated libreforge 2022-03-31 20:18:46 +01:00
Auxilor
79c9225997 Updated libreforge 2022-03-30 20:36:26 +01:00
Auxilor
daa159e17d Updated libreforge 2022-03-28 19:03:08 +01:00
Auxilor
84e90ca338 Added only-on-books option for descriptions 2022-03-26 17:00:58 +00:00
Auxilor
994bffb39b Updated libreforge 2022-03-25 09:27:05 +00:00
Auxilor
22ffb1b470 Updated libreforge 2022-03-21 19:21:03 +00:00
Auxilor
de056bcba6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gradle.properties
 2022-03-21 19:20:21 +00:00
Auxilor
21517d6421 Updated libreforge 2022-03-19 16:11:52 +00:00
Auxilor
1dad05e834 Fixed ItemConversions bugs 2022-03-17 15:18:52 +00:00
Auxilor
7e7d8e9f49 Updated libreforge 2022-03-17 08:56:47 +00:00
Auxilor
83fbad75af Updated MythicMobs 2022-03-16 20:53:20 +00:00
Auxilor
b32c6ea668 Updated libreforge 2022-03-16 09:06:59 +00:00
Auxilor
cd91978a63 Updated block breaking 2022-03-15 13:09:22 +00:00
Auxilor
dc66408d3d Updated placeholder registration 2022-03-15 13:08:12 +00:00
Auxilor
259f5377c4 Updated display priority 2022-03-14 10:05:38 +00:00
Auxilor
ab14193e35 Updated libreforge 2022-03-12 21:13:00 +00:00
Auxilor
669019f7dc Added null safety check 2022-03-12 12:25:03 +00:00
Auxilor
c80a0355f0 Updated libreforge 2022-03-12 12:23:53 +00:00
Auxilor
93958133ce Updated libreforge 2022-03-10 15:11:15 +00:00
Auxilor
ca0bb3f8ef Updated libreforge 2022-03-09 20:32:14 +00:00
Auxilor
df47705274 Fixed anticheat support for Buckshot, Succession, Tripleshot, and Pentashot 2022-03-09 14:09:20 +00:00
Auxilor
e5938d5b61 Fixed beheading custom heads 2022-03-09 11:31:05 +00:00
Auxilor
b914f89643 Updated libreforge 2022-03-09 11:28:24 +00:00
Auxilor
7c86f7d46a Updated libreforge 2022-03-08 20:24:51 +00:00
Auxilor
dde187e7e7 Fixed beheading 2022-03-08 08:33:18 +00:00
Auxilor
33cda127f9 Updated libreforge 2022-03-07 14:08:37 +00:00
Auxilor
f5ab4cbb3d Updated succession 2022-03-07 12:38:32 +00:00
Auxilor
6deea17b85 Fixed CustomEnchantLookup performance issues 2022-03-06 13:00:58 +00:00
Auxilor
fbbe351870 Removed advanced.rehandle-breaking 2022-03-05 13:28:19 +00:00
Auxilor
b08403676f Fixed thrive having the same bug as preservation 2022-03-04 18:41:10 +00:00
Auxilor
1cbd6038c0 Updated libreforge 2022-03-04 13:37:59 +00:00
Auxilor
f8a2c9d9e4 Merge remote-tracking branch 'origin/master' 2022-03-04 11:18:44 +00:00
Auxilor
c6b291eb67 Updated registries 2022-03-04 11:18:02 +00:00
Auxilor
bf135755c6 Added 1.18.2 support 2022-03-04 11:17:35 +00:00
Auxilor
633312af79 Fixed prosperity bug 2022-03-03 20:58:29 +00:00
Auxilor
1b284c8883 Updated to 3.20.0 2022-03-01 16:23:17 +00:00
Auxilor
f8e3a6933a Updated customenchants.yml 2022-02-28 09:58:31 +00:00
Auxilor
adcfaccbf5 Added value-placeholder option to custom ecoenchants 2022-02-28 09:57:55 +00:00
Auxilor
384ff82adb Fixed %value% placeholder for Drill 2022-02-28 09:55:52 +00:00
Auxilor
b861ab40c0 Fixed artifact/spell required to extend bug 2022-02-28 09:54:38 +00:00
Auxilor
cc96b9d6ba Updated libreforge 2022-02-28 09:52:37 +00:00
Auxilor
3ba3d43344 Fixed rare crash with LootPopulator 2022-02-25 11:30:25 +00:00
Auxilor
513b6d9c14 Updated libreforge 2022-02-25 11:27:53 +00:00
Auxilor
b8861b8275 Updated libreforge 2022-02-20 17:20:58 +00:00
Auxilor
dc9db7faad Dropped support for 1.16.5 2022-02-19 18:42:44 +00:00
Auxilor
72b334d5f7 Updated libreforge 2022-02-19 16:01:59 +00:00
Auxilor
43a313ec83 Categorized persistent data keys 2022-02-18 11:28:42 +00:00
Auxilor
45bac32c88 Fixed 2 more minor migration bugs 2022-02-18 11:26:55 +00:00
Auxilor
9248682ff6 Upgraded code to eco 6.25.0 2022-02-18 11:25:53 +00:00
Auxilor
3af40853c8 Updated eco and libreforge 2022-02-18 11:10:27 +00:00
Auxilor
f51e3397de Updated libreforge 2022-02-15 16:48:01 +00:00
Auxilor
33a1497c16 Updated libreforge 2022-02-14 17:17:04 +00:00
Auxilor
1713e00f41 Updated libreforge 2022-02-13 15:39:08 +00:00
Auxilor
4c73e5130c Updated libreforge 2022-02-12 10:49:54 +00:00
Auxilor
486937c5a6 Fixed potential duplication glitch with telekinesis 2022-02-11 14:06:57 +00:00
Auxilor
de322bb536 Updated libreforge 2022-02-10 10:59:27 +00:00
Auxilor
7803f29c8e Updated libreforge 2022-02-09 20:24:35 +00:00
Auxilor
4b755f5e87 Updated libreforge 2022-02-08 20:44:23 +00:00
Auxilor
e9f31e3948 Updated libreforge 2022-02-08 14:04:22 +00:00
Auxilor
65d8b0b9dd Updated libreforge 2022-02-07 11:43:12 +00:00
Auxilor
b5fc1ea09b Updated libreforge 2022-02-06 17:44:03 +00:00
Auxilor
3ed0a20def Updated libreforge 2022-02-06 14:56:55 +00:00
Auxilor
a908723e8b Updated libreforge 2022-02-05 14:11:34 +00:00
Auxilor
61f131b480 Updated libreforge 2022-02-05 13:21:56 +00:00
Auxilor
a2474e6943 Updated libreforge 2022-02-05 11:24:07 +00:00
Auxilor
d89cd2be79 Updated libreforge 2022-02-04 18:50:06 +00:00
Auxilor
782fe9d03b Updated libreforge 2022-02-04 10:29:06 +00:00
Auxilor
20c24c3fb3 Fixed loader constraint violations 2022-02-03 19:14:38 +00:00
Auxilor
a32611607a Updated libreforge 2022-02-03 09:24:59 +00:00
Auxilor
5b62974eb7 Updated libreforge 2022-02-01 18:45:30 +00:00
Auxilor
632d2838ca Updated libreforge 2022-01-31 19:11:05 +00:00
Auxilor
9d339b5870 Updated libreforge 2022-01-31 17:52:10 +00:00
Auxilor
d4b375e7f7 Updated libreforge 2022-01-30 18:12:50 +00:00
Auxilor
b572233b10 Updated libreforge 2022-01-29 21:52:42 +00:00
Auxilor
b15bcb9f2c Updated libreforge 2022-01-29 11:25:46 +00:00
Auxilor
30ce54e53f PR Changes 2022-01-28 19:37:46 +00:00
Will FP
f8191653a6
Merge pull request #129 
Fixed custom enchants support in CMI and Essentials
 2022-01-28 19:37:04 +00:00
_OfTeN_
44f9389ed6 Fixed custom enchants support in CMI and Essentials 2022-01-28 22:35:54 +03:00
Auxilor
6707cee8a2 Fixed more problems with custom enchants 2022-01-28 19:29:08 +00:00
Auxilor
f4d03cbb50 Fixed very mild case of stupidity 2022-01-28 19:21:24 +00:00
Auxilor
8c78c8f756 Updated custom enchants on enable 2022-01-28 19:16:53 +00:00
Auxilor
700744d444 Updated libreforge 2022-01-28 19:02:55 +00:00
Auxilor
db1a0030f7 Removed really-legacy reversion code from well over a year ago 2022-01-28 11:16:40 +00:00
Auxilor
1f03f1ae38 Updated libreforge 2022-01-28 11:11:24 +00:00
Auxilor
95b86c9577 Updated libreforge 2022-01-27 18:46:18 +00:00
Auxilor
c75732a5cb Updated libreforge 2022-01-26 21:30:52 +00:00
Auxilor
d86bb5020b Fixed loot populator 2022-01-26 20:20:12 +00:00
Auxilor
336236240c Fixed loot populator 2022-01-26 19:58:07 +00:00
Auxilor
f07f50e614 Updated libreforge 2022-01-26 11:56:45 +00:00
Auxilor
609d3f8d16 PR Fixes 2022-01-24 22:08:39 +00:00
_OfTeN_
d9d9e0a40b Revert "Fixed Intellect and Wisdom sometimes giving more exp than they should" 
This reverts commit f164b76c62.
 2022-01-24 23:15:46 +03:00
_OfTeN_
84e57fb2d6 Added AntigriefManager support to Instability enchantment 2022-01-24 23:09:34 +03:00
_OfTeN_
c538a007da Added AntigriefManager support to Corrosive enchantment 2022-01-24 23:09:01 +03:00
_OfTeN_
f164b76c62 Fixed Intellect and Wisdom sometimes giving more exp than they should 2022-01-24 22:54:27 +03:00
Auxilor
90269bbf86 Updated libreforge 2022-01-24 19:32:41 +00:00
Auxilor
aa38dec835 Fixed missing config values 2022-01-24 19:32:14 +00:00
Auxilor
5a7a09dc60 Updated libreforge 2022-01-23 16:56:33 +00:00
Auxilor
2692a354a4 Updated libreforge 2022-01-22 12:11:40 +00:00
Auxilor
dde3f6a85b Updated libreforge 2022-01-21 19:02:47 +00:00
Auxilor
737c181034 PR Changes 2022-01-21 15:30:27 +00:00
Drăghiciu Nicolae
81992138b5
Merge branch 'Auxilor:master' into master 2022-01-21 15:17:11 +02:00
Auxilor
b466ba594b Updated libreforge 2022-01-21 09:09:23 +00:00
Auxilor
d03d31a27d Updated libreforge 2022-01-19 19:15:54 +00:00
Drăghiciu Nicolae
a8c1894195
Merge branch 'Auxilor:master' into master 2022-01-18 20:44:45 +02:00
Auxilor
823dabc041 Updated libreforge 2022-01-18 16:33:28 +00:00
Auxilor
703d19c544 Fixed invigoration 2022-01-18 08:34:36 +00:00
Auxilor
c75a23e99a Fixed invigoration 2022-01-18 08:34:22 +00:00
Auxilor
6ac7d759f8 Merge remote-tracking branch 'origin/master' 2022-01-18 08:33:24 +00:00
Auxilor
5a2463b44c Merge remote-tracking branch 'origin/master' 2022-01-18 08:33:02 +00:00
0ft3n
fe05c76495
Fixed Invigoration giving invulnerability 2022-01-18 00:47:32 +03:00
Auxilor
39a213c727 Updated placeholders 2022-01-17 19:11:55 +00:00
Auxilor
e38187be35 Updated libreforge 2022-01-17 19:10:22 +00:00
Auxilor
6c1319032a Moved buckshot to remove the projectile on the next tick 2022-01-17 17:04:52 +00:00
Auxilor
3e88078d07 Fixed builds 2022-01-17 16:55:03 +00:00
Auxilor
71437e9eb4 Fixed onDeflect bug 2022-01-17 16:50:05 +00:00
Drăghiciu Nicolae
d4d9746768
Merge branch 'Auxilor:master' into master 2022-01-16 12:55:26 +02:00
Auxilor
b4fa4a0f98 PR change 2022-01-15 19:06:15 +00:00
0ft3n
8ebb2b1529
Added a warning for not having a slot defined for a target in target.yml 2022-01-15 21:59:36 +03:00
NicoNekoDev
7ac301b443 Use getFormatedStrings 2022-01-15 19:44:40 +02:00
NicoNekoDev
51ee56e548 Create lore prefix and suffix for enchanted items 
(except books because it looks ugly on them and makes no sense)
 2022-01-15 19:24:08 +02:00
Auxilor
91a39926dc Updated libreforge 2022-01-14 17:45:33 +00:00
Auxilor
aedb2154b4 Fixed more uses of deprecated methods 2022-01-13 12:34:27 +00:00
Auxilor
cf41a467da Updated to eco 6.19.0 2022-01-13 12:32:41 +00:00
Auxilor
fcbf779537 Disabled rehandle-breaking by default 2022-01-13 10:52:06 +00:00
Auxilor
12d84820b2 Updated minimum eco version 2022-01-12 12:48:16 +00:00
Auxilor
9762fe8b17 Updated libreforge to 3.0.0 2022-01-12 12:45:02 +00:00
Auxilor
79aa66a9bd Updated libreforge 2022-01-11 09:52:50 +00:00
Will FP
a5b2ffe40a
Merge pull request #115 
Fix error on Invigoration
 2022-01-10 19:36:45 +00:00
cfcradle
227c46394f
Fix comment on Invigoration config 
Change comment to 2.5% to match the default damage-multiplier value.
 2022-01-09 23:42:24 -05:00
cfcradle
601934fa88
Make damageReduction reduce damage. 
Swap the addition for subtraction, so more invigoration points will multiply the damage by a lower percentage.
 2022-01-09 23:25:15 -05:00
Auxilor
404605cb1b Updated libreforge 2022-01-09 18:39:06 +00:00
Auxilor
6510cd2c6a Fixed requirements with custom ecoenchants 2022-01-09 18:09:31 +00:00
Auxilor
e96f6de53f Updated libreforge 2022-01-09 12:58:39 +00:00
Auxilor
7f4d2e65a6 Added escape via customenchants.yml 2022-01-08 16:13:52 +00:00
Auxilor
cc7d934489 Implemented toStrings 2022-01-08 16:01:09 +00:00
Auxilor
c2c446ca56 Fixed target.yml 2022-01-08 15:50:31 +00:00
Auxilor
6c4849ee5f Fixed demo enchant 2022-01-08 13:52:29 +00:00
Auxilor
ff3768dc6f Fixed integration loaders not in 2022-01-08 13:51:35 +00:00
Auxilor
03327db98b Fixed config load order with custom enchants 2022-01-08 13:45:47 +00:00
Auxilor
abd1b4d009 Fixed type case sensitivity 2022-01-08 13:42:29 +00:00
Auxilor
8f1873e3eb Added EnchantmentConfig#save 2022-01-08 13:39:46 +00:00
Auxilor
f148121981 Added demo custom enchantment 2022-01-08 13:38:19 +00:00
Auxilor
c7f97393d7 Merge branch 'master' into develop 2022-01-08 13:36:50 +00:00
Auxilor
5e264a3631 Added ability to create custom enchants in config via libreforge 2022-01-08 13:36:00 +00:00
Auxilor
6059b8e928 Weird codemc nms build issue 2022-01-07 19:42:16 +00:00
Auxilor
581a4f7751 Added custom entity support to beheading 2022-01-07 19:38:25 +00:00
Auxilor
4cf6995fb0 Fixed excessive velocity with charge 2022-01-03 14:56:02 +00:00
Auxilor
cca7c377a2 Fixed copper with fortune on infernal touch 2022-01-01 16:05:02 +00:00
Auxilor
2ed76f1051 Added hide-in-lore flag 2021-12-29 18:33:49 +00:00
Auxilor
0b0df6d84e Fixed spells triggering when putting out fires with left-click items 2021-12-27 19:47:44 +00:00
Auxilor
740d81f9ef Fixed description bug 2021-12-26 16:05:09 +00:00
Auxilor
2a88bb2298 Added chance options to drill, pentashot, and tripleshot 2021-12-26 15:56:34 +00:00
Auxilor
04d560e01e Nerfed optics 2021-12-26 15:54:23 +00:00
Auxilor
31591de719 Codestyle 2021-12-26 13:26:33 +00:00
Auxilor
f8bd6f2547 Updated config string getters 2021-12-21 14:57:03 +00:00
Auxilor
4fa90fabd5 Cleaned up EcoEnchants#hasAnyOfType 2021-12-21 14:50:13 +00:00
Auxilor
1e03f23c13 eco 6.17.0 migration 2021-12-14 09:09:38 +00:00
Auxilor
69fcd54e17 Updated minimum eco version 2021-12-14 09:02:22 +00:00
Auxilor
c31b04a099 canEnchantItem now allows for increasing item level 2021-12-13 22:13:50 +00:00
Will FP
5d18d8c391
Merge pull request #106 
fix: arraylist index out of bounds
 2021-12-12 11:17:40 +00:00
Auxilor
6f3ecc726f Fixed canEnchantItem with singular types 2021-12-07 08:24:28 +00:00
Auxilor
28304d0ebe Fixed nullability annotation 2021-12-06 09:59:49 +00:00
Will FP
c958b30a3f
Merge pull request #107 
Made LootPopulator work with minecarts with chests
 2021-12-05 13:49:00 +00:00
Auxilor
060f140d14 Removed Light Artifact due to 1.18 incompatibility 2021-11-30 19:33:26 +00:00
Auxilor
8fee321f44 Updated build.gradle for v1_18_R1 2021-11-30 18:56:59 +00:00
_OfTeN_
41f76c5909 Made LootPopulator work with minecarts with chests 2021-11-29 19:16:51 +03:00
Auxilor
bd2f2a8e9d Implemented 1.18 NMS 2021-11-29 08:14:11 +00:00
Auxilor
bc4c1362ed Added in source tree for 1.18 - awaiting release 2021-11-28 13:18:06 +00:00
Auxilor
14f6c95095 Added warning to CommandLocaleExport 2021-11-26 18:22:35 +00:00
WindLeaf_qwq
0bb4f8592a
bruh 2021-11-26 11:04:57 +08:00
WindLeaf_qwq
8b6301f90b
fix: arraylist index out of bounds 2021-11-26 10:33:27 +08:00
Blc
6e53c8469c
fix: hunger curse config 
As specified here(https://github.com/Auxilor/EcoEnchants/blob/master/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java#L48), this enchant need to be configured.
Otherwise delta variable always be zero, and players with this curse never be hunger
 2021-11-23 12:41:42 +03:00
Auxilor
b60254433a Heavily nerfed force and razor 2021-11-22 12:02:45 +00:00
Auxilor
193ec4b707 Heavily nerfed blast mining 2021-11-22 12:01:51 +00:00
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
Auxilor
585f848a0b Removed timing messages 2021-07-26 18:15:24 +01:00
Auxilor
23284f81c3 More internal chanegs 2021-07-26 18:12:58 +01:00
Auxilor
75d3f401ec Removed forEach calls 2021-07-26 18:04:33 +01:00
Auxilor
90839d0bde Switch EnchantChecks arrow code off to ArrowUtils 2021-07-26 17:59:06 +01:00
Auxilor
7f707e2dd6 Remove ItemConversions things out of display options 2021-07-26 17:56:53 +01:00