From 413fac32fa0b3ec34578020640880ed28263cb01 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 31 Mar 2015 08:47:40 -0400 Subject: [PATCH] Logistical Transporters now render color in glass instead of frame --- .../client/render/RenderPartTransmitter.java | 59 +++++++++++++---- .../multipart/PartDiversionTransporter.java | 2 +- .../common/multipart/PartHeatTransmitter.java | 6 +- .../multipart/PartLogisticalTransporter.java | 29 +++++---- .../common/multipart/PartMechanicalPipe.java | 6 +- .../common/multipart/PartPressurizedTube.java | 6 +- .../multipart/PartRestrictiveTransporter.java | 19 +++++- .../common/multipart/PartSidedPipe.java | 40 +++++++----- .../common/multipart/PartUniversalCable.java | 6 +- .../common/multipart/TransmitterType.java | 61 +++++++++++------- .../blocks/models/LogisticalTransporter.png | Bin 608 -> 1558 bytes .../models/LogisticalTransporterGlass.png | Bin 0 -> 1169 bytes .../LogisticalTransporterGlassColored.png | Bin 0 -> 1279 bytes .../LogisticalTransporterHorizontal.png | Bin 220 -> 1161 bytes .../LogisticalTransporterHorizontalGlass.png | Bin 0 -> 1199 bytes ...ticalTransporterHorizontalGlassColored.png | Bin 0 -> 1277 bytes .../models/LogisticalTransporterVertical.png | Bin 257 -> 1159 bytes .../LogisticalTransporterVerticalGlass.png | Bin 0 -> 1169 bytes ...isticalTransporterVerticalGlassColored.png | Bin 0 -> 1318 bytes 19 files changed, 156 insertions(+), 78 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlass.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlassColored.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlass.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlassColored.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlass.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlassColored.png diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 9f2a1b4f9..f75f362d7 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.client.model.ModelTransporterBox; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; @@ -144,7 +145,17 @@ public class RenderPartTransmitter implements IIconSelfRegister for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - renderSide(side, type); + renderSide(side, type, false); + } + + CCRenderState.draw(); + + CCRenderState.reset(); + CCRenderState.startDrawing(); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + renderSide(side, type, true); } CCRenderState.draw(); @@ -512,7 +523,7 @@ public class RenderPartTransmitter implements IIconSelfRegister pop(); } - public void renderStatic(PartSidedPipe transmitter) + public void renderStatic(PartSidedPipe transmitter, int pass) { CCRenderState.reset(); CCRenderState.hasColour = true; @@ -520,29 +531,49 @@ public class RenderPartTransmitter implements IIconSelfRegister for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - renderSide(side, transmitter); + renderSide(side, transmitter, pass); } } - public void renderSide(ForgeDirection side, PartSidedPipe transmitter) + public void renderSide(ForgeDirection side, PartSidedPipe transmitter, int pass) { - IIcon renderIcon = transmitter.getIconForSide(side); - - Colour c = null; - - if(transmitter.getRenderColor() != null) + if(pass == 1) { - c = new ColourRGBA(transmitter.getRenderColor().getColor(0), transmitter.getRenderColor().getColor(1), transmitter.getRenderColor().getColor(2), 1); + if(transmitter.transparencyRender()) + { + IIcon renderIcon = transmitter.getIconForSide(side, false); + EnumColor color = transmitter.getRenderColor(false); + + Colour c = null; + + if(color != null) + { + c = new ColourRGBA(color.getColor(0), color.getColor(1), color.getColor(2), 1); + } + + renderPart(renderIcon, transmitter.getModelForSide(side, false), transmitter.x(), transmitter.y(), transmitter.z(), c); + } + } + else { + IIcon renderIcon = transmitter.getIconForSide(side, true); + EnumColor color = transmitter.getRenderColor(true); + + Colour c = null; + + if(color != null) + { + c = new ColourRGBA(color.getColor(0), color.getColor(1), color.getColor(2), 1); + } + + renderPart(renderIcon, transmitter.getModelForSide(side, false), transmitter.x(), transmitter.y(), transmitter.z(), c); } - - renderPart(renderIcon, transmitter.getModelForSide(side, false), transmitter.x(), transmitter.y(), transmitter.z(), c); } - public void renderSide(ForgeDirection side, TransmitterType type) + public void renderSide(ForgeDirection side, TransmitterType type, boolean opaque) { boolean out = side == ForgeDirection.UP || side == ForgeDirection.DOWN; - IIcon renderIcon = out ? type.getSideIcon() : type.getCenterIcon(); + IIcon renderIcon = out ? type.getSideIcon(opaque) : type.getCenterIcon(opaque); renderPart(renderIcon, getItemModel(side, type), 0, 0, 0, null); } diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index f1e9dfa74..44ebf729f 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -35,7 +35,7 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } @Override - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { return transporterIcons.getCenterIcon(2); } diff --git a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java index fdacea586..1dea25a11 100644 --- a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java @@ -157,19 +157,19 @@ public class PartHeatTransmitter extends PartTransmitter implements } @Override - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { return heatIcons.getCenterIcon(0); } @Override - public IIcon getSideIcon() + public IIcon getSideIcon(boolean opaque) { return heatIcons.getSideIcon(0); } @Override - public IIcon getSideIconRotated() + public IIcon getSideIconRotated(boolean opaque) { return heatIcons.getSideIcon(1); } diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index a6735a182..f41b9862c 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -45,7 +45,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class PartLogisticalTransporter extends PartTransmitter implements ILogisticalTransporter { - public static TransmitterIcons transporterIcons = new TransmitterIcons(3, 4); + public static TransmitterIcons transporterIcons = new TransmitterIcons(5, 8); public static final int SPEED = 5; @@ -77,8 +77,9 @@ public class PartLogisticalTransporter extends PartTransmitter public static void registerIcons(IIconRegister register) { - transporterIcons.registerCenterIcons(register, new String[] {"LogisticalTransporter", "RestrictiveTransporter", "DiversionTransporter"}); - transporterIcons.registerSideIcons(register, new String[] {"LogisticalTransporterVertical", "LogisticalTransporterHorizontal", "RestrictiveTransporterVertical", "RestrictiveTransporterHorizontal"}); + transporterIcons.registerCenterIcons(register, new String[] {"LogisticalTransporter", "RestrictiveTransporter", "DiversionTransporter", "LogisticalTransporterGlass", "LogisticalTransporterGlassColored"}); + transporterIcons.registerSideIcons(register, new String[] {"LogisticalTransporterVertical", "LogisticalTransporterHorizontal", "RestrictiveTransporterVertical", "RestrictiveTransporterHorizontal", + "LogisticalTransporterVerticalGlass", "LogisticalTransporterVerticalGlassColored", "LogisticalTransporterHorizontalGlass", "LogisticalTransporterHorizontalGlassColored"}); } @Override @@ -116,21 +117,21 @@ public class PartLogisticalTransporter extends PartTransmitter } @Override - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { - return transporterIcons.getCenterIcon(0); + return transporterIcons.getCenterIcon(opaque ? 0 : (color != null ? 4 : 3)); } @Override - public IIcon getSideIcon() + public IIcon getSideIcon(boolean opaque) { - return transporterIcons.getSideIcon(0); + return transporterIcons.getSideIcon(opaque ? 0 : (color != null ? 5 : 4)); } @Override - public IIcon getSideIconRotated() + public IIcon getSideIconRotated(boolean opaque) { - return transporterIcons.getSideIcon(1); + return transporterIcons.getSideIcon(opaque ? 1 : (color != null ? 7 : 6)); } @Override @@ -675,9 +676,15 @@ public class PartLogisticalTransporter extends PartTransmitter } @Override - public EnumColor getRenderColor() + public EnumColor getRenderColor(boolean post) { - return color; + return post ? null : color; + } + + @Override + public boolean transparencyRender() + { + return true; } @Override diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index a834e52ed..a1fd6441e 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -206,19 +206,19 @@ public class PartMechanicalPipe extends PartTransmitter implements } @Override - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { return pipeIcons.getCenterIcon(tier.ordinal()); } @Override - public IIcon getSideIcon() + public IIcon getSideIcon(boolean opaque) { return pipeIcons.getSideIcon(0); } @Override - public IIcon getSideIconRotated() + public IIcon getSideIconRotated(boolean opaque) { return pipeIcons.getSideIcon(1); } diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index b24952e6f..615215eae 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -204,19 +204,19 @@ public class PartPressurizedTube extends PartTransmitter implements } @Override - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { return tubeIcons.getCenterIcon(0); } @Override - public IIcon getSideIcon() + public IIcon getSideIcon(boolean opaque) { return tubeIcons.getSideIcon(0); } @Override - public IIcon getSideIconRotated() + public IIcon getSideIconRotated(boolean opaque) { return tubeIcons.getSideIcon(1); } diff --git a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java index 09142fd74..0c70f9c59 100644 --- a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java @@ -1,5 +1,6 @@ package mekanism.common.multipart; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IIcon; public class PartRestrictiveTransporter extends PartLogisticalTransporter @@ -17,19 +18,19 @@ public class PartRestrictiveTransporter extends PartLogisticalTransporter } @Override - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { return transporterIcons.getCenterIcon(1); } @Override - public IIcon getSideIcon() + public IIcon getSideIcon(boolean opaque) { return transporterIcons.getSideIcon(2); } @Override - public IIcon getSideIconRotated() + public IIcon getSideIconRotated(boolean opaque) { return transporterIcons.getSideIcon(3); } @@ -39,4 +40,16 @@ public class PartRestrictiveTransporter extends PartLogisticalTransporter { return 1000; } + + @Override + public boolean transparencyRender() + { + return false; + } + + @Override + protected boolean onConfigure(EntityPlayer player, int part, int side) + { + return false; + } } diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 6eddf0a99..63972ca25 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -130,11 +130,11 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return (connections & tester) > 0; } - public abstract IIcon getCenterIcon(); + public abstract IIcon getCenterIcon(boolean opaque); - public abstract IIcon getSideIcon(); + public abstract IIcon getSideIcon(boolean opaque); - public abstract IIcon getSideIconRotated(); + public abstract IIcon getSideIconRotated(boolean opaque); @Override public void update() @@ -168,8 +168,13 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { return false; } + + public boolean transparencyRender() + { + return false; + } - public IIcon getIconForSide(ForgeDirection side) + public IIcon getIconForSide(ForgeDirection side, boolean opaque) { ConnectionType type = getConnectionType(side); @@ -177,29 +182,29 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { if(client.oldTransmitterRender || renderCenter()) { - return getCenterIcon(); + return getCenterIcon(opaque); } else if(getAllCurrentConnections() == 3 && side != ForgeDirection.DOWN && side != ForgeDirection.UP) { - return getSideIcon(); + return getSideIcon(opaque); } else if(getAllCurrentConnections() == 12 && (side == ForgeDirection.DOWN || side == ForgeDirection.UP)) { - return getSideIcon(); + return getSideIcon(opaque); } else if(getAllCurrentConnections() == 12 && (side == ForgeDirection.EAST || side == ForgeDirection.WEST)) { - return getSideIconRotated(); + return getSideIconRotated(opaque); } else if(getAllCurrentConnections() == 48 && side != ForgeDirection.EAST && side != ForgeDirection.WEST) { - return getSideIconRotated(); + return getSideIconRotated(opaque); } - return getCenterIcon(); + return getCenterIcon(opaque); } else { - return getSideIcon(); + return getSideIcon(opaque); } } @@ -319,13 +324,13 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, @Override public IIcon getBreakingIcon(Object subPart, int side) { - return getCenterIcon(); + return getCenterIcon(true); } @Override public IIcon getBrokenIcon(int side) { - return getCenterIcon(); + return getCenterIcon(true); } @Override @@ -353,7 +358,12 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { if(pass == 0) { - RenderPartTransmitter.getInstance().renderStatic(this); + RenderPartTransmitter.getInstance().renderStatic(this, pass); + return true; + } + else if(pass == 1 && transparencyRender()) + { + RenderPartTransmitter.getInstance().renderStatic(this, pass); return true; } @@ -685,7 +695,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return false; } - public EnumColor getRenderColor() + public EnumColor getRenderColor(boolean opaque) { return null; } diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index e3555e324..6d15b919f 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -193,19 +193,19 @@ public class PartUniversalCable extends PartTransmitter implement } @Override - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { return cableIcons.getCenterIcon(tier.ordinal()); } @Override - public IIcon getSideIcon() + public IIcon getSideIcon(boolean opaque) { return cableIcons.getSideIcon(0); } @Override - public IIcon getSideIconRotated() + public IIcon getSideIconRotated(boolean opaque) { return cableIcons.getSideIcon(1); } diff --git a/src/main/java/mekanism/common/multipart/TransmitterType.java b/src/main/java/mekanism/common/multipart/TransmitterType.java index b0cdef971..699dad90f 100644 --- a/src/main/java/mekanism/common/multipart/TransmitterType.java +++ b/src/main/java/mekanism/common/multipart/TransmitterType.java @@ -6,35 +6,35 @@ import net.minecraft.util.IIcon; public enum TransmitterType { - UNIVERSAL_CABLE_BASIC("BasicUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, 0, 0), - UNIVERSAL_CABLE_ADVANCED("AdvancedUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, 1, 0), - UNIVERSAL_CABLE_ELITE("EliteUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, 2, 0), - UNIVERSAL_CABLE_ULTIMATE("UltimateUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, 3, 0), - MECHANICAL_PIPE_BASIC("BasicMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, 0, 0), - MECHANICAL_PIPE_ADVANCED("AdvancedMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, 0, 0), - MECHANICAL_PIPE_ELITE("EliteMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, 0, 0), - MECHANICAL_PIPE_ULTIMATE("UltimateMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, 0, 0), - PRESSURIZED_TUBE("PressurizedTube", Size.SMALL, TransmissionType.GAS, PartPressurizedTube.tubeIcons, 0, 0), - LOGISTICAL_TRANSPORTER("LogisticalTransporter", Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, 0, 0), - RESTRICTIVE_TRANSPORTER("RestrictiveTransporter", Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, 1, 2), - DIVERSION_TRANSPORTER("DiversionTransporter", Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, 2, 0), - HEAT_TRANSMITTER("HeatTransmitter", Size.SMALL, TransmissionType.HEAT, PartHeatTransmitter.heatIcons, 0, 0); + UNIVERSAL_CABLE_BASIC("BasicUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, false, 0, 0), + UNIVERSAL_CABLE_ADVANCED("AdvancedUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, false, 1, 0), + UNIVERSAL_CABLE_ELITE("EliteUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, false, 2, 0), + UNIVERSAL_CABLE_ULTIMATE("UltimateUniversalCable", Size.SMALL, TransmissionType.ENERGY, PartUniversalCable.cableIcons, false, 3, 0), + MECHANICAL_PIPE_BASIC("BasicMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, false, 0, 0), + MECHANICAL_PIPE_ADVANCED("AdvancedMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, false, 0, 0), + MECHANICAL_PIPE_ELITE("EliteMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, false, 0, 0), + MECHANICAL_PIPE_ULTIMATE("UltimateMechanicalPipe", Size.LARGE, TransmissionType.FLUID, PartMechanicalPipe.pipeIcons, false, 0, 0), + PRESSURIZED_TUBE("PressurizedTube", Size.SMALL, TransmissionType.GAS, PartPressurizedTube.tubeIcons, false, 0, 0), + LOGISTICAL_TRANSPORTER("LogisticalTransporter", Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, true, 0, 0, 3, 4), + RESTRICTIVE_TRANSPORTER("RestrictiveTransporter", Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, false, 1, 2), + DIVERSION_TRANSPORTER("DiversionTransporter", Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, true, 2, 0, 3, 4), + HEAT_TRANSMITTER("HeatTransmitter", Size.SMALL, TransmissionType.HEAT, PartHeatTransmitter.heatIcons, false, 0, 0); private String unlocalizedName; private Size size; private TransmissionType transmissionType; private TransmitterIcons transmitterIcons; - private int centerIndex; - private int sideIndex; + private boolean transparencyRender; + private int[] indexes; - private TransmitterType(String name, Size s, TransmissionType type, TransmitterIcons icons, int center, int side) + private TransmitterType(String name, Size s, TransmissionType type, TransmitterIcons icons, boolean transparency, int... is) { unlocalizedName = name; size = s; transmissionType = type; transmitterIcons = icons; - centerIndex = center; - sideIndex = side; + transparencyRender = transparency; + indexes = is; } public String getName() @@ -46,20 +46,37 @@ public enum TransmitterType { return size; } + + public boolean hasTransparency() + { + return transparencyRender; + } public TransmissionType getTransmission() { return transmissionType; } - public IIcon getCenterIcon() + public IIcon getCenterIcon(boolean opaque) { - return transmitterIcons.getCenterIcon(centerIndex); + if(!transparencyRender) + { + return transmitterIcons.getCenterIcon(indexes[0]); + } + else { + return transmitterIcons.getCenterIcon(opaque ? indexes[0] : indexes[2]); + } } - public IIcon getSideIcon() + public IIcon getSideIcon(boolean opaque) { - return transmitterIcons.getSideIcon(sideIndex); + if(!transparencyRender) + { + return transmitterIcons.getSideIcon(indexes[1]); + } + else { + return transmitterIcons.getSideIcon(opaque ? indexes[1] : indexes[3]); + } } public static enum Size diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png index 73906f050cdbdb92fc4dca2fd4b119eb7bb34a28..0a759c11916dfa49031f52584d95826f66b26b4d 100644 GIT binary patch delta 1541 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlassColored.png new file mode 100644 index 0000000000000000000000000000000000000000..f96b610e9e12e86b36301b463760d3cf500beffd GIT binary patch literal 1279 zcmV4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zc(ge;vmD43xVvWt zzK$_ctKLB)um63|fgK@pL@-KlI=KJ<002ovPDHLkV1l=eXMz9# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png index 4d4e0a5105dbcecff86cedfe7fd890d8a85ca196..fa6c14c75962dc3c1927cff34e9281da71196ddf 100644 GIT binary patch delta 1141 zcmV-*1d99I0f`BaBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wQk{t z0000~NklbIwqXm-NL-tC#}Eu zo*DHH^btS+0R#|0009ILK;Y*BD>Jpfp}R|Op#KdcLMm_pRv`%Iuw(%e00000NkvXX Hu0mjf=N&P8 delta 193 zcmeC=yu&y_xt@V7$=lt9;Xep2*t>i(0|NtRfk$L90|U1(2s1Lwnj--eWH0gbb!ETD z!OtM0eau3m6eyJG>Eaj?aX5L)rcJ-j8#FXLJ>1UEoN3Q2e3*fG+I;(Zqn@Tf1Fj1P z|IIG{AFO1*LdJ1oGJC7?id2i(MY$q9O^&e@yjK5oJl{LDFYA-|C3;aqg7phaq^HY2taWB&Y-9x5Wwtj|MbEsv2WTsUr>mdKI;Vst07`N~%>V!Z diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlass.png new file mode 100644 index 0000000000000000000000000000000000000000..e6d483f36d34bb037276e92881e680aaa965473e GIT binary patch literal 1199 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 literal 0 HcmV?d00001