diff --git a/dependencies.gradle b/dependencies.gradle index 0899277f..c2dd1136 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { compile('com.github.GTNewHorizons:NotEnoughItems:2.3.32-GTNH:dev') - compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-158-GTNH:dev') + compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-160-GTNH:dev') compile('curse.maven:cofh-core-69162:2388751') compile('com.github.GTNewHorizons:waila:1.5.22:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.32:dev') { transitive = false } diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 39b06b1b..b18e3e4d 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -28,7 +28,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, - dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;after:waila;after:thaumicenergistics;after:ae2wct") + dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;required-after:Baubles;after:waila;after:thaumicenergistics;after:ae2wct") public class FluidCraft { public static final String MODID = "GRADLETOKEN_MODID"; diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index c852e86c..2db08c31 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -1,9 +1,6 @@ package com.glodblock.github.inventory; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; +import java.util.*; import javax.annotation.Nullable; @@ -291,6 +288,24 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { return item; } + private int gtMachineCircuitCheck(InventoryAdaptor ad) { + if (ad == null) { + return 0; + } + for (ItemSlot i : ad) { + ItemStack is = i.getItemStack(); + if (is == null || Objects.requireNonNull(is.getItem()).getUnlocalizedName().equals("gt.integrated_circuit")) + continue; + return 1; + } + return 0; + } + + private boolean isGTMachine(Object o) { + return o instanceof TileEntity + && ((TileEntity) o).getBlockType().getUnlocalizedName().equals("gt.blockmachines"); + } + private boolean isConduit(TileEntity te) { return ModAndClassUtil.COFH && te instanceof IItemDuct; } @@ -353,6 +368,9 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { return 2; } } + if (isGTMachine(tank)) { + return gtMachineCircuitCheck(inv); + } return inv != null && inv.containsItems() ? 1 : 0; }