From 18f31ac3ef836d1cfe076beb887a59e37c6b38b3 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Thu, 2 Mar 2023 16:46:35 +0800 Subject: [PATCH 1/6] fix export bus exporting too much fluid --- .../com/glodblock/github/common/parts/PartFluidExportBus.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java index 67518f1b..a81a9887 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java @@ -137,8 +137,9 @@ public class PartFluidExportBus extends FCSharedFluidBus implements ICraftingReq this.source); } + int space = fh.fill(this.getSide().getOpposite(), toExtract.getFluidStack(), false); + toExtract.setStackSize(space); final IAEFluidStack real = inv.extractItems(toExtract, Actionable.MODULATE, this.source); - if (real != null && isAllowed) { int realInserted = fh.fill(this.getSide().getOpposite(), real.getFluidStack(), true); if (realInserted < real.getStackSize()) { From 16f207ce80c18715bf9851dbf2f174ad222bdd10 Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Fri, 3 Mar 2023 10:37:37 +0800 Subject: [PATCH 2/6] terminal does not update view --- .../gui/container/ContainerFluidMonitor.java | 44 ++++++++----------- .../gui/container/ContainerItemMonitor.java | 38 ++++++++-------- .../container/base/FCContainerMonitor.java | 2 +- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java index 68786d71..96ae7334 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java @@ -18,8 +18,6 @@ import org.apache.commons.lang3.tuple.MutablePair; import appeng.api.AEApi; import appeng.api.config.Actionable; -import appeng.api.implementations.guiobjects.IPortableCell; -import appeng.api.implementations.tiles.IMEChest; import appeng.api.implementations.tiles.IViewCellStorage; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; @@ -28,6 +26,7 @@ import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.storage.IBaseMonitor; +import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; @@ -42,7 +41,6 @@ import appeng.util.item.AEItemStack; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.base.FCContainerMonitor; import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.inventory.item.IFluidPortableCell; import com.glodblock.github.network.CPacketFluidUpdate; import com.glodblock.github.network.SPacketFluidUpdate; import com.glodblock.github.network.SPacketMEInventoryUpdate; @@ -61,27 +59,28 @@ public class ContainerFluidMonitor extends FCContainerMonitor { super(ip, monitorable, bindInventory); if (Platform.isServer()) { this.serverCM = monitorable.getConfigManager(); - this.monitor = monitorable.getFluidInventory(); - if (this.monitor != null) { - this.monitor.addListener(this, null); - if (monitorable instanceof IFluidPortableCell) { - this.setPowerSource((IEnergySource) monitorable); - } else if (monitorable instanceof IPortableCell) { - this.setPowerSource((IEnergySource) monitorable); - } else if (monitorable instanceof IMEChest) { - this.setPowerSource((IEnergySource) monitorable); - } else if (monitorable instanceof IGridHost) { - final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN); - if (node != null) { - this.networkNode = node; - final IGrid g = node.getGrid(); - if (g != null) { - this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class))); + if (monitorable instanceof IGridHost) { + final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN); + if (node != null) { + this.networkNode = node; + final IGrid g = node.getGrid(); + if (g != null) { + this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class))); + IStorageGrid storageGrid = g.getCache(IStorageGrid.class); + this.monitor = storageGrid.getFluidInventory(); + if (this.monitor == null) { + this.setValidContainer(false); + } else { + this.monitor.addListener(this, null); } } + } else { + this.setValidContainer(false); } } else { - this.setValidContainer(false); + this.monitor = monitorable.getFluidInventory(); + this.monitor.addListener(this, null); + this.setPowerSource((IEnergySource) monitorable); } } else { this.monitor = null; @@ -151,11 +150,6 @@ public class ContainerFluidMonitor extends FCContainerMonitor { } } - @Override - protected boolean isInvalid() { - return this.monitor != this.host.getFluidInventory(); - } - @Override protected void queueInventory(final ICrafting c) { if (Platform.isServer() && c instanceof EntityPlayer && this.monitor != null) { diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java index caa1474e..12f2183a 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java @@ -9,8 +9,6 @@ import net.minecraft.inventory.ICrafting; import net.minecraftforge.common.util.ForgeDirection; import appeng.api.AEApi; -import appeng.api.implementations.guiobjects.IPortableCell; -import appeng.api.implementations.tiles.IMEChest; import appeng.api.implementations.tiles.IViewCellStorage; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; @@ -19,6 +17,7 @@ import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.storage.IBaseMonitor; +import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -43,26 +42,29 @@ public class ContainerItemMonitor extends FCContainerMonitor { super(ip, monitorable, bindInventory); if (Platform.isServer()) { this.serverCM = monitorable.getConfigManager(); - this.monitor = monitorable.getItemInventory(); - if (this.monitor != null) { - this.monitor.addListener(this, null); - this.setCellInventory(this.monitor); - if (monitorable instanceof IPortableCell) { - this.setPowerSource((IEnergySource) monitorable); - } else if (monitorable instanceof IMEChest) { - this.setPowerSource((IEnergySource) monitorable); - } else if (monitorable instanceof IGridHost) { - final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN); - if (node != null) { - this.networkNode = node; - final IGrid g = node.getGrid(); - if (g != null) { - this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class))); + if (monitorable instanceof IGridHost) { + final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN); + if (node != null) { + this.networkNode = node; + final IGrid g = node.getGrid(); + if (g != null) { + this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class))); + IStorageGrid storageGrid = g.getCache(IStorageGrid.class); + this.monitor = storageGrid.getItemInventory(); + if (this.monitor == null) { + this.setValidContainer(false); + } else { + this.monitor.addListener(this, null); } } + } else { + this.setValidContainer(false); } } else { - this.setValidContainer(false); + this.monitor = monitorable.getItemInventory(); + this.monitor.addListener(this, null); + this.setCellInventory(this.monitor); + this.setPowerSource((IEnergySource) monitorable); } } else { this.monitor = null; diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java index bb2d1307..2dbc9852 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java @@ -112,7 +112,7 @@ public abstract class FCContainerMonitor> extends FCBaseCo protected abstract void processItemList(); protected boolean isInvalid() { - return this.monitor != this.host.getItemInventory(); + return this.monitor == null; } protected void updatePowerStatus() { From 0a01bb008b0ecfbb443871910ff8f245536b0e93 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Fri, 3 Mar 2023 20:27:02 +0800 Subject: [PATCH 3/6] fix gl crash --- dependencies.gradle | 2 +- .../com/glodblock/github/common/parts/base/FCPartMonitor.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c2dd1136..c454665d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { compile('com.github.GTNewHorizons:NotEnoughItems:2.3.32-GTNH:dev') - compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-160-GTNH:dev') + compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-171-GTNH:dev') compile('curse.maven:cofh-core-69162:2388751') compile('com.github.GTNewHorizons:waila:1.5.22:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.32:dev') { transitive = false } diff --git a/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java b/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java index 653160d2..b2ab8906 100644 --- a/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java +++ b/src/main/java/com/glodblock/github/common/parts/base/FCPartMonitor.java @@ -35,6 +35,7 @@ import appeng.client.texture.CableBusTextures; import appeng.core.AELog; import appeng.core.localization.PlayerMessages; import appeng.helpers.Reflected; +import appeng.hooks.TickHandler; import appeng.me.GridAccessException; import appeng.parts.reporting.AbstractPartDisplay; import appeng.parts.reporting.PartPanel; @@ -199,7 +200,7 @@ public abstract class FCPartMonitor extends AbstractPartDisplay implements IPart super.finalize(); if (this.dspList != null) { - GLAllocation.deleteDisplayLists(this.dspList); + TickHandler.INSTANCE.scheduleCallListDelete(this.dspList); } } From 84e395e47065007e34c813dd752fbb2f436e8cec Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Sat, 4 Mar 2023 08:36:21 +0800 Subject: [PATCH 4/6] fix cant Take/Put items in Universal Terminal --- .../github/client/gui/container/ContainerItemMonitor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java index 12f2183a..2ff3c6e9 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java @@ -55,6 +55,7 @@ public class ContainerItemMonitor extends FCContainerMonitor { this.setValidContainer(false); } else { this.monitor.addListener(this, null); + this.setCellInventory(this.monitor); } } } else { From d2c03bc9031d85e58ae5363ad857cafddaff4f1f Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Mon, 6 Mar 2023 15:54:33 +0800 Subject: [PATCH 5/6] fix fc pattern terminal shift click will use not support item to fill slot --- .../container/base/FCContainerMonitor.java | 4 ++ .../com/glodblock/github/nei/NEIUtils.java | 31 ++++--------- .../github/nei/object/OrderStack.java | 46 ++++++++++++++++++- .../nei/recipes/extractor/ExtractorUtil.java | 2 +- .../github/network/CPacketTransferRecipe.java | 30 ++++++------ 5 files changed, 70 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java index 2dbc9852..3c92521c 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java @@ -63,6 +63,10 @@ public abstract class FCContainerMonitor> extends FCBaseCo this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING); } + public IMEMonitor getMonitor() { + return this.monitor; + } + public IGridNode getNetworkNode() { return this.networkNode; } diff --git a/src/main/java/com/glodblock/github/nei/NEIUtils.java b/src/main/java/com/glodblock/github/nei/NEIUtils.java index 5044e451..1851a803 100644 --- a/src/main/java/com/glodblock/github/nei/NEIUtils.java +++ b/src/main/java/com/glodblock/github/nei/NEIUtils.java @@ -1,9 +1,7 @@ package com.glodblock.github.nei; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import net.minecraft.item.ItemStack; @@ -43,24 +41,11 @@ public class NEIUtils { } public static List> clearNull(List> list) { - List> cleared = new LinkedList<>(); - HashMap map = new HashMap<>(); - int upper = 0; - for (OrderStack orderStack : list) { - if (orderStack != null && orderStack.getStack() != null) { - if (orderStack.getStack() instanceof ItemStack && ((ItemStack) orderStack.getStack()).stackSize == 0) - continue; - map.put(orderStack.getIndex(), orderStack.getStack()); - upper = Math.max(upper, orderStack.getIndex()); - } - } - int id = 0; - for (int i = 0; i <= upper; i++) { - if (map.containsKey(i)) { - cleared.add(new OrderStack<>(map.get(i), id)); - id++; - } - } - return cleared; + AtomicInteger i = new AtomicInteger(0); + return list.stream().filter(Objects::nonNull) + .filter( + orderStack -> !(orderStack.getStack() != null && orderStack.getStack() instanceof ItemStack + && ((ItemStack) orderStack.getStack()).stackSize == 0)) + .peek(orderStack -> orderStack.setIndex(i.getAndIncrement())).collect(Collectors.toList()); } } 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 39743826..a5e625c7 100644 --- a/src/main/java/com/glodblock/github/nei/object/OrderStack.java +++ b/src/main/java/com/glodblock/github/nei/object/OrderStack.java @@ -1,10 +1,14 @@ package com.glodblock.github.nei.object; +import java.util.ArrayList; +import java.util.List; + import javax.annotation.Nullable; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -15,7 +19,8 @@ import com.glodblock.github.util.Util; public class OrderStack { private T RealStack; - private final int index; + private int index; + private ItemStack[] items; public static final int ITEM = 1; public static final int FLUID = 2; @@ -28,10 +33,29 @@ public class OrderStack { this.index = order; } + public OrderStack(T stack, int order, ItemStack[] items) { + this(stack, order); + if (items.length > 1) { + this.items = items; + } + } + public void putStack(T stack) { this.RealStack = stack; } + public void putItems(ItemStack[] items) { + this.items = items; + } + + public ItemStack[] getItems() { + return this.items; + } + + public final void setIndex(int i) { + this.index = i; + } + public T getStack() { return RealStack; } @@ -71,6 +95,16 @@ public class OrderStack { NBTTagCompound tmp = new NBTTagCompound(); tmp.setByte("t", (byte) ITEM); ((ItemStack) RealStack).writeToNBT(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); + } + tmp.setTag(index + ":", list); + } buf.setTag(index + ":", tmp); } else if (RealStack instanceof FluidStack) { NBTTagCompound tmp = new NBTTagCompound(); @@ -91,7 +125,15 @@ public class OrderStack { byte id = info.getByte("t"); switch (id) { case ITEM: - return new OrderStack<>(ItemStack.loadItemStackFromNBT(info), index); + List list = new ArrayList<>(); + if (info.hasKey(index + ":")) { + 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)); + } + } + return new OrderStack<>(ItemStack.loadItemStackFromNBT(info), index, list.toArray(new ItemStack[0])); case FLUID: return new OrderStack<>(FluidStack.loadFluidStackFromNBT(info), index); case CUSTOM: diff --git a/src/main/java/com/glodblock/github/nei/recipes/extractor/ExtractorUtil.java b/src/main/java/com/glodblock/github/nei/recipes/extractor/ExtractorUtil.java index 775dc866..0ed06f84 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/extractor/ExtractorUtil.java +++ b/src/main/java/com/glodblock/github/nei/recipes/extractor/ExtractorUtil.java @@ -26,7 +26,7 @@ public final class ExtractorUtil { return items.stream().map(item -> { index.getAndIncrement(); Object o = transformer.apply(item); - return o != null ? new OrderStack<>(o, index.get()) : null; + return o != null ? new OrderStack<>(o, index.get(), item.items) : null; }).filter(Objects::nonNull).collect(Collectors.toList()); } } diff --git a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java index 55b9b9e4..0f638416 100644 --- a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java +++ b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java @@ -12,8 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; import appeng.api.AEApi; -import appeng.api.config.FuzzyMode; -import appeng.api.storage.ITerminalHost; +import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -97,12 +96,10 @@ public class CPacketTransferRecipe implements IMessage { public IMessage onMessage(CPacketTransferRecipe message, MessageContext ctx) { Container c = ctx.getServerHandler().playerEntity.openContainer; if (c instanceof ContainerItemMonitor) { - ITerminalHost host = ((ContainerItemMonitor) c).getHost(); - IItemList storageList; - if (host != null) { - storageList = host.getItemInventory().getStorageList(); - } else { - storageList = AEApi.instance().storage().createItemList(); + IMEMonitor monitor = ((ContainerItemMonitor) c).getMonitor(); + IItemList storageList = AEApi.instance().storage().createItemList(); + if (monitor != null) { + storageList = monitor.getStorageList(); } if (c instanceof FCContainerEncodeTerminal) { // pattern terminal only @@ -130,16 +127,15 @@ public class CPacketTransferRecipe implements IMessage { // using exists item to fill slot if (message.shift && !storageList.isEmpty()) { for (OrderStack stack : message.inputs) { - if (stack.getStack() instanceof FluidStack) continue; - ItemStack is = (ItemStack) stack.getStack(); - IAEItemStack iaeItemStack = AEApi.instance().storage().createItemStack(is); + if (stack.getStack() instanceof FluidStack || stack.getItems() == null) continue; + IAEItemStack iaeItemStack = AEApi.instance().storage() + .createItemStack((ItemStack) stack.getStack()); if (storageList.findPrecise(iaeItemStack) == null) { - for (IAEItemStack tmp : storageList.findFuzzy(iaeItemStack, FuzzyMode.IGNORE_ALL)) { - if (iaeItemStack.sameOre(tmp)) { - ItemStack substitute = tmp.getItemStack().copy(); - substitute.stackSize = is.stackSize; - stack.putStack(substitute); - break; + // try to replace item + for (ItemStack replaceItemStack : stack.getItems()) { + if (storageList.findPrecise( + AEApi.instance().storage().createItemStack(replaceItemStack)) != null) { + stack.putStack(replaceItemStack); } } } From ab7769a45da71eecaedae24c6f839ef9f6eb7f2e Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Mon, 6 Mar 2023 18:35:54 +0800 Subject: [PATCH 6/6] add default method --- .../github/nei/recipes/FluidRecipe.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java b/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java index e5c62371..8617d386 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java +++ b/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java @@ -1,9 +1,7 @@ package com.glodblock.github.nei.recipes; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -30,7 +28,8 @@ public final class FluidRecipe { public static List> getPackageInputs(IRecipeHandler recipe, int index, boolean priority) { TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipe; - if (tRecipe == null || !IdentifierMap.containsKey(tRecipe.getOverlayIdentifier())) return new ArrayList<>(); + if (tRecipe == null) return new ArrayList<>(); + if (!IdentifierMap.containsKey(tRecipe.getOverlayIdentifier())) return getDefaultPackageInputs(tRecipe, index); if (tRecipe.getOverlayIdentifier() == null) return getPackageInputsLegacy(recipe, index); IRecipeExtractor extractor = IdentifierMap.get(tRecipe.getOverlayIdentifier()); if (extractor == null) return new ArrayList<>(); @@ -54,9 +53,26 @@ public final class FluidRecipe { return out; } + private static List> getDefaultPackageInputs(TemplateRecipeHandler tRecipe, int index) { + List> tmp = new LinkedList<>(); + AtomicInteger i = new AtomicInteger(0); + tRecipe.getIngredientStacks(index) + .forEach(ps -> tmp.add(new OrderStack<>(ps.item, i.getAndIncrement(), ps.items))); + return tmp; + } + + private static List> getDefaultPackageOutputs(TemplateRecipeHandler tRecipe, int index) { + List> tmp = new LinkedList<>(); + AtomicInteger i = new AtomicInteger(0); + tmp.add(new OrderStack<>(tRecipe.getResultStack(index).item, i.getAndIncrement())); + tRecipe.getOtherStacks(index).forEach(ps -> tmp.add(new OrderStack<>(ps.item, i.getAndIncrement()))); + return tmp; + } + public static List> getPackageOutputs(IRecipeHandler recipe, int index, boolean useOther) { TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipe; - if (tRecipe == null || !IdentifierMap.containsKey(tRecipe.getOverlayIdentifier())) return new ArrayList<>(); + if (tRecipe == null) return new ArrayList<>(); + if (!IdentifierMap.containsKey(tRecipe.getOverlayIdentifier())) return getDefaultPackageOutputs(tRecipe, index); if (tRecipe.getOverlayIdentifier() == null) return getPackageOutputsLegacy(recipe, index, useOther); IRecipeExtractor extractor = IdentifierMap.get(tRecipe.getOverlayIdentifier()); if (extractor == null) return new ArrayList<>();