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,698 Commits 7 Branches 275 Tags 22 MiB
8f1873e3eb
Commit Graph

604 Commits

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