Performance improvements in uuid from item getting

2 files changed, 4 insertions, 21 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index ce15b09a..5c3083a3 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -748,7 +748,7 @@ public class NEUManager {
 		}
 	}
 
-	public String getUUIDFromNBT(NBTTagCompound tag) {
+	public static String getUUIDFromNBT(NBTTagCompound tag) {
 		String uuid = null;
 		if (tag != null && tag.hasKey("ExtraAttributes", 10)) {
 			NBTTagCompound ea = tag.getCompoundTag("ExtraAttributes");
@@ -965,7 +965,7 @@ public class NEUManager {
 			.resolveInternalName();
 	}
 
-	public String getUUIDForItem(ItemStack stack) {
+	public static String getUUIDForItem(ItemStack stack) {
 		if (stack == null) return null;
 		NBTTagCompound tag = stack.getTagCompound();
 		return getUUIDFromNBT(tag);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCustomizeManager.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCustomizeManager.java
index 15fc8ef8..dad801ec 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCustomizeManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCustomizeManager.java
@@ -21,6 +21,7 @@ package io.github.moulberry.notenoughupdates.miscfeatures;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import io.github.moulberry.notenoughupdates.NEUManager;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.ChromaColour;
 import net.minecraft.client.Minecraft;
@@ -67,8 +68,6 @@ public class ItemCustomizeManager {
 
 	private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
 	private static ItemDataMap itemDataMap = new ItemDataMap();
-	private static final HashMap<Integer, String> itemUuidCache = new HashMap<>();
-
 	public static class ItemDataMap {
 		public HashMap<String, ItemData> itemData = new HashMap<>();
 	}
@@ -269,25 +268,10 @@ public class ItemCustomizeManager {
 		return CUSTOM_GLINT_TEXTURE;
 	}
 
-	public static String getUuidForItem(ItemStack stack) {
-		if (!stack.hasTagCompound()) return null;
-
-		int nbtHash = stack.getTagCompound().hashCode();
-
-		if (itemUuidCache.containsKey(nbtHash)) {
-			return itemUuidCache.get(nbtHash);
-		}
-
-		String uuid = NotEnoughUpdates.INSTANCE.manager.getUUIDForItem(stack);
-
-		itemUuidCache.put(nbtHash, uuid);
-		return uuid;
-	}
-
 	public static ItemData getDataForItem(ItemStack stack) {
 		if (stack == null) return null;
 
-		String uuid = getUuidForItem(stack);
+		String uuid = NEUManager.getUUIDForItem(stack);
 
 		if (uuid == null) {
 			return null;
@@ -297,7 +281,6 @@ public class ItemCustomizeManager {
 	}
 
 	public static void tick() {
-		itemUuidCache.clear();
 		disableTextureBinding = false;
 	}