diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java index 598c86f3..374363ba 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java @@ -394,6 +394,10 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi final EntityPlayer player = Minecraft.getMinecraft().thePlayer; if (mouseButton == 3) { + if (this instanceof GuiBaseFluidPatternTerminal + && ((GuiBaseFluidPatternTerminal) this).container.isCraftingMode()) { + return; + } if (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix) { if (slot.getHasStack()) { InventoryAction action = InventoryAction.valueOf("SET_PATTERN_VALUE"); diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 712d294d..961a1ec2 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -183,6 +183,10 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { @Override public boolean containsItems() { + if (invFluids == null && invItems == null) { + // If this entity doesn't have fluid or item inventory, we just view it as full of things. + return true; + } if (invFluids != null && invFluids.getTankInfo(this.side) != null) { List tankInfos = new LinkedList<>(); if (invFluids instanceof TileCableBus && ((TileCableBus) invFluids).getPart(this.side) instanceof PartP2PLiquids) { @@ -212,14 +216,20 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { } else { tankInfos.add(invFluids.getTankInfo(this.side)); } + boolean hasTank = false; for (FluidTankInfo[] tankInfoArray : tankInfos) { for (FluidTankInfo tank : tankInfoArray) { + hasTank = true; FluidStack fluid = tank.fluid; if (fluid != null && fluid.amount > 0) { return true; } } } + if (!hasTank && invItems == null) { + // If this entity doesn't have fluid or item inventory, we just view it as full of things. + return true; + } } return invItems != null && invItems.containsItems(); }