diff options
| -rw-r--r-- | dependencies.gradle | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java | 24 |
3 files changed, 22 insertions, 13 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index b91c80b4d1..4c4dd7e7f0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,8 +40,9 @@ dependencies { api("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") api("com.github.GTNewHorizons:ModularUI:1.1.22:dev") api("com.github.GTNewHorizons:waila:1.6.2:dev") - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-262-GTNH:dev") - api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.45-gtnh:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-271-GTNH-pre:dev") + api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.58-gtnh-pre:dev") + implementation("com.github.GTNewHorizons:Avaritia:1.46:dev") compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.2.11:dev") { transitive = false } 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; } |