From f80341ca9d3a8eccb7931d9168e9f4b48d78df39 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Tue, 21 Jan 2014 18:19:39 -0500 Subject: [PATCH 1/2] Clean Slurry textures --- .../mekanism/textures/blocks/LiquidCleanOre.png | Bin 0 -> 12177 bytes .../textures/blocks/LiquidCleanOre.png.mcmeta | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 resources/assets/mekanism/textures/blocks/LiquidCleanOre.png create mode 100644 resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta diff --git a/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png b/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png new file mode 100644 index 0000000000000000000000000000000000000000..12a045fea8ce3538f5119ab645a7b72e8defa04b GIT binary patch literal 12177 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 Date: Tue, 21 Jan 2014 21:05:27 -0500 Subject: [PATCH 2/2] 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; }