From 25133d8c3f9fe5a4598bce782c054849f775cecd Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:07:58 +0300 Subject: [PATCH 1/4] fail (#233) --- .../github/inventory/FluidConvertingInventoryAdaptor.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 7075487d..29b5c64a 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -31,9 +31,7 @@ import com.glodblock.github.util.Util; import appeng.api.config.FuzzyMode; import appeng.api.config.InsertionMode; -import appeng.api.config.Settings; import appeng.api.config.Upgrades; -import appeng.api.config.YesNo; import appeng.api.parts.IPart; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; @@ -103,7 +101,7 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { return InventoryAdaptor.getAdaptor(capProvider, face); if (InventoryAdaptor.getAdaptor(capProvider, face) == null) { if (capProvider instanceof IFluidHandler tank) { - if (!(tank.getTankInfo(face).length > 0)) return null; + if (tank.getTankInfo(face) == null || !(tank.getTankInfo(face).length > 0)) return null; } else { return null; } @@ -112,7 +110,7 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { IFluidHandler fluid = capProvider instanceof IFluidHandler ? (IFluidHandler) capProvider : null; boolean onmi = false; if (inter instanceof TileInterface in) { - if (in.getConfigManager().getSetting(Settings.BLOCK) == YesNo.NO) onmi = in.getTargets().size() > 1; + onmi = in.getTargets().size() > 1; } return new FluidConvertingInventoryAdaptor(capProvider, item, fluid, face, new BlockPos(inter), onmi); } From b09615f98225a2d785fa7699ce2f586e7dbf3d57 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 25 Oct 2024 16:12:52 +0200 Subject: [PATCH 2/4] update --- dependencies.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c1906a32..c6a23111 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,19 +34,19 @@ * 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.6.42-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-469-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.6.44-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-471-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.1:dev') implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.7:dev") - compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.15:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.17: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.9.16:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.8.18:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.46:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.8.20:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.52:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } @@ -54,8 +54,8 @@ dependencies { compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.26-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.26-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.73:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.74:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.15:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.17:dev") } From 311210fc4ab78dedf6d0348fefd5243059cad47b Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Sun, 27 Oct 2024 17:06:27 +0200 Subject: [PATCH 3/4] another fix (#235) --- .../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 29b5c64a..875b9b1d 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -99,7 +99,8 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { || Util.getPart(inter, face.getOpposite()) instanceof PartFluidExportBus || Util.getPart(inter, face.getOpposite()) instanceof PartFluidP2PInterface)) return InventoryAdaptor.getAdaptor(capProvider, face); - if (InventoryAdaptor.getAdaptor(capProvider, face) == null) { + if (InventoryAdaptor.getAdaptor(capProvider, face) == null + && !(ModAndClassUtil.EIO && capProvider instanceof IItemDuct)) { if (capProvider instanceof IFluidHandler tank) { if (tank.getTankInfo(face) == null || !(tank.getTankInfo(face).length > 0)) return null; } else { From 12ebe0b55a92d61d0eca85a57015903e11975357 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 27 Oct 2024 14:59:23 +0100 Subject: [PATCH 4/4] update (cherry picked from commit 5934a8b886a5cb133df5254cbe324574e7daf6f8) --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c6a23111..7f0b7bc1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -41,12 +41,12 @@ dependencies { implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.7:dev") - compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.17:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.18: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.9.16:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.8.20:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.52:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.54:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } @@ -57,5 +57,5 @@ dependencies { compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.74:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.17:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.18:dev") }