From a66637d2eccfbd6267345ec4e6f1d25f06c1fec5 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 20 Nov 2020 18:01:25 +0000
Subject: [PATCH] Fixed extensions for Spells and Artifacts

---
 Extensions/Firewand/build.gradle                           | 2 +-
 .../java/com/willfp/ecoenchants/firewand/Firewand.java     | 2 +-
 .../ecoenchants/enchantments/itemtypes/Artifact.java       | 7 ++++++-
 .../willfp/ecoenchants/enchantments/itemtypes/Spell.java   | 6 +++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Extensions/Firewand/build.gradle b/Extensions/Firewand/build.gradle
index 0ac00e95..8acda628 100644
--- a/Extensions/Firewand/build.gradle
+++ b/Extensions/Firewand/build.gradle
@@ -4,7 +4,7 @@ dependencies {
 }
 
 jar{
-    archiveFileName = findProperty("Name") + " v" + findProperty("version") + ".jar"
+    archiveFileName = project.name + " Extension" + ".jar"
 }
 
 description = 'FireWand'
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 67ed69f7..405a78e0 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
@@ -15,7 +15,7 @@ import org.bukkit.metadata.FixedMetadataValue;
 
 public class Firewand extends Spell {
     public Firewand() {
-        super("firewand");
+        super("firewand", FirewandMain.class);
     }
 
     @Override
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java
index e0c34025..6beba064 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java
@@ -34,7 +34,11 @@ public abstract class Artifact extends EcoEnchant {
     private Particle.DustOptions extra;
 
     protected Artifact(String key, Prerequisite... prerequisites) {
-        super(key, EnchantmentType.ARTIFACT, prerequisites);
+        this(key, EcoEnchantsPlugin.class, prerequisites);
+    }
+
+    protected Artifact(String key, Class<?> plugin, Prerequisite... prerequisites) {
+        super(key, EnchantmentType.ARTIFACT, plugin, prerequisites);
 
         if(!Prerequisite.areMet(prerequisites)) {
             HandlerList.unregisterAll(this); // Prevent events firing
@@ -43,6 +47,7 @@ public abstract class Artifact extends EcoEnchant {
 
         this.particle = this.getParticle();
         this.extra = this.getDustOptions();
+
     }
 
     protected abstract Particle getParticle();
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 1eabaada..e9b21b86 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
@@ -36,7 +36,11 @@ public abstract class Spell extends EcoEnchant {
     );
 
     protected Spell(String key, Prerequisite... prerequisites) {
-        super(key, EnchantmentType.SPELL, prerequisites);
+        this(key, EcoEnchantsPlugin.class, prerequisites);
+    }
+
+    protected Spell(String key, Class<?> plugin, Prerequisite... prerequisites) {
+        super(key, EnchantmentType.SPELL, plugin, prerequisites);
     }
 
     public int getCooldownTime() {