upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash, fix encoded pattern overwrite (#987)

Browse Source 
Co-authored-by: Martin Robertz <dream-master@gmx.net>
This commit is contained in:
lc-1337andMartin Robertz authored and GitHub committed 2025-12-28 10:02:49 +00:00
1 parent 6761feeccc
commit 2086e6a4b4
1 file changed
+10 -13
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+10 -13
View File
@@ -51,6 +51,7 @@ import appeng.container.slot.SlotRestrictedInput;
import appeng.core.sync.packets.PacketPatternSlot;
import appeng.helpers.IContainerCraftingPacket;
import appeng.items.contents.WirelessPatternTerminalGuiObject;
import appeng.items.misc.ItemEncodedPattern;
import appeng.items.storage.ItemViewCell;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.IAEAppEngInventory;
@@ -259,7 +260,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
// first check the output slots, should either be null, or a pattern
if (output != null) {
if (!this.isEncodedPattern(output) && !this.isUltimatePattern(output)) {
if (!this.isEncodedPattern(output)) {
return;
}
} // if nothing is there we should snag a new pattern.
@@ -276,13 +277,13 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
}
refillBlankPatterns(patternSlotIN);
}
// add a new encoded pattern.
if (isCraftingMode()) {
output = AEApi.instance().definitions().items().encodedPattern().maybeStack(1).orNull();
} else {
output = AEApi.instance().definitions().items().encodedUltimatePattern().maybeStack(1).orNull();;
}
// add a new encoded pattern.
if (isCraftingMode()) {
output = AEApi.instance().definitions().items().encodedPattern().maybeStack(1).orNull();
} else {
output = AEApi.instance().definitions().items().encodedUltimatePattern().maybeStack(1).orNull();;
}
// encode the slot.
@@ -362,11 +363,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
}
private boolean isEncodedPattern(final ItemStack stack) {
return stack != null && AEApi.instance().definitions().items().encodedPattern().isSameAs(stack);
}
private boolean isUltimatePattern(final ItemStack stack) {
return stack != null && AEApi.instance().definitions().items().encodedUltimatePattern().isSameAs(stack);
return stack != null && stack.getItem() instanceof ItemEncodedPattern;
}
@Override
@@ -492,7 +489,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
this.beSubstitute = this.patternTerminal.canBeSubstitution();
if (this.isFirstUpdate) {
if (isCraftingMode()) {
if (craftingModeSupport && isCraftingMode()) {
this.copyToMatrix();
} else {
this.updateVirtualSlots(StorageName.CRAFTING_INPUT, this.inputs, craftingSlotsClient);