From b663d8780189566dda5c568d90055b7bbe6ea993 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 30 Dec 2024 20:56:51 +0100 Subject: [PATCH 1/5] update --- dependencies.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 67d69c20f..8b2fa6cce 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,8 +34,8 @@ * 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.7.4-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-511-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-516-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.2:dev') @@ -47,8 +47,8 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.0:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.0:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.33:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.1:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.38:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -57,7 +57,7 @@ dependencies { compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.1-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.6:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.11:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.6.0:dev") From 319dcc95dfa217dc6567bf0ea26fde5a943967a0 Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Tue, 31 Dec 2024 05:16:00 +0200 Subject: [PATCH 2/5] Prevent Universal Wireless crafting terminal void items. (#254) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gui/container/ContainerCraftingWireless.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java index f5c0886c6..df3732e4d 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import com.glodblock.github.inventory.ItemBiggerAppEngInventory; import com.glodblock.github.inventory.item.IWirelessCraftTerminal; import com.glodblock.github.inventory.item.IWirelessTerminal; @@ -36,7 +37,16 @@ public ContainerCraftingWireless(final InventoryPlayer ip, final IWirelessTermin crafting, x + y * 3, 37 + x * 18, - -72 + y * 18)); + -72 + y * 18) { + + @Override + public void onSlotChanged() { + if (this.inventory instanceof ItemBiggerAppEngInventory i) { + i.markDirty(); + } + super.onSlotChanged(); + } + }); } } AppEngInternalInventory output = new AppEngInternalInventory(this, 1); From 954f5eec3799c113f5b376a12d69c851ac5bfc3a Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 31 Dec 2024 14:01:51 +0100 Subject: [PATCH 3/5] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8b2fa6cce..c7174cd58 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -48,7 +48,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.0:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.9.1:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.38:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.40:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } From 6acffd220ebc874b5badac5468a26aa23bc730de Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:45:18 +0200 Subject: [PATCH 4/5] Fix npe on fluid conduit connected check (#255) --- .../github/inventory/FluidConvertingInventoryAdaptor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index f4500f459..fc3818cf8 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -366,7 +366,8 @@ private boolean isGTMachine(Object o) { private boolean isFluidConduitConnected(TileEntity te, ForgeDirection dir) { try { ILiquidConduit liquidConduit = (ILiquidConduit) eioTypeCheck.invoke(te, ILiquidConduit.class); - return liquidConduit.getConnectionMode(dir.getOpposite()) != ConnectionMode.DISABLED; + return liquidConduit != null + && liquidConduit.getConnectionMode(dir.getOpposite()) != ConnectionMode.DISABLED; } catch (IllegalAccessException | InvocationTargetException e) { return false; } From b84ed01a02e1f6050b34746d18a64769966850d6 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 3 Jan 2025 21:41:52 +0100 Subject: [PATCH 5/5] update --- dependencies.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c7174cd58..7dc5509f2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,8 +34,8 @@ * 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.7.8-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-516-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.11-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-518-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.2:dev') @@ -46,18 +46,18 @@ dependencies { compileOnly("com.github.GTNewHorizons:GTNHLib:0.6.0:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.0:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.1:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.40:dev') { + compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.1:dev') + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.2:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.48: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.11.1-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.2-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.11:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.13:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")