From 2f57f0df5945624c86e097786322e6bfe6b4ac72 Mon Sep 17 00:00:00 2001
From: Pim van der Loos <pimvanderloos@gmail.com>
Date: Tue, 4 Aug 2020 14:25:53 +0200
Subject: [PATCH] Fix incorrect armored elytra creation

- No longer making "armored elytra"s out of non-elytra items.
---
 .gitignore                                            | 11 +++++++++++
 pom.xml                                               |  8 ++++++++
 .../nl/pim16aap2/armoredElytra/ArmoredElytra.java     |  9 +++++++--
 .../armoredElytra/handlers/EventHandlers.java         | 11 +++++++----
 src/main/resources/plugin.yml                         |  3 ++-
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3231e15..77bb666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,14 @@ hs_err_pid*
 # Mac Files #
 **/.DS_Store
 /target/
+/lib/
+.classpath
+.directory
+.externalToolBuilders/
+.idea/
+.project
+.settings/
+ArmoredElytra (1).iml
+NBTChange
+dependency-reduced-pom.xml
+mover.xml
diff --git a/pom.xml b/pom.xml
index 9004cc2..cc084db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,14 @@
             <scope>compile</scope>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>n3kas.ae</groupId>-->
+<!--            <artifactId>AdvancedEnchantments</artifactId>-->
+<!--            <scope>system</scope>-->
+<!--            <version>6.5.9</version>-->
+<!--            <systemPath>${basedir}/lib/AdvancedEnchantments-6.5.9.jar</systemPath>-->
+<!--        </dependency>-->
+
         <!--
         <dependency>
             <groupId>com.github.Arnuh</groupId>
diff --git a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
index bb9ae7f..960f335 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
@@ -28,8 +28,7 @@ import java.util.Map;
 import java.util.logging.Level;
 
 // TODO: Figure out if the config really does read the list of enchantments accurately. A bug report with a customized config seemed to load the default settings...
-// TODO: Verify enchantments on startup. Remove them from the list if they're invalid.
-// TODO: Don't delete the config/translation file. Look at BigDoors.
+// TODO: Verify enchantments on startup.
 // TODO: Enchanting should require XP.
 
 public class ArmoredElytra extends JavaPlugin implements Listener
@@ -58,6 +57,12 @@ public class ArmoredElytra extends JavaPlugin implements Listener
             return;
         }
 
+////        Material mat = Material.ELYTRA;
+////        n3kas.ae.Core.canApplyTo(mat);
+//        for (String str : n3kas.ae.api.getAllEnchantments())
+//            System.out.println(str);
+//        System.exit(0);
+
         nbtEditor = minecraftVersion.isNewerThan(MinecraftVersion.v1_15) ? new NBTEditor() : new NBTEditor_legacy();
         if (isBlacklistedVersion())
         {
diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
index 2134c67..ac8a8f2 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
@@ -98,9 +98,12 @@ public class EventHandlers implements Listener
     // Clean >=1.10 inventories.
     private void cleanAnvilNew(AnvilInventory anvilInventory)
     {
-        anvilInventory.getItem(0).setAmount(0);
-        anvilInventory.getItem(1).setAmount(anvilInventory.getItem(1).getAmount() - 1);
-        anvilInventory.getItem(2).setAmount(0);
+        if (anvilInventory.getItem(0) != null)
+            anvilInventory.getItem(0).setAmount(0);
+        if (anvilInventory.getItem(1) != null)
+            anvilInventory.getItem(1).setAmount(anvilInventory.getItem(1).getAmount() - 1);
+        if (anvilInventory.getItem(2) != null)
+            anvilInventory.getItem(2).setAmount(0);
     }
 
     // Check if the enchantment is allowed on elytras.
@@ -408,7 +411,7 @@ public class EventHandlers implements Listener
         int slot = e.getRawSlot();
 
         if (slot == 2 && anvilInventory.getItem(0) != null && anvilInventory.getItem(1) != null &&
-            anvilInventory.getItem(2) != null)
+            anvilInventory.getItem(2) != null && anvilInventory.getItem(2).getType() == Material.ELYTRA)
         {
             ArmorTier armortier = ArmoredElytra.getInstance().getNbtEditor().getArmorTier(anvilInventory.getItem(2));
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 7eaac6f..58e0e8a 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,6 +2,7 @@ name: ArmoredElytra
 main: nl.pim16aap2.armoredElytra.ArmoredElytra
 version: ${project.version}
 author: pim16aap2
+softdepend: [AdvancedEnchantments]
 api-version: 1.13
 commands:
   ArmoredElytra:
@@ -39,4 +40,4 @@ permissions:
   armoredelytra.give.diamond:
     description: Allow the player to spawn in diamond tier armored elytras.
   armoredElytra.admin:
-    description: Receive a message if this plugin is out of date when joining the server.
\ No newline at end of file
+    description: Receive a message if this plugin is out of date when joining the server.