From fad395b2fbc15e52227ed3734067cf4b0ca918e2 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 11 Dec 2020 19:50:39 +0000 Subject: [PATCH] Reverted module changes --- .../src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java | 2 +- .../java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java | 2 +- .../java/com/willfp/ecoenchants/effects/EffectsEnchantment.java | 2 +- .../main/java/com/willfp/ecoenchants/endershot/Endershot.java | 2 +- .../src/main/java/com/willfp/ecoenchants/firewand/Firewand.java | 2 +- .../main/java/com/willfp/ecoenchants/precision/Precision.java | 2 +- .../com/willfp/ecoenchants/summoning/SummoningEnchantment.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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 81de0621..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 @@ -13,7 +13,7 @@ import org.bukkit.potion.PotionEffect; public class Alchemy extends EcoEnchant { public Alchemy() { - super("alchemy", EnchantmentType.NORMAL, AlchemyMain.getInstance()); + super("alchemy", EnchantmentType.NORMAL, AlchemyMain.class); } private static final FixedMetadataValue TRUE = new FixedMetadataValue(EcoEnchantsPlugin.getInstance(), true); diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java b/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java index 515f1aa7..cad118cf 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java +++ b/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java @@ -12,7 +12,7 @@ import org.bukkit.event.entity.EntityDamageEvent; public abstract class BiomesEnchantment extends EcoEnchant { protected BiomesEnchantment(String key, EnchantmentType type, Prerequisite... prerequisites) { - super(key, type, BiomesMain.getInstance(), prerequisites); + super(key, type, BiomesMain.class, prerequisites); } public abstract boolean isValid(Biome biome); 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 7ed21b0a..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 @@ -13,7 +13,7 @@ import org.bukkit.potion.PotionEffectType; public abstract class EffectsEnchantment extends EcoEnchant { protected EffectsEnchantment(String key, EnchantmentType type, Prerequisite... prerequisites) { - super(key, type, EffectsMain.getInstance(), prerequisites); + super(key, type, EffectsMain.class, prerequisites); } public abstract PotionEffectType getPotionEffect(); 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 e7b30cf6..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 @@ -18,7 +18,7 @@ import org.bukkit.inventory.ItemStack; public class Endershot extends EcoEnchant { public Endershot() { - super("endershot", EnchantmentType.NORMAL, EndershotMain.getInstance()); + super("endershot", EnchantmentType.NORMAL, EndershotMain.class); } @EventHandler(priority = EventPriority.LOW) diff --git a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java index 02def3d0..518dca1b 100644 --- a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java +++ b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java @@ -14,7 +14,7 @@ import org.bukkit.metadata.FixedMetadataValue; public class Firewand extends Spell { public Firewand() { - super("firewand", FirewandMain.getInstance()); + super("firewand", FirewandMain.class); } @Override 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 08389ead..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 @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class Precision extends EcoEnchant { public Precision() { super( - "precision", EnchantmentType.SPECIAL, PrecisionMain.getInstance() + "precision", EnchantmentType.SPECIAL, PrecisionMain.class ); } diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java index 99517e1e..4438fb01 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java +++ b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java @@ -28,7 +28,7 @@ public abstract class SummoningEnchantment extends EcoEnchant { private final SummoningType summoningType; protected SummoningEnchantment(String key, EnchantmentType type, SummoningType summoningType, Prerequisite... prerequisites) { - super(key, type, SummoningMain.getInstance(), prerequisites); + super(key, type, SummoningMain.class, prerequisites); this.summoningType = summoningType; }