From dd30f02aa25fa3b00082d2f84d8ebc42aebb7706 Mon Sep 17 00:00:00 2001
From: Pim van der Loos <pimvanderloos@gmail.com>
Date: Mon, 23 Nov 2020 09:18:49 +0100
Subject: [PATCH] Drop Minecraft 1.9 support

---
 .../armoredElytra/ArmoredElytra.java          |  5 ++-
 .../armoredElytra/handlers/EventHandlers.java | 40 +++----------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
index 723f087..29cbcb6 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
@@ -51,9 +51,10 @@ public class ArmoredElytra extends JavaPlugin implements Listener
     public void onEnable()
     {
         instance = this;
-        if (minecraftVersion.isOlderThan(MinecraftVersion.v1_8))
+        if (minecraftVersion.isOlderThan(MinecraftVersion.v1_9))
         {
             myLogger(Level.SEVERE, "Trying to run this plugin on an unsupported version... ABORT!");
+            this.setEnabled(false);
             return;
         }
 
@@ -98,7 +99,7 @@ public class ArmoredElytra extends JavaPlugin implements Listener
         if (compatibleMCVer())
         {
             Bukkit.getPluginManager()
-                  .registerEvents(new EventHandlers(this, is1_9, config.craftingInSmithingTable()), this);
+                  .registerEvents(new EventHandlers(this, config.craftingInSmithingTable()), this);
             getCommand("ArmoredElytra").setExecutor(new CommandHandler(this));
         }
         else
diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
index ac8a8f2..4291c7e 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
@@ -30,32 +30,19 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
-import java.util.function.Consumer;
 import java.util.logging.Level;
 
 public class EventHandlers implements Listener
 {
     private final ArmoredElytra plugin;
 
-    private final Consumer<AnvilInventory> cleanAnvilInventory;
-    private final Consumer<Player> moveChestplateToInventory;
     private final boolean creationEnabled;
 
-    public EventHandlers(ArmoredElytra plugin, boolean is1_9, boolean creationEnabled)
+    public EventHandlers(ArmoredElytra plugin, boolean creationEnabled)
     {
         this.plugin = plugin;
         this.creationEnabled = creationEnabled;
         initializeArmorEquipEvent();
-        if (is1_9)
-        {
-            cleanAnvilInventory = this::cleanAnvilOld;
-            moveChestplateToInventory = this::moveChestplateToInventoryOld;
-        }
-        else
-        {
-            cleanAnvilInventory = this::cleanAnvilNew;
-            moveChestplateToInventory = this::moveChestplateToInventoryNew;
-        }
     }
 
     private void initializeArmorEquipEvent()
@@ -74,29 +61,14 @@ public class EventHandlers implements Listener
         }
     }
 
-    private void moveChestplateToInventoryOld(Player player)
-    {
-        player.getInventory().getChestplate().setType(XMaterial.AIR.parseMaterial());
-    }
-
-    private void moveChestplateToInventoryNew(Player player)
+    private void moveChestplateToInventory(Player player)
     {
         player.getInventory().addItem(player.getInventory().getChestplate());
         player.getInventory().getChestplate().setAmount(0);
         player.updateInventory();
     }
 
-    // Clean 1.9 inventories.
-    private void cleanAnvilOld(AnvilInventory anvilInventory)
-    {
-        ItemStack air = new ItemStack(XMaterial.AIR.parseMaterial(), 1);
-        anvilInventory.setItem(0, air);
-        anvilInventory.setItem(1, air);
-        anvilInventory.setItem(2, air);
-    }
-
-    // Clean >=1.10 inventories.
-    private void cleanAnvilNew(AnvilInventory anvilInventory)
+    private void cleanAnvilInventory(AnvilInventory anvilInventory)
     {
         if (anvilInventory.getItem(0) != null)
             anvilInventory.getItem(0).setAmount(0);
@@ -438,7 +410,7 @@ public class EventHandlers implements Listener
                     player.setItemOnCursor(result);
 
                 // Clean the anvil's inventory after transferring the items.
-                cleanAnvilInventory.accept(anvilInventory);
+                cleanAnvilInventory(anvilInventory);
                 player.updateInventory();
                 return;
             }
@@ -503,7 +475,7 @@ public class EventHandlers implements Listener
                     // If the durability equals/exceeds maxDurability, it's broken (0 = full item
                     // durability).
                     if (durability >= maxDurability)
-                        moveChestplateToInventory.accept(p);
+                        moveChestplateToInventory(p);
                     else
                         newDurability = durability + durabilityDelta;
                 }
@@ -511,7 +483,7 @@ public class EventHandlers implements Listener
                 if (newDurability >= maxDurability)
                 {
                     newDurability = maxDurability;
-                    moveChestplateToInventory.accept(p);
+                    moveChestplateToInventory(p);
                 }
                 elytra.setDurability((short) (newDurability));
             }