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

842 Commits

Author SHA1 Message Date
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