remove unneeded method

cleanup + clarify variables

Author: ghzdude

src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeMemory.java

@@ -9,13 +9,13 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemStackHandler;
 
+import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.utils.MouseData;
 import com.cleanroommc.modularui.value.sync.SyncHandler;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
 import java.util.Map;
 
 public class CraftingRecipeMemory extends SyncHandler {
@@ -161,7 +161,7 @@ public void readOnClient(int id, PacketBuffer buf) {
             int index = buf.readByte();
             var recipe = memorizedRecipes[index];
             if (recipe == null) recipe = new MemorizedRecipe(index);
-            recipe.recipeResult = readStackSafe(buf);
+            recipe.recipeResult = NetworkUtils.readItemStack(buf);
             recipe.index = index;
             memorizedRecipes[index] = recipe;
         } else if (id == 4) {
@@ -183,7 +183,7 @@ public void writeRecipes(PacketBuffer buf) {
         for (var entry : written.entrySet()) {
             var recipe = memorizedRecipes[entry.getKey()];
             buf.writeByte(recipe.index);
-            buf.writeItemStack(recipe.recipeResult);
+            NetworkUtils.writeItemStack(buf, recipe.recipeResult);
             buf.writeInt(recipe.timesUsed);
             buf.writeBoolean(recipe.isRecipeLocked());
         }
@@ -196,7 +196,7 @@ public void readRecipes(PacketBuffer buf) {
             if (!hasRecipe(index))
                 memorizedRecipes[index] = new MemorizedRecipe(index);
 
-            memorizedRecipes[index].recipeResult = readStackSafe(buf);
+            memorizedRecipes[index].recipeResult = NetworkUtils.readItemStack(buf);
             memorizedRecipes[index].timesUsed = buf.readInt();
             memorizedRecipes[index].recipeLocked = buf.readBoolean();
         }
@@ -223,14 +223,6 @@ public void readOnServer(int id, PacketBuffer buf) {
         }
     }
 
-    private static ItemStack readStackSafe(PacketBuffer buffer) {
-        ItemStack ret = ItemStack.EMPTY;
-        try {
-            ret = buffer.readItemStack();
-        } catch (IOException ignored) {}
-        return ret;
-    }
-
     public static class MemorizedRecipe {
 
         private final ItemStackHandler craftingMatrix = new ItemStackHandler(9);
@@ -264,13 +256,13 @@ private static MemorizedRecipe deserializeNBT(NBTTagCompound tagCompound, int in
         private void writeToBuffer(PacketBuffer buffer) {
             buffer.writeByte(this.index);
             buffer.writeInt(this.timesUsed);
-            buffer.writeItemStack(this.recipeResult);
+            NetworkUtils.writeItemStack(buffer, this.recipeResult);
         }
 
         private static @NotNull MemorizedRecipe fromBuffer(PacketBuffer buffer) {
             var recipe = new MemorizedRecipe(buffer.readByte());
             recipe.timesUsed = buffer.readInt();
-            recipe.recipeResult = readStackSafe(buffer);
+            recipe.recipeResult = NetworkUtils.readItemStack(buffer);
             return recipe;
         }
 

src/main/java/gregtech/common/mui/widget/workbench/CraftingInputSlot.java

@@ -1,5 +1,6 @@
 package gregtech.common.mui.widget.workbench;
 
+import gregtech.api.util.GTUtility;
 import gregtech.client.utils.RenderUtil;
 import gregtech.common.metatileentities.storage.CraftingRecipeLogic;
 
@@ -13,6 +14,7 @@
 import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
 import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
+import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -23,8 +25,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
-
 public class CraftingInputSlot extends Widget<CraftingOutputSlot> implements Interactable,
                                JeiGhostIngredientSlot<ItemStack>,
                                JeiIngredientProvider {
@@ -149,21 +149,22 @@ public void init(String key, PanelSyncManager syncHandler) {
         @Override
         public void readOnClient(int id, PacketBuffer buf) {
             if (id == 1) {
-                boolean c = buf.readBoolean();
-                var s = readStackSafe(buf);
-                boolean i = buf.readBoolean();
-                this.handler.setStackInSlot(this.index, s);
-                this.listener.onChange(s, c, true, i);
+                boolean onlyAmt = buf.readBoolean();
+                var stack = NetworkUtils.readItemStack(buf);
+                boolean init = buf.readBoolean();
+
+                this.handler.setStackInSlot(this.index, stack);
+                this.listener.onChange(stack, onlyAmt, true, init);
             }
         }
 
         @Override
         public void readOnServer(int id, PacketBuffer buf) {
             if (id == 1) {
-                var b = buf.readBoolean();
-                var s = readStackSafe(buf);
-                this.handler.setStackInSlot(this.index, s);
-                this.listener.onChange(s, b, false, false);
+                var onlyAmt = buf.readBoolean();
+                var stack = NetworkUtils.readItemStack(buf);
+                this.handler.setStackInSlot(this.index, stack);
+                this.listener.onChange(stack, onlyAmt, false, false);
             }
         }
 
@@ -184,23 +185,22 @@ public void detectAndSendChanges(boolean init) {
                 final boolean finalOnlyAmountChanged = onlyAmountChanged;
                 syncToClient(1, buffer -> {
                     buffer.writeBoolean(finalOnlyAmountChanged);
-                    buffer.writeItemStack(itemStack);
+                    NetworkUtils.writeItemStack(buffer, itemStack);
                     buffer.writeBoolean(init);
                 });
             }
         }
 
         public void syncStack() {
-            final var cursorStack = getSyncManager().getCursorItem().copy();
-            cursorStack.setCount(1);
+            final var cursorStack = GTUtility.copy(1, getSyncManager().getCursorItem());
             final var curStack = getStack();
             final boolean onlyAmt = ItemHandlerHelper.canItemStacksStackRelaxed(curStack, cursorStack);
 
             this.handler.setStackInSlot(this.index, cursorStack);
             this.listener.onChange(cursorStack, onlyAmt, true, false);
             syncToServer(1, buffer -> {
                 buffer.writeBoolean(onlyAmt);
-                buffer.writeItemStack(cursorStack);
+                NetworkUtils.writeItemStack(buffer, cursorStack);
             });
         }
 
@@ -217,13 +217,5 @@ public void setStack(ItemStack stack) {
             this.handler.setStackInSlot(this.index, stack);
             this.listener.onChange(stack, false, getSyncManager().isClient(), false);
         }
-
-        private ItemStack readStackSafe(PacketBuffer buffer) {
-            ItemStack ret = ItemStack.EMPTY;
-            try {
-                ret = buffer.readItemStack();
-            } catch (IOException ignored) {}
-            return ret;
-        }
     }
 }