From 9ff95486f572cfbb7a04702223564166fa45d5b6 Mon Sep 17 00:00:00 2001
From: Timo Ley <timo.ley@tilera.dev>
Date: Sat, 31 Dec 2022 15:50:08 +0100
Subject: [PATCH] fix: autocrafting with legacy terminals

---
 .../client/gui/implementations/GuiCraftConfirm.java    | 10 ++++++----
 .../implementations/ContainerCraftConfirm.java         |  6 ++++--
 .../java/appeng/core/api/definitions/ApiBlocks.java    |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
index a99b6148..9624a18f 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
@@ -42,6 +42,8 @@ import appeng.helpers.WirelessTerminalGuiObject;
 import appeng.parts.reporting.PartCraftingTerminal;
 import appeng.parts.reporting.PartPatternTerminal;
 import appeng.parts.reporting.PartTerminal;
+import appeng.tile.legacy.TileCraftTerminal;
+import appeng.tile.legacy.TileTerminal;
 import appeng.util.Platform;
 import com.google.common.base.Joiner;
 import net.minecraft.client.gui.GuiButton;
@@ -86,11 +88,11 @@ public class GuiCraftConfirm extends AEBaseGui {
             this.OriginalGui = GuiBridge.GUI_WIRELESS_TERM;
         }
 
-        if (te instanceof PartTerminal) {
+        if (te instanceof PartTerminal || te instanceof TileTerminal) {
             this.OriginalGui = GuiBridge.GUI_ME;
         }
 
-        if (te instanceof PartCraftingTerminal) {
+        if (te instanceof PartCraftingTerminal || te instanceof TileCraftTerminal) {
             this.OriginalGui = GuiBridge.GUI_CRAFTING_TERMINAL;
         }
 
@@ -138,9 +140,9 @@ public class GuiCraftConfirm extends AEBaseGui {
                 20,
                 GuiText.Cancel.getLocal()
             );
+            this.buttonList.add(this.cancel);
         }
-
-        this.buttonList.add(this.cancel);
+        
     }
 
     @Override
diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
index d8675d31..24754dcf 100644
--- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
+++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
@@ -51,6 +51,8 @@ import appeng.helpers.WirelessTerminalGuiObject;
 import appeng.parts.reporting.PartCraftingTerminal;
 import appeng.parts.reporting.PartPatternTerminal;
 import appeng.parts.reporting.PartTerminal;
+import appeng.tile.legacy.TileCraftTerminal;
+import appeng.tile.legacy.TileTerminal;
 import appeng.util.Platform;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.entity.player.EntityPlayer;
@@ -285,11 +287,11 @@ public class ContainerCraftConfirm extends AEBaseContainer {
             originalGui = GuiBridge.GUI_WIRELESS_TERM;
         }
 
-        if (ah instanceof PartTerminal) {
+        if (ah instanceof PartTerminal || ah instanceof TileTerminal) {
             originalGui = GuiBridge.GUI_ME;
         }
 
-        if (ah instanceof PartCraftingTerminal) {
+        if (ah instanceof PartCraftingTerminal || ah instanceof TileCraftTerminal) {
             originalGui = GuiBridge.GUI_CRAFTING_TERMINAL;
         }
 
diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index a770ec5d..351cd346 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -31,6 +31,7 @@ import appeng.block.grindstone.BlockCrank;
 import appeng.block.grindstone.BlockGrinder;
 import appeng.block.legacy.BlockCraftMonitor;
 import appeng.block.legacy.BlockCraftTerminal;
+import appeng.block.legacy.BlockLegacyChest;
 import appeng.block.legacy.BlockLegacyController;
 import appeng.block.legacy.BlockPatternEncoder;
 import appeng.block.legacy.BlockStorageMonitor;