From 29cb32b6eedf837e15637b5e9a7648856db2b1b8 Mon Sep 17 00:00:00 2001 From: Caedis Date: Sun, 10 Mar 2024 19:34:25 -0500 Subject: [PATCH] Fix GT circuit detection with dual interfaces (#194) * Also check machine if gt5nh * Spotless apply for branch fixGTBlocking for #194 (#195) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../inventory/FluidConvertingInventoryAdaptor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 459a23c6..322858e8 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -338,8 +338,13 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { } private boolean isGTMachine(Object o) { - return ModAndClassUtil.GT5 && o instanceof TileEntity - && ((TileEntity) o).getBlockType().getUnlocalizedName().equals("gt.blockmachines"); + if (!(ModAndClassUtil.GT5 || ModAndClassUtil.GT5NH)) return false; + + if (o instanceof TileEntity te) { + return te.getBlockType().getUnlocalizedName().equals("gt.blockmachines"); + } + + return false; } private boolean isItemConduit(TileEntity te) {