update NBT API usage

xGinko · Aug 6, 2024 · eb71550 · eb71550
1 parent 78b9149
commit eb71550
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/...xploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CommandItems.java b/...xploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CommandItems.java
@@ -1,6 +1,6 @@
 package me.xginko.aef.modules.illegals.items.nbt;
 
-import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBT;
 import me.xginko.aef.enums.AEFPermission;
 import me.xginko.aef.enums.ItemLegality;
 import me.xginko.aef.modules.illegals.items.IllegalItemModule;
@@ -36,7 +36,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
             return ItemLegality.LEGAL;
         }
 
-        if (new NBTItem(itemStack).toString().contains("run_command")) {
+        if (NBT.get(itemStack, itemNBT -> itemNBT).toString().contains("run_command")) {
             return ItemLegality.ILLEGAL;
         }
 

diff --git a/...oitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CustomNBTFilter.java b/...oitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CustomNBTFilter.java
@@ -1,6 +1,6 @@
 package me.xginko.aef.modules.illegals.items.nbt;
 
-import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBT;
 import me.xginko.aef.enums.AEFPermission;
 import me.xginko.aef.enums.IllegalHandling;
 import me.xginko.aef.enums.ItemLegality;
@@ -58,7 +58,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
         }
 
         if (!useWhitelist || blacklistMode == whitelistedTypes.contains(itemStack.getType())) {
-            String nbtItemToString = new NBTItem(itemStack).toString();
+            String nbtItemToString = NBT.get(itemStack, itemNBT -> itemNBT).toString();
             for (String tag : illegalTags) {
                 if (nbtItemToString.contains(tag)) {
                     return ItemLegality.ILLEGAL;

diff --git a/...xesFolia/src/main/java/me/xginko/aef/modules/illegals/items/nbt/NBTFilledStorageItem.java b/...xesFolia/src/main/java/me/xginko/aef/modules/illegals/items/nbt/NBTFilledStorageItem.java
@@ -1,7 +1,7 @@
 package me.xginko.aef.modules.illegals.items.nbt;
 
 import com.destroystokyo.paper.MaterialTags;
-import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBT;
 import me.xginko.aef.enums.AEFPermission;
 import me.xginko.aef.enums.IllegalHandling;
 import me.xginko.aef.enums.ItemLegality;
@@ -60,7 +60,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
             return ItemLegality.LEGAL;
         }
 
-        if (storageTypes.contains(itemStack.getType()) && new NBTItem(itemStack).getKeys().contains(stored_items_tag)) {
+        if (storageTypes.contains(itemStack.getType()) && NBT.get(itemStack, itemNBT -> itemNBT).getKeys().contains(stored_items_tag)) {
             return ItemLegality.ILLEGAL;
         }
 

diff --git a/...ploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CommandItems.java b/...ploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CommandItems.java
@@ -1,6 +1,6 @@
 package me.xginko.aef.modules.illegals.items.nbt;
 
-import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBT;
 import me.xginko.aef.enums.AEFPermission;
 import me.xginko.aef.enums.ItemLegality;
 import me.xginko.aef.modules.illegals.items.IllegalItemModule;
@@ -37,7 +37,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
             return ItemLegality.LEGAL;
         }
 
-        if (new NBTItem(itemStack).toString().contains("run_command")) {
+        if (NBT.get(itemStack, itemNBT -> itemNBT).toString().contains("run_command")) {
             return ItemLegality.ILLEGAL;
         }
 

diff --git a/...itFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CustomNBTFilter.java b/...itFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/nbt/CustomNBTFilter.java
@@ -1,6 +1,6 @@
 package me.xginko.aef.modules.illegals.items.nbt;
 
-import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBT;
 import me.xginko.aef.enums.AEFPermission;
 import me.xginko.aef.enums.IllegalHandling;
 import me.xginko.aef.enums.ItemLegality;
@@ -58,7 +58,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
         }
 
         if (!useWhitelist || blacklistMode == whitelistedTypes.contains(itemStack.getType())) {
-            String nbtItemToString = new NBTItem(itemStack).toString();
+            String nbtItemToString = NBT.get(itemStack, itemNBT -> itemNBT).toString();
             for (String tag : illegalTags) {
                 if (nbtItemToString.contains(tag)) {
                     return ItemLegality.ILLEGAL;

diff --git a/...esLegacy/src/main/java/me/xginko/aef/modules/illegals/items/nbt/NBTFilledStorageItem.java b/...esLegacy/src/main/java/me/xginko/aef/modules/illegals/items/nbt/NBTFilledStorageItem.java
@@ -1,6 +1,6 @@
 package me.xginko.aef.modules.illegals.items.nbt;
 
-import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBT;
 import me.xginko.aef.enums.AEFPermission;
 import me.xginko.aef.enums.IllegalHandling;
 import me.xginko.aef.enums.ItemLegality;
@@ -59,7 +59,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
             return ItemLegality.LEGAL;
         }
 
-        if (storageTypes.contains(itemStack.getType()) && new NBTItem(itemStack).getKeys().contains(stored_items_tag)) {
+        if (storageTypes.contains(itemStack.getType()) && NBT.get(itemStack, itemNBT -> itemNBT).getKeys().contains(stored_items_tag)) {
             return ItemLegality.ILLEGAL;
         }