diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java index 3729b569..8d681df2 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java @@ -17,6 +17,7 @@ import org.lwjgl.input.Mouse; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.FCGuiTextField; +import com.glodblock.github.client.gui.GuiFluidMonitor; import com.glodblock.github.client.gui.GuiItemMonitor; import com.glodblock.github.client.gui.container.base.FCContainerMonitor; import com.glodblock.github.inventory.InventoryHandler; @@ -45,6 +46,7 @@ import appeng.client.gui.widgets.GuiTabButton; import appeng.client.gui.widgets.IDropToFillTextField; import appeng.client.gui.widgets.ISortSource; import appeng.client.me.InternalSlotME; +import appeng.client.me.ItemRepo; import appeng.client.me.PinSlotME; import appeng.client.me.SlotDisconnected; import appeng.client.me.SlotME; @@ -124,7 +126,7 @@ public abstract class FCGuiMonitor> extends FCBaseMEGui (this.monitorableContainer = (FCContainerMonitor) this.inventorySlots).setGui(this); this.viewCell = te instanceof IViewCellStorage; pinsState = (PinsState) configSrc.getSetting(Settings.PINS_STATE); - hasPinHost = te instanceof ITerminalPins; + hasPinHost = te instanceof ITerminalPins && !(this instanceof GuiFluidMonitor); } public int getOffsetY() { @@ -272,6 +274,7 @@ public abstract class FCGuiMonitor> extends FCBaseMEGui this.offsetY = this.guiTop + 8; + buttonList.clear(); if (this.customSortOrder) { this.buttonList.add( this.SortByBox = new GuiImgButton( @@ -871,7 +874,7 @@ public abstract class FCGuiMonitor> extends FCBaseMEGui @Override public void setAEPins(IAEItemStack[] pins) { - repo.setAEPins(pins); + if (repo instanceof ItemRepo) repo.setAEPins(pins); } @Override diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java index 2ee6e834..bb50853f 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; +import com.glodblock.github.inventory.item.BaseWirelessInventory; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.network.SPacketMEUpdateBuffer; import com.google.common.collect.ImmutableList; @@ -36,6 +37,7 @@ import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalPins; +import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.util.IConfigManager; @@ -88,7 +90,8 @@ public abstract class FCContainerMonitor> extends FCBaseCo this.clientCM.registerSetting(Settings.PINS_STATE, PinsState.DISABLED); // use for GUI if (Platform.isServer()) { - if (monitorable instanceof ITerminalPins t) { + if (monitorable instanceof ITerminalPins t && !(monitorable instanceof BaseWirelessInventory bwi + && bwi.getChannel() == StorageChannel.FLUIDS)) { pinsHandler = t.getPinsHandler(ip.player); } }