From b08cde7de4ec93cba05fb070991ad1dffb800ce1 Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 4 Dec 2023 00:36:16 +0900 Subject: Fix non-MUI way used for syncing itemstack (#2387) --- .../gui/modularui/widget/CoverDataFollower_SlotWidget.java | 10 +++------- .../automation/GT_MetaTileEntity_RecipeFilter.java | 8 ++------ 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java index 8c19d65ba5..0b827bfbc6 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java @@ -1,6 +1,5 @@ package gregtech.common.gui.modularui.widget; -import java.io.IOException; import java.util.function.Consumer; import java.util.function.Function; @@ -8,6 +7,7 @@ import net.minecraft.item.ItemStack; import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; import com.gtnewhorizons.modularui.api.widget.Interactable; +import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils; import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; import com.gtnewhorizons.modularui.common.widget.SlotWidget; @@ -90,12 +90,8 @@ public class CoverDataFollower_SlotWidget extends if (!isPhantom()) return false; ClickData clickData = ClickData.create(button, false); syncToServer(5, buffer -> { - try { - clickData.writeToPacket(buffer); - buffer.writeItemStackToBuffer(draggedStack); - } catch (IOException e) { - e.printStackTrace(); - } + clickData.writeToPacket(buffer); + NetworkUtils.writeItemStack(buffer, draggedStack); }); phantomClick(clickData, draggedStack); dataSetter.accept(getMcSlot().getStack()); diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java index e7ae0e471e..6f023e025b 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java @@ -263,11 +263,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil NetworkUtils.writeStringSafe(buffer, recipeMap != null ? recipeMap.mUniqueIdentifier : null); buffer.writeVarIntToBuffer(filteredMachines.size()); for (ItemStack filteredMachine : filteredMachines) { - try { - buffer.writeItemStackToBuffer(filteredMachine); - } catch (IOException e) { - e.printStackTrace(); - } + NetworkUtils.writeItemStack(buffer, filteredMachine); } }); } @@ -311,7 +307,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil int filteredMachineSize = buf.readVarIntFromBuffer(); filteredMachineSize = Math.min(filteredMachineSize, 256); // Prevent storing too many items for (int i = 0; i < filteredMachineSize; i++) { - ItemStack stack = buf.readItemStackFromBuffer(); + ItemStack stack = NetworkUtils.readItemStack(buf); if (stack != null) { filteredMachines.add(stack); } -- cgit