From 56943c8e2bf49735dba3a9db25269a959ace71a9 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Tue, 21 Jan 2014 21:05:27 -0500 Subject: [PATCH] Fix transmitter issue --- common/mekanism/client/render/MekanismRenderer.java | 8 +++++++- common/mekanism/common/multipart/PartSidedPipe.java | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/common/mekanism/client/render/MekanismRenderer.java b/common/mekanism/client/render/MekanismRenderer.java index 0afde58ac..5460d0ec6 100644 --- a/common/mekanism/client/render/MekanismRenderer.java +++ b/common/mekanism/client/render/MekanismRenderer.java @@ -82,7 +82,13 @@ public class MekanismRenderer { if(gas instanceof OreGas) { - gas.setIcon(event.map.registerIcon("mekanism:LiquidOre")); + if(gas.getUnlocalizedName().contains("clean")) + { + gas.setIcon(event.map.registerIcon("mekanism:LiquidCleanOre")); + } + else { + gas.setIcon(event.map.registerIcon("mekanism:LiquidOre")); + } } } diff --git a/common/mekanism/common/multipart/PartSidedPipe.java b/common/mekanism/common/multipart/PartSidedPipe.java index 04698c74a..172f81e10 100644 --- a/common/mekanism/common/multipart/PartSidedPipe.java +++ b/common/mekanism/common/multipart/PartSidedPipe.java @@ -461,13 +461,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } - onRefresh(); - if(!world().isRemote) { currentTransmitterConnections = possibleTransmitters; currentAcceptorConnections = possibleAcceptors; - + } + + onRefresh(); + + if(!world().isRemote) + { sendDesc = true; } } @@ -611,7 +614,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, public boolean canConnectToAcceptor(ForgeDirection side, boolean ignoreActive) { - if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side)) + if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side) || !connectionMapContainsSide(currentAcceptorConnections, side)) { return false; }