From 3bd0ff271c2655117eb5259a419f8ec78f7f2a7b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 24 May 2016 17:50:08 -0400 Subject: [PATCH] Remove traces of legacy transmitter rendering --- .../client/render/MekanismRenderer.java | 2 +- .../client/render/RenderPartTransmitter.java | 818 ------------------ .../transmitter/RenderUniversalCable.java | 4 +- .../multipart/PartDiversionTransporter.java | 20 - .../multipart/PartLogisticalTransporter.java | 34 - .../common/multipart/PartMechanicalPipe.java | 43 - .../common/multipart/PartPressurizedTube.java | 48 - .../multipart/PartRestrictiveTransporter.java | 20 - .../common/multipart/PartSidedPipe.java | 40 - .../multipart/PartThermodynamicConductor.java | 72 +- .../common/multipart/PartUniversalCable.java | 49 -- .../multipart/PlasticMicroMaterial.java | 20 - .../common/multipart/TransmitterIcons.java | 43 - .../common/multipart/TransmitterType.java | 71 +- .../DiversionTransporterHorizontal.png | Bin 1063 -> 0 bytes ...ogisticalTransporterHorizontalAdvanced.png | Bin 1113 -> 0 bytes .../LogisticalTransporterHorizontalBasic.png | Bin 1139 -> 0 bytes .../LogisticalTransporterHorizontalElite.png | Bin 1119 -> 0 bytes .../LogisticalTransporterHorizontalGlass.png | Bin 958 -> 0 bytes ...ticalTransporterHorizontalGlassColored.png | Bin 1275 -> 0 bytes ...ogisticalTransporterHorizontalUltimate.png | Bin 1115 -> 0 bytes .../MechanicalPipeHorizontalAdvanced.png | Bin 1087 -> 0 bytes .../MechanicalPipeHorizontalBasic.png | Bin 1095 -> 0 bytes .../MechanicalPipeHorizontalElite.png | Bin 1087 -> 0 bytes .../MechanicalPipeHorizontalUltimate.png | Bin 1090 -> 0 bytes .../PressurizedTubeHorizontalAdvanced.png | Bin 317 -> 0 bytes .../PressurizedTubeHorizontalBasic.png | Bin 306 -> 0 bytes .../PressurizedTubeHorizontalElite.png | Bin 302 -> 0 bytes .../PressurizedTubeHorizontalUltimate.png | Bin 305 -> 0 bytes ...ermodynamicConductorHorizontalAdvanced.png | Bin 339 -> 0 bytes .../ThermodynamicConductorHorizontalBasic.png | Bin 308 -> 0 bytes .../ThermodynamicConductorHorizontalElite.png | Bin 324 -> 0 bytes ...ermodynamicConductorHorizontalUltimate.png | Bin 339 -> 0 bytes .../UniversalCableHorizontalAdvanced.png | Bin 396 -> 0 bytes .../UniversalCableHorizontalBasic.png | Bin 318 -> 0 bytes .../UniversalCableHorizontalElite.png | Bin 311 -> 0 bytes .../UniversalCableHorizontalUltimate.png | Bin 318 -> 0 bytes 37 files changed, 44 insertions(+), 1240 deletions(-) delete mode 100644 src/main/java/mekanism/client/render/RenderPartTransmitter.java delete mode 100644 src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java delete mode 100644 src/main/java/mekanism/common/multipart/TransmitterIcons.java delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterHorizontal.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlass.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlassColored.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalUltimate.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalUltimate.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalUltimate.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalUltimate.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableHorizontalAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableHorizontalBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableHorizontalElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableHorizontalUltimate.png diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 2153c7df3..64564589d 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -325,7 +325,7 @@ public class MekanismRenderer for(int i = 0; i < 4; i++) { - int nextIndex = i+amount%4; + int nextIndex = (i+amount)%4; vertices[7*i + 4] = quad.getVertexData()[7*nextIndex + 4]; vertices[7*i + 5] = quad.getVertexData()[7*nextIndex + 5]; } diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java deleted file mode 100644 index 95b301408..000000000 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ /dev/null @@ -1,818 +0,0 @@ -package mekanism.client.render; - -/* -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; -import mekanism.common.content.transporter.TransporterStack; -import mekanism.common.item.ItemConfigurator; -import mekanism.common.multipart.PartDiversionTransporter; -import mekanism.common.multipart.PartLogisticalTransporter; -import mekanism.common.multipart.PartMechanicalPipe; -import mekanism.common.multipart.PartPressurizedTube; -import mekanism.common.multipart.PartSidedPipe; -import mekanism.common.multipart.PartSidedPipe.ConnectionType; -import mekanism.common.multipart.PartThermodynamicConductor; -import mekanism.common.multipart.PartUniversalCable; -import mekanism.common.multipart.TransmitterType; -import mekanism.common.multipart.TransmitterType.Size; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.common.util.TransporterUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.colour.Colour; -import codechicken.lib.colour.ColourRGBA; -import codechicken.lib.lighting.LightModel; -import codechicken.lib.lighting.LightModel.Light; -import codechicken.lib.render.CCModel; -import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.ColourMultiplier; -import codechicken.lib.render.TextureUtils; -import codechicken.lib.render.TextureUtils.IIconSelfRegister; -import codechicken.lib.render.uv.IconTransformation; -import codechicken.lib.vec.Translation; -import codechicken.lib.vec.Vector3; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -*/ - -//@SideOnly(Side.CLIENT) -public class RenderPartTransmitter //TODO implements IIconSelfRegister -{ -/* - public static RenderPartTransmitter INSTANCE; - - public static Map small_models; - public static Map large_models; - public static Map contents_models; - - private static final int stages = 100; - private static final double height = 0.45; - private static final double offset = 0.015; - - private ModelTransporterBox modelBox = new ModelTransporterBox(); - - private HashMap> cachedLiquids = new HashMap>(); - private HashMap> cachedOverlays = new HashMap>(); - - private Minecraft mc = Minecraft.getMinecraft(); - - private EntityItem entityItem = new EntityItem(null); - private RenderItem renderer = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); - - public static RenderPartTransmitter getInstance() - { - return INSTANCE; - } - - public static void init() - { - INSTANCE = new RenderPartTransmitter(); - TextureUtils.addIconRegistrar(INSTANCE); - - small_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_small.obj"), 7, null); - - for(Map.Entry e : small_models.entrySet()) - { - e.setValue(e.getValue().computeLighting(LightModel.standardLightModel).twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); - } - - large_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_large.obj"), 7, null); - - for(Map.Entry e : large_models.entrySet()) - { - e.setValue(e.getValue().computeLighting(LightModel.standardLightModel).twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); - } - - contents_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_contents.obj"), 7, null); - LightModel interiorLightModel = new LightModel() - .setAmbient(new Vector3(0.6, 0.6, 0.6)) - .addLight(new Light(new Vector3(0.3, 1, -0.7)) - .setDiffuse(new Vector3(0.6, 0.6, 0.6))) - .addLight(new Light(new Vector3(-0.3, 1, 0.7)) - .setDiffuse(new Vector3(0.6, 0.6, 0.6))); - - for(CCModel c : contents_models.values()) - { - c.apply(new Translation(Vector3.center)); - c.computeLighting(interiorLightModel); - c.shrinkUVs(0.0005); - } - } - - private void push() - { - GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } - - private void pop() - { - GL11.glPopAttrib(); - GlStateManager.popMatrix(); - } - - public void renderItem(TransmitterType type) - { - CCRenderState.reset(); - CCRenderState.startDrawing(); - - for(EnumFacing side : EnumFacing.VALUES) - { - renderSide(side, type, false); - } - - CCRenderState.draw(); - - CCRenderState.reset(); - CCRenderState.startDrawing(); - - for(EnumFacing side : EnumFacing.VALUES) - { - renderSide(side, type, true); - } - - CCRenderState.draw(); - } - - public void renderContents(PartLogisticalTransporter transporter, float partialTick, Vector3 vec) - { - GlStateManager.pushMatrix(); - - entityItem.age = 0; - entityItem.hoverStart = 0; - - entityItem.setPosition(transporter.x() + 0.5, transporter.y() + 0.5, transporter.z() + 0.5); - entityItem.worldObj = transporter.world(); - - for(TransporterStack stack : transporter.getTransmitter().transit) - { - if(stack != null) - { - GlStateManager.pushMatrix(); - entityItem.setEntityItemStack(stack.itemStack); - - float[] pos = TransporterUtils.getStackPosition(transporter.getTransmitter(), stack, partialTick*transporter.tier.speed); - - GL11.glTranslated(vec.x + pos[0], vec.y + pos[1] - entityItem.yOffset, vec.z + pos[2]); - GlStateManager.scale(0.75F, 0.75F, 0.75F); - - renderer.doRender(entityItem, 0, 0, 0, 0, 0); - GlStateManager.popMatrix(); - - if(stack.color != null) - { - CCRenderState.changeTexture(MekanismUtils.getResource(ResourceType.RENDER, "TransporterBox.png")); - GlStateManager.pushMatrix(); - MekanismRenderer.glowOn(); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glColor4f(stack.color.getColor(0), stack.color.getColor(1), stack.color.getColor(2), 1.0F); - GlStateManager.translate((float)(vec.x + pos[0]), (float)(vec.y + pos[1] - entityItem.yOffset - ((stack.itemStack.getItem() instanceof ItemBlock) ? 0.1 : 0)), (float)(vec.z + pos[2])); - modelBox.render(0.0625F); - MekanismRenderer.glowOff(); - GlStateManager.popMatrix(); - } - } - } - - if(transporter instanceof PartDiversionTransporter) - { - EntityPlayer player = mc.thePlayer; - World world = mc.thePlayer.worldObj; - ItemStack itemStack = player.getCurrentEquippedItem(); - MovingObjectPosition pos = player.rayTrace(8.0D, 1.0F); - - if(pos != null && itemStack != null && itemStack.getItem() instanceof ItemConfigurator) - { - int xPos = MathHelper.floor_double(pos.blockX); - int yPos = MathHelper.floor_double(pos.blockY); - int zPos = MathHelper.floor_double(pos.blockZ); - - Coord4D obj = new Coord4D(xPos, yPos, zPos, transporter.world().provider.dimensionId); - - if(obj.equals(Coord4D.get(transporter.tile()))) - { - int mode = ((PartDiversionTransporter)transporter).modes[pos.sideHit]; - EnumFacing side = EnumFacing.getFront(pos.sideHit); - - pushTransporter(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.8F); - - CCRenderState.changeTexture(mode == 0 ? MekanismRenderer.getItemsTexture() : MekanismRenderer.getBlocksTexture()); - GlStateManager.translate((float)vec.x, (float)vec.y, (float)vec.z); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.translate(0.5F, 0.5F, 0.5F); - - int display = getOverlayDisplay(world, side, mode).display; - GL11.glCallList(display); - - popTransporter(); - } - } - } - - GlStateManager.popMatrix(); - } - - public void renderContents(PartUniversalCable cable, Vector3 pos) - { - if(cable.currentPower == 0) - { - return; - } - - push(); - CCRenderState.reset(); - CCRenderState.useNormals = true; - CCRenderState.startDrawing(); - GL11.glTranslated(pos.x, pos.y, pos.z); - - for(EnumFacing side : EnumFacing.VALUES) - { - renderEnergySide(side, cable); - } - - MekanismRenderer.glowOn(); - MekanismRenderer.cullFrontFace(); - - CCRenderState.draw(); - - MekanismRenderer.disableCullFace(); - MekanismRenderer.glowOff(); - - pop(); - } - - public void renderContents(PartThermodynamicConductor transmitter, Vector3 pos) - { - push(); - CCRenderState.reset(); - CCRenderState.useNormals = true; - CCRenderState.startDrawing(); - GL11.glTranslated(pos.x, pos.y, pos.z); - - for(EnumFacing side : EnumFacing.VALUES) - { - renderHeatSide(side, transmitter); - } - - MekanismRenderer.glowOn(); - MekanismRenderer.cullFrontFace(); - - CCRenderState.draw(); - - MekanismRenderer.disableCullFace(); - MekanismRenderer.glowOff(); - - pop(); - } - - public void renderContents(PartMechanicalPipe pipe, Vector3 pos) - { - float targetScale; - - if(pipe.getTransmitter().hasTransmitterNetwork()) - { - targetScale = pipe.getTransmitter().getTransmitterNetwork().fluidScale; - } - else { - targetScale = (float)pipe.buffer.getFluidAmount() / (float)pipe.buffer.getCapacity(); - } - - if(Math.abs(pipe.currentScale - targetScale) > 0.01) - { - pipe.currentScale = (12 * pipe.currentScale + targetScale) / 13; - } - else { - pipe.currentScale = targetScale; - } - - Fluid fluid; - - if(pipe.getTransmitter().hasTransmitterNetwork()) - { - fluid = pipe.getTransmitter().getTransmitterNetwork().refFluid; - } - else { - fluid = pipe.getBuffer() == null ? null : pipe.getBuffer().getFluid(); - } - - float scale = pipe.currentScale; - - if(scale > 0.01 && fluid != null) - { - push(); - - MekanismRenderer.glowOn(fluid.getLuminosity()); - MekanismRenderer.colorFluid(fluid); - - CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - GL11.glTranslated(pos.x, pos.y, pos.z); - - boolean gas = fluid.isGaseous(); - - for(EnumFacing side : EnumFacing.VALUES) - { - if(pipe.getConnectionType(side) == ConnectionType.NORMAL) - { - DisplayInteger[] displayLists = getListAndRender(side, fluid); - - if(displayLists != null) - { - if(!gas) - { - displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); - } - else { - GL11.glColor4f(1F, 1F, 1F, scale); - displayLists[stages-1].render(); - } - } - } - else if(pipe.getConnectionType(side) != ConnectionType.NONE) - { - GL11.glCullFace(GL11.GL_FRONT); - CCRenderState.startDrawing(); - renderFluidInOut(side, pipe); - CCRenderState.draw(); - GL11.glCullFace(GL11.GL_BACK); - } - } - - DisplayInteger[] displayLists = getListAndRender(null, fluid); - - if(displayLists != null) - { - if(!gas) - { - displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); - } - else { - GL11.glColor4f(1F, 1F, 1F, scale); - displayLists[stages-1].render(); - } - } - - MekanismRenderer.glowOff(); - MekanismRenderer.resetColor(); - - pop(); - } - } - - private DisplayInteger[] getListAndRender(EnumFacing side, Fluid fluid) - { - if(side == null || fluid == null || fluid.getIcon() == null) - { - return null; - } - - if(cachedLiquids.containsKey(side) && cachedLiquids.get(side).containsKey(fluid)) - { - return cachedLiquids.get(side).get(fluid); - } - - Model3D toReturn = new Model3D(); - toReturn.baseBlock = Blocks.water; - toReturn.setTexture(fluid.getIcon()); - - toReturn.setSideRender(side, false); - toReturn.setSideRender(side.getOpposite(), false); - - DisplayInteger[] displays = new DisplayInteger[stages]; - - if(cachedLiquids.containsKey(side)) - { - cachedLiquids.get(side).put(fluid, displays); - } - else { - HashMap map = new HashMap(); - map.put(fluid, displays); - cachedLiquids.put(side, map); - } - - for(int i = 0; i < stages; i++) - { - displays[i] = DisplayInteger.createAndStart(); - - switch(side) - { - case UNKNOWN: - { - toReturn.minX = 0.25 + offset; - toReturn.minY = 0.25 + offset; - toReturn.minZ = 0.25 + offset; - - toReturn.maxX = 0.75 - offset; - toReturn.maxY = 0.25 + offset + ((float)i / (float)stages)*height; - toReturn.maxZ = 0.75 - offset; - break; - } - case DOWN: - { - toReturn.minX = 0.5 - (((float)i / (float)stages)*height)/2; - toReturn.minY = 0.0; - toReturn.minZ = 0.5 - (((float)i / (float)stages)*height)/2; - - toReturn.maxX = 0.5 + (((float)i / (float)stages)*height)/2; - toReturn.maxY = 0.25 + offset; - toReturn.maxZ = 0.5 + (((float)i / (float)stages)*height)/2; - break; - } - case UP: - { - toReturn.minX = 0.5 - (((float)i / (float)stages)*height)/2; - toReturn.minY = 0.25 - offset + ((float)i / (float)stages)*height; - toReturn.minZ = 0.5 - (((float)i / (float)stages)*height)/2; - - toReturn.maxX = 0.5 + (((float)i / (float)stages)*height)/2; - toReturn.maxY = 1.0; - toReturn.maxZ = 0.5 + (((float)i / (float)stages)*height)/2; - break; - } - case NORTH: - { - toReturn.minX = 0.25 + offset; - toReturn.minY = 0.25 + offset; - toReturn.minZ = 0.0; - - toReturn.maxX = 0.75 - offset; - toReturn.maxY = 0.25 + offset + ((float)i / (float)stages)*height; - toReturn.maxZ = 0.25 + offset; - break; - } - case SOUTH: - { - toReturn.minX = 0.25 + offset; - toReturn.minY = 0.25 + offset; - toReturn.minZ = 0.75 - offset; - - toReturn.maxX = 0.75 - offset; - toReturn.maxY = 0.25 + offset + ((float)i / (float)stages)*height; - toReturn.maxZ = 1.0; - break; - } - case WEST: - { - toReturn.minX = 0.0; - toReturn.minY = 0.25 + offset; - toReturn.minZ = 0.25 + offset; - - toReturn.maxX = 0.25 + offset; - toReturn.maxY = 0.25 + offset + ((float)i / (float)stages)*height; - toReturn.maxZ = 0.75 - offset; - break; - } - case EAST: - { - toReturn.minX = 0.75 - offset; - toReturn.minY = 0.25 + offset; - toReturn.minZ = 0.25 + offset; - - toReturn.maxX = 1.0; - toReturn.maxY = 0.25 + offset + ((float)i / (float)stages)*height; - toReturn.maxZ = 0.75 - offset; - break; - } - } - - MekanismRenderer.renderObject(toReturn); - displays[i].endList(); - } - - return displays; - } - - public void renderContents(PartPressurizedTube tube, Vector3 pos) - { - if(!tube.getTransmitter().hasTransmitterNetwork() || tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0) - { - return; - } - - push(); - - CCRenderState.reset(); - CCRenderState.useNormals = true; - CCRenderState.startDrawing(); - GL11.glTranslated(pos.x, pos.y, pos.z); - - for(EnumFacing side : EnumFacing.VALUES) - { - renderGasSide(side, tube); - } - - MekanismRenderer.glowOn(0); - MekanismRenderer.cullFrontFace(); - - CCRenderState.draw(); - - MekanismRenderer.disableCullFace(); - MekanismRenderer.glowOff(); - - pop(); - } - - public void renderStatic(PartSidedPipe transmitter, int pass) - { - CCRenderState.reset(); - CCRenderState.hasColour = true; - CCRenderState.setBrightness(transmitter.world(), transmitter.x(), transmitter.y(), transmitter.z()); - - for(EnumFacing side : EnumFacing.VALUES) - { - renderSide(side, transmitter, pass); - } - } - - public void renderSide(EnumFacing side, PartSidedPipe transmitter, int pass) - { - if(pass == 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); - } - } - - public void renderSide(EnumFacing side, TransmitterType type, boolean opaque) - { - boolean out = side == EnumFacing.UP || side == EnumFacing.DOWN; - - IIcon renderIcon = out ? type.getSideIcon(opaque) : type.getCenterIcon(opaque); - - renderPart(renderIcon, getItemModel(side, type), 0, 0, 0, null); - } - - public void renderEnergySide(EnumFacing side, PartUniversalCable cable) - { - CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - renderTransparency(MekanismRenderer.energyIcon, cable.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, cable.currentPower)); - } - - public void renderHeatSide(EnumFacing side, PartThermodynamicConductor cable) - { - CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - renderTransparency(MekanismRenderer.heatIcon, cable.getModelForSide(side, true), ColourTemperature.fromTemperature(cable.temperature, cable.getBaseColour())); - } - - public void renderFluidInOut(EnumFacing side, PartMechanicalPipe pipe) - { - CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - renderTransparency(pipe.getTransmitter().getTransmitterNetwork().refFluid.getIcon(), pipe.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, pipe.currentScale)); - } - - public void renderGasSide(EnumFacing side, PartPressurizedTube tube) - { - CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - renderTransparency(tube.getTransmitter().getTransmitterNetwork().refGas.getIcon(), tube.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, tube.currentScale)); - } - - public void renderPart(IIcon icon, CCModel cc, double x, double y, double z, Colour color) - { - if(color != null) - { - cc.render(new Translation(x, y, z), new IconTransformation(icon), new ColourMultiplier(color.rgba())); - } - else { - cc.render(new Translation(x, y, z), new IconTransformation(icon)); - } - } - - public void renderTransparency(IIcon icon, CCModel cc, Colour color) - { - if(color != null) - { - cc.render(new IconTransformation(icon), new ColourMultiplier(color.rgba())); - } - else { - cc.render(new IconTransformation(icon)); - } - } - - public CCModel getItemModel(EnumFacing side, TransmitterType type) - { - String name = side.name().toLowerCase(); - boolean out = side == EnumFacing.UP || side == EnumFacing.DOWN; - name += out ? "NORMAL" : "NONE"; - - if(type.getSize() == Size.SMALL) - { - return small_models.get(name); - } - else { - return large_models.get(name); - } - } - - @Override - public void registerIcons(IIconRegister register) - { - PartUniversalCable.registerIcons(register); - PartMechanicalPipe.registerIcons(register); - PartPressurizedTube.registerIcons(register); - PartLogisticalTransporter.registerIcons(register); - PartThermodynamicConductor.registerIcons(register); - } - - @Override - public int atlasIndex() - { - return 0; - } - - private void popTransporter() - { - GL11.glPopAttrib(); - MekanismRenderer.glowOff(); - MekanismRenderer.blendOff(); - GlStateManager.popMatrix(); - } - - private void pushTransporter() - { - GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_LIGHTING); - MekanismRenderer.glowOn(); - MekanismRenderer.blendOn(); - } - - private DisplayInteger getOverlayDisplay(World world, EnumFacing side, int mode) - { - if(cachedOverlays.containsKey(side) && cachedOverlays.get(side).containsKey(mode)) - { - return cachedOverlays.get(side).get(mode); - } - - IIcon icon = null; - - switch(mode) - { - case 0: - icon = Items.gunpowder.getIcon(new ItemStack(Items.gunpowder), 0); - break; - case 1: - icon = Blocks.redstone_torch.getIcon(0, 0); - break; - case 2: - icon = Blocks.unlit_redstone_torch.getIcon(0, 0); - break; - } - - Model3D toReturn = new Model3D(); - toReturn.baseBlock = Blocks.stone; - toReturn.setTexture(icon); - - DisplayInteger display = DisplayInteger.createAndStart(); - - if(cachedOverlays.containsKey(side)) - { - cachedOverlays.get(side).put(mode, display); - } - else { - HashMap map = new HashMap(); - map.put(mode, display); - cachedOverlays.put(side, map); - } - - switch(side) - { - case DOWN: - { - toReturn.minY = -0.01; - toReturn.maxY = 0; - - toReturn.minX = 0; - toReturn.minZ = 0; - toReturn.maxX = 1; - toReturn.maxZ = 1; - break; - } - case UP: - { - toReturn.minY = 1; - toReturn.maxY = 1.01; - - toReturn.minX = 0; - toReturn.minZ = 0; - toReturn.maxX = 1; - toReturn.maxZ = 1; - break; - } - case NORTH: - { - toReturn.minZ = -0.01; - toReturn.maxZ = 0; - - toReturn.minX = 0; - toReturn.minY = 0; - toReturn.maxX = 1; - toReturn.maxY = 1; - break; - } - case SOUTH: - { - toReturn.minZ = 1; - toReturn.maxZ = 1.01; - - toReturn.minX = 0; - toReturn.minY = 0; - toReturn.maxX = 1; - toReturn.maxY = 1; - break; - } - case WEST: - { - toReturn.minX = -0.01; - toReturn.maxX = 0; - - toReturn.minY = 0; - toReturn.minZ = 0; - toReturn.maxY = 1; - toReturn.maxZ = 1; - break; - } - case EAST: - { - toReturn.minX = 1; - toReturn.maxX = 1.01; - - toReturn.minY = 0; - toReturn.minZ = 0; - toReturn.maxY = 1; - toReturn.maxZ = 1; - break; - } - default: - { - break; - } - } - - MekanismRenderer.renderObject(toReturn); - display.endList(); - - return display; - } - - public void resetDisplayInts() - { - cachedLiquids.clear(); - cachedOverlays.clear(); - } -*/ -} diff --git a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java index baa31ed96..43d2e4837 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java @@ -1,6 +1,6 @@ package mekanism.client.render.transmitter; -import mcmultipart.multipart.IMultipart; +import mekanism.api.MekanismConfig.client; import mekanism.client.render.MekanismRenderer; import mekanism.common.ColourRGBA; import mekanism.common.multipart.PartUniversalCable; @@ -20,7 +20,7 @@ public class RenderUniversalCable extends RenderTransmitterBase implements IFluidHandler { - public static TransmitterIcons pipeIcons = new TransmitterIcons(4, 8); - public float currentScale; public FluidTank buffer = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME); @@ -164,31 +158,6 @@ public class PartMechanicalPipe extends PartTransmitter implements IGasHandler { public Tier.TubeTier tier = Tier.TubeTier.BASIC; - public static TransmitterIcons tubeIcons = new TransmitterIcons(4, 8); - public float currentScale; public GasTank buffer = new GasTank(getCapacity()); @@ -178,31 +167,6 @@ public class PartPressurizedTube extends PartTransmitter implements IHeatTransfer { public Tier.ConductorTier tier; - public static TransmitterIcons conductorIcons = new TransmitterIcons(4, 8); - public double temperature = 0; public double clientTemperature = 0; public double heatToAbsorb = 0; + + public boolean renderUpdate; public PartThermodynamicConductor(Tier.ConductorTier conductorTier) { @@ -67,32 +63,6 @@ public class PartThermodynamicConductor extends PartTransmitter;BAHEerQAk)>j5;=!vh6Ys^T$1VEr24bHKtV19 zv1mM^a~uZ*G0MdfZG3Dy;8`xlup+~;5tfrUR^nMu`)HEQH40KrP1kafn@kU3>_`mb z`+n4Kiz2tkaH1$OEYI+Kgm^@}vW>MMVtX6v5me~uuIXSC*&vLl4Wbb&(}d~o5-ca1 zoeyk#HKB-POrSXo7iAgC3hSzRdpHOG&{)vh%aS8y?ebw2qSL@IY3dW-2z+sOxr-dw>6Zv#umEfC^XV8vOrZI$y|U# zLS%(hN)*yUQXu?egt)52ST>=sqL@+=bPa1PPJ;qA`=uI=SP=Z z=7%5JWa3>i+AaI+40#q)88w*?UVNBJuDl19HCUhZxrWzo9*;FTFO~Dt_uC(=-!^dW z%kajQ8&CHSymI}A;-fR-1y$-OUH<&DIQ#r(>A=Z}?}_nKxm)d9kDj>nZqwl8>i2in z=#z6-@7`-(b@1cC)-G!Cig9WQpcXZCQKide{N(i6>+5C;qc_ifdOEiE(9Dm-bau?2 j*gX4eKzUnS$}DQ6jt|SL)oT~OhEF%s-J@Pf9Xj$0_`+KE diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalAdvanced.png deleted file mode 100644 index a20f051db9ba12cd37c71d811a1844a914e6160f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1113 zcmaJ=UuYCZ7++1Rk{W2C;-3;2*U}pGZg=i(?`}6))4ScX@TK$u5+exmU9L9sBqI-zRn0Nqz zysZzR64K4__h(TT!?e6%mHSD5;gDotJF176XkfdP%`jcvfvX!Mh=2h!WH~asc;kB( zSfkP#=91}n9IEjo%;pkGGMh>@ zxp~JYx?`Xw*IMBw*5pcxhjfCyGRC9L?iGhI!TvCIfuhvA1$G~`91~akj>TpnF|Sss4m(24ixXkY*N#1{H2X7g&M96We(y3pFPbMq(v%(nF$JTpJh zaDUe;Y4}y>Yb_b7o}IXK0SAA@5HIv zSCi-8IbnRuxVIzczI^ui$k+G3yLNW!%&F;Zb4U6#=I%n`&Ch<{e`Rv|uSD z3+9k=>&N*=*E)OKrY6syEzV6o<2u25^`lKMuY2o5ZT$sBb8i&09i6qu_cC3-ZLIB{ zsU83I2R$Xc#*DJh-;<%U1$_n6rMH`B)Tp2kEp4=olr5@otZnE$?QzC%I?mN+1L$Xv(*tg58_*(p}wftYD;NLwV<><_)w9c!94V#ch=qLL+ZfH zz4!2a=X~eq&f(#qU9pZ$9Sp<7@&j6tt{{3>w$pD=uRo&8Mv^O&5j;+6hL4!Eg~t%c zJH`YmBEy=QzKZ%8rfsWTDwA^IZPmmMXG9n-bUeytnEsuiXP8rnfH5>-yD9d;>>LYh zE5+`W3PQolqDgz8?xT_VP|2)MnTo~k+yVMSl{#<`F+k{4+&~ReY{Rcg_mP=rK?6dj zQtT5^<-#z?VjlsC>x-KZLLe&~l#&TidJ~8Olz2hmp%53K3I$aZK=WZ~G~XImi<;hy zMNcVqk`Pbj`C6^U)e;=`CwQnR3NMJfD8?xw9?ZDJ2;*+h-SVKJ!1Qg8*w_V;M`H|E zNs6UPpQPY;g~F0!H)s}$mW&S#kB6MVJ5H2W109eedMaaCbWob{5MM+AuKFhJ$9Q*( zOl$Z2KoO9tQ8jE<9psX{mSU-evusOE3sCIM$T=t``XJ2pDY_zN^@Oa+IU$i0GA(Z2 z4T#~IsKvFPa<%7j)vS*Ug8dT4l~(tLCo#dnB=$fy+vpb9w%2woTnl=l@;22X-~Iqu zx{n>usE=wdqd}KsN$<<{>avod`lWO-3AL;)>j{_^w4A~=xz;kdH@VXPa(OC-kDB{T zvs)%QLD6<;bm?Jf_>oH|-lwBIbnnYidM*CWYw1#W^PfG}VwZ%~KVEJVm|gB4;Qq?W zk=MT#+PrH_m*V9HHy<3_zPmcm{W*JZ--Q$Reyx9$KXvi9t@9n{7EXR_bgo$c@YHnI z)rDh6&wM}f?Q}0@K83qqG2iuj-Z*|^omrnx9xJ{R_P>~X?ZMjjzPk0un7dUT-TwHO zYS3=|UOjv=wq|YhP%zQ8sc5t(Yf^SAPEYyKevb>7!HMROAhtnRW5{hR<@HnKR;%%HZ6qFTc>v Y7%!a|{ps%I$I)*fpBvK7XWrlc9}ii1o&W#< diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalElite.png deleted file mode 100644 index 86558589cbc40f609ea714403b4db845baa03ad4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1119 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#mdRR#KpqY%+S!t z*wWC@)y&Do#MQ;z$l1ljz|zdg)fA@JGq1QLF)uk4rZ*Fz*8s0xE9aur#FG4?ko^1{ zSnLI4MqfGNHRn6#~z=$Zqw#d%K`$B>F!Z^BM3tBc^y^`DcCW11vKbgcF!N?3K-y2D>fL-+p%C6F&CE>@q?8 z_x`-UQ61kG<9)g;c%$N@g|7FHCJVL+wE3vaz7&5vx`B~Fk-5`iL+{TdP?q;}^>bP0 Hl+XkKepPh8 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlass.png deleted file mode 100644 index c34ea126b014afac34e5c925f24a6ee16df819fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 958 zcmaJ=J#W)M7&eMjl}HscOeYsrAc)T&aUxqWC9z{_2}e;HsTu3om&8i#GrkLPG9d;e z{sCsR*%gf z|8{rSpDdR@*>sz>2lN<^=-f*Y*9`Cw0VndtsE52@@$3s~a9rsi><{R`eX9F761*HE zWKqJ{9M?F^63?F^3WjJL#s>f6<0l@3fx(}suIMHvnuJHo6df-+eSbOiwSYf-1R9yn z1R_K|kVR)P(KCZz>FR8qA449jAarW*SEdGT7nnFjKox2gU#!(ZT@xg=Ua!_40$G$) zC@N49E3%?jMZGG6_25~wG#KeU%U;J~JANz*ha%21Xo3{fGA zn0i?yCi{hgg@~Vq2@P=!az$^5XVl=C)2kGsWFs4sb(vVfVCE%I62v^E0_eK`hepu` zO=u5Y`~9ad=`Ruldx+p!>a&X*?dPEq-As{3aoWfDtf*plf+;2woB-2YRSn!b3F83I z$^8|_b#*5u)Qf%OSO(8jgfI+rTUKq!wA!jIo08O4TTNMOR+Uy;G@GpUwSsG5e-@#b z7Tn;PYj5S|?GPm_vW3#{IST9)M_`q<9&YzyZq-|JgY90dtz5{=!2ELmxa{JHbx^+C zv@Y9hnjgii<5Sk!aOcef_ACU)YWA~>@8{ADj@vE03xAy}uWsEvy}0~(`S!(MeQXnD7{6^nVMzR1A~OGYxeb}Y_CC6P+_^H^Uh5jU(sd=9A5pIDyY{l(UAeo` zu8FuP(T&8-fZ3LS4#S8EOPY)r5(*3z&03y82XH2)98UgkV&Z?fAmk z3pfxXcD&illYHC-V`4*Eg-vN+Fr01+GZDOgJE%*sD1ZcY0i>jMSz}XnJRg@ucFs-U zAP>>o?D&0AExaGN6cqxq(P9Ww6a}n|kuuv%wE0Cqla!et8G<4WB*juBOOv4R;3%6K zX=MYPr;rQX?08Jq<19fWlSyOJWK`5BK`{(NkTgNl281wZ9kMQ@46;^LjKD!Htcr16 zRAi8gD1?-RZpV?*`z1(mo?i(pYlTLkmJul-PEbaYkfdB)d9qXp@to+!n^|wz^CX zPc7%BEl!8K$o0yaF34e6dXX zNop_T+FMWyRdFATcvM9K`TnrtDjI5O8*O8pE|1k=LHf;%jY1Z~m|Z55$6;~c1#V=O z+6!Fnf4Kw_L*$10pJ5kWXoGU*%Ic!a%JM@QZM=$B`*Y>aQ4A|-^Ky=0YT{Pk%?}Td zj~yr*>NSMcY?16=d^@~$ZaQJT{C3PZvApCRYIt>WWNc>h#9TIWd-mkTi^EtAR^C}U zy%!r<_-A}{;j_%mW6?9xWb^Lb!lyU>svEyl%iDTpM!{fTC~>v#t;O!KF%$99;%xKz zEB6*Yd9B}j=$T7j`$~R3k41Zb9X&liT=RQpV|xe-Zu~%KNz7;Gw_K~`x2?P0-&>9K zQd5>k``KFm$(i<{jYs__K=jMAcPM|?-PeQf9IqZU9Vxrg(=*l2CM&h8O9Lj$!N%u2 z@ae;+4Bwy1db;>cAHDZ?cKVOZIq>n1-9NlJz%TCK_x|y%v$rbFJaKuQ_l@;F>qu!e z-wmnFleV7afv$=`=&9MkgX6y)`Dy8u+wSel^trFT=}dNpCr?*4WYk@p;5oc)@Ry0$ z+`awR7Iv2II93m)N`N{c+^AenUJq40enA=Ot3R=3M~NS+z;>10eR2<$ZR~2YcWtfA O{f@kDAD40NdG}ur_{!n{ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalUltimate.png deleted file mode 100644 index 29026c7e1c2d2014e7d59e79614ce6c690fb2007..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1115 zcmaJ=U1$_n6dn^OtC(2ST5O?=Bd8U3X6|k#o0;q?yE8jxsT={egLKBy z24Eg)M)|8L7^kSlb!MRl_hh$8I}{xA=~x4?;}$!2#1wFuzaUW@yt$ zFx^6y&pI+JnjIAvc2znHdSy@-4Q9(`I_^uvfd#Qf`__={Nq&N<`jyBzFmnuDh2X&i z^Hx+(Hb=|Ig|xu7hIIe{9TQm~v_&JrCOX0cf#XFE@L?WEfR`dXUHcdk%{BU^yrR}( zkz0Z(V(ds9S1Og*Qj|sR00%@-*ZLd}+QZmlh91gHNXIVjBRkVlm@SThW(O#kKKrRnGH0}=s4OaNu~ZU7qDcVKttlWx#AH-f)3I1!U9FE~E}%gbVuIQ#x2Q2OMf3~Fwl<*1YD|rSB(J1Jrp7fE$i2oD{+G)UFi+KrueN6E9en^BSl|Iy1GUorrxdz+S>0IN5z89Sdp0vbNLKXQ6``GR+7 zReaINX#1kE2{s-2=IN1+U%QUI_;Y6N!&J-ctI$vTN_*GOz24v5b$B+n`}O#)uOHlM zEMETM>Ci^7y*++yZsNO{$K#=&|MtKCY}uO=p|jMA-iB?|!_#}-9A_{6)8G8;+|Ape z5wAQok-Iv%>Rf*J^tV4g84un1E4%Jw_W8`KmA#bu%c0So$&2@b=blM-Dpyjy2mb{> CWp_G@3dh?;^p^NnpBxERJB!oRh5xoT!QG~rjXlK@4?ZF&4bI$qszW@LJ%bDou zKE1#3NFzm2`;%vsG}&o?HS8sSuUuXwTL35e@OdMjWEIOK=gP87zgQgv0zCU};(54Y%dc!F$<;XB= zo+-QVe7QTLmvg#kFrBC9j-o^ySP*M;(HgQnsTgA_ekF4D%`8J#AUGFeHbnKMdT1HB zkPe3;K^*`K?ostkOiVBvK-Iye2^f5UdhH-mgVPFL3=n2w`6RK_A(_0vT5j{ysMLb47AqBq;@+8@_|H+ zq#!+SK^rHP7(*-}!!#to^D3_hD&PeXfJ7v!D5?_S6&1vVa3U(yxJlc?nytec*WBVJ zcH~O33pI?~3_?S-?)795MqU;s!Nt%Trg_ zN6(ttfc9$s>CdRUt95a9MOnIf5no?A*qoocTd%foU#P>m+}9QL^PC!gFt$Kg;_b2B z7lLnZeOQ{993LOQbg1P{X?o(v;^fik$v1U-sJgvW(`@g}_u%lb|D=b0K@^=NHz7?EJC;snW;@au#_6adBA6z(Goh2*nA~yF zc~J_xxX7{(ibYg##YGTmAAJzDf+GIlqp&N2^+8kw6-6KX!JBcW`cMtr+;cDAcg}Zy z?w{GrZ*B8d&7&x)E!7v#k)00L++WDwuhrg?Z6!_=@BkXZRo#PBuZadBowD^J%t758 z*>?+eQ`D?=R=$7>>3-EfHmipiHn3g7rl{_oz}1ami0MICw45mO^3qj?w#+EAQ%dt` zSA!+1ujavlS|)GQh7HAJdbZHrfl3_M5bJbcmmOaXqD5OW9T{r4@a4=q6+CO ztsxK665AOu006YCut4e(1!)s4@Ic~tg#&zq2P)uIfu|cEL!x=+keZ7p8?neK%9Jp6 zRgSAxt87(dkyqq^q9`0MaDosah=@PpU_FR9en-k>5f^ef=%b2fkbVqxG|8lPKMxcF zi5fMIjEW5%oQg*oa>JUIsY+U`OXm3m5JVY(L}#o^lM@oLWkr@`MQU#J9+ z8O%){F4vw8-I%{^^SLFbkN3|J+Kuw7(f3!zvRhl)KJ|}pe~8Af_4Uj-0!~rC|9XG6 zI3Y3TD`SP*8*fgXT>ZS*ar(it*Hha+FP?qu&Yt4ByJs&?jmvD?yG)O`_V&aZZW-U2 zoSfU8A9sL6Tp=EOb diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalElite.png deleted file mode 100644 index 3f54f8e7efec6e96465c259becf5130741aa3a97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1087 zcmaJ=Uue@n7*EmZ7)}|!Se+0u5C=BNrDR>g>THu%3wF#}*g%D)$!!faxtQGSpO-Ol z%Fw-t!q{sceA77{2ns42qA(Cea0u$t_Ns`!Oxe8DcKR?4T<-4U_xrxz_va@2`;ND^ z>~Encsx@^&&5)h;SMv_?_bQcdWDDZNAU=(TaZz(26*Eu{(kV+Dff=Y7<$a!5nAAZ$ng>f_z(|dz{>(p*FT0tbB$p+qbBRI$Sum`F?M8*D;A4v zG0Y-&gaeW!alF6@LWm$jUfIT4DP(&c4G${xbk}sSiEP^UsO8Wojxt2)?-VR2o!)e8 zd-Xz*l5r)?;Q-5XmgVPFLwh&_|H#-9?PbdjC)NRv+2iLPJDK zD111aNJgYM(Jx9M43w}UC=t-r4dQ^QbB!%>uXB_C< zb*=)ii{Iz$oXr;s3)0y7&++@gVDR3Y7Q5d5_{HmIi;L=wa`n{HuknZW<*QF0EwnA4 zyK-}Sc11f|ZkNW}^pAPQP+9r7(R^JVdK;+j-Zx5Jo1g!lui~NVv1NOuc~9WpyVmVz zLd!EBUQA9+OiT>zJ$SoZo&55A>OghsO`wSi?4WXM1Jl#(1FHX|Q;9zHPJHOnFDFB3 Ae*gdg diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalUltimate.png deleted file mode 100644 index f062b323aff4f56e66183d9977229a94a270975f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1090 zcmaJ=UuYCZ7~c>nF&ac-HA)NP25bdycW3whWS5-bZuicddPlgNO`sy;*`4j~ zT<&r$;j9#uwr@h(hmsPk`d}hPpXx)>3N3-YsGu|trO;QwmmnC0cJ^|Y_z<%&J2M}@ z-}n8#KXa`wcc!iNSS!OYZJAyzPj?WkmJjIPuT<9Qc9f(BNk1MXCEY_z!o(v8WNdv5 z<&kbqf4+*k8K(J!RTw0L+4G8lZB7p`T-kOhn_;?p%C2rqAOc3vnB~OTmk*a&V3~1t zAd(fbu8PL3-in9%E4hMEnJ{FN?Kus)%L;X1Bcg+{J?Z#LInLJnD)bzfc^1?lWFpRP ziW=tMGiORN_h!hrKZ#%CgK0A}@*|iU|4B4$;dY$M0--(2#F*b(g)rd`D6k&la>LHjY<*&x%} z?H(uqQZXmMxEaSM zx?`XQ*V^WayK)uPLps4;0prO=_xi>$!TvaQfvVQJ1wI|H921xPlRH%wop_Iq_T`kiOrOP4MoSdRYcD>#*VcS||ASv8bMMBXK6E|&*C#{i zje{M>RVLSdk$bxVQu8YVM=#xZ`nvk4qw~>`zu#O;E_@hXmlh($xgYc!bC*}Y&sCEx zZ|1KrJ->SU+0e+zyB}Tgo!fKYRTpRfSZf_Vd+oyLZ|B!OKK;wTPllJ*rS|zRmD$2d zOGi`Z@Sfh8^x?C&zWrzB3vO}c)y$7K4~M4C-9Px)(t2Kuo%mBe@OAILpa1*)Otp#W WXdWnjQ~k*fUUepw(-xD%U;PiWPh~&= diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalAdvanced.png deleted file mode 100644 index 01c289fa30880c93a9a5e8a180768fb964b3b387..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH`RU8C~ZO`y;zPZ!6Kh{JEgck>=r5U5SKCF1$; zO;Xtj9uJ;}oVLzl9>QGdjCPreZpd)HT@Szo{V=f6{P!*_1_rv3lnrqUg(3<^DlH)T9E zH>T@k?)`2T@6eHTMmM9L?M3J>?k(5kJujPZ<}q?7FzP(`pXZdFyK1J7l=jlHzp^Ve zbzlADF)?2{{q|Jf%-e=b@}0ZZZkIEid6dum*rezSF$aYID+E71^m3LW&{qteu6{1- HoD!M<>&pIsRYH_mFY9#OR-n*+PZ!6Kh{JEg4f&W91@5rQB_zJo z)_JIDrm|=1E&m%gBcgN?N9<{4%{(O{&mlXvQFP0-*Fr_-E;wt7?tQp? z%B~vL$%;&8{%)xkYnK&ZxbQUWtC-H;@V)szlNhVsueJ>GI(Q=D(^r>}dWMbB-K?L_ zGwk=WZ!CT%%bDDh)W{*gsPy1`-XQ^}m#sc=(#dWA`fR3{y?)B$!@uFVdQ&MBb@0QpdL3;+NC diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalElite.png deleted file mode 100644 index 77890b5566332698d7440619e8ebac3adb019838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH`7;b+X#y+EPeo-U3d5r^M~+wwUn^5iud@7TR# zr^TVb7!M0=_KL#dk1TNqK0Hoau;)XKUa#l=wZ8j5Obq(rke%Dg7WLY!C5Y=xK(@R5 z56kD8@r=eU4VAL%=0B*gVrDq-xK6q#w@&xFc6?OBz2A9#Q-U_6>txn?t&C?Vl=9~O zah_qX*Z#)hys09|E}4xS0*p!z{^uPMaGE>QM@l-mY;WI{DSTgx*lzf~{IsV-^Qo-! rFY_fge!UKyZ26`jS!XHh8>V{#4?`70&M0;Ry}{t=>gTe~DWM4fzlw2$ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeHorizontalUltimate.png deleted file mode 100644 index 3e56b19ebb11a3917435e4241b799f1b860ea50e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH`-%G vwvuxGWxhn>@7EP4bIL3vyz>s0Fy^n?9Gv|A*33IVpD=j3`njxgN@xNA4|8); diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalAdvanced.png deleted file mode 100644 index f3cf285ed7b6f3f83d6f082a871f9ac41a94a9e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH_i-+S82r9hzvo-U3d5r^M~9ppT0z%xar{&%M0 zm+SGHoW)+S%u{eK(b#X*o5`lJ^aAfAi}Mzn3T92`d=V!$?Lp5utHkT2j7lM)qU{F0 z!cPPat+HA9{a*TOQIR%*3%-}vNNTcHn>cDmkoHTCl~k}a>LKeJyUL^WX|4gxu>7;9iFgnLQhuK`KM=J z6y6dL{1wvjUR-~Zw7QeNl8C+lQzh@0TKS@CyWXwWc9*$WRZOb6=<>&pIsRYH`FNj2peP>$iCr;B4q#NoH$yLp`zd5#=lkW?`J zqA95)D{K(FEI~o#70(35A4@t!Yx>@MlVpF!KSEWnww%3_oQ5GiATsaH5+3O4H}e2j6zo z|JGbT{d{!YzGKdh`JZ25I#AYQxG8+?R|E57H|`7cX62k$aS~FjWE5n09y9mtPm5_m xdT%=_K9u}i()jj&lK@k+>EfI7>aC2GnDV^@;%{=gh=PKF!PC{xWt~$(695M$auNUl diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalElite.png deleted file mode 100644 index 447f1701352f5fcabfefa858720845f7a57a7da4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH`FOM8EwB2eg}r;B4q#NoGLhJ1$=c(yc}m%L{R z-tPBBIM%3iRYh?8!D1tYjbG$LneMJSvTy~DXxEe5I=3fXl(k#D)$A}+(5X}oP1O~O z&qIGNtDpBgYk$MJ2aHp$RoPAyxUh&b%HH>~mfMl6Ga@DO3@`2fu^u)MnZ4)x36VGc z%+FsxKKwjzJ_Ex8$>T{M?LYZ223arDxVhSJS%h@*oqZG5WM!TId-g@?4%6<8KhyT# ziEMep`iAwbRKdBYx90jMFAcfe>mh!A**wz=wW93;3$FHLmH&Hprh~nLIWi=^q|8jR Q1?V{jPgg&ebxsLQ0KYbYqyPW_ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorHorizontalUltimate.png deleted file mode 100644 index 28be74aff8eb598138eec672c400186e77ab9dde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH_aaN(`xXMsWwJY5_^A`ZU|bL46^5V&*o&qDbL z9IbT<_8MO<$bD*(`Nhru&GO$dXXb;;S9}aB;a%7`P2tTQxAKI;eAeAwn*7>RQg<#h zIB$I9!C$w1m;En`Tos=nd8c7QP@c6Gm&ZqzwerUc4+|Qes${t-ePG}F$*#G#e_i;# zEOUZ;fepWn{QC1Yt6%XjFdY8CC-(obeLq8{OmNGit?OPVtS!#_@3d)Erp<>&pIsRYH`_x+*bGnt_2)($mE;B;xSfFvq-R2Ob&eE8ZcB zi#ncN@m5_Ixc-k)zQZZ;PklBk-aEWvce1#^f556;UbneKY1UO{mVem^_5b9i z>YQa@@V$K}_jOK9-mTN?-{vM2*Z%MQpSk8e3kO3(iT1TkSE5YU&XLxd_38&hW4)A` zrxUZ^Vao@n&LpJGDKo#bOAs`m&OZjh#*R5R z`4}wYCamLl*>&Lk{L`VnCTjaa7SwN2&`~*myy>y_A%joWJ*PHJv5d-$HJ`UsHt_O= okNhTI{0^^LB_K9wx!(h>M^|gIb1v#M0mF^K)78&qol`;+03xfR<>&pIsRYH`V&00v<8z^+z)5S3);_%xrTRta6p1ek83k$1a zX7P28*tS<4FM7yy?%2gf`RUU+jylZfsC@g)^sk5K@2#%MK5d7VOi^u_BJ@S)dDp!U z$vv_A8jc?0)L2_OccOs7WnmM$mViW;H%WR2f648LpC4af$>`AZp+fL}-2J=%Plx|X z{}IEqWbuq!8C!xPP3={Tmezn&E_hv%a_v^vf+<<|?reM8A9{fOPloysE?Vn0F_;lB_D+%$24l3ZFNM(Q|%p`@ym31&iJF`<>&pIsRYH`Vcg=xQhk-&zJY5_^A`ZU|v*mMA5blo+5z+rgQu&X%Q~loCIB<| BdcObw diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableHorizontalUltimate.png deleted file mode 100644 index ea1070c33cfcf67e13569e5ee167665455e12d31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH_q$QIGFR;_XAIBe>Z0CVrDq7X^+*vjD zY-`>u7BaBu+W59NOlS40c8_H<{8c6HGk>-z7o1bcfRNa$D)0yUv}8> z>k3D?wWntEoYaj>>|sBDueT#L;^<_a_R|-t`Aa6uv1;TmUZ0ZpZ<>@N&|3_iu6{1- HoD!M