Use new interface term API for cribs (#2314)

* Use new interface term API for cribs

Requires new AE2 version before this works.

* Update dependencies.gradle

* sa

* Update dependencies.gradle

* Update dependencies.gradle

* fix wrong tag

(cherry picked from commit 5197207f744b5f7e65d229893b872af6608d8b25)

* Update `ae2` and fix compatability

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Andrei Laiff <q.laiff@gmail.com>

2 files changed, 19 insertions, 11 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index fdb365a446..b1146a10bb 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.Logger;
 import com.google.common.base.Stopwatch;
 
 import appeng.api.AEApi;
-import appeng.helpers.InterfaceTerminalSupportedClassProvider;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
@@ -275,7 +274,10 @@ public class GT_Mod implements IGT_Mod {
         EntityRegistry.registerModEntity(GT_Entity_Arrow.class, "GT_Entity_Arrow", 1, GT_Values.GT, 160, 1, true);
         EntityRegistry
             .registerModEntity(GT_Entity_Arrow_Potion.class, "GT_Entity_Arrow_Potion", 2, GT_Values.GT, 160, 1, true);
-        InterfaceTerminalSupportedClassProvider.register(GT_MetaTileEntity_Hatch_CraftingInput_ME.class);
+        AEApi.instance()
+            .registries()
+            .interfaceTerminal()
+            .register(GT_MetaTileEntity_Hatch_CraftingInput_ME.class);
 
         GT_PreLoad.runMineTweakerCompat();
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java
index 3232078353..bddbbf3103 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java
@@ -64,10 +64,10 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.AECableType;
 import appeng.api.util.DimensionalCoord;
+import appeng.api.util.IInterfaceViewable;
 import appeng.core.AppEng;
 import appeng.core.sync.GuiBridge;
 import appeng.helpers.ICustomNameObject;
-import appeng.helpers.IInterfaceTerminalSupport;
 import appeng.items.misc.ItemEncodedPattern;
 import appeng.items.tools.quartz.ToolQuartzCuttingKnife;
 import appeng.me.GridAccessException;
@@ -93,7 +93,7 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
 
 public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_Hatch_InputBus
     implements IConfigurationCircuitSupport, IAddGregtechLogo, IAddUIWidgets, IPowerChannelState, ICraftingProvider,
-    IGridProxyable, IDualInputHatch, ICustomNameObject, IInterfaceTerminalSupport {
+    IGridProxyable, IDualInputHatch, ICustomNameObject, IInterfaceViewable {
 
     // Each pattern slot in the crafting input hatch has its own internal inventory
     public static class PatternSlot implements IDualInputInventory {
@@ -317,10 +317,6 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
     private static final int SLOT_CIRCUIT = MAX_PATTERN_COUNT;
     private static final int SLOT_MANUAL_START = SLOT_CIRCUIT + 1;
     private static final int MANUAL_SLOT_WINDOW = 10;
-    private static final PatternsConfiguration[] patternConfigurations = new PatternsConfiguration[] {
-        new PatternsConfiguration(0, 9), new PatternsConfiguration(9, 9), new PatternsConfiguration(18, 9),
-        new PatternsConfiguration(27, 9) };
-
     private BaseActionSource requestSource = null;
     private @Nullable AENetworkProxy gridProxy = null;
 
@@ -456,12 +452,17 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
     }
 
     @Override
-    public PatternsConfiguration[] getPatternsConfigurations() {
-        return patternConfigurations;
+    public int rows() {
+        return 4;
+    }
+
+    @Override
+    public int rowSize() {
+        return 9;
     }
 
     @Override
-    public IInventory getPatterns(int i) {
+    public IInventory getPatterns() {
         return this;
     }
 
@@ -494,6 +495,11 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
     }
 
     @Override
+    public boolean shouldDisplay() {
+        return false;
+    }
+
+    @Override
     public void gridChanged() {
         needPatternSync = true;
     }