diff --git a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java b/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java index f3dea127..ee46b8e6 100644 --- a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java +++ b/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java @@ -33,6 +33,7 @@ public class Alchemy extends EcoEnchant { if(!EnchantmentUtils.passedChance(this, level)) return; + if(this.getDisabledWorlds().contains(entity.getWorld())) return; PotionEffect effect = event.getNewEffect(); diff --git a/Extensions/Alchemy/src/main/resources/enchants/normal/alchemy.yml b/Extensions/Alchemy/src/main/resources/enchants/normal/alchemy.yml index 827d2549..9caea8a2 100644 --- a/Extensions/Alchemy/src/main/resources/enchants/normal/alchemy.yml +++ b/Extensions/Alchemy/src/main/resources/enchants/normal/alchemy.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Extensions/Alchemy/src/main/resources/extension.yml b/Extensions/Alchemy/src/main/resources/extension.yml index 25a24e50..fe5dccb7 100644 --- a/Extensions/Alchemy/src/main/resources/extension.yml +++ b/Extensions/Alchemy/src/main/resources/extension.yml @@ -1,3 +1,3 @@ name: Alchemy main: com.willfp.ecoenchants.alchemy.AlchemyMain -version: 1.0.0 \ No newline at end of file +version: 1.0.1 \ No newline at end of file diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/altitude.yml b/Extensions/Biomes/src/main/resources/enchants/normal/altitude.yml index fb0146a7..d2c29202 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/altitude.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/altitude.yml @@ -20,6 +20,7 @@ general-config: - axe - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - aquamarine - dehydration diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/aquamarine.yml b/Extensions/Biomes/src/main/resources/enchants/normal/aquamarine.yml index 8b807615..9a6cea04 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/aquamarine.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/aquamarine.yml @@ -20,6 +20,7 @@ general-config: - axe - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - altitude - dehydration diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/dehydration.yml b/Extensions/Biomes/src/main/resources/enchants/normal/dehydration.yml index a5b7d5f0..5f8dbfc4 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/dehydration.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/dehydration.yml @@ -20,6 +20,7 @@ general-config: - axe - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - altitude - aquamarine diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/elevation.yml b/Extensions/Biomes/src/main/resources/enchants/normal/elevation.yml index c8965fe7..5a247ae0 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/elevation.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/elevation.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - glacial - heat_treated diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/glacial.yml b/Extensions/Biomes/src/main/resources/enchants/normal/glacial.yml index 5ce4badb..26eda066 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/glacial.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/glacial.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - elevation - heat_treated diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/heattreated.yml b/Extensions/Biomes/src/main/resources/enchants/normal/heattreated.yml index d661c574..99957d3b 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/heattreated.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/heattreated.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - elevation - glacial diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/icelord.yml b/Extensions/Biomes/src/main/resources/enchants/normal/icelord.yml index a04bc2f5..43d08bed 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/icelord.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/icelord.yml @@ -20,6 +20,7 @@ general-config: - axe - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - altitide - aquamarine diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/oceanic.yml b/Extensions/Biomes/src/main/resources/enchants/normal/oceanic.yml index 331902a7..f7b77b11 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/oceanic.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/oceanic.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - elevation - glacial diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/rainforest.yml b/Extensions/Biomes/src/main/resources/enchants/normal/rainforest.yml index 2884c321..bb76f958 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/rainforest.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/rainforest.yml @@ -20,6 +20,7 @@ general-config: - axe - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - altitude - aquamarine diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/tropical.yml b/Extensions/Biomes/src/main/resources/enchants/normal/tropical.yml index bb07629c..bc0a2b39 100644 --- a/Extensions/Biomes/src/main/resources/enchants/normal/tropical.yml +++ b/Extensions/Biomes/src/main/resources/enchants/normal/tropical.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - elevation - glacial diff --git a/Extensions/Biomes/src/main/resources/extension.yml b/Extensions/Biomes/src/main/resources/extension.yml index e70f5c36..b23e4c6c 100644 --- a/Extensions/Biomes/src/main/resources/extension.yml +++ b/Extensions/Biomes/src/main/resources/extension.yml @@ -1,3 +1,3 @@ name: Biomes main: com.willfp.ecoenchants.biomes.BiomesMain -version: 1.0.0 \ No newline at end of file +version: 1.0.1 \ No newline at end of file diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java index 7b759db9..6c418c85 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java +++ b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java @@ -30,6 +30,7 @@ public abstract class EffectsEnchantment extends EcoEnchant { } int level = EnchantChecks.getArmorPoints(player, this); + if(this.getDisabledWorlds().contains(player.getWorld())) return; if(level > 0) { player.addPotionEffect(new PotionEffect(this.getPotionEffect(), 0x6fffffff, level - 1, false, false, true)); } diff --git a/Extensions/Effects/src/main/resources/enchants/normal/jumpboost.yml b/Extensions/Effects/src/main/resources/enchants/normal/jumpboost.yml index 87bce45c..694d36fb 100644 --- a/Extensions/Effects/src/main/resources/enchants/normal/jumpboost.yml +++ b/Extensions/Effects/src/main/resources/enchants/normal/jumpboost.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - spring maximum-level: 3 diff --git a/Extensions/Effects/src/main/resources/enchants/normal/nightvision.yml b/Extensions/Effects/src/main/resources/enchants/normal/nightvision.yml index 8f3204fb..9f72038d 100644 --- a/Extensions/Effects/src/main/resources/enchants/normal/nightvision.yml +++ b/Extensions/Effects/src/main/resources/enchants/normal/nightvision.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 1 diff --git a/Extensions/Effects/src/main/resources/enchants/normal/regeneration.yml b/Extensions/Effects/src/main/resources/enchants/normal/regeneration.yml index 0159a8d7..451f6312 100644 --- a/Extensions/Effects/src/main/resources/enchants/normal/regeneration.yml +++ b/Extensions/Effects/src/main/resources/enchants/normal/regeneration.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Extensions/Effects/src/main/resources/enchants/normal/speed.yml b/Extensions/Effects/src/main/resources/enchants/normal/speed.yml index fb7e10ab..6c07dbc2 100644 --- a/Extensions/Effects/src/main/resources/enchants/normal/speed.yml +++ b/Extensions/Effects/src/main/resources/enchants/normal/speed.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - streamlining maximum-level: 3 diff --git a/Extensions/Effects/src/main/resources/enchants/normal/waterbreathing.yml b/Extensions/Effects/src/main/resources/enchants/normal/waterbreathing.yml index fc1fb99f..fae51bf1 100644 --- a/Extensions/Effects/src/main/resources/enchants/normal/waterbreathing.yml +++ b/Extensions/Effects/src/main/resources/enchants/normal/waterbreathing.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 1 diff --git a/Extensions/Effects/src/main/resources/extension.yml b/Extensions/Effects/src/main/resources/extension.yml index d45286a5..c34280c8 100644 --- a/Extensions/Effects/src/main/resources/extension.yml +++ b/Extensions/Effects/src/main/resources/extension.yml @@ -1,3 +1,3 @@ name: Effects main: com.willfp.ecoenchants.effects.EffectsMain -version: 1.0.1 \ No newline at end of file +version: 1.0.2 \ No newline at end of file diff --git a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java b/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java index 923b553f..109fea5c 100644 --- a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java +++ b/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java @@ -37,6 +37,7 @@ public class Endershot extends EcoEnchant { event.setCancelled(true); if(!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if(!player.getInventory().contains(Material.ENDER_PEARL, 1) && !player.getGameMode().equals(GameMode.CREATIVE)) return; diff --git a/Extensions/Endershot/src/main/resources/enchants/normal/endershot.yml b/Extensions/Endershot/src/main/resources/enchants/normal/endershot.yml index 628b5137..df64b360 100644 --- a/Extensions/Endershot/src/main/resources/enchants/normal/endershot.yml +++ b/Extensions/Endershot/src/main/resources/enchants/normal/endershot.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 1 diff --git a/Extensions/Endershot/src/main/resources/extension.yml b/Extensions/Endershot/src/main/resources/extension.yml index d00ef6d6..def9482b 100644 --- a/Extensions/Endershot/src/main/resources/extension.yml +++ b/Extensions/Endershot/src/main/resources/extension.yml @@ -1,3 +1,3 @@ name: Endershot main: com.willfp.ecoenchants.endershot.EndershotMain -version: 1.0.0 +version: 1.0.1 diff --git a/Extensions/Firewand/src/main/resources/enchants/spell/firewand.yml b/Extensions/Firewand/src/main/resources/enchants/spell/firewand.yml index bb54ab2d..fda2a949 100644 --- a/Extensions/Firewand/src/main/resources/enchants/spell/firewand.yml +++ b/Extensions/Firewand/src/main/resources/enchants/spell/firewand.yml @@ -17,6 +17,7 @@ general-config: - rod - carrot_stick grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Extensions/Firewand/src/main/resources/extension.yml b/Extensions/Firewand/src/main/resources/extension.yml index 49203275..960eeb84 100644 --- a/Extensions/Firewand/src/main/resources/extension.yml +++ b/Extensions/Firewand/src/main/resources/extension.yml @@ -1,287 +1,3 @@ name: Firewand main: com.willfp.ecoenchants.firewand.FirewandMain -version: 1.0.3 - -# This is some junk so that polymart lets me upload it - -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 -### JUNK 9851390485762394875629834765928374659283476592384765986 \ No newline at end of file +version: 1.0.4 \ No newline at end of file diff --git a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java b/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java index d4f6a66f..661b3373 100644 --- a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java +++ b/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java @@ -46,6 +46,7 @@ public class Precision extends EcoEnchant { ItemStack itemStack = TridentStack.getTridentStack(trident); if (!EnchantChecks.item(itemStack, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getMainhandLevel(player, this); diff --git a/Extensions/Precision/src/main/resources/enchants/special/precision.yml b/Extensions/Precision/src/main/resources/enchants/special/precision.yml index c827abfe..4e68daa4 100644 --- a/Extensions/Precision/src/main/resources/enchants/special/precision.yml +++ b/Extensions/Precision/src/main/resources/enchants/special/precision.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Extensions/Precision/src/main/resources/extension.yml b/Extensions/Precision/src/main/resources/extension.yml index 1e8b8668..a6f56445 100644 --- a/Extensions/Precision/src/main/resources/extension.yml +++ b/Extensions/Precision/src/main/resources/extension.yml @@ -1,3 +1,3 @@ name: Precision main: com.willfp.ecoenchants.precision.PrecisionMain -version: 1.0.3 \ No newline at end of file +version: 1.0.4 \ No newline at end of file diff --git a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java b/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java index 5e7d40e1..8b74cee6 100644 --- a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java +++ b/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java @@ -35,7 +35,8 @@ public class SprintArtifactsListener implements Listener { if(!matching.isPresent()) return; Artifact artifact = (Artifact) matching.get(); - if (!EnchantChecks.chestplate(player, artifact)) return; + if (!EnchantChecks.boots(player, artifact)) return; + if(artifact.getDisabledWorlds().contains(player.getWorld())) return; player.getWorld().spawnParticle(artifact.getParticle(), player.getLocation().add(0, 0.1, 0), 1, 0, 0, 0, 0, artifact.getDustOptions(), true); } diff --git a/Extensions/SprintArtifacts/src/main/resources/extension.yml b/Extensions/SprintArtifacts/src/main/resources/extension.yml index 7c7698c3..8425b85c 100644 --- a/Extensions/SprintArtifacts/src/main/resources/extension.yml +++ b/Extensions/SprintArtifacts/src/main/resources/extension.yml @@ -1,3 +1,3 @@ name: Sprint Artifacts main: com.willfp.ecoenchants.sprintartifacts.SprintArtifactsMain -version: 1.0.0 \ No newline at end of file +version: 1.0.1 \ No newline at end of file diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/crawler.yml b/Extensions/Summoning/src/main/resources/enchants/normal/crawler.yml index bc68340d..1a011fed 100644 --- a/Extensions/Summoning/src/main/resources/enchants/normal/crawler.yml +++ b/Extensions/Summoning/src/main/resources/enchants/normal/crawler.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - sniper maximum-level: 3 diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/firestorm.yml b/Extensions/Summoning/src/main/resources/enchants/normal/firestorm.yml index 09a973d7..11db7581 100644 --- a/Extensions/Summoning/src/main/resources/enchants/normal/firestorm.yml +++ b/Extensions/Summoning/src/main/resources/enchants/normal/firestorm.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - metallic maximum-level: 3 diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/ghoul.yml b/Extensions/Summoning/src/main/resources/enchants/normal/ghoul.yml index 4b59ad5a..2f1729e0 100644 --- a/Extensions/Summoning/src/main/resources/enchants/normal/ghoul.yml +++ b/Extensions/Summoning/src/main/resources/enchants/normal/ghoul.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: - mortality maximum-level: 4 diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/mortality.yml b/Extensions/Summoning/src/main/resources/enchants/normal/mortality.yml index 547b4803..736470d4 100644 --- a/Extensions/Summoning/src/main/resources/enchants/normal/mortality.yml +++ b/Extensions/Summoning/src/main/resources/enchants/normal/mortality.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: - ghoul maximum-level: 4 diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/sniper.yml b/Extensions/Summoning/src/main/resources/enchants/normal/sniper.yml index 995049ad..8d5682c1 100644 --- a/Extensions/Summoning/src/main/resources/enchants/normal/sniper.yml +++ b/Extensions/Summoning/src/main/resources/enchants/normal/sniper.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - crawler maximum-level: 3 diff --git a/Extensions/Summoning/src/main/resources/enchants/special/metallic.yml b/Extensions/Summoning/src/main/resources/enchants/special/metallic.yml index 2d389934..1916efec 100644 --- a/Extensions/Summoning/src/main/resources/enchants/special/metallic.yml +++ b/Extensions/Summoning/src/main/resources/enchants/special/metallic.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - firestorm maximum-level: 2 diff --git a/Extensions/Summoning/src/main/resources/extension.yml b/Extensions/Summoning/src/main/resources/extension.yml index 13a332ff..d092c54c 100644 --- a/Extensions/Summoning/src/main/resources/extension.yml +++ b/Extensions/Summoning/src/main/resources/extension.yml @@ -1,3 +1,3 @@ name: Summoning main: com.willfp.ecoenchants.summoning.SummoningMain -version: 1.0.2 \ No newline at end of file +version: 1.0.3 \ No newline at end of file diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index abb673fc..70f9577d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -14,6 +14,7 @@ import org.apache.commons.lang.WordUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; +import org.bukkit.World; import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.EnchantmentTarget; import org.bukkit.event.Listener; @@ -32,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.stream.Collectors; @SuppressWarnings({"unchecked", "deprecation"}) public abstract class EcoEnchant extends Enchantment implements Listener, Registerable, Watcher { @@ -51,6 +53,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist private EnchantmentRarity rarity; private final Set target = new HashSet<>(); private final Set targetMaterials = new HashSet<>(); + private final Set disabledWorldNames = new HashSet<>(); private boolean enabled; @@ -115,6 +118,8 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist maxLvl = config.getInt(EcoEnchants.GENERAL_LOCATION + "maximum-level", 1); name = StringUtils.translate(config.getString("name")); description = StringUtils.translate(config.getString("description")); + disabledWorldNames.clear(); + disabledWorldNames.addAll(config.getStrings(EcoEnchants.GENERAL_LOCATION + "disabled-in-worlds")); target.clear(); targetMaterials.clear(); target.addAll(config.getTargets()); @@ -294,6 +299,17 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist return config; } + /** + * Get worlds that the enchantment is disabled in + * + * @return A list of all disabled worlds + */ + public List getDisabledWorlds() { + List worldNames = Bukkit.getWorlds().stream().map(World::getName).map(String::toLowerCase).collect(Collectors.toList()); + List disabledExistingWorldNames = disabledWorldNames.stream().filter(s -> worldNames.contains(s.toLowerCase())).collect(Collectors.toList()); + return Bukkit.getWorlds().stream().filter(world -> disabledExistingWorldNames.contains(world.getName().toLowerCase())).collect(Collectors.toList()); + } + /** * Get display name of enchantment. * Not deprecated, unlike {@link Enchantment#getName()} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java index d1faccce..d1a6860f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java @@ -55,6 +55,7 @@ public class CallingCurse extends EcoEnchant implements EcoRunnable { public void run() { players.forEach((player, level) -> { double distance = EcoEnchants.CALLING_CURSE.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "distance"); + if(this.getDisabledWorlds().contains(player.getWorld())) return; for (Entity e : player.getWorld().getNearbyEntities(player.getLocation(), distance, distance, distance)) { if(!(e instanceof Monster)) continue; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java index 61627fde..ba2da3a3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java @@ -82,6 +82,7 @@ public class DecayCurse extends EcoEnchant implements EcoRunnable { for(ItemStack item : player.getInventory().getContents()) { int level = EnchantChecks.getItemLevel(item, this); if(level == 0) continue; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if(!(item.getItemMeta() instanceof Repairable)) continue; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java index 1fe2c2c5..060a347d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java @@ -22,6 +22,8 @@ public class FragilityCurse extends EcoEnchant { if (!EnchantChecks.item(item, this)) return; + if(this.getDisabledWorlds().contains(event.getPlayer().getWorld())) return; + int min = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "minimum-extra-durability"); int max = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "maximum-extra-durability"); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java index ff695084..cfc061b7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java @@ -24,6 +24,7 @@ public class HungerCurse extends EcoEnchant { if(!EnchantChecks.helmet(player, this)) return; if(event.getFoodLevel() > player.getFoodLevel()) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int delta = player.getFoodLevel() - event.getFoodLevel(); delta *= this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "times-more-hunger"); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java index 1d7e2135..38a82722 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java @@ -37,6 +37,8 @@ public class Beheading extends EcoEnchant { if(!EnchantmentUtils.passedChance(this, level)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + ItemStack item; if(victim instanceof Player) { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java index d141b74d..840307fe 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java @@ -28,6 +28,8 @@ public class Dexterous extends EcoEnchant { return; } + if(this.getDisabledWorlds().contains(player.getWorld())) return; + int level = EnchantChecks.getItemLevel(item, this); double bonus = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "add-speed-per-level"); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java index d3d9d043..2792384e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java @@ -18,6 +18,7 @@ public class Economical extends EcoEnchant { @EventHandler public void onElytraBoost(PlayerElytraBoostEvent event) { if(EnchantmentUtils.passedChance(this, EnchantChecks.getArmorPoints(event.getPlayer(), this))) + if(this.getDisabledWorlds().contains(event.getPlayer().getWorld())) return; event.setShouldConsume(false); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java index 42afbc3f..52b8e33a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java @@ -45,6 +45,7 @@ public class Enderism extends EcoEnchant { return; if (!EnchantChecks.arrow(arrow, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getArrowLevel(arrow, this); double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java index 490e37ce..68fc1f73 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java @@ -40,6 +40,7 @@ public class Farmhand extends EcoEnchant { ItemStack item = event.getItem(); if (!EnchantChecks.item(item, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (!item.getType().toString().endsWith("_HOE")) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java index 8d037eb1..8f7f28c0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java @@ -53,6 +53,7 @@ public class Forcefield extends EcoEnchant implements EcoRunnable { @Override public void run() { players.forEach((player, level) -> { + if(this.getDisabledWorlds().contains(player.getWorld())) return; double initialDistance = EcoEnchants.FORCEFIELD.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "initial-distance"); double bonus = EcoEnchants.FORCEFIELD.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-level"); double distance = initialDistance + (level * bonus); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java index 7717be49..8d9f094e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java @@ -36,6 +36,7 @@ public class Frozen extends EcoEnchant { if (points == 0) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if(!EnchantmentUtils.passedChance(this, points)) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java index 1752c0b4..229c4a2b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java @@ -35,6 +35,8 @@ public class Graceful extends EcoEnchant { if(!EnchantChecks.boots(player, this)) return; int level = EnchantChecks.getBootsLevel(player, this); + if(this.getDisabledWorlds().contains(player.getWorld())) return; + if(!EnchantmentUtils.passedChance(this, level)) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java index 76b7604d..160a583d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java @@ -34,6 +34,8 @@ public class GreenThumb extends EcoEnchant { if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + if(!AntigriefManager.canBreakBlock(player, event.getClickedBlock())) return; if(!AntigriefManager.canPlaceBlock(player, event.getClickedBlock())) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java index 6ff01a15..deb3c84c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java @@ -35,6 +35,7 @@ public class Grit extends EcoEnchant { if (totalGritPoints == 0) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (!(attacker.getInventory().getItemInMainHand() instanceof Damageable)) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java index 425c26de..d399c405 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java @@ -33,6 +33,7 @@ public class Incandescence extends EcoEnchant { if (totalIncandescencePoints == 0) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; Bukkit.getScheduler().runTaskLater(EcoEnchantsPlugin.getInstance(), () -> { victim.setFireTicks(totalIncandescencePoints * this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "ticks-per-point") + this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "initial-ticks")); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java index ba3c727a..3bef9b04 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java @@ -18,7 +18,15 @@ import org.bukkit.inventory.FurnaceRecipe; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; public class InfernalTouch extends EcoEnchant { @@ -67,6 +75,7 @@ public class InfernalTouch extends EcoEnchant { return; if (!AntigriefManager.canBreakBlock(player, block)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; Collection drops = new ArrayList<>(); event.getItems().forEach((item -> { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java index 3e95e8b1..31d9038e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java @@ -27,6 +27,7 @@ public class Invigoration extends EcoEnchant { return; int totalInvigorationPoints = EnchantChecks.getArmorPoints(player, this, 0); + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (totalInvigorationPoints == 0) return; @@ -46,6 +47,7 @@ public class Invigoration extends EcoEnchant { return; int totalInvigorationPoints = EnchantChecks.getArmorPoints(player, this, 0); + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (totalInvigorationPoints == 0) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java index b45fa7dc..75bc7718 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java @@ -35,6 +35,8 @@ public class Launch extends EcoEnchant { if(!EnchantChecks.chestplate(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + int level = EnchantChecks.getChestplateLevel(player, this); double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); double boost = 1 + (multiplier * level); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java index 7260919d..2a188a7b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java @@ -35,6 +35,7 @@ public class MagmaWalker extends EcoEnchant { if(event.getFrom().getBlock().equals(event.getTo().getBlock())) return; if (!EnchantChecks.boots(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; Vector[] circle = VectorUtils.getCircle(this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "initial-radius") + (this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "per-level-radius") * EnchantChecks.getBootsLevel(player, this) - 1)); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java index a470b310..ff8ea3d8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java @@ -60,6 +60,7 @@ public class Magnetic extends EcoEnchant implements EcoRunnable { public void run() { players.forEach((player, level) -> { double distance = initialDistance + (level * bonus); + if(this.getDisabledWorlds().contains(player.getWorld())) return; for (Entity e : player.getWorld().getNearbyEntities(player.getLocation(), distance, 2.0d, distance)) { if(!(e instanceof Item || e instanceof ExperienceOrb)) continue; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java index bc606383..f52cf4ed 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java @@ -30,6 +30,7 @@ public class Marksman extends EcoEnchant { Player player = (Player) event.getEntity().getShooter(); if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (!(event.getEntity() instanceof Arrow)) return; Arrow a = (Arrow) event.getEntity(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java index b92cccd5..a27e3ab4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java @@ -30,6 +30,7 @@ public class Necrotic extends EcoEnchant { WitherSkeleton victim = (WitherSkeleton) event.getEntity(); if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getMainhandLevel(player, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java index 474bdc51..7bfd641f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java @@ -27,6 +27,8 @@ public class Parry extends EcoEnchant { if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + int level = EnchantChecks.getMainhandLevel(player, this); double damage = event.getDamage(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java index 73761459..cecab3ef 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java @@ -36,6 +36,7 @@ public class Reel extends EcoEnchant { if(!AntigriefManager.canInjure(player, victim)) return; if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getMainhandLevel(player, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java index 910eb218..6c6dac78 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java @@ -26,6 +26,7 @@ public class Rejuvenation extends EcoEnchant { Player player = (Player) event.getEntity(); int totalRejuvenationPoints = EnchantChecks.getArmorPoints(player, this, 0); + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (totalRejuvenationPoints == 0) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java index dc359f95..65ee48d1 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java @@ -23,6 +23,7 @@ public class Sating extends EcoEnchant { Player player = (Player) event.getEntity(); if(!EnchantChecks.helmet(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if(event.getFoodLevel() > player.getFoodLevel()) return; int level = EnchantChecks.getHelmetLevel(player, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java index 389cf548..9c9af193 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java @@ -39,6 +39,7 @@ public class Shockwave extends EcoEnchant { } if (!EnchantChecks.item(item, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int ticks = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "particle-tick-delay"); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java index 648f49da..e1ca8549 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java @@ -34,6 +34,8 @@ public class ShotAssist extends EcoEnchant { int points = EnchantChecks.getArmorPoints(player, this, 0); + if(this.getDisabledWorlds().contains(player.getWorld())) return; + if(points == 0) return; double damage = event.getDamage(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java index 4b150a10..c557d3bb 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java @@ -32,6 +32,7 @@ public class Slicing extends EcoEnchant { return; if (!EnchantChecks.chestplate(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; for (Entity entity : player.getNearbyEntities(1, 1, 1)) { LivingEntity victim; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java index f07324cd..4e37880c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java @@ -5,8 +5,8 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.TridentStack; -import com.willfp.ecoenchants.util.internal.DropQueue; import com.willfp.ecoenchants.util.NumberUtils; +import com.willfp.ecoenchants.util.internal.DropQueue; import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; @@ -44,6 +44,7 @@ public class Spearfishing extends EcoEnchant { return; Player player = (Player) event.getEntity().getShooter(); + if(this.getDisabledWorlds().contains(player.getWorld())) return; ItemStack item = TridentStack.getTridentStack(trident); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java index 63e28034..280dedc6 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java @@ -34,6 +34,7 @@ public class Spiked extends EcoEnchant { if(!AntigriefManager.canInjure(player, victim)) return; if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getMainhandLevel(player, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java index 13f4d401..3d9b9500 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java @@ -6,7 +6,11 @@ import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.nms.TridentStack; import org.bukkit.Bukkit; -import org.bukkit.entity.*; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Trident; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; @@ -39,6 +43,7 @@ public class Splash extends EcoEnchant { ItemStack item = TridentStack.getTridentStack(trident); if (!EnchantChecks.item(item, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getItemLevel(item, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java index da5d7a48..362b33e2 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java @@ -25,6 +25,7 @@ public class Stamina extends EcoEnchant { if(!player.isSprinting()) return; if(!EnchantChecks.boots(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if(event.getFoodLevel() > player.getFoodLevel()) return; int level = EnchantChecks.getBootsLevel(player, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java index d9e0804a..3161f8e2 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java @@ -11,7 +11,11 @@ import com.willfp.ecoenchants.util.internal.DropQueue; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.entity.*; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Item; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Trident; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockBreakEvent; @@ -37,6 +41,7 @@ public class Telekinesis extends EcoEnchant { Player player = event.getPlayer(); if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (event.isCancelled()) return; @@ -63,6 +68,7 @@ public class Telekinesis extends EcoEnchant { Block block = event.getBlock(); if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) return; @@ -109,6 +115,7 @@ public class Telekinesis extends EcoEnchant { if(player == null || item == null) return; if (!EnchantChecks.item(item, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int xp = event.getDroppedExp(); Collection drops = event.getDrops(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java index 5e38fa5c..a753c5ad 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java @@ -32,6 +32,7 @@ public class Thrive extends EcoEnchant { player.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue()); return; } + if(EcoEnchants.THRIVE.getDisabledWorlds().contains(player.getWorld())) return; double thriveBonus = totalThrivePoints * EcoEnchants.THRIVE.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "health-per-point"); double prosperityBonus = totalProsperityPoints * EcoEnchants.PROSPERITY.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "health-per-point"); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java index 24435f67..1064f679 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java @@ -23,6 +23,8 @@ public class Wisdom extends EcoEnchant { if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + int level = EnchantChecks.getMainhandLevel(player, this); event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point"))))); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java index b3d03c30..2eae0419 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java @@ -47,6 +47,8 @@ public class Aiming extends EcoEnchant { int level = EnchantChecks.getMainhandLevel(player, this); + if(this.getDisabledWorlds().contains(player.getWorld())) return; + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "distance-per-level"); double distance = level * multiplier; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java index 56468fb6..2541be95 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java @@ -26,6 +26,8 @@ public class Frenzy extends EcoEnchant { if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + int level = EnchantChecks.getMainhandLevel(player, this); int duration = (int) (level * 20 * this.getConfig().getDouble((EcoEnchants.CONFIG_LOCATION + "seconds-per-level"))); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java index 24bb3fd5..1f77c3e1 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java @@ -34,6 +34,7 @@ public class Harpoon extends EcoEnchant { if(!AntigriefManager.canInjure(player, victim)) return; if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getMainhandLevel(player, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java index 39f7b271..8fc1b4da 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java @@ -22,6 +22,8 @@ public class Indestructibility extends EcoEnchant { if (!EnchantChecks.item(item, this)) return; + if(this.getDisabledWorlds().contains(event.getPlayer().getWorld())) return; + double level = EnchantChecks.getItemLevel(item, this); double levelbonus = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "level-bonus"); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java index 00ebc088..ee4f7b03 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java @@ -30,6 +30,8 @@ public class Instability extends EcoEnchant { if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + if (!(event.getEntity() instanceof Arrow)) return; int level = EnchantChecks.getMainhandLevel(player, this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java index 4b55afb5..2d7361fb 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java @@ -23,6 +23,8 @@ public class Intellect extends EcoEnchant { if (!EnchantChecks.mainhand(player, this)) return; + if(this.getDisabledWorlds().contains(player.getWorld())) return; + int level = EnchantChecks.getMainhandLevel(player, this); event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point"))))); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java index 6295820e..88891ca7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java @@ -79,6 +79,7 @@ public class Repairing extends EcoEnchant implements EcoRunnable { @Override public void run() { players.forEach((player -> { + if(this.getDisabledWorlds().contains(player.getWorld())) return; for(ItemStack item : player.getInventory().getContents()) { int level = EnchantChecks.getItemLevel(item, this); if(level == 0) continue; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java index 39276f5e..4ec2cece 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java @@ -5,12 +5,17 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; public class Soulbound extends EcoEnchant { public Soulbound() { super( @@ -26,13 +31,15 @@ public class Soulbound extends EcoEnchant { return soulboundItemsMap.get(player); } - @EventHandler + @EventHandler(priority = EventPriority.HIGHEST) public void onSoulboundDeath(PlayerDeathEvent event) { if(event.getKeepInventory()) return; Player player = event.getEntity(); List soulboundItems = new ArrayList<>(); // Stored as list to preserve duplicates + if(this.getDisabledWorlds().contains(player.getWorld())) return; + Arrays.stream(player.getInventory().getContents()).filter(Objects::nonNull).forEach((itemStack -> { if(itemStack.containsEnchantment(this)) soulboundItems.add(itemStack); @@ -47,7 +54,7 @@ public class Soulbound extends EcoEnchant { soulboundItemsMap.put(player, soulboundItems); } - @EventHandler + @EventHandler(priority = EventPriority.HIGHEST) public void onSoulboundRespawn(PlayerRespawnEvent event) { if(!soulboundItemsMap.containsKey(event.getPlayer())) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java index 1ae40f9b..4873ceb5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java @@ -17,7 +17,12 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; /** * Wrapper for Spell enchantments @@ -68,6 +73,7 @@ public abstract class Spell extends EcoEnchant { return; int level = EnchantChecks.getMainhandLevel(player, this); + if(this.getDisabledWorlds().contains(player.getWorld())) return; if(!cooldownTracker.containsKey(player.getUniqueId())) cooldownTracker.put(player.getUniqueId(), new SpellRunnable(this)); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java index 545d858b..ff545c05 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java @@ -10,12 +10,20 @@ import com.willfp.ecoenchants.nms.TridentStack; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.entity.*; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Trident; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockDamageEvent; -import org.bukkit.event.entity.*; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityShootBowEvent; +import org.bukkit.event.entity.ProjectileHitEvent; +import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffectType; @@ -35,6 +43,8 @@ public class WatcherTriggers implements Listener { return; if (!(event.getEntity() instanceof LivingEntity)) return; + if(((Arrow) event.getDamager()).getShooter() == null) + return; if(!(((Arrow) event.getDamager()).getShooter() instanceof LivingEntity)) return; @@ -53,6 +63,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnArrow(arrow).forEach(((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(attacker.getWorld())) return; enchant.onArrowDamage(attacker, victim, arrow, level, event); })); } @@ -67,6 +78,9 @@ public class WatcherTriggers implements Listener { if(!(((Trident) event.getDamager()).getShooter() instanceof LivingEntity)) return; + if(((Trident) event.getDamager()).getShooter() == null) + return; + if (!(event.getEntity() instanceof LivingEntity)) return; @@ -88,6 +102,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnItem(item).forEach(((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(attacker.getWorld())) return; enchant.onTridentDamage(attacker, victim, trident, level, event); })); } @@ -112,6 +127,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnArmor(player).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(player.getWorld())) return; enchant.onJump(player, level, event); }); } @@ -149,6 +165,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnMainhand(attacker).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(attacker.getWorld())) return; enchant.onMeleeAttack(attacker, victim, level, event); }); } @@ -166,6 +183,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnMainhand(shooter).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(shooter.getWorld())) return; enchant.onBowShoot(shooter, arrow, level, event); }); } @@ -185,6 +203,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnArmor(victim).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(victim.getWorld())) return; enchant.onFallDamage(victim, level, event); }); } @@ -198,11 +217,15 @@ public class WatcherTriggers implements Listener { if (!(event.getEntity() instanceof Arrow)) return; + if(event.getEntity().getShooter() == null) + return; + Arrow arrow = (Arrow) event.getEntity(); LivingEntity shooter = (LivingEntity) event.getEntity().getShooter(); EnchantChecks.getEnchantsOnArrow(arrow).forEach(((enchant, level) -> { if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(shooter.getWorld())) return; enchant.onArrowHit(shooter, level, event); })); } @@ -213,6 +236,8 @@ public class WatcherTriggers implements Listener { return; if (!(event.getEntity().getShooter() instanceof LivingEntity)) return; + if(event.getEntity().getShooter() == null) + return; if (!(event.getEntity() instanceof Trident)) return; @@ -222,6 +247,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnItem(item).forEach(((enchant, level) -> { if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(shooter.getWorld())) return; enchant.onTridentHit(shooter, level, event); })); } @@ -241,6 +267,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnMainhand(player).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(player.getWorld())) return; enchant.onBlockBreak(player, block, level, event); }); } @@ -257,6 +284,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnArmor(victim).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(victim.getWorld())) return; enchant.onDamageWearingArmor(victim, level, event); }); } @@ -271,6 +299,7 @@ public class WatcherTriggers implements Listener { EcoEnchants.getAll().forEach((enchant -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(player.getWorld())) return; int level = EnchantChecks.getArmorPoints(player, enchant); enchant.onArmorEquip(player, level, event); })); @@ -290,6 +319,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnMainhand(player).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(player.getWorld())) return; enchant.onDamageBlock(player, block, level, event); }); } @@ -312,6 +342,7 @@ public class WatcherTriggers implements Listener { EnchantChecks.getEnchantsOnItem(item).forEach((enchant, level) -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(shooter.getWorld())) return; enchant.onTridentLaunch(shooter, trident, level, event); }); } @@ -338,6 +369,7 @@ public class WatcherTriggers implements Listener { EcoEnchants.getAll().forEach((enchant -> { if(event.isCancelled()) return; if(!enchant.isEnabled()) return; + if(enchant.getDisabledWorlds().contains(blocker.getWorld())) return; int level; if (!EnchantChecks.offhand(blocker, enchant) && !EnchantChecks.mainhand(blocker, enchant)) return; if(EnchantChecks.offhand(blocker, enchant)) level = EnchantChecks.getOffhandLevel(blocker, enchant); diff --git a/Plugin/src/main/resources/enchants/artifact/ashartifact.yml b/Plugin/src/main/resources/enchants/artifact/ashartifact.yml index a461cd2b..c5920953 100644 --- a/Plugin/src/main/resources/enchants/artifact/ashartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/ashartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml b/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml index 643c3610..070d02d9 100644 --- a/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/crimsonartifact.yml b/Plugin/src/main/resources/enchants/artifact/crimsonartifact.yml index 5be20b4a..7280cba7 100644 --- a/Plugin/src/main/resources/enchants/artifact/crimsonartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/crimsonartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/damageartifact.yml b/Plugin/src/main/resources/enchants/artifact/damageartifact.yml index ac14398c..ebce7b7c 100644 --- a/Plugin/src/main/resources/enchants/artifact/damageartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/damageartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml b/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml index 3651e9a4..4a53ef63 100644 --- a/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/dustartifact.yml b/Plugin/src/main/resources/enchants/artifact/dustartifact.yml index 03568121..f904cba6 100644 --- a/Plugin/src/main/resources/enchants/artifact/dustartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/dustartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml b/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml index 0fed3225..1b31bbb7 100644 --- a/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml b/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml index 611b6759..f738205e 100644 --- a/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/endartifact.yml b/Plugin/src/main/resources/enchants/artifact/endartifact.yml index 2a97c48f..d02f8df6 100644 --- a/Plugin/src/main/resources/enchants/artifact/endartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/endartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/fireartifact.yml b/Plugin/src/main/resources/enchants/artifact/fireartifact.yml index 1f46a7b9..8be61e11 100644 --- a/Plugin/src/main/resources/enchants/artifact/fireartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/fireartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/heartartifact.yml b/Plugin/src/main/resources/enchants/artifact/heartartifact.yml index 65eaba3e..11c04588 100644 --- a/Plugin/src/main/resources/enchants/artifact/heartartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/heartartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml b/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml index 69db0938..5286f9a9 100644 --- a/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/inkartifact.yml b/Plugin/src/main/resources/enchants/artifact/inkartifact.yml index bf7913b2..fbc227f7 100644 --- a/Plugin/src/main/resources/enchants/artifact/inkartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/inkartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml b/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml index 068b0584..3438b041 100644 --- a/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/limeartifact.yml b/Plugin/src/main/resources/enchants/artifact/limeartifact.yml index 1cf27300..c983a898 100644 --- a/Plugin/src/main/resources/enchants/artifact/limeartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/limeartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/magicartifact.yml b/Plugin/src/main/resources/enchants/artifact/magicartifact.yml index 02ab65e1..c623e186 100644 --- a/Plugin/src/main/resources/enchants/artifact/magicartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/magicartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml b/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml index 6c2bdb1c..156808b5 100644 --- a/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/musicartifact.yml b/Plugin/src/main/resources/enchants/artifact/musicartifact.yml index a7849aee..31677b8e 100644 --- a/Plugin/src/main/resources/enchants/artifact/musicartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/musicartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/netherartifact.yml b/Plugin/src/main/resources/enchants/artifact/netherartifact.yml index a5b8bd39..e6117a6a 100644 --- a/Plugin/src/main/resources/enchants/artifact/netherartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/netherartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml b/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml index 9739073d..b05bfc98 100644 --- a/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml b/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml index 3626547e..c71129c7 100644 --- a/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/snowartifact.yml b/Plugin/src/main/resources/enchants/artifact/snowartifact.yml index 2191c194..4933801d 100644 --- a/Plugin/src/main/resources/enchants/artifact/snowartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/snowartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/soulartifact.yml b/Plugin/src/main/resources/enchants/artifact/soulartifact.yml index 67e818b9..246fb412 100644 --- a/Plugin/src/main/resources/enchants/artifact/soulartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/soulartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/soulfireartifact.yml b/Plugin/src/main/resources/enchants/artifact/soulfireartifact.yml index 6c59e7e2..b727d0da 100644 --- a/Plugin/src/main/resources/enchants/artifact/soulfireartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/soulfireartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml b/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml index 6ceac137..6a037f29 100644 --- a/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/tearartifact.yml b/Plugin/src/main/resources/enchants/artifact/tearartifact.yml index 665874d3..284341b0 100644 --- a/Plugin/src/main/resources/enchants/artifact/tearartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/tearartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/totemartifact.yml b/Plugin/src/main/resources/enchants/artifact/totemartifact.yml index e7f4ce4a..a5781935 100644 --- a/Plugin/src/main/resources/enchants/artifact/totemartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/totemartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/warpedartifact.yml b/Plugin/src/main/resources/enchants/artifact/warpedartifact.yml index 96062c88..4d26a2fc 100644 --- a/Plugin/src/main/resources/enchants/artifact/warpedartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/warpedartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/waterartifact.yml b/Plugin/src/main/resources/enchants/artifact/waterartifact.yml index 01b2f08d..366149a3 100644 --- a/Plugin/src/main/resources/enchants/artifact/waterartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/waterartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/witchartifact.yml b/Plugin/src/main/resources/enchants/artifact/witchartifact.yml index 67fc6830..9ee05e33 100644 --- a/Plugin/src/main/resources/enchants/artifact/witchartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/witchartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/artifact/zapartifact.yml b/Plugin/src/main/resources/enchants/artifact/zapartifact.yml index b51889a9..3e6ce125 100644 --- a/Plugin/src/main/resources/enchants/artifact/zapartifact.yml +++ b/Plugin/src/main/resources/enchants/artifact/zapartifact.yml @@ -22,6 +22,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml b/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml index 67a21513..574f6048 100644 --- a/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml +++ b/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml @@ -19,6 +19,7 @@ general-config: - hoe - shovel grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/curse/callingcurse.yml b/Plugin/src/main/resources/enchants/curse/callingcurse.yml index f6bbb0be..892d5f47 100644 --- a/Plugin/src/main/resources/enchants/curse/callingcurse.yml +++ b/Plugin/src/main/resources/enchants/curse/callingcurse.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: false + disabled-in-worlds: [] conflicts: - mending diff --git a/Plugin/src/main/resources/enchants/curse/decaycurse.yml b/Plugin/src/main/resources/enchants/curse/decaycurse.yml index b5238c0a..7b0cf141 100644 --- a/Plugin/src/main/resources/enchants/curse/decaycurse.yml +++ b/Plugin/src/main/resources/enchants/curse/decaycurse.yml @@ -16,6 +16,7 @@ general-config: targets: - all grindstoneable: true + disabled-in-worlds: [] conflicts: - mending - repairing diff --git a/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml b/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml index 633b98d7..868860e2 100644 --- a/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml +++ b/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml @@ -16,6 +16,7 @@ general-config: targets: - all grindstoneable: false + disabled-in-worlds: [] conflicts: - unbreaking diff --git a/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml b/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml index 57f8baca..049e2832 100644 --- a/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml +++ b/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: false + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/curse/hungercurse.yml b/Plugin/src/main/resources/enchants/curse/hungercurse.yml index c9b04ce9..ace9721d 100644 --- a/Plugin/src/main/resources/enchants/curse/hungercurse.yml +++ b/Plugin/src/main/resources/enchants/curse/hungercurse.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: false + disabled-in-worlds: [] conflicts: - sating diff --git a/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml b/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml index 1a85fba0..85579089 100644 --- a/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml +++ b/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml b/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml index c53de762..abca3c69 100644 --- a/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml +++ b/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml @@ -19,6 +19,7 @@ general-config: - hoe - shovel grindstoneable: true + disabled-in-worlds: [] conflicts: - fortune diff --git a/Plugin/src/main/resources/enchants/curse/permanencecurse.yml b/Plugin/src/main/resources/enchants/curse/permanencecurse.yml index eaf85317..8cfb2b5a 100644 --- a/Plugin/src/main/resources/enchants/curse/permanencecurse.yml +++ b/Plugin/src/main/resources/enchants/curse/permanencecurse.yml @@ -16,6 +16,7 @@ general-config: targets: - all grindstoneable: false + disabled-in-worlds: [] conflicts: - mending diff --git a/Plugin/src/main/resources/enchants/normal/abattoir.yml b/Plugin/src/main/resources/enchants/normal/abattoir.yml index 05925e51..393bde6d 100644 --- a/Plugin/src/main/resources/enchants/normal/abattoir.yml +++ b/Plugin/src/main/resources/enchants/normal/abattoir.yml @@ -24,6 +24,7 @@ general-config: - arachnid - impaling maximum-level: 5 + disabled-in-worlds: [] config: multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/abrasion.yml b/Plugin/src/main/resources/enchants/normal/abrasion.yml index 9a46b13a..faed0a8b 100644 --- a/Plugin/src/main/resources/enchants/normal/abrasion.yml +++ b/Plugin/src/main/resources/enchants/normal/abrasion.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/aerial.yml b/Plugin/src/main/resources/enchants/normal/aerial.yml index 12522bb2..80dbebf3 100644 --- a/Plugin/src/main/resources/enchants/normal/aerial.yml +++ b/Plugin/src/main/resources/enchants/normal/aerial.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/aquatic.yml b/Plugin/src/main/resources/enchants/normal/aquatic.yml index bcaaa093..e0087853 100644 --- a/Plugin/src/main/resources/enchants/normal/aquatic.yml +++ b/Plugin/src/main/resources/enchants/normal/aquatic.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/arachnid.yml b/Plugin/src/main/resources/enchants/normal/arachnid.yml index cb66bb2d..b377a120 100644 --- a/Plugin/src/main/resources/enchants/normal/arachnid.yml +++ b/Plugin/src/main/resources/enchants/normal/arachnid.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - serrated - bladed diff --git a/Plugin/src/main/resources/enchants/normal/arcanic.yml b/Plugin/src/main/resources/enchants/normal/arcanic.yml index fb2fdd37..8dcce376 100644 --- a/Plugin/src/main/resources/enchants/normal/arcanic.yml +++ b/Plugin/src/main/resources/enchants/normal/arcanic.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/atmospheric.yml b/Plugin/src/main/resources/enchants/normal/atmospheric.yml index 060bd7a9..193f73ac 100644 --- a/Plugin/src/main/resources/enchants/normal/atmospheric.yml +++ b/Plugin/src/main/resources/enchants/normal/atmospheric.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/backstab.yml b/Plugin/src/main/resources/enchants/normal/backstab.yml index 65a97f0e..54f3b528 100644 --- a/Plugin/src/main/resources/enchants/normal/backstab.yml +++ b/Plugin/src/main/resources/enchants/normal/backstab.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/beheading.yml b/Plugin/src/main/resources/enchants/normal/beheading.yml index b611476a..3a6a285a 100644 --- a/Plugin/src/main/resources/enchants/normal/beheading.yml +++ b/Plugin/src/main/resources/enchants/normal/beheading.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/blastmining.yml b/Plugin/src/main/resources/enchants/normal/blastmining.yml index dc1194c1..98fc16f6 100644 --- a/Plugin/src/main/resources/enchants/normal/blastmining.yml +++ b/Plugin/src/main/resources/enchants/normal/blastmining.yml @@ -16,6 +16,7 @@ general-config: targets: - pickaxe grindstoneable: true + disabled-in-worlds: [] conflicts: - drill - vein diff --git a/Plugin/src/main/resources/enchants/normal/bleed.yml b/Plugin/src/main/resources/enchants/normal/bleed.yml index f00ae5a3..79a1a979 100644 --- a/Plugin/src/main/resources/enchants/normal/bleed.yml +++ b/Plugin/src/main/resources/enchants/normal/bleed.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/blind.yml b/Plugin/src/main/resources/enchants/normal/blind.yml index f9192da5..d3cb525c 100644 --- a/Plugin/src/main/resources/enchants/normal/blind.yml +++ b/Plugin/src/main/resources/enchants/normal/blind.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/blockbreather.yml b/Plugin/src/main/resources/enchants/normal/blockbreather.yml index 7d67e947..3d2d3b45 100644 --- a/Plugin/src/main/resources/enchants/normal/blockbreather.yml +++ b/Plugin/src/main/resources/enchants/normal/blockbreather.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/bosshunter.yml b/Plugin/src/main/resources/enchants/normal/bosshunter.yml index 43f57465..d977ca59 100644 --- a/Plugin/src/main/resources/enchants/normal/bosshunter.yml +++ b/Plugin/src/main/resources/enchants/normal/bosshunter.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/buckshot.yml b/Plugin/src/main/resources/enchants/normal/buckshot.yml index c2cc1b45..82238f8b 100644 --- a/Plugin/src/main/resources/enchants/normal/buckshot.yml +++ b/Plugin/src/main/resources/enchants/normal/buckshot.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - succession - pentashot diff --git a/Plugin/src/main/resources/enchants/normal/butchering.yml b/Plugin/src/main/resources/enchants/normal/butchering.yml index 487bf2cc..3626ba5b 100644 --- a/Plugin/src/main/resources/enchants/normal/butchering.yml +++ b/Plugin/src/main/resources/enchants/normal/butchering.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - sharpness - bane_of_arthropods diff --git a/Plugin/src/main/resources/enchants/normal/cerebral.yml b/Plugin/src/main/resources/enchants/normal/cerebral.yml index e6e75aa9..65d0ea35 100644 --- a/Plugin/src/main/resources/enchants/normal/cerebral.yml +++ b/Plugin/src/main/resources/enchants/normal/cerebral.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/chopless.yml b/Plugin/src/main/resources/enchants/normal/chopless.yml index d1d44847..2b124b5e 100644 --- a/Plugin/src/main/resources/enchants/normal/chopless.yml +++ b/Plugin/src/main/resources/enchants/normal/chopless.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/cleave.yml b/Plugin/src/main/resources/enchants/normal/cleave.yml index 25527518..58d3fa3f 100644 --- a/Plugin/src/main/resources/enchants/normal/cleave.yml +++ b/Plugin/src/main/resources/enchants/normal/cleave.yml @@ -16,6 +16,7 @@ general-config: targets: - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - carve maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/collateral.yml b/Plugin/src/main/resources/enchants/normal/collateral.yml index b18647b0..8874c829 100644 --- a/Plugin/src/main/resources/enchants/normal/collateral.yml +++ b/Plugin/src/main/resources/enchants/normal/collateral.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/conclude.yml b/Plugin/src/main/resources/enchants/normal/conclude.yml index c5d9908c..365d6152 100644 --- a/Plugin/src/main/resources/enchants/normal/conclude.yml +++ b/Plugin/src/main/resources/enchants/normal/conclude.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/corrosive.yml b/Plugin/src/main/resources/enchants/normal/corrosive.yml index 01fa6abf..0c946e7c 100644 --- a/Plugin/src/main/resources/enchants/normal/corrosive.yml +++ b/Plugin/src/main/resources/enchants/normal/corrosive.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/cranial.yml b/Plugin/src/main/resources/enchants/normal/cranial.yml index df6880c9..9e456d5c 100644 --- a/Plugin/src/main/resources/enchants/normal/cranial.yml +++ b/Plugin/src/main/resources/enchants/normal/cranial.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/criticals.yml b/Plugin/src/main/resources/enchants/normal/criticals.yml index ece78418..fe7390f9 100644 --- a/Plugin/src/main/resources/enchants/normal/criticals.yml +++ b/Plugin/src/main/resources/enchants/normal/criticals.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/cubism.yml b/Plugin/src/main/resources/enchants/normal/cubism.yml index 72a7af13..c1364304 100644 --- a/Plugin/src/main/resources/enchants/normal/cubism.yml +++ b/Plugin/src/main/resources/enchants/normal/cubism.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/defender.yml b/Plugin/src/main/resources/enchants/normal/defender.yml index bf499513..aed2c950 100644 --- a/Plugin/src/main/resources/enchants/normal/defender.yml +++ b/Plugin/src/main/resources/enchants/normal/defender.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/deflection.yml b/Plugin/src/main/resources/enchants/normal/deflection.yml index 65d1c59f..8a323645 100644 --- a/Plugin/src/main/resources/enchants/normal/deflection.yml +++ b/Plugin/src/main/resources/enchants/normal/deflection.yml @@ -16,6 +16,7 @@ general-config: targets: - shield grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/defusion.yml b/Plugin/src/main/resources/enchants/normal/defusion.yml index 8bf33b44..adaa08fa 100644 --- a/Plugin/src/main/resources/enchants/normal/defusion.yml +++ b/Plugin/src/main/resources/enchants/normal/defusion.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - sharpness - bane_of_arthropods diff --git a/Plugin/src/main/resources/enchants/normal/dexterous.yml b/Plugin/src/main/resources/enchants/normal/dexterous.yml index af2e1738..9b0d9f10 100644 --- a/Plugin/src/main/resources/enchants/normal/dexterous.yml +++ b/Plugin/src/main/resources/enchants/normal/dexterous.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/disable.yml b/Plugin/src/main/resources/enchants/normal/disable.yml index 56f54208..4de4dc1a 100644 --- a/Plugin/src/main/resources/enchants/normal/disable.yml +++ b/Plugin/src/main/resources/enchants/normal/disable.yml @@ -16,6 +16,7 @@ general-config: targets: - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/disappear.yml b/Plugin/src/main/resources/enchants/normal/disappear.yml index ffcd7ccb..abf7a32e 100644 --- a/Plugin/src/main/resources/enchants/normal/disappear.yml +++ b/Plugin/src/main/resources/enchants/normal/disappear.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/diurnal.yml b/Plugin/src/main/resources/enchants/normal/diurnal.yml index 26de7ec2..2b7565fa 100644 --- a/Plugin/src/main/resources/enchants/normal/diurnal.yml +++ b/Plugin/src/main/resources/enchants/normal/diurnal.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - nocturnal maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/diverse.yml b/Plugin/src/main/resources/enchants/normal/diverse.yml index 334f81eb..77858deb 100644 --- a/Plugin/src/main/resources/enchants/normal/diverse.yml +++ b/Plugin/src/main/resources/enchants/normal/diverse.yml @@ -16,6 +16,7 @@ general-config: targets: - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/drill.yml b/Plugin/src/main/resources/enchants/normal/drill.yml index 433cd5d5..033044fa 100644 --- a/Plugin/src/main/resources/enchants/normal/drill.yml +++ b/Plugin/src/main/resources/enchants/normal/drill.yml @@ -18,6 +18,7 @@ general-config: - axe - shovel grindstoneable: true + disabled-in-worlds: [] conflicts: - lumberjack - blast_mining diff --git a/Plugin/src/main/resources/enchants/normal/dullness.yml b/Plugin/src/main/resources/enchants/normal/dullness.yml index 5ef41336..d8fdab06 100644 --- a/Plugin/src/main/resources/enchants/normal/dullness.yml +++ b/Plugin/src/main/resources/enchants/normal/dullness.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/dweller.yml b/Plugin/src/main/resources/enchants/normal/dweller.yml index 03369877..a40e6538 100644 --- a/Plugin/src/main/resources/enchants/normal/dweller.yml +++ b/Plugin/src/main/resources/enchants/normal/dweller.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/economical.yml b/Plugin/src/main/resources/enchants/normal/economical.yml index cbf375e8..ec120121 100644 --- a/Plugin/src/main/resources/enchants/normal/economical.yml +++ b/Plugin/src/main/resources/enchants/normal/economical.yml @@ -16,6 +16,7 @@ general-config: targets: - elytra grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/electroshock.yml b/Plugin/src/main/resources/enchants/normal/electroshock.yml index 7c2e1dc1..1ad4ba96 100644 --- a/Plugin/src/main/resources/enchants/normal/electroshock.yml +++ b/Plugin/src/main/resources/enchants/normal/electroshock.yml @@ -16,6 +16,7 @@ general-config: targets: - shield grindstoneable: true + conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/enderism.yml b/Plugin/src/main/resources/enchants/normal/enderism.yml index ed286f31..5d927479 100644 --- a/Plugin/src/main/resources/enchants/normal/enderism.yml +++ b/Plugin/src/main/resources/enchants/normal/enderism.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: - netheric maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/enderslayer.yml b/Plugin/src/main/resources/enchants/normal/enderslayer.yml index b747a920..972d4ee2 100644 --- a/Plugin/src/main/resources/enchants/normal/enderslayer.yml +++ b/Plugin/src/main/resources/enchants/normal/enderslayer.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - sharpness - bane_of_arthropods diff --git a/Plugin/src/main/resources/enchants/normal/endinfusion.yml b/Plugin/src/main/resources/enchants/normal/endinfusion.yml index 0df773b3..3865d5fb 100644 --- a/Plugin/src/main/resources/enchants/normal/endinfusion.yml +++ b/Plugin/src/main/resources/enchants/normal/endinfusion.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - nether_infusion maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/evasion.yml b/Plugin/src/main/resources/enchants/normal/evasion.yml index d007fc81..f2abb05b 100644 --- a/Plugin/src/main/resources/enchants/normal/evasion.yml +++ b/Plugin/src/main/resources/enchants/normal/evasion.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/extinguishing.yml b/Plugin/src/main/resources/enchants/normal/extinguishing.yml index b524f0e2..5681b046 100644 --- a/Plugin/src/main/resources/enchants/normal/extinguishing.yml +++ b/Plugin/src/main/resources/enchants/normal/extinguishing.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/extract.yml b/Plugin/src/main/resources/enchants/normal/extract.yml index 26252734..4a913fc0 100644 --- a/Plugin/src/main/resources/enchants/normal/extract.yml +++ b/Plugin/src/main/resources/enchants/normal/extract.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/extraction.yml b/Plugin/src/main/resources/enchants/normal/extraction.yml index f107d1ba..4407f82f 100644 --- a/Plugin/src/main/resources/enchants/normal/extraction.yml +++ b/Plugin/src/main/resources/enchants/normal/extraction.yml @@ -16,6 +16,7 @@ general-config: targets: - pickaxe grindstoneable: true + disabled-in-worlds: [] conflicts: - stone_switcher - silk_touch diff --git a/Plugin/src/main/resources/enchants/normal/famine.yml b/Plugin/src/main/resources/enchants/normal/famine.yml index db41ea8e..5ec4d632 100644 --- a/Plugin/src/main/resources/enchants/normal/famine.yml +++ b/Plugin/src/main/resources/enchants/normal/famine.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/farmhand.yml b/Plugin/src/main/resources/enchants/normal/farmhand.yml index 9b6854f3..1d2f92c7 100644 --- a/Plugin/src/main/resources/enchants/normal/farmhand.yml +++ b/Plugin/src/main/resources/enchants/normal/farmhand.yml @@ -16,6 +16,7 @@ general-config: targets: - hoe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/fetching.yml b/Plugin/src/main/resources/enchants/normal/fetching.yml index 6714e226..216840d2 100644 --- a/Plugin/src/main/resources/enchants/normal/fetching.yml +++ b/Plugin/src/main/resources/enchants/normal/fetching.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/finality.yml b/Plugin/src/main/resources/enchants/normal/finality.yml index a6970166..cd30d88b 100644 --- a/Plugin/src/main/resources/enchants/normal/finality.yml +++ b/Plugin/src/main/resources/enchants/normal/finality.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/finishing.yml b/Plugin/src/main/resources/enchants/normal/finishing.yml index 0983b540..9694129e 100644 --- a/Plugin/src/main/resources/enchants/normal/finishing.yml +++ b/Plugin/src/main/resources/enchants/normal/finishing.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/fireaffinity.yml b/Plugin/src/main/resources/enchants/normal/fireaffinity.yml index 461a67b2..0ad4fe64 100644 --- a/Plugin/src/main/resources/enchants/normal/fireaffinity.yml +++ b/Plugin/src/main/resources/enchants/normal/fireaffinity.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - water_affinity maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/firststrike.yml b/Plugin/src/main/resources/enchants/normal/firststrike.yml index be24706c..eb6523e7 100644 --- a/Plugin/src/main/resources/enchants/normal/firststrike.yml +++ b/Plugin/src/main/resources/enchants/normal/firststrike.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/flinch.yml b/Plugin/src/main/resources/enchants/normal/flinch.yml index 16feb5d3..e5e6e658 100644 --- a/Plugin/src/main/resources/enchants/normal/flinch.yml +++ b/Plugin/src/main/resources/enchants/normal/flinch.yml @@ -16,6 +16,7 @@ general-config: targets: - shield grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/forcefield.yml b/Plugin/src/main/resources/enchants/normal/forcefield.yml index 93a000b8..b3d47b82 100644 --- a/Plugin/src/main/resources/enchants/normal/forcefield.yml +++ b/Plugin/src/main/resources/enchants/normal/forcefield.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/freerunner.yml b/Plugin/src/main/resources/enchants/normal/freerunner.yml index 622798ba..21144f2a 100644 --- a/Plugin/src/main/resources/enchants/normal/freerunner.yml +++ b/Plugin/src/main/resources/enchants/normal/freerunner.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/frozen.yml b/Plugin/src/main/resources/enchants/normal/frozen.yml index 83bfae3b..ddd6fe90 100644 --- a/Plugin/src/main/resources/enchants/normal/frozen.yml +++ b/Plugin/src/main/resources/enchants/normal/frozen.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/fury.yml b/Plugin/src/main/resources/enchants/normal/fury.yml index 02b3092f..c60cd4e1 100644 --- a/Plugin/src/main/resources/enchants/normal/fury.yml +++ b/Plugin/src/main/resources/enchants/normal/fury.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/goliath.yml b/Plugin/src/main/resources/enchants/normal/goliath.yml index c1a684e4..69443a59 100644 --- a/Plugin/src/main/resources/enchants/normal/goliath.yml +++ b/Plugin/src/main/resources/enchants/normal/goliath.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/graceful.yml b/Plugin/src/main/resources/enchants/normal/graceful.yml index 62049c3d..268640b3 100644 --- a/Plugin/src/main/resources/enchants/normal/graceful.yml +++ b/Plugin/src/main/resources/enchants/normal/graceful.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/grapple.yml b/Plugin/src/main/resources/enchants/normal/grapple.yml index 9b34596c..ac6e7244 100644 --- a/Plugin/src/main/resources/enchants/normal/grapple.yml +++ b/Plugin/src/main/resources/enchants/normal/grapple.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - knockback - tornado diff --git a/Plugin/src/main/resources/enchants/normal/greenthumb.yml b/Plugin/src/main/resources/enchants/normal/greenthumb.yml index b0ce987c..5f93cc2a 100644 --- a/Plugin/src/main/resources/enchants/normal/greenthumb.yml +++ b/Plugin/src/main/resources/enchants/normal/greenthumb.yml @@ -16,6 +16,7 @@ general-config: targets: - hoe grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/grit.yml b/Plugin/src/main/resources/enchants/normal/grit.yml index 2cf7a648..027e59b3 100644 --- a/Plugin/src/main/resources/enchants/normal/grit.yml +++ b/Plugin/src/main/resources/enchants/normal/grit.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/hellish.yml b/Plugin/src/main/resources/enchants/normal/hellish.yml index db493971..f2998355 100644 --- a/Plugin/src/main/resources/enchants/normal/hellish.yml +++ b/Plugin/src/main/resources/enchants/normal/hellish.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - void_affinity maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/hook.yml b/Plugin/src/main/resources/enchants/normal/hook.yml index 21ab34bc..3e82ba78 100644 --- a/Plugin/src/main/resources/enchants/normal/hook.yml +++ b/Plugin/src/main/resources/enchants/normal/hook.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - punch maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/horde.yml b/Plugin/src/main/resources/enchants/normal/horde.yml index fd640d55..2710f07e 100644 --- a/Plugin/src/main/resources/enchants/normal/horde.yml +++ b/Plugin/src/main/resources/enchants/normal/horde.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/iceshot.yml b/Plugin/src/main/resources/enchants/normal/iceshot.yml index f0dbda77..b9750842 100644 --- a/Plugin/src/main/resources/enchants/normal/iceshot.yml +++ b/Plugin/src/main/resources/enchants/normal/iceshot.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/identify.yml b/Plugin/src/main/resources/enchants/normal/identify.yml index 87ec596c..844869e9 100644 --- a/Plugin/src/main/resources/enchants/normal/identify.yml +++ b/Plugin/src/main/resources/enchants/normal/identify.yml @@ -16,6 +16,7 @@ general-config: targets: - shield grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/ignite.yml b/Plugin/src/main/resources/enchants/normal/ignite.yml index cc65b108..4085049e 100644 --- a/Plugin/src/main/resources/enchants/normal/ignite.yml +++ b/Plugin/src/main/resources/enchants/normal/ignite.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/illusionaspect.yml b/Plugin/src/main/resources/enchants/normal/illusionaspect.yml index 5f86a16e..bf7067ef 100644 --- a/Plugin/src/main/resources/enchants/normal/illusionaspect.yml +++ b/Plugin/src/main/resources/enchants/normal/illusionaspect.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/impact.yml b/Plugin/src/main/resources/enchants/normal/impact.yml index a92a73e9..4a1b8a17 100644 --- a/Plugin/src/main/resources/enchants/normal/impact.yml +++ b/Plugin/src/main/resources/enchants/normal/impact.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/incandescence.yml b/Plugin/src/main/resources/enchants/normal/incandescence.yml index c9519ff6..2554562e 100644 --- a/Plugin/src/main/resources/enchants/normal/incandescence.yml +++ b/Plugin/src/main/resources/enchants/normal/incandescence.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/infernaltouch.yml b/Plugin/src/main/resources/enchants/normal/infernaltouch.yml index 2a9c534e..b96f043a 100644 --- a/Plugin/src/main/resources/enchants/normal/infernaltouch.yml +++ b/Plugin/src/main/resources/enchants/normal/infernaltouch.yml @@ -16,6 +16,7 @@ general-config: targets: - pickaxe grindstoneable: true + disabled-in-worlds: [] conflicts: - silk_touch - stone_switcher diff --git a/Plugin/src/main/resources/enchants/normal/inferno.yml b/Plugin/src/main/resources/enchants/normal/inferno.yml index 1a030779..ae79053f 100644 --- a/Plugin/src/main/resources/enchants/normal/inferno.yml +++ b/Plugin/src/main/resources/enchants/normal/inferno.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/infuriate.yml b/Plugin/src/main/resources/enchants/normal/infuriate.yml index 31d1f4b5..a282446b 100644 --- a/Plugin/src/main/resources/enchants/normal/infuriate.yml +++ b/Plugin/src/main/resources/enchants/normal/infuriate.yml @@ -16,6 +16,7 @@ general-config: targets: - shield grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/insecticide.yml b/Plugin/src/main/resources/enchants/normal/insecticide.yml index 145fa955..ac6ad319 100644 --- a/Plugin/src/main/resources/enchants/normal/insecticide.yml +++ b/Plugin/src/main/resources/enchants/normal/insecticide.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - power - force diff --git a/Plugin/src/main/resources/enchants/normal/instantaneous.yml b/Plugin/src/main/resources/enchants/normal/instantaneous.yml index c20e86af..042f8dfd 100644 --- a/Plugin/src/main/resources/enchants/normal/instantaneous.yml +++ b/Plugin/src/main/resources/enchants/normal/instantaneous.yml @@ -19,6 +19,7 @@ general-config: - shovel - hoe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/invigoration.yml b/Plugin/src/main/resources/enchants/normal/invigoration.yml index 850d1bc5..52e3c564 100644 --- a/Plugin/src/main/resources/enchants/normal/invigoration.yml +++ b/Plugin/src/main/resources/enchants/normal/invigoration.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/kinetic.yml b/Plugin/src/main/resources/enchants/normal/kinetic.yml index 338ccfe1..e32ac55a 100644 --- a/Plugin/src/main/resources/enchants/normal/kinetic.yml +++ b/Plugin/src/main/resources/enchants/normal/kinetic.yml @@ -16,6 +16,7 @@ general-config: targets: - elytra grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/launch.yml b/Plugin/src/main/resources/enchants/normal/launch.yml index 3acf4f2e..b26c2618 100644 --- a/Plugin/src/main/resources/enchants/normal/launch.yml +++ b/Plugin/src/main/resources/enchants/normal/launch.yml @@ -16,6 +16,7 @@ general-config: targets: - elytra grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/leeching.yml b/Plugin/src/main/resources/enchants/normal/leeching.yml index 69c66c26..de3a8375 100644 --- a/Plugin/src/main/resources/enchants/normal/leeching.yml +++ b/Plugin/src/main/resources/enchants/normal/leeching.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - life_steal maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/lesion.yml b/Plugin/src/main/resources/enchants/normal/lesion.yml index 5c1f2e54..f9a41711 100644 --- a/Plugin/src/main/resources/enchants/normal/lesion.yml +++ b/Plugin/src/main/resources/enchants/normal/lesion.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/levitate.yml b/Plugin/src/main/resources/enchants/normal/levitate.yml index 2a60aed2..50713908 100644 --- a/Plugin/src/main/resources/enchants/normal/levitate.yml +++ b/Plugin/src/main/resources/enchants/normal/levitate.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/liquidshot.yml b/Plugin/src/main/resources/enchants/normal/liquidshot.yml index fbf0d7b3..afa4a11a 100644 --- a/Plugin/src/main/resources/enchants/normal/liquidshot.yml +++ b/Plugin/src/main/resources/enchants/normal/liquidshot.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/lumberjack.yml b/Plugin/src/main/resources/enchants/normal/lumberjack.yml index 397777b7..9042d142 100644 --- a/Plugin/src/main/resources/enchants/normal/lumberjack.yml +++ b/Plugin/src/main/resources/enchants/normal/lumberjack.yml @@ -16,6 +16,7 @@ general-config: targets: - axe grindstoneable: true + disabled-in-worlds: [] maximum-level: 6 conflicts: - drill diff --git a/Plugin/src/main/resources/enchants/normal/magmawalker.yml b/Plugin/src/main/resources/enchants/normal/magmawalker.yml index 07696ad6..098ed1fc 100644 --- a/Plugin/src/main/resources/enchants/normal/magmawalker.yml +++ b/Plugin/src/main/resources/enchants/normal/magmawalker.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/magnetic.yml b/Plugin/src/main/resources/enchants/normal/magnetic.yml index a39ce6f8..dfd7f63f 100644 --- a/Plugin/src/main/resources/enchants/normal/magnetic.yml +++ b/Plugin/src/main/resources/enchants/normal/magnetic.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/marking.yml b/Plugin/src/main/resources/enchants/normal/marking.yml index 7875bb83..52fb70f1 100644 --- a/Plugin/src/main/resources/enchants/normal/marking.yml +++ b/Plugin/src/main/resources/enchants/normal/marking.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/marksman.yml b/Plugin/src/main/resources/enchants/normal/marksman.yml index a5c2ef67..6c0c30d5 100644 --- a/Plugin/src/main/resources/enchants/normal/marksman.yml +++ b/Plugin/src/main/resources/enchants/normal/marksman.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/necrotic.yml b/Plugin/src/main/resources/enchants/normal/necrotic.yml index 51b08c19..51813d2b 100644 --- a/Plugin/src/main/resources/enchants/normal/necrotic.yml +++ b/Plugin/src/main/resources/enchants/normal/necrotic.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - looting maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/netheric.yml b/Plugin/src/main/resources/enchants/normal/netheric.yml index 31312adb..8a5faae4 100644 --- a/Plugin/src/main/resources/enchants/normal/netheric.yml +++ b/Plugin/src/main/resources/enchants/normal/netheric.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: - enderism maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/netherinfusion.yml b/Plugin/src/main/resources/enchants/normal/netherinfusion.yml index 645f8265..eeef2341 100644 --- a/Plugin/src/main/resources/enchants/normal/netherinfusion.yml +++ b/Plugin/src/main/resources/enchants/normal/netherinfusion.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - end_infusion maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/nocturnal.yml b/Plugin/src/main/resources/enchants/normal/nocturnal.yml index 06853be4..a9447dd0 100644 --- a/Plugin/src/main/resources/enchants/normal/nocturnal.yml +++ b/Plugin/src/main/resources/enchants/normal/nocturnal.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - diurnal maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/optics.yml b/Plugin/src/main/resources/enchants/normal/optics.yml index 4e5b212b..33457e75 100644 --- a/Plugin/src/main/resources/enchants/normal/optics.yml +++ b/Plugin/src/main/resources/enchants/normal/optics.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/oxygenate.yml b/Plugin/src/main/resources/enchants/normal/oxygenate.yml index 1dc1eb42..a41494a8 100644 --- a/Plugin/src/main/resources/enchants/normal/oxygenate.yml +++ b/Plugin/src/main/resources/enchants/normal/oxygenate.yml @@ -19,6 +19,7 @@ general-config: - shovel - hoe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/pacify.yml b/Plugin/src/main/resources/enchants/normal/pacify.yml index 5e8e53f0..d4067145 100644 --- a/Plugin/src/main/resources/enchants/normal/pacify.yml +++ b/Plugin/src/main/resources/enchants/normal/pacify.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - serrated - bladed diff --git a/Plugin/src/main/resources/enchants/normal/paladin.yml b/Plugin/src/main/resources/enchants/normal/paladin.yml index 9f492433..e5abab99 100644 --- a/Plugin/src/main/resources/enchants/normal/paladin.yml +++ b/Plugin/src/main/resources/enchants/normal/paladin.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/paralyze.yml b/Plugin/src/main/resources/enchants/normal/paralyze.yml index 30193584..c12a2c45 100644 --- a/Plugin/src/main/resources/enchants/normal/paralyze.yml +++ b/Plugin/src/main/resources/enchants/normal/paralyze.yml @@ -16,6 +16,7 @@ general-config: targets: - shield grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/parasitic.yml b/Plugin/src/main/resources/enchants/normal/parasitic.yml index 98b6eb83..6f97a760 100644 --- a/Plugin/src/main/resources/enchants/normal/parasitic.yml +++ b/Plugin/src/main/resources/enchants/normal/parasitic.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/parry.yml b/Plugin/src/main/resources/enchants/normal/parry.yml index e9e70be0..c9f92049 100644 --- a/Plugin/src/main/resources/enchants/normal/parry.yml +++ b/Plugin/src/main/resources/enchants/normal/parry.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/phantasm.yml b/Plugin/src/main/resources/enchants/normal/phantasm.yml index 4cee7981..628d2f34 100644 --- a/Plugin/src/main/resources/enchants/normal/phantasm.yml +++ b/Plugin/src/main/resources/enchants/normal/phantasm.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - serrated - bladed diff --git a/Plugin/src/main/resources/enchants/normal/plasmic.yml b/Plugin/src/main/resources/enchants/normal/plasmic.yml index f195679c..ff8eade0 100644 --- a/Plugin/src/main/resources/enchants/normal/plasmic.yml +++ b/Plugin/src/main/resources/enchants/normal/plasmic.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - voltage maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/protector.yml b/Plugin/src/main/resources/enchants/normal/protector.yml index d3a3edfa..fe2653b6 100644 --- a/Plugin/src/main/resources/enchants/normal/protector.yml +++ b/Plugin/src/main/resources/enchants/normal/protector.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/proximity.yml b/Plugin/src/main/resources/enchants/normal/proximity.yml index d71add5c..42032da0 100644 --- a/Plugin/src/main/resources/enchants/normal/proximity.yml +++ b/Plugin/src/main/resources/enchants/normal/proximity.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/puncture.yml b/Plugin/src/main/resources/enchants/normal/puncture.yml index c6a7d8ae..461dc9ef 100644 --- a/Plugin/src/main/resources/enchants/normal/puncture.yml +++ b/Plugin/src/main/resources/enchants/normal/puncture.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml b/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml index fca3bec2..c6aad7ea 100644 --- a/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml +++ b/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/radiance.yml b/Plugin/src/main/resources/enchants/normal/radiance.yml index 46f4e1dd..90bdcf40 100644 --- a/Plugin/src/main/resources/enchants/normal/radiance.yml +++ b/Plugin/src/main/resources/enchants/normal/radiance.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/rage.yml b/Plugin/src/main/resources/enchants/normal/rage.yml index 73c48d8c..1d27726d 100644 --- a/Plugin/src/main/resources/enchants/normal/rage.yml +++ b/Plugin/src/main/resources/enchants/normal/rage.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/rapid.yml b/Plugin/src/main/resources/enchants/normal/rapid.yml index 688d95a0..323e21a4 100644 --- a/Plugin/src/main/resources/enchants/normal/rapid.yml +++ b/Plugin/src/main/resources/enchants/normal/rapid.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/reel.yml b/Plugin/src/main/resources/enchants/normal/reel.yml index 56e210fa..65cf4acb 100644 --- a/Plugin/src/main/resources/enchants/normal/reel.yml +++ b/Plugin/src/main/resources/enchants/normal/reel.yml @@ -16,6 +16,7 @@ general-config: targets: - rod grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/reinforcement.yml b/Plugin/src/main/resources/enchants/normal/reinforcement.yml index c8449a4d..d10bdb38 100644 --- a/Plugin/src/main/resources/enchants/normal/reinforcement.yml +++ b/Plugin/src/main/resources/enchants/normal/reinforcement.yml @@ -16,6 +16,7 @@ general-config: targets: - elytra grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/rejuvenation.yml b/Plugin/src/main/resources/enchants/normal/rejuvenation.yml index 34e17ab4..5985f2b5 100644 --- a/Plugin/src/main/resources/enchants/normal/rejuvenation.yml +++ b/Plugin/src/main/resources/enchants/normal/rejuvenation.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/replenish.yml b/Plugin/src/main/resources/enchants/normal/replenish.yml index e9c1553c..3ec98d2e 100644 --- a/Plugin/src/main/resources/enchants/normal/replenish.yml +++ b/Plugin/src/main/resources/enchants/normal/replenish.yml @@ -16,6 +16,7 @@ general-config: targets: - hoe grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/respirator.yml b/Plugin/src/main/resources/enchants/normal/respirator.yml index 3fca853c..46dc68ef 100644 --- a/Plugin/src/main/resources/enchants/normal/respirator.yml +++ b/Plugin/src/main/resources/enchants/normal/respirator.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/revenant.yml b/Plugin/src/main/resources/enchants/normal/revenant.yml index 505bff40..96e61dc8 100644 --- a/Plugin/src/main/resources/enchants/normal/revenant.yml +++ b/Plugin/src/main/resources/enchants/normal/revenant.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - power - force diff --git a/Plugin/src/main/resources/enchants/normal/sating.yml b/Plugin/src/main/resources/enchants/normal/sating.yml index 49de89ba..5974c86c 100644 --- a/Plugin/src/main/resources/enchants/normal/sating.yml +++ b/Plugin/src/main/resources/enchants/normal/sating.yml @@ -16,6 +16,7 @@ general-config: targets: - helmet grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/serrated.yml b/Plugin/src/main/resources/enchants/normal/serrated.yml index 284718a8..5054f7f2 100644 --- a/Plugin/src/main/resources/enchants/normal/serrated.yml +++ b/Plugin/src/main/resources/enchants/normal/serrated.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - bladed - phantasm diff --git a/Plugin/src/main/resources/enchants/normal/settle.yml b/Plugin/src/main/resources/enchants/normal/settle.yml index 3e1c188e..d6d3184e 100644 --- a/Plugin/src/main/resources/enchants/normal/settle.yml +++ b/Plugin/src/main/resources/enchants/normal/settle.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - power - force diff --git a/Plugin/src/main/resources/enchants/normal/shockwave.yml b/Plugin/src/main/resources/enchants/normal/shockwave.yml index 0cfad2f0..e9a6e8fa 100644 --- a/Plugin/src/main/resources/enchants/normal/shockwave.yml +++ b/Plugin/src/main/resources/enchants/normal/shockwave.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/shotassist.yml b/Plugin/src/main/resources/enchants/normal/shotassist.yml index 75c4c0b9..40d70321 100644 --- a/Plugin/src/main/resources/enchants/normal/shotassist.yml +++ b/Plugin/src/main/resources/enchants/normal/shotassist.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/sickening.yml b/Plugin/src/main/resources/enchants/normal/sickening.yml index ef76e0c9..e4a586bb 100644 --- a/Plugin/src/main/resources/enchants/normal/sickening.yml +++ b/Plugin/src/main/resources/enchants/normal/sickening.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/slaughter.yml b/Plugin/src/main/resources/enchants/normal/slaughter.yml index 910fd4f7..a34231ad 100644 --- a/Plugin/src/main/resources/enchants/normal/slaughter.yml +++ b/Plugin/src/main/resources/enchants/normal/slaughter.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - power - force diff --git a/Plugin/src/main/resources/enchants/normal/slicing.yml b/Plugin/src/main/resources/enchants/normal/slicing.yml index 48df2f26..56a65a33 100644 --- a/Plugin/src/main/resources/enchants/normal/slicing.yml +++ b/Plugin/src/main/resources/enchants/normal/slicing.yml @@ -16,6 +16,7 @@ general-config: targets: - elytra grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/normal/spearfishing.yml b/Plugin/src/main/resources/enchants/normal/spearfishing.yml index db269835..c402ec7e 100644 --- a/Plugin/src/main/resources/enchants/normal/spearfishing.yml +++ b/Plugin/src/main/resources/enchants/normal/spearfishing.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/spiked.yml b/Plugin/src/main/resources/enchants/normal/spiked.yml index 945456f5..ed50a986 100644 --- a/Plugin/src/main/resources/enchants/normal/spiked.yml +++ b/Plugin/src/main/resources/enchants/normal/spiked.yml @@ -16,6 +16,7 @@ general-config: targets: - rod grindstoneable: true + disabled-in-worlds: [] conflicts: - harpoon maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/splash.yml b/Plugin/src/main/resources/enchants/normal/splash.yml index fa464821..21e40689 100644 --- a/Plugin/src/main/resources/enchants/normal/splash.yml +++ b/Plugin/src/main/resources/enchants/normal/splash.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - wisdom maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/stab.yml b/Plugin/src/main/resources/enchants/normal/stab.yml index db43db4b..df8f87ac 100644 --- a/Plugin/src/main/resources/enchants/normal/stab.yml +++ b/Plugin/src/main/resources/enchants/normal/stab.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/stalwart.yml b/Plugin/src/main/resources/enchants/normal/stalwart.yml index 2c39b6eb..67ea6569 100644 --- a/Plugin/src/main/resources/enchants/normal/stalwart.yml +++ b/Plugin/src/main/resources/enchants/normal/stalwart.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/stamina.yml b/Plugin/src/main/resources/enchants/normal/stamina.yml index 19305d34..63ca97ba 100644 --- a/Plugin/src/main/resources/enchants/normal/stamina.yml +++ b/Plugin/src/main/resources/enchants/normal/stamina.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml b/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml index 1d1aa1be..dc7ffa7c 100644 --- a/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml +++ b/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml @@ -16,6 +16,7 @@ general-config: targets: - pickaxe grindstoneable: true + disabled-in-worlds: [] conflicts: - transfuse - silk_touch diff --git a/Plugin/src/main/resources/enchants/normal/strayaspect.yml b/Plugin/src/main/resources/enchants/normal/strayaspect.yml index 0437e3f7..4517e684 100644 --- a/Plugin/src/main/resources/enchants/normal/strayaspect.yml +++ b/Plugin/src/main/resources/enchants/normal/strayaspect.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/succession.yml b/Plugin/src/main/resources/enchants/normal/succession.yml index 13fe6d48..433aa0fe 100644 --- a/Plugin/src/main/resources/enchants/normal/succession.yml +++ b/Plugin/src/main/resources/enchants/normal/succession.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - tripleshot - pentashot diff --git a/Plugin/src/main/resources/enchants/normal/supercritical.yml b/Plugin/src/main/resources/enchants/normal/supercritical.yml index 836df8d8..0552873f 100644 --- a/Plugin/src/main/resources/enchants/normal/supercritical.yml +++ b/Plugin/src/main/resources/enchants/normal/supercritical.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/sycophant.yml b/Plugin/src/main/resources/enchants/normal/sycophant.yml index 6a1edf40..3d151778 100644 --- a/Plugin/src/main/resources/enchants/normal/sycophant.yml +++ b/Plugin/src/main/resources/enchants/normal/sycophant.yml @@ -16,6 +16,7 @@ general-config: targets: - shield grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/normal/tectonic.yml b/Plugin/src/main/resources/enchants/normal/tectonic.yml index e9581127..ceef7532 100644 --- a/Plugin/src/main/resources/enchants/normal/tectonic.yml +++ b/Plugin/src/main/resources/enchants/normal/tectonic.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - feather_falling maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/telekinesis.yml b/Plugin/src/main/resources/enchants/normal/telekinesis.yml index 3d97453a..503b0b1b 100644 --- a/Plugin/src/main/resources/enchants/normal/telekinesis.yml +++ b/Plugin/src/main/resources/enchants/normal/telekinesis.yml @@ -23,6 +23,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/normal/thor.yml b/Plugin/src/main/resources/enchants/normal/thor.yml index 19301211..0aa16cc4 100644 --- a/Plugin/src/main/resources/enchants/normal/thor.yml +++ b/Plugin/src/main/resources/enchants/normal/thor.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/thrive.yml b/Plugin/src/main/resources/enchants/normal/thrive.yml index e6e6186d..af294f68 100644 --- a/Plugin/src/main/resources/enchants/normal/thrive.yml +++ b/Plugin/src/main/resources/enchants/normal/thrive.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - prosperity maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/tornado.yml b/Plugin/src/main/resources/enchants/normal/tornado.yml index 88b3553c..e7ce86a1 100644 --- a/Plugin/src/main/resources/enchants/normal/tornado.yml +++ b/Plugin/src/main/resources/enchants/normal/tornado.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - knockback - grapple diff --git a/Plugin/src/main/resources/enchants/normal/toxic.yml b/Plugin/src/main/resources/enchants/normal/toxic.yml index 5e6a8e9c..2514dc8b 100644 --- a/Plugin/src/main/resources/enchants/normal/toxic.yml +++ b/Plugin/src/main/resources/enchants/normal/toxic.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/transfuse.yml b/Plugin/src/main/resources/enchants/normal/transfuse.yml index ef0ef0eb..c7de3555 100644 --- a/Plugin/src/main/resources/enchants/normal/transfuse.yml +++ b/Plugin/src/main/resources/enchants/normal/transfuse.yml @@ -16,6 +16,7 @@ general-config: targets: - pickaxe grindstoneable: true + disabled-in-worlds: [] conflicts: - stone_switcher - silk_touch diff --git a/Plugin/src/main/resources/enchants/normal/tripleshot.yml b/Plugin/src/main/resources/enchants/normal/tripleshot.yml index 1695cecf..79ee7536 100644 --- a/Plugin/src/main/resources/enchants/normal/tripleshot.yml +++ b/Plugin/src/main/resources/enchants/normal/tripleshot.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - succession - pentashot diff --git a/Plugin/src/main/resources/enchants/normal/vampireaspect.yml b/Plugin/src/main/resources/enchants/normal/vampireaspect.yml index 08cf378b..1ed40208 100644 --- a/Plugin/src/main/resources/enchants/normal/vampireaspect.yml +++ b/Plugin/src/main/resources/enchants/normal/vampireaspect.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/vein.yml b/Plugin/src/main/resources/enchants/normal/vein.yml index 1f973d75..551d4f8e 100644 --- a/Plugin/src/main/resources/enchants/normal/vein.yml +++ b/Plugin/src/main/resources/enchants/normal/vein.yml @@ -16,6 +16,7 @@ general-config: targets: - pickaxe grindstoneable: true + disabled-in-worlds: [] maximum-level: 5 conflicts: - drill diff --git a/Plugin/src/main/resources/enchants/normal/venom.yml b/Plugin/src/main/resources/enchants/normal/venom.yml index 924335af..664a6e6e 100644 --- a/Plugin/src/main/resources/enchants/normal/venom.yml +++ b/Plugin/src/main/resources/enchants/normal/venom.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/normal/voidaffinity.yml b/Plugin/src/main/resources/enchants/normal/voidaffinity.yml index 59a8a2ea..71dc49a5 100644 --- a/Plugin/src/main/resources/enchants/normal/voidaffinity.yml +++ b/Plugin/src/main/resources/enchants/normal/voidaffinity.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - netheric maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/voltage.yml b/Plugin/src/main/resources/enchants/normal/voltage.yml index 83c56e62..4103e3bd 100644 --- a/Plugin/src/main/resources/enchants/normal/voltage.yml +++ b/Plugin/src/main/resources/enchants/normal/voltage.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - plasmic maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/normal/wateraffinity.yml b/Plugin/src/main/resources/enchants/normal/wateraffinity.yml index b4797876..9c4c3b6c 100644 --- a/Plugin/src/main/resources/enchants/normal/wateraffinity.yml +++ b/Plugin/src/main/resources/enchants/normal/wateraffinity.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - fire_affinity maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/wateraspect.yml b/Plugin/src/main/resources/enchants/normal/wateraspect.yml index 748dd7ab..c9ea411b 100644 --- a/Plugin/src/main/resources/enchants/normal/wateraspect.yml +++ b/Plugin/src/main/resources/enchants/normal/wateraspect.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - fire_aspect maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/normal/weakening.yml b/Plugin/src/main/resources/enchants/normal/weakening.yml index 7a0fd860..c1fa91b0 100644 --- a/Plugin/src/main/resources/enchants/normal/weakening.yml +++ b/Plugin/src/main/resources/enchants/normal/weakening.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/normal/wisdom.yml b/Plugin/src/main/resources/enchants/normal/wisdom.yml index bb7154cf..4cb5e1f7 100644 --- a/Plugin/src/main/resources/enchants/normal/wisdom.yml +++ b/Plugin/src/main/resources/enchants/normal/wisdom.yml @@ -23,6 +23,7 @@ general-config: - crossbow - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - splash - intellect diff --git a/Plugin/src/main/resources/enchants/normal/wound.yml b/Plugin/src/main/resources/enchants/normal/wound.yml index ddcab321..795cfe30 100644 --- a/Plugin/src/main/resources/enchants/normal/wound.yml +++ b/Plugin/src/main/resources/enchants/normal/wound.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 7 diff --git a/Plugin/src/main/resources/enchants/normal/zeus.yml b/Plugin/src/main/resources/enchants/normal/zeus.yml index a5d8fe3b..9fe898ea 100644 --- a/Plugin/src/main/resources/enchants/normal/zeus.yml +++ b/Plugin/src/main/resources/enchants/normal/zeus.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/special/aiming.yml b/Plugin/src/main/resources/enchants/special/aiming.yml index 0b7a8bb9..ff0b92ae 100644 --- a/Plugin/src/main/resources/enchants/special/aiming.yml +++ b/Plugin/src/main/resources/enchants/special/aiming.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 5 diff --git a/Plugin/src/main/resources/enchants/special/annihilate.yml b/Plugin/src/main/resources/enchants/special/annihilate.yml index 74ee71d3..a2ac16ba 100644 --- a/Plugin/src/main/resources/enchants/special/annihilate.yml +++ b/Plugin/src/main/resources/enchants/special/annihilate.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - knockback - tornado diff --git a/Plugin/src/main/resources/enchants/special/bladed.yml b/Plugin/src/main/resources/enchants/special/bladed.yml index f27dd589..c2afa7f9 100644 --- a/Plugin/src/main/resources/enchants/special/bladed.yml +++ b/Plugin/src/main/resources/enchants/special/bladed.yml @@ -16,6 +16,7 @@ general-config: targets: - trident grindstoneable: true + disabled-in-worlds: [] conflicts: - impaling - serrated diff --git a/Plugin/src/main/resources/enchants/special/bolt.yml b/Plugin/src/main/resources/enchants/special/bolt.yml index c5db0b59..f3154b21 100644 --- a/Plugin/src/main/resources/enchants/special/bolt.yml +++ b/Plugin/src/main/resources/enchants/special/bolt.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/special/carve.yml b/Plugin/src/main/resources/enchants/special/carve.yml index 711f6d9f..d2c574db 100644 --- a/Plugin/src/main/resources/enchants/special/carve.yml +++ b/Plugin/src/main/resources/enchants/special/carve.yml @@ -16,6 +16,7 @@ general-config: targets: - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - cleave maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/special/confusion.yml b/Plugin/src/main/resources/enchants/special/confusion.yml index 1f0f48ba..82a5bfbb 100644 --- a/Plugin/src/main/resources/enchants/special/confusion.yml +++ b/Plugin/src/main/resources/enchants/special/confusion.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 4 diff --git a/Plugin/src/main/resources/enchants/special/energizing.yml b/Plugin/src/main/resources/enchants/special/energizing.yml index f55ad34f..d0fbd41f 100644 --- a/Plugin/src/main/resources/enchants/special/energizing.yml +++ b/Plugin/src/main/resources/enchants/special/energizing.yml @@ -19,6 +19,7 @@ general-config: - shovel - hoe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/force.yml b/Plugin/src/main/resources/enchants/special/force.yml index d384db36..5081311c 100644 --- a/Plugin/src/main/resources/enchants/special/force.yml +++ b/Plugin/src/main/resources/enchants/special/force.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - power - revenant diff --git a/Plugin/src/main/resources/enchants/special/frenzy.yml b/Plugin/src/main/resources/enchants/special/frenzy.yml index 315d270b..4783cd80 100644 --- a/Plugin/src/main/resources/enchants/special/frenzy.yml +++ b/Plugin/src/main/resources/enchants/special/frenzy.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/harpoon.yml b/Plugin/src/main/resources/enchants/special/harpoon.yml index 22d3118e..19cfde43 100644 --- a/Plugin/src/main/resources/enchants/special/harpoon.yml +++ b/Plugin/src/main/resources/enchants/special/harpoon.yml @@ -16,6 +16,7 @@ general-config: targets: - rod grindstoneable: true + disabled-in-worlds: [] conflicts: - spiked maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/indestructibility.yml b/Plugin/src/main/resources/enchants/special/indestructibility.yml index f6c05d72..37d6a1ca 100644 --- a/Plugin/src/main/resources/enchants/special/indestructibility.yml +++ b/Plugin/src/main/resources/enchants/special/indestructibility.yml @@ -16,6 +16,7 @@ general-config: targets: - all grindstoneable: true + disabled-in-worlds: [] conflicts: - unbreaking maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/instability.yml b/Plugin/src/main/resources/enchants/special/instability.yml index 89f6c353..08caa76e 100644 --- a/Plugin/src/main/resources/enchants/special/instability.yml +++ b/Plugin/src/main/resources/enchants/special/instability.yml @@ -17,6 +17,7 @@ general-config: - bow - crossbow grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/intellect.yml b/Plugin/src/main/resources/enchants/special/intellect.yml index 29e3fb7a..5c5c3697 100644 --- a/Plugin/src/main/resources/enchants/special/intellect.yml +++ b/Plugin/src/main/resources/enchants/special/intellect.yml @@ -23,6 +23,7 @@ general-config: - hoe - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - splash - wisdom diff --git a/Plugin/src/main/resources/enchants/special/lifesteal.yml b/Plugin/src/main/resources/enchants/special/lifesteal.yml index acd1eee9..fe4f27e2 100644 --- a/Plugin/src/main/resources/enchants/special/lifesteal.yml +++ b/Plugin/src/main/resources/enchants/special/lifesteal.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: - leeching maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/pentashot.yml b/Plugin/src/main/resources/enchants/special/pentashot.yml index 3c67ed56..5c0bb711 100644 --- a/Plugin/src/main/resources/enchants/special/pentashot.yml +++ b/Plugin/src/main/resources/enchants/special/pentashot.yml @@ -16,6 +16,7 @@ general-config: targets: - bow grindstoneable: true + disabled-in-worlds: [] conflicts: - succession - tripleshot diff --git a/Plugin/src/main/resources/enchants/special/preservation.yml b/Plugin/src/main/resources/enchants/special/preservation.yml index 38045d36..7dcd09c7 100644 --- a/Plugin/src/main/resources/enchants/special/preservation.yml +++ b/Plugin/src/main/resources/enchants/special/preservation.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - protection - fire_protection diff --git a/Plugin/src/main/resources/enchants/special/prosperity.yml b/Plugin/src/main/resources/enchants/special/prosperity.yml index 325c0825..735d4608 100644 --- a/Plugin/src/main/resources/enchants/special/prosperity.yml +++ b/Plugin/src/main/resources/enchants/special/prosperity.yml @@ -19,6 +19,7 @@ general-config: - leggings - boots grindstoneable: true + disabled-in-worlds: [] conflicts: - thrive maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/razor.yml b/Plugin/src/main/resources/enchants/special/razor.yml index 29e7b471..205862c3 100644 --- a/Plugin/src/main/resources/enchants/special/razor.yml +++ b/Plugin/src/main/resources/enchants/special/razor.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: - sharpness - smite diff --git a/Plugin/src/main/resources/enchants/special/repairing.yml b/Plugin/src/main/resources/enchants/special/repairing.yml index 17ccc40e..3714fd09 100644 --- a/Plugin/src/main/resources/enchants/special/repairing.yml +++ b/Plugin/src/main/resources/enchants/special/repairing.yml @@ -16,6 +16,7 @@ general-config: targets: - all grindstoneable: true + disabled-in-worlds: [] conflicts: - mending - decay_curse diff --git a/Plugin/src/main/resources/enchants/special/soulbound.yml b/Plugin/src/main/resources/enchants/special/soulbound.yml index 1cfbb254..b57e1655 100644 --- a/Plugin/src/main/resources/enchants/special/soulbound.yml +++ b/Plugin/src/main/resources/enchants/special/soulbound.yml @@ -16,6 +16,7 @@ general-config: targets: - all grindstoneable: true + disabled-in-worlds: [] conflicts: [] config: diff --git a/Plugin/src/main/resources/enchants/special/spring.yml b/Plugin/src/main/resources/enchants/special/spring.yml index 173ab540..280bf856 100644 --- a/Plugin/src/main/resources/enchants/special/spring.yml +++ b/Plugin/src/main/resources/enchants/special/spring.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/special/streamlining.yml b/Plugin/src/main/resources/enchants/special/streamlining.yml index 1eccbb0e..c0b96639 100644 --- a/Plugin/src/main/resources/enchants/special/streamlining.yml +++ b/Plugin/src/main/resources/enchants/special/streamlining.yml @@ -16,6 +16,7 @@ general-config: targets: - boots grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 8 diff --git a/Plugin/src/main/resources/enchants/special/volatile.yml b/Plugin/src/main/resources/enchants/special/volatile.yml index a19967e7..4cb7242c 100644 --- a/Plugin/src/main/resources/enchants/special/volatile.yml +++ b/Plugin/src/main/resources/enchants/special/volatile.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/spell/charge.yml b/Plugin/src/main/resources/enchants/spell/charge.yml index 3041b26e..262d6557 100644 --- a/Plugin/src/main/resources/enchants/spell/charge.yml +++ b/Plugin/src/main/resources/enchants/spell/charge.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 6 diff --git a/Plugin/src/main/resources/enchants/spell/dynamite.yml b/Plugin/src/main/resources/enchants/spell/dynamite.yml index bd8f3a93..bddc6686 100644 --- a/Plugin/src/main/resources/enchants/spell/dynamite.yml +++ b/Plugin/src/main/resources/enchants/spell/dynamite.yml @@ -16,6 +16,7 @@ general-config: targets: - pickaxe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 2 diff --git a/Plugin/src/main/resources/enchants/spell/missile.yml b/Plugin/src/main/resources/enchants/spell/missile.yml index 44b1072a..952ce6d4 100644 --- a/Plugin/src/main/resources/enchants/spell/missile.yml +++ b/Plugin/src/main/resources/enchants/spell/missile.yml @@ -17,6 +17,7 @@ general-config: - sword - axe grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/spell/quake.yml b/Plugin/src/main/resources/enchants/spell/quake.yml index 0cec14f9..39d88963 100644 --- a/Plugin/src/main/resources/enchants/spell/quake.yml +++ b/Plugin/src/main/resources/enchants/spell/quake.yml @@ -16,6 +16,7 @@ general-config: targets: - sword grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 3 diff --git a/Plugin/src/main/resources/enchants/spell/vitalize.yml b/Plugin/src/main/resources/enchants/spell/vitalize.yml index 8b649abe..96e22b1c 100644 --- a/Plugin/src/main/resources/enchants/spell/vitalize.yml +++ b/Plugin/src/main/resources/enchants/spell/vitalize.yml @@ -19,6 +19,7 @@ general-config: - pickaxe - shovel grindstoneable: true + disabled-in-worlds: [] conflicts: [] maximum-level: 1