diff --git a/dependencies.gradle b/dependencies.gradle index 9f6f43e2..901f7c80 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,28 +34,28 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-754-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.8.43-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-762-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.9.15:dev') - api("com.github.GTNewHorizons:GTNHLib:0.8.29:dev") + api("com.github.GTNewHorizons:GTNHLib:0.8.34:dev") - implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.10:dev") { + implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.11:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.4-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.2:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.10.8:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.138:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.10.10:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.152:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } 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.github.GTNewHorizons:OpenComputers:1.12.6-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.8-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.16-GTNH:dev') { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.4.0:dev") diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java index bd83b674..40d65816 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java @@ -244,8 +244,7 @@ public class ContainerLevelTerminal extends FCBaseContainer { } @Override - public PrimaryGui getPrimaryGui() { - + public PrimaryGui createPrimaryGui() { ContainerOpenContext context = getOpenContext(); return new FluidPrimaryGui( GuiType.LEVEL_TERMINAL, diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelWireless.java index 0e16910a..29f13c62 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerLevelWireless.java @@ -22,8 +22,7 @@ public class ContainerLevelWireless extends ContainerLevelTerminal { } @Override - public PrimaryGui getPrimaryGui() { - + public PrimaryGui createPrimaryGui() { ContainerOpenContext context = getOpenContext(); return new FluidPrimaryGui( GuiType.WIRELESS_LEVEL_TERMINAL, diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java index 20eea6e9..095a5d3f 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java @@ -172,8 +172,7 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer } @Override - public PrimaryGui getPrimaryGui() { - + public PrimaryGui createPrimaryGui() { ContainerOpenContext context = getOpenContext(); return new FluidPrimaryGui( GuiType.GUI_SUPER_STOCK_REPLENISHER, diff --git a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java index e231b96c..bd67dfd9 100644 --- a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java +++ b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java @@ -115,7 +115,7 @@ public class CPacketFluidPatternTermBtns implements IMessage { } } case MAGNET_OPEN_FILTER -> { - final PrimaryGui pGui = abc.getPrimaryGui(); + final PrimaryGui pGui = abc.createPrimaryGui(); final int nextGui = abc.getSwitchAbleGuiNext(); InventoryHandler.openGui( diff --git a/src/main/java/com/glodblock/github/network/CPacketLevelTerminalCommands.java b/src/main/java/com/glodblock/github/network/CPacketLevelTerminalCommands.java index 2331f0db..0538f7ea 100644 --- a/src/main/java/com/glodblock/github/network/CPacketLevelTerminalCommands.java +++ b/src/main/java/com/glodblock/github/network/CPacketLevelTerminalCommands.java @@ -120,7 +120,7 @@ public class CPacketLevelTerminalCommands implements IMessage { if (Objects.requireNonNull(message.action) == Action.EDIT) { if (player.openContainer instanceof AEBaseContainer abc) { - final PrimaryGui pGui = abc.getPrimaryGui(); + final PrimaryGui pGui = abc.createPrimaryGui(); TileEntity tile = DimensionManager.getWorld(message.dim) .getTileEntity(message.x, message.y, message.z); @@ -150,7 +150,7 @@ public class CPacketLevelTerminalCommands implements IMessage { } } else if (Objects.requireNonNull(message.action) == Action.RENAME) { if (player.openContainer instanceof AEBaseContainer abc) { - final PrimaryGui pGui = abc.getPrimaryGui(); + final PrimaryGui pGui = abc.createPrimaryGui(); TileEntity tile = DimensionManager.getWorld(message.dim) .getTileEntity(message.x, message.y, message.z); diff --git a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java index 14cf3846..6f428359 100644 --- a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java +++ b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java @@ -91,7 +91,7 @@ public class CPacketSwitchGuis implements IMessage { } } else { if (cont instanceof AEBaseContainer aeBaseContainer) { - final PrimaryGui pGui = aeBaseContainer.getPrimaryGui(); + final PrimaryGui pGui = aeBaseContainer.createPrimaryGui(); ContainerOpenContext context = aeBaseContainer.getOpenContext(); if (context == null) return null; TileEntity te = context.getTile();