From 4697baf28221ec7faeab17d14120f3e75b908af6 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Fri, 18 Mar 2022 21:15:43 +0100
Subject: [PATCH 1/4] Code cleanup

---
 src/main/java/com/songoda/epichoppers/EpicHoppers.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/songoda/epichoppers/EpicHoppers.java b/src/main/java/com/songoda/epichoppers/EpicHoppers.java
index 93f8926..6bd0b35 100644
--- a/src/main/java/com/songoda/epichoppers/EpicHoppers.java
+++ b/src/main/java/com/songoda/epichoppers/EpicHoppers.java
@@ -52,7 +52,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.PluginManager;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -156,8 +155,8 @@ public class EpicHoppers extends SongodaPlugin {
                 try {
                     SkyBlock.getInstance().getPermissionManager().registerPermission(
                             (BasicPermission) Class.forName("com.songoda.epichoppers.compatibility.EpicHoppersPermission").getDeclaredConstructor().newInstance());
-                } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-                    e.printStackTrace();
+                } catch (ReflectiveOperationException ex) {
+                    ex.printStackTrace();
                 }
             }
         });

From 39096ddb5c4081f44dcbbec62e5356a0f1371ee8 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Fri, 18 Mar 2022 21:15:25 +0100
Subject: [PATCH 2/4] Replaces deprecated NBTItem calls

---
 src/main/java/com/songoda/epichoppers/EpicHoppers.java   | 9 ++++-----
 .../songoda/epichoppers/hopper/levels/LevelManager.java  | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/songoda/epichoppers/EpicHoppers.java b/src/main/java/com/songoda/epichoppers/EpicHoppers.java
index 6bd0b35..0f98e6e 100644
--- a/src/main/java/com/songoda/epichoppers/EpicHoppers.java
+++ b/src/main/java/com/songoda/epichoppers/EpicHoppers.java
@@ -12,8 +12,7 @@ import com.songoda.core.gui.GuiManager;
 import com.songoda.core.hooks.EconomyManager;
 import com.songoda.core.hooks.ProtectionManager;
 import com.songoda.core.locale.Locale;
-import com.songoda.core.nms.NmsManager;
-import com.songoda.core.nms.nbt.NBTItem;
+import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
 import com.songoda.core.utils.TextUtils;
 import com.songoda.epichoppers.boost.BoostManager;
 import com.songoda.epichoppers.commands.CommandBoost;
@@ -251,9 +250,9 @@ public class EpicHoppers extends SongodaPlugin {
         }
         item.setItemMeta(itemmeta);
 
-        NBTItem nbtItem = NmsManager.getNbt().of(item);
-        nbtItem.set("level", level.getLevel());
-        return nbtItem.finish();
+        NBTItem nbtItem = new NBTItem(item);
+        nbtItem.setInteger("level", level.getLevel());
+        return nbtItem.getItem();
     }
 
     @Override
diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java b/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java
index 2d6ab46..3559192 100644
--- a/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java
+++ b/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java
@@ -2,7 +2,7 @@ package com.songoda.epichoppers.hopper.levels;
 
 import com.songoda.core.nms.NmsManager;
 import com.songoda.core.nms.nbt.NBTCore;
-import com.songoda.core.nms.nbt.NBTItem;
+import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
 import com.songoda.epichoppers.hopper.levels.modules.Module;
 import org.bukkit.ChatColor;
 import org.bukkit.inventory.ItemStack;
@@ -28,11 +28,10 @@ public class LevelManager {
     }
 
     public Level getLevel(ItemStack item) {
-        NBTCore nbt = NmsManager.getNbt();
-        NBTItem nbtItem = nbt.of(item);
+        NBTItem nbtItem = new NBTItem(item);
 
-        if (nbtItem.has("level"))
-            return getLevel(nbtItem.getNBTObject("level").asInt());
+        if (nbtItem.hasKey("level"))
+            return getLevel(nbtItem.getInteger("level"));
 
         // Legacy trash.
         if (item.hasItemMeta() && item.getItemMeta().getDisplayName().contains(":")) {

From 8b82ebd323bf6f82f286aca5ae2f294065222fc6 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Fri, 18 Mar 2022 21:16:12 +0100
Subject: [PATCH 3/4] Updates Core to v2.6.12

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d7f9f26..2053c64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>com.songoda</groupId>
             <artifactId>SongodaCore</artifactId>
-            <version>2.6.11</version>
+            <version>2.6.12</version>
             <scope>compile</scope>
         </dependency>
 

From 1e2db2cadfeb2edbda44ec59a765111fd4112150 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Fri, 18 Mar 2022 21:16:20 +0100
Subject: [PATCH 4/4] Release v4.7.4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2053c64..644f22d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>EpicHoppers</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>4.7.3</version>
+    <version>4.7.4</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>EpicHoppers-${project.version}</finalName>