From ef2281f7179addd69a5e3d468463a4db31137214 Mon Sep 17 00:00:00 2001 From: Firenoo <49818773+firenoo@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:56:30 -0700 Subject: [PATCH 1/5] Use new interface terminal API --- src/main/java/com/glodblock/github/proxy/CommonProxy.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java index 1a7ae60b..ced7ea7b 100644 --- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java +++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java @@ -18,7 +18,6 @@ import com.glodblock.github.util.ModAndClassUtil; import appeng.api.AEApi; import appeng.api.IAppEngApi; import appeng.api.config.Upgrades; -import appeng.helpers.InterfaceTerminalSupportedClassProvider; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -67,9 +66,9 @@ public class CommonProxy { Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1); } AEApi.instance().registries().externalStorage().addExternalStorageInterface(new AEFluidInterfaceHandler()); - InterfaceTerminalSupportedClassProvider.register(PartFluidP2PInterface.class); - InterfaceTerminalSupportedClassProvider.register(PartFluidInterface.class); - InterfaceTerminalSupportedClassProvider.register(TileFluidInterface.class); + AEApi.instance().registries().ifaceTerm().register(PartFluidP2PInterface.class); + AEApi.instance().registries().ifaceTerm().register(PartFluidInterface.class); + AEApi.instance().registries().ifaceTerm().register(TileFluidInterface.class); } public void registerRenderers() {} From 42d7eb3aa42ea5d24eb8d932aa36ae80ffb0c618 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 12 Oct 2023 11:53:42 +0200 Subject: [PATCH 2/5] Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 6635daa3..571945ba 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-259-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-263-GTNH-pre:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.6.0:dev') compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') From 7a1adb40b044926bb6988509c08d691aa8287687 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 22 Oct 2023 01:45:56 +0200 Subject: [PATCH 3/5] update be+deps --- build.gradle | 4 ++-- dependencies.gradle | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index b74b980f..e59189c8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1696952014 +//version: 1697697256 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -798,7 +798,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} diff --git a/dependencies.gradle b/dependencies.gradle index f31cbd36..c0949797 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,23 +4,23 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.4.5-GTNH:dev') api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-268-GTNH-pre:dev') api('curse.maven:cofh-core-69162:2388751') - api('com.github.GTNewHorizons:waila:1.6.0:dev') + api('com.github.GTNewHorizons:waila:1.6.2:dev') api("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.1:dev") compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.0:dev") + compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.1:dev") compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.14:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.5.3:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.49:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.55:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } + compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.59-pre:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.13-GTNH:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.17:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.14:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.21:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.18:dev") { transitive = false } } From 3101820a7b09702182a2ff22e6b3eac7aeeb75c9 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 22 Oct 2023 02:05:54 +0200 Subject: [PATCH 4/5] Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c0949797..e45d439e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -14,7 +14,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.14:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.5.3:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.55:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.59-pre:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') From 6d646f8c4a1a2ee63366bbd398dda6bf7c58555b Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 22 Oct 2023 02:16:51 +0200 Subject: [PATCH 5/5] Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index e45d439e..c17d3f35 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -18,7 +18,7 @@ dependencies { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.59-pre:dev') { transitive = false } + compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.13-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.21:dev') { transitive = false }