Should help with #8

VazkiiMods · Apr 9, 2024 · 0f3129b · 0f3129b
1 parent 02bbca8
commit 0f3129b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/org/violetmoon/zeta/registry/CreativeTabManager.java b/src/main/java/org/violetmoon/zeta/registry/CreativeTabManager.java
@@ -28,6 +28,7 @@
 public class CreativeTabManager {
 
 	private static final Object MUTEX = new Object();
+	private static final Map<ItemLike, Item> itemLikeCache = new HashMap<>();
 
 	private static final Map<ResourceKey<CreativeModeTab>, CreativeTabAdditions> additions = new HashMap<>();
 	private static final Multimap<ItemLike, ResourceKey<CreativeModeTab>> mappedItems = HashMultimap.create();
@@ -210,7 +211,12 @@ private static boolean appendNextTo(ResourceKey<CreativeModeTab> tabKey, Mutable
 		for(Entry<ItemStack, TabVisibility> entry : entries) {
 			ItemStack stack = entry.getKey();
 			Item item = stack.getItem();
-			if(item == target.asItem()) {
+
+			if(!itemLikeCache.containsKey(target))
+				itemLikeCache.put(target, target.asItem());
+			Item targetItem = itemLikeCache.get(target);
+
+			if(item == targetItem) {
 				for(int i = 0; i < firstSet.items.size(); i++) {
 					int j = i;
 					if(!behind)