diff options
3 files changed, 6 insertions, 14 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index fed9241103..fcabfe33b1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -38,7 +38,7 @@ dependencies { api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") api("com.github.GTNewHorizons:NotEnoughItems:2.4.12-GTNH:dev") api("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") - api("com.github.GTNewHorizons:ModularUI:1.1.23:dev") + api("com.github.GTNewHorizons:ModularUI:1.1.24:dev") api("com.github.GTNewHorizons:waila:1.6.5:dev") api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-288-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.67-gtnh:dev") 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<T extends ISerializableObject> 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); } |