From 0f531665b18ffc464b9fd8774bb7afa21c3eefe4 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Wed, 30 Dec 2020 12:30:27 +0000
Subject: [PATCH] Moved Xray off to an extension

---
 .../ecoenchants/enchantments/EcoEnchants.java  |  2 --
 eco-extensions/xray/build.gradle               |  7 +++++++
 .../com/willfp/ecoenchants/xray}/Xray.java     |  2 +-
 .../com/willfp/ecoenchants/xray/XrayMain.java  | 18 ++++++++++++++++++
 .../src/main/resources/enchants/spell/xray.yml |  0
 .../xray/src/main/resources/extension.yml      |  3 +++
 settings.gradle                                |  3 ++-
 7 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 eco-extensions/xray/build.gradle
 rename {eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell => eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray}/Xray.java (98%)
 create mode 100644 eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray/XrayMain.java
 rename {eco-core/core-plugin => eco-extensions/xray}/src/main/resources/enchants/spell/xray.yml (100%)
 create mode 100644 eco-extensions/xray/src/main/resources/extension.yml

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
index c4c5fd21..f33f749f 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
@@ -226,7 +226,6 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Dynamite;
 import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Missile;
 import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Quake;
 import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Vitalize;
-import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Xray;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import lombok.experimental.UtilityClass;
 import org.bukkit.NamespacedKey;
@@ -470,7 +469,6 @@ public class EcoEnchants {
     public static final EcoEnchant CHARGE = new Charge();
     public static final EcoEnchant ASCEND = new Ascend();
     public static final EcoEnchant ARBORIST = new Arborist();
-    public static final EcoEnchant XRAY = new Xray();
 
     /**
      * Get all registered {@link EcoEnchant}s.
diff --git a/eco-extensions/xray/build.gradle b/eco-extensions/xray/build.gradle
new file mode 100644
index 00000000..7e2aad63
--- /dev/null
+++ b/eco-extensions/xray/build.gradle
@@ -0,0 +1,7 @@
+group 'com.willfp'
+version '1.0.0'
+description = 'Xray Extension'
+
+jar {
+    archiveFileName = project.getDescription() + " v" + project.version + ".jar"
+}
\ No newline at end of file
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Xray.java b/eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray/Xray.java
similarity index 98%
rename from eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Xray.java
rename to eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray/Xray.java
index f872f481..40f1f543 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Xray.java
+++ b/eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray/Xray.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.enchantments.ecoenchants.spell;
+package com.willfp.ecoenchants.xray;
 
 import com.willfp.eco.util.TeamUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
diff --git a/eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray/XrayMain.java b/eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray/XrayMain.java
new file mode 100644
index 00000000..e406bd6d
--- /dev/null
+++ b/eco-extensions/xray/src/main/java/com/willfp/ecoenchants/xray/XrayMain.java
@@ -0,0 +1,18 @@
+package com.willfp.ecoenchants.xray;
+
+import com.willfp.eco.util.extensions.Extension;
+import com.willfp.ecoenchants.enchantments.EcoEnchant;
+
+public class XrayMain extends Extension {
+    public static final EcoEnchant XRAY = new Xray();
+
+    @Override
+    public void onEnable() {
+        // Handled by super
+    }
+
+    @Override
+    public void onDisable() {
+        // Handled by super
+    }
+}
diff --git a/eco-core/core-plugin/src/main/resources/enchants/spell/xray.yml b/eco-extensions/xray/src/main/resources/enchants/spell/xray.yml
similarity index 100%
rename from eco-core/core-plugin/src/main/resources/enchants/spell/xray.yml
rename to eco-extensions/xray/src/main/resources/enchants/spell/xray.yml
diff --git a/eco-extensions/xray/src/main/resources/extension.yml b/eco-extensions/xray/src/main/resources/extension.yml
new file mode 100644
index 00000000..9c0f6b20
--- /dev/null
+++ b/eco-extensions/xray/src/main/resources/extension.yml
@@ -0,0 +1,3 @@
+name: Xray
+main: com.willfp.ecoenchants.xray.XrayMain
+version: ${projectVersion}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 01465ef2..532164d9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,4 +22,5 @@ include ':eco-extensions:firewand'
 //include ':eco-extensions:mmo'
 include ':eco-extensions:precision'
 include ':eco-extensions:sprint-artifacts'
-include ':eco-extensions:summoning'
\ No newline at end of file
+include ':eco-extensions:summoning'
+include ':eco-extensions:xray'
\ No newline at end of file