simpler uuid switching handling

Author: Ekwav

src/client/java/com/coflnet/CoflModClient.java

@@ -113,6 +113,10 @@ public class CoflModClient implements ClientModInitializer {
     // Staggered refresh tracking: inventory name -> last request time
     private static final Map<String, Long> lastRefreshTimePerInventory = new HashMap<>();
     private static final long REFRESH_THROTTLE_MS = 500; // 0.5 seconds minimum between requests
+    
+    // Maps new UUIDs to original UUID when items update with new UUIDs but same title
+    // This allows finding descriptions loaded for the original UUID when hovering an item with updated UUID
+    public static final Map<String, String> uuidToOriginalUuid = new HashMap<>();
 
     public class TooltipMessage implements  Message{
         private final String text;
@@ -282,7 +286,11 @@ public void onInitializeClient() {
 
         ItemTooltipCallback.EVENT.register((stack, tooltipContext, tooltipType, lines) -> {
             String stackId = getIdFromStack(stack);
-            if (!knownIds.contains(stackId)
+            
+            // Check if this UUID maps to an original UUID that has descriptions
+            String lookupId = uuidToOriginalUuid.getOrDefault(stackId, stackId);
+            
+            if (!knownIds.contains(stackId) && !knownIds.contains(lookupId)
                     && MinecraftClient.getInstance().currentScreen instanceof HandledScreen<?> hs) {
 
                 if(!stack.isEmpty() && !stackId.equals("Go Back;1"))
@@ -292,7 +300,10 @@ public void onInitializeClient() {
                 return;
             }
 
-            DescriptionHandler.DescModification[] tooltips = DescriptionHandler.getTooltipData(stackId);
+            // Try to get descriptions using the original UUID if mapped
+            DescriptionHandler.DescModification[] tooltips = DescriptionHandler.getTooltipData(lookupId);
+            if(tooltips == null && !lookupId.equals(stackId))
+                tooltips = DescriptionHandler.getTooltipData(stackId); // fallback to current UUID
             if(tooltips == null)
                 return;
 
@@ -864,12 +875,11 @@ public static void loadDescriptionsForItems(String title, DefaultedList<ItemStac
                 try {
                     Thread.sleep(delayMs);
                     // Request with current inventory state (in case it updated)
-                    DefaultedList<ItemStack> currentItems = new DefaultedList<>();
+                    DefaultedList<ItemStack> currentItems = DefaultedList.of();
                     HandledScreen currentScreen = MinecraftClient.getInstance().currentScreen instanceof HandledScreen 
                         ? (HandledScreen) MinecraftClient.getInstance().currentScreen 
                         : null;
                     if (currentScreen != null && currentScreen.getTitle().getString().equals(title)) {
-                        currentItems = DefaultedList.of();
                         currentItems.addAll(currentScreen.getScreenHandler().getStacks());
                     } else {
                         // Inventory changed, use the items we have

src/client/java/com/coflnet/mixin/NewItemInChestMixin.java

@@ -1,11 +1,14 @@
 package com.coflnet.mixin;
 
 import com.coflnet.CoflModClient;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.component.ComponentType;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
@@ -16,6 +19,44 @@
 
 @Mixin(ClientPlayNetworkHandler.class)
 public class NewItemInChestMixin {
+    
+    private static final Gson gson = new Gson();
+
+    @Inject(method = "onScreenHandlerSlotUpdate", at = @At("HEAD"))
+    private void onSlotUpdateHead(ScreenHandlerSlotUpdateS2CPacket packet, CallbackInfo ci) {
+        // Track UUID changes before the slot is updated
+        try {
+            if (MinecraftClient.getInstance().player == null || MinecraftClient.getInstance().player.currentScreenHandler == null)
+                return;
+            
+            int slot = packet.getSlot();
+            if (slot < 0 || slot >= MinecraftClient.getInstance().player.currentScreenHandler.slots.size())
+                return;
+                
+            ItemStack previousStack = MinecraftClient.getInstance().player.currentScreenHandler.getSlot(slot).getStack();
+            ItemStack newStack = packet.getStack();
+            
+            if (previousStack.isEmpty() || newStack.isEmpty())
+                return;
+            
+            String prevTitle = previousStack.getCustomName() != null ? previousStack.getCustomName().getString() : "";
+            String newTitle = newStack.getCustomName() != null ? newStack.getCustomName().getString() : "";
+            
+            // If item title is the same but UUIDs differ, map new UUID to original
+            if (!prevTitle.isEmpty() && prevTitle.equals(newTitle)) {
+                String prevUuid = extractUuid(previousStack);
+                String newUuid = extractUuid(newStack);
+                
+                if (prevUuid != null && newUuid != null && !prevUuid.equals(newUuid)) {
+                    // Find the original UUID (follow chain if exists)
+                    String originalUuid = CoflModClient.uuidToOriginalUuid.getOrDefault(prevUuid, prevUuid);
+                    CoflModClient.uuidToOriginalUuid.put(newUuid, originalUuid);
+                }
+            }
+        } catch (Exception e) {
+            // Silently ignore errors in UUID tracking
+        }
+    }
 
     @Inject(method = "onScreenHandlerSlotUpdate", at = @At("TAIL"))
     private void onPacketReceive(ScreenHandlerSlotUpdateS2CPacket packet, CallbackInfo ci) {
@@ -53,4 +94,19 @@ private void onPacketReceive(ScreenHandlerSlotUpdateS2CPacket packet, CallbackIn
             System.out.println("[NewItemInChestMixin] Failed to process packet: " + e.getMessage());
         }
     }
+    
+    private String extractUuid(ItemStack stack) {
+        for (ComponentType<?> type : stack.getComponents().getTypes()) {
+            if (type.toString().contains("minecraft:custom_data")) {
+                JsonObject stackJson = gson.fromJson(stack.get(type).toString(), JsonObject.class);
+                if (stackJson != null) {
+                    JsonElement uuid = stackJson.get("uuid");
+                    if (uuid != null) {
+                        return uuid.getAsString();
+                    }
+                }
+            }
+        }
+        return null;
+    }
 }