Merge remote-tracking branch 'origin/main'

Author: Circulate233

src/main/java/com/circulation/random_complement/client/handler/RCInputHandler.java

@@ -73,26 +73,38 @@ public static boolean work(boolean isMouse) {
         for (var kb : KeyBindings.values()) {
             switch (kb) {
                 case QueryInterface -> {
-                    if (kb.getKeyBinding().isActiveAndMatches(eventKey)) {
-                        if (isMouse && !Mouse.isButtonDown(m)) {
-                            return true;
-                        }
-                        if (mc.currentScreen instanceof AccessorGuiCraftingCPU gui) {
-                            int viewStart = gui.invokerGetScrollBar().getCurrentScroll() * 3;
-                            int viewEnd = viewStart + 18;
-                            if (gui.getTooltip() + viewStart < Math.min(viewEnd, gui.getVisual().size())) {
-                                Minecraft.getMinecraft().addScheduledTask(() -> {
-                                    if (gui.getTooltip() + viewStart < Math.min(viewEnd, gui.getVisual().size())) {
-                                        val item = gui.getVisual().get(gui.getTooltip() + viewStart);
-                                        if (item != null)
-                                            RandomComplement.NET_CHANNEL.sendToServer(new InterfaceTracing(item));
-                                    }
-                                });
-                                return true;
-                            }
-                        }
+                    if (!kb.getKeyBinding().isActiveAndMatches(eventKey)) {
+                        break;
+                    }
+
+                    // IMPORTANT: don't cancel mouse releases (prevents stuck dragging)
+                    if (isMouse && !Mouse.getEventButtonState()) {
                         return false;
                     }
+
+                    // Only do anything inside the Crafting CPU GUI
+                    if (!(mc.currentScreen instanceof AccessorGuiCraftingCPU gui)) {
+                        return false;
+                    }
+
+                    int viewStart = gui.invokerGetScrollBar().getCurrentScroll() * 3;
+                    int viewEnd = viewStart + 18;
+
+                    int idx = gui.getTooltip() + viewStart;
+                    if (idx < Math.min(viewEnd, gui.getVisual().size())) {
+                        Minecraft.getMinecraft().addScheduledTask(() -> {
+                            int idx2 = gui.getTooltip() + gui.invokerGetScrollBar().getCurrentScroll() * 3;
+                            if (idx2 < gui.getVisual().size()) {
+                                val item = gui.getVisual().get(idx2);
+                                if (item != null) {
+                                    RandomComplement.NET_CHANNEL.sendToServer(new InterfaceTracing(item));
+                                }
+                            }
+                        });
+                        return true;
+                    }
+
+                    return false;
                 }
                 default -> {
                 }

src/main/java/com/circulation/random_complement/mixin/ae2/MixinWirelessTerminalGuiObject.java

@@ -70,14 +70,26 @@ public void loadFromNBT(CallbackInfo ci) {
         return false;
     }
 
-    @Redirect(method = "loadFromNBT", at = @At(value = "INVOKE", target = "Lappeng/tile/inventory/AppEngInternalInventory;readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V"), allow = 1)
-    public void loadViewCell(AppEngInternalInventory instance, NBTTagCompound data) {
-        instance.readFromNBT(data, "viewCell");
+    @Redirect(method = "loadFromNBT", at = @At(value = "INVOKE", target = "Lappeng/tile/inventory/AppEngInternalInventory;readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V"), require = 1, allow = 1)
+    private void loadViewCell(AppEngInternalInventory instance, NBTTagCompound data) {
+        if (data == null) return;
+
+        if (data.hasKey("viewCell")) {
+            instance.readFromNBT(data, "viewCell");
+        } else {
+            instance.readFromNBT(data);
+        }
     }
 
-    @Redirect(method = "loadFromNBT", at = @At(value = "INVOKE", target = "Lappeng/parts/automation/UpgradeInventory;readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V"), allow = 1)
-    public void loadUpgrade(UpgradeInventory instance, NBTTagCompound data) {
-        instance.readFromNBT(data, "upgrades");
+    @Redirect(method = "loadFromNBT", at = @At(value = "INVOKE", target = "Lappeng/parts/automation/UpgradeInventory;readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V"), require = 1, allow = 1)
+    private void loadUpgrade(UpgradeInventory instance, NBTTagCompound data) {
+        if (data == null) return;
+
+        if (data.hasKey("upgrades")) {
+            instance.readFromNBT(data, "upgrades");
+        } else {
+            instance.readFromNBT(data);
+        }
     }
 
     @Inject(method = "loadFromNBT", at = @At("TAIL"))