From 1efa92adad54bbe51883456b307cb1271c1c36fa Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 25 Oct 2023 23:01:56 +0900 Subject: [PATCH 1/2] Fix stacksize overflow when overlaying recipe (#167) --- .../container/base/FCContainerEncodeTerminal.java | 3 +-- .../github/common/tile/TileFluidAutoFiller.java | 3 +-- .../com/glodblock/github/nei/object/OrderStack.java | 10 ++++------ src/main/java/com/glodblock/github/util/Util.java | 12 ++++++++++++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java index e081d967..8360d040 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java @@ -492,8 +492,7 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor protected NBTBase createItemTag(final ItemStack i) { final NBTTagCompound c = new NBTTagCompound(); if (i != null) { - i.writeToNBT(c); - c.setInteger("Count", i.stackSize); + Util.writeItemStackToNBT(i, c); } return c; } diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java index d8ef4059..44c3eb5c 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java @@ -180,8 +180,7 @@ public class TileFluidAutoFiller extends AENetworkInvTile protected NBTBase createItemTag(final ItemStack i) { final NBTTagCompound c = new NBTTagCompound(); if (i != null) { - i.writeToNBT(c); - c.setInteger("Count", i.stackSize); + Util.writeItemStackToNBT(i, c); } return c; } diff --git a/src/main/java/com/glodblock/github/nei/object/OrderStack.java b/src/main/java/com/glodblock/github/nei/object/OrderStack.java index 255544f4..79d73a8e 100644 --- a/src/main/java/com/glodblock/github/nei/object/OrderStack.java +++ b/src/main/java/com/glodblock/github/nei/object/OrderStack.java @@ -94,14 +94,12 @@ public class OrderStack { if (RealStack instanceof ItemStack) { NBTTagCompound tmp = new NBTTagCompound(); tmp.setByte("t", (byte) ITEM); - ((ItemStack) RealStack).writeToNBT(tmp); + Util.writeItemStackToNBT(((ItemStack) RealStack), tmp); // replacement items if (items != null) { NBTTagList list = new NBTTagList(); for (ItemStack is : this.items) { - NBTTagCompound t = new NBTTagCompound(); - is.writeToNBT(t); - list.appendTag(t); + Util.writeItemStackToNBT(is, new NBTTagCompound()); } tmp.setTag(index + ":", list); } @@ -130,10 +128,10 @@ public class OrderStack { NBTTagList items = info.getTagList(index + ":", 10); for (int x = 0; x < items.tagCount(); x++) { final NBTTagCompound item = items.getCompoundTagAt(x); - list.add(ItemStack.loadItemStackFromNBT(item)); + list.add(Util.loadItemStackFromNBT(item)); } } - return new OrderStack<>(ItemStack.loadItemStackFromNBT(info), index, list.toArray(new ItemStack[0])); + return new OrderStack<>(Util.loadItemStackFromNBT(info), index, list.toArray(new ItemStack[0])); } case FLUID -> { return new OrderStack<>(FluidStack.loadFluidStackFromNBT(info), index); diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 4b59962d..795c1e02 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -304,6 +304,18 @@ public final class Util { } } + public static void writeItemStackToNBT(ItemStack itemStack, NBTTagCompound tag) { + itemStack.writeToNBT(tag); + tag.setInteger("Count", itemStack.stackSize); + } + + public static ItemStack loadItemStackFromNBT(NBTTagCompound tag) { + ItemStack itemStack = ItemStack.loadItemStackFromNBT(tag); + if (itemStack == null) return null; + itemStack.stackSize = tag.getInteger("Count"); + return itemStack; + } + public static IAEFluidStack loadFluidStackFromNBT(final NBTTagCompound i) { final FluidStack t = FluidRegistry.getFluidStack(i.getString("FluidName"), 1); if (t == null) return null; From 567b1dbce55b44f7055021994c80848abb087734 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 25 Oct 2023 23:02:07 +0900 Subject: [PATCH 2/2] Move DefaultExtractorLoader to FMLLoadCompleteEvent (#168) --- .gitignore | 41 ++++++++++++++++--- build.gradle | 4 +- .../java/com/glodblock/github/FluidCraft.java | 8 ++-- .../glodblock/github/proxy/ClientProxy.java | 8 +++- .../glodblock/github/proxy/CommonProxy.java | 3 ++ 5 files changed, 52 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 39a19e4a..5e80e0ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,38 @@ -*.bat -.gradle/ -.idea/ -out/ +.gradle +.settings +/.idea/ +/.vscode/ +/run/ +/build/ +/eclipse/ +.classpath +.project +/bin/ +/config/ +/crash-reports/ +/logs/ +options.txt +/saves/ +usernamecache.json +banned-ips.json +banned-players.json +eula.txt +ops.json +server.properties +servers.dat +usercache.json +whitelist.json +/out/ *.iml *.ipr *.iws -run/ -build/ +src/main/resources/mixins.*([!.]).json +*.bat +*.DS_Store +!gradlew.bat +.factorypath +addon.local.gradle +addon.local.gradle.kts +addon.late.local.gradle +addon.late.local.gradle.kts +layout.json diff --git a/build.gradle b/build.gradle index b74b980f..e59189c8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1696952014 +//version: 1697697256 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -798,7 +798,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 96b5d375..18a4e3e0 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -89,6 +89,11 @@ public class FluidCraft { proxy.postInit(event); } + @Mod.EventHandler + public void onLoadComplete(FMLLoadCompleteEvent event) { + proxy.onLoadComplete(event); + } + @Mod.EventHandler public void onServerStart(FMLServerStartingEvent event) { SPacketMEUpdateBuffer.init(); @@ -106,9 +111,6 @@ public class FluidCraft { } } - @Mod.EventHandler - public void onLoadComplete(FMLLoadCompleteEvent event) {} - public static ResourceLocation resource(String path) { return new ResourceLocation(MODID, path); } diff --git a/src/main/java/com/glodblock/github/proxy/ClientProxy.java b/src/main/java/com/glodblock/github/proxy/ClientProxy.java index 282d5a97..6f3446f1 100644 --- a/src/main/java/com/glodblock/github/proxy/ClientProxy.java +++ b/src/main/java/com/glodblock/github/proxy/ClientProxy.java @@ -7,6 +7,7 @@ import com.glodblock.github.nei.recipes.DefaultExtractorLoader; import com.glodblock.github.util.ModAndClassUtil; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -28,8 +29,13 @@ public class ClientProxy extends CommonProxy { @Override public void postInit(FMLPostInitializationEvent event) { super.postInit(event); + } + + @Override + public void onLoadComplete(FMLLoadCompleteEvent event) { + super.onLoadComplete(event); if (ModAndClassUtil.NEI) { - (new DefaultExtractorLoader()).run(); + new DefaultExtractorLoader().run(); } } } diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java index 1a7ae60b..2662b4c0 100644 --- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java +++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java @@ -21,6 +21,7 @@ import appeng.api.config.Upgrades; import appeng.helpers.InterfaceTerminalSupportedClassProvider; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; @@ -72,6 +73,8 @@ public class CommonProxy { InterfaceTerminalSupportedClassProvider.register(TileFluidInterface.class); } + public void onLoadComplete(FMLLoadCompleteEvent event) {} + public void registerRenderers() {} public void registerMovables() {