Fix stacksize overflow when overlaying recipe (#167)

This commit is contained in:
miozune authored and GitHub committed 2023-10-25 23:01:56 +09:00
1 parent bd0e7fabca
commit 1efa92adad
4 files changed
+18 -10

No files matched your search

@@ -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;
}
@@ -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;
}
@@ -94,14 +94,12 @@ public class OrderStack<T> {
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<T> {
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);
@@ -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;