From 5249c0b6c8ef216d9599e7d4410850868eef52fd Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 21 May 2016 12:31:36 -0400 Subject: [PATCH] Add content renderers for the rest of the transmitters, everything works as far as I can see but for some reason it takes a block update to actually start calling the special renderers --- .../java/mekanism/client/ClientProxy.java | 9 + .../client/render/ColourTemperature.java | 32 +- .../client/render/MekanismRenderer.java | 6 +- .../RenderLogisticalTransporter.java | 280 ++++++++++++++++++ .../transmitter/RenderMechanicalPipe.java | 12 +- .../transmitter/RenderPressurizedTube.java | 55 ++++ .../RenderThermodynamicConductor.java | 49 +++ .../transmitter/RenderTransmitterBase.java | 7 +- 8 files changed, 424 insertions(+), 26 deletions(-) create mode 100644 src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java create mode 100644 src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java create mode 100644 src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index a45ce847c..abcfa8651 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -98,7 +98,10 @@ import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderThermoelectricBoiler; +import mekanism.client.render.transmitter.RenderLogisticalTransporter; import mekanism.client.render.transmitter.RenderMechanicalPipe; +import mekanism.client.render.transmitter.RenderPressurizedTube; +import mekanism.client.render.transmitter.RenderThermodynamicConductor; import mekanism.client.render.transmitter.RenderUniversalCable; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; @@ -126,7 +129,10 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.multiblock.MultiblockManager; +import mekanism.common.multipart.PartLogisticalTransporter; import mekanism.common.multipart.PartMechanicalPipe; +import mekanism.common.multipart.PartPressurizedTube; +import mekanism.common.multipart.PartThermodynamicConductor; import mekanism.common.multipart.PartUniversalCable; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.tile.TileEntityAdvancedElectricMachine; @@ -322,6 +328,9 @@ public class ClientProxy extends CommonProxy MultipartRegistryClient.bindMultipartSpecialRenderer(PartMechanicalPipe.class, new RenderMechanicalPipe()); MultipartRegistryClient.bindMultipartSpecialRenderer(PartUniversalCable.class, new RenderUniversalCable()); + MultipartRegistryClient.bindMultipartSpecialRenderer(PartThermodynamicConductor.class, new RenderThermodynamicConductor()); + MultipartRegistryClient.bindMultipartSpecialRenderer(PartLogisticalTransporter.class, new RenderLogisticalTransporter()); + MultipartRegistryClient.bindMultipartSpecialRenderer(PartPressurizedTube.class, new RenderPressurizedTube()); } @Override diff --git a/src/main/java/mekanism/client/render/ColourTemperature.java b/src/main/java/mekanism/client/render/ColourTemperature.java index 8d8f74e89..273448376 100644 --- a/src/main/java/mekanism/client/render/ColourTemperature.java +++ b/src/main/java/mekanism/client/render/ColourTemperature.java @@ -1,13 +1,12 @@ package mekanism.client.render; -//import java.util.HashMap; -// -//import mekanism.api.IHeatTransfer; -//import codechicken.lib.colour.ColourRGBA; +import java.util.HashMap; -public class ColourTemperature// extends ColourRGBA +import mekanism.api.IHeatTransfer; +import mekanism.common.ColourRGBA; + +public class ColourTemperature extends ColourRGBA { -/* public static HashMap cache = new HashMap(); public double temp; @@ -23,12 +22,11 @@ public class ColourTemperature// extends ColourRGBA if(temperature < 0) { double alphaBlend = -temperature/IHeatTransfer.AMBIENT_TEMP; - if(alphaBlend < 0) - alphaBlend = 0; - if(alphaBlend > 1) - alphaBlend = 1; + if(alphaBlend < 0) alphaBlend = 0; + if(alphaBlend > 1) alphaBlend = 1; return new ColourTemperature(1, 1, 1, alphaBlend, temperature).blendOnto(baseColour); } + double absTemp = temperature + IHeatTransfer.AMBIENT_TEMP; absTemp /= 100; @@ -50,8 +48,7 @@ public class ColourTemperature// extends ColourRGBA { red = 1; } - else - { + else { tmpCalc = effectiveTemp - 60; tmpCalc = 329.698727446 * Math.pow(tmpCalc,-0.1332047592); red = tmpCalc/255D; @@ -63,8 +60,7 @@ public class ColourTemperature// extends ColourRGBA tmpCalc = 99.4708025861 * Math.log(tmpCalc) - 161.1195681661; green = tmpCalc/255D; } - else - { + else { tmpCalc = effectiveTemp - 60; tmpCalc = 288.1221695283 * Math.pow(tmpCalc, -0.0755148492); green = tmpCalc/255D; @@ -78,8 +74,7 @@ public class ColourTemperature// extends ColourRGBA { blue = 0; } - else - { + else { tmpCalc = effectiveTemp - 10; tmpCalc = 138.5177312231 * Math.log(tmpCalc) - 305.0447927307; @@ -109,8 +104,8 @@ public class ColourTemperature// extends ColourRGBA public ColourTemperature blendOnto(ColourRGBA baseColour) { - double sR = (r & 0xFF)/255D, sG = (g & 0xFF)/255D, sB = (b & 0xFF)/255D, sA = (a & 0xFF)/255D; - double dR = (baseColour.r & 0xFF)/255D, dG = (baseColour.g & 0xFF)/255D, dB = (baseColour.b & 0xFF)/255D, dA = (baseColour.a & 0xFF)/255D; + double sR = (valR & 0xFF)/255D, sG = (valG & 0xFF)/255D, sB = (valB & 0xFF)/255D, sA = (valA & 0xFF)/255D; + double dR = (baseColour.valR & 0xFF)/255D, dG = (baseColour.valG & 0xFF)/255D, dB = (baseColour.valB & 0xFF)/255D, dA = (baseColour.valA & 0xFF)/255D; double rR = sR * sA + dR * (1-sA); double rG = sG * sA + dG * (1-sA); @@ -119,5 +114,4 @@ public class ColourTemperature// extends ColourRGBA return new ColourTemperature(rR, rG, rB, rA, temp); } -*/ } diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 1bc8a8e87..161bbacec 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -18,6 +18,8 @@ import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; +import mekanism.client.render.transmitter.RenderLogisticalTransporter; +import mekanism.client.render.transmitter.RenderMechanicalPipe; import mekanism.common.base.IMetaItem; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -81,7 +83,6 @@ public class MekanismRenderer public static TextureAtlasSprite missingIcon; public static Map> textureMap = new HashMap>(); - @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) @@ -128,6 +129,9 @@ public class MekanismRenderer { initFluidTextures(event.map); + RenderLogisticalTransporter.onStitch(event.map); + RenderMechanicalPipe.onStitch(); + for(Gas gas : GasRegistry.getRegisteredGasses()) { gas.updateIcon(event.map); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java new file mode 100644 index 000000000..cdefb569a --- /dev/null +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -0,0 +1,280 @@ +package mekanism.client.render.transmitter; + +import java.util.HashMap; + +import mcmultipart.multipart.IMultipart; +import mekanism.api.Coord4D; +import mekanism.client.model.ModelTransporterBox; +import mekanism.client.render.MekanismRenderer; +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.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.TransporterUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; +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.EnumFacing; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + +public class RenderLogisticalTransporter extends RenderTransmitterBase +{ + private ModelTransporterBox modelBox = new ModelTransporterBox(); + + private EntityItem entityItem = new EntityItem(null); + + private Render renderer = (Render)Minecraft.getMinecraft().getRenderManager().getEntityClassRenderObject(EntityItem.class); + + private static HashMap> cachedOverlays = new HashMap>(); + + private static TextureAtlasSprite gunpowderIcon; + private static TextureAtlasSprite torchOffIcon; + private static TextureAtlasSprite torchOnIcon; + + public RenderLogisticalTransporter() + { + super(); + } + + @Override + public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + { + PartLogisticalTransporter transporter = (PartLogisticalTransporter)multipart; + GL11.glPushMatrix(); + + //possibly TODO + entityItem.setNoDespawn(); + entityItem.hoverStart = 0; + + entityItem.setPosition(transporter.getPos().getX() + 0.5, transporter.getPos().getY() + 0.5, transporter.getPos().getZ() + 0.5); + entityItem.worldObj = transporter.getWorld(); + + for(TransporterStack stack : transporter.getTransmitter().transit) + { + if(stack != null) + { + GL11.glPushMatrix(); + entityItem.setEntityItemStack(stack.itemStack); + + float[] pos = TransporterUtils.getStackPosition(transporter.getTransmitter(), stack, partialTick*transporter.tier.speed); + + GL11.glTranslated(x + pos[0], y + pos[1], z + pos[2]); + GL11.glScalef(0.75F, 0.75F, 0.75F); + + renderer.doRender(entityItem, 0, 0, 0, 0, 0); + GL11.glPopMatrix(); + + if(stack.color != null) + { + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "TransporterBox.png")); + GL11.glPushMatrix(); + MekanismRenderer.glowOn(); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glColor4f(stack.color.getColor(0), stack.color.getColor(1), stack.color.getColor(2), 1.0F); + GL11.glTranslatef((float)(x + pos[0]), (float)(y + pos[1] - ((stack.itemStack.getItem() instanceof ItemBlock) ? 0.1 : 0)), (float)(z + pos[2])); + modelBox.render(0.0625F); + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + } + } + + 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) + { + Coord4D obj = new Coord4D(pos.getBlockPos(), transporter.getWorld()); + + if(obj.equals(new Coord4D(transporter.getPos(), transporter.getWorld()))) + { + int mode = ((PartDiversionTransporter)transporter).modes[pos.sideHit.ordinal()]; + + pushTransporter(); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.8F); + + bindTexture(MekanismRenderer.getBlocksTexture()); + GL11.glTranslatef((float)x, (float)y, (float)z); + GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + + int display = getOverlayDisplay(world, pos.sideHit, mode).display; + GL11.glCallList(display); + + popTransporter(); + } + } + } + + GL11.glPopMatrix(); + } + + private DisplayInteger getOverlayDisplay(World world, EnumFacing side, int mode) + { + if(cachedOverlays.containsKey(side) && cachedOverlays.get(side).containsKey(mode)) + { + return cachedOverlays.get(side).get(mode); + } + + TextureAtlasSprite icon = null; + + switch(mode) + { + case 0: + icon = gunpowderIcon; + break; + case 1: + icon = torchOnIcon; + break; + case 2: + icon = torchOffIcon; + 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; + } + + private void popTransporter() + { + GL11.glPopAttrib(); + MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); + GL11.glPopMatrix(); + } + + private void pushTransporter() + { + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); + MekanismRenderer.glowOn(); + MekanismRenderer.blendOn(); + } + + public static void onStitch(TextureMap map) + { + cachedOverlays.clear(); + + gunpowderIcon = map.getTextureExtry("minecraft:items/gunpowder"); + torchOffIcon = map.getTextureExtry("minecraft:blocks/redstone_torch_off"); + torchOnIcon = map.getTextureExtry("minecraft:blocks/redstone_torch_on"); + + System.out.println(gunpowderIcon); + System.out.println(torchOffIcon); + System.out.println(torchOnIcon); + } +} diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index b81da338a..376b602e0 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL11; public class RenderMechanicalPipe extends RenderTransmitterBase { - private HashMap> cachedLiquids = new HashMap>(); + private static HashMap> cachedLiquids = new HashMap>(); private static final int stages = 100; private static final double height = 0.45; @@ -74,7 +74,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase MekanismRenderer.colorFluid(fluid); bindTexture(MekanismRenderer.getBlocksTexture()); - GL11.glTranslated(x, y, z); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); boolean gas = fluid.isGaseous(); @@ -98,15 +98,14 @@ public class RenderMechanicalPipe extends RenderTransmitterBase } else if(pipe.getConnectionType(side) != ConnectionType.NONE) { - GL11.glCullFace(GL11.GL_FRONT); Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldRenderer = tessellator.getWorldRenderer(); renderFluidInOut(worldRenderer, side, pipe); tessellator.draw(); - GL11.glCullFace(GL11.GL_BACK); } } + isDrawing = false; DisplayInteger[] displayLists = getListAndRender(null, fluid); if(displayLists != null) @@ -259,4 +258,9 @@ public class RenderMechanicalPipe extends RenderTransmitterBase TextureAtlasSprite tex = MekanismRenderer.getFluidTexture(pipe.getTransmitter().getTransmitterNetwork().refFluid, FluidType.STILL); renderTransparency(renderer, tex, getModelForSide(pipe, side), new ColourRGBA(1.0, 1.0, 1.0, pipe.currentScale)); } + + public static void onStitch() + { + cachedLiquids.clear(); + } } diff --git a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java new file mode 100644 index 000000000..678e38ae5 --- /dev/null +++ b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java @@ -0,0 +1,55 @@ +package mekanism.client.render.transmitter; + +import mcmultipart.multipart.IMultipart; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.ColourRGBA; +import mekanism.common.multipart.PartPressurizedTube; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.util.EnumFacing; + +import org.lwjgl.opengl.GL11; + +public class RenderPressurizedTube extends RenderTransmitterBase +{ + public RenderPressurizedTube() + { + super(); + } + + @Override + public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + { + PartPressurizedTube tube = (PartPressurizedTube)multipart; + + if(!tube.getTransmitter().hasTransmitterNetwork() || tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0) + { + return; + } + + push(); + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldRenderer = tessellator.getWorldRenderer(); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + + for(EnumFacing side : EnumFacing.VALUES) + { + renderGasSide(worldRenderer, side, tube); + } + + MekanismRenderer.glowOn(0); + + tessellator.draw(); + isDrawing = false; + + MekanismRenderer.glowOff(); + + pop(); + } + + public void renderGasSide(WorldRenderer renderer, EnumFacing side, PartPressurizedTube tube) + { + bindTexture(MekanismRenderer.getBlocksTexture()); + renderTransparency(renderer, tube.getTransmitter().getTransmitterNetwork().refGas.getSprite(), getModelForSide(tube, side), new ColourRGBA(1.0, 1.0, 1.0, tube.currentScale)); + } +} diff --git a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java new file mode 100644 index 000000000..733710825 --- /dev/null +++ b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java @@ -0,0 +1,49 @@ +package mekanism.client.render.transmitter; + +import mcmultipart.multipart.IMultipart; +import mekanism.client.render.ColourTemperature; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.multipart.PartThermodynamicConductor; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.util.EnumFacing; + +import org.lwjgl.opengl.GL11; + +public class RenderThermodynamicConductor extends RenderTransmitterBase +{ + public RenderThermodynamicConductor() + { + super(); + } + + @Override + public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + { + PartThermodynamicConductor transmitter = (PartThermodynamicConductor)multipart; + + push(); + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldRenderer = tessellator.getWorldRenderer(); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + + for(EnumFacing side : EnumFacing.VALUES) + { + renderHeatSide(worldRenderer, side, transmitter); + } + + MekanismRenderer.glowOn(); + + tessellator.draw(); + isDrawing = false; + + MekanismRenderer.glowOff(); + pop(); + } + + public void renderHeatSide(WorldRenderer renderer, EnumFacing side, PartThermodynamicConductor cable) + { + bindTexture(MekanismRenderer.getBlocksTexture()); + renderTransparency(renderer, MekanismRenderer.heatIcon, getModelForSide(cable, side), ColourTemperature.fromTemperature(cable.temperature, cable.getBaseColour())); + } +} diff --git a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java index 16be73e17..254f0ab20 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java @@ -8,6 +8,7 @@ import mekanism.common.ColourRGBA; import mekanism.common.multipart.PartTransmitter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -29,13 +30,15 @@ public abstract class RenderTransmitterBase extends MultipartSpecialRenderer private static OBJModel contentsModel; private static Map contentsMap = new HashMap(); + protected Minecraft mc = Minecraft.getMinecraft(); + public RenderTransmitterBase() { if(contentsModel == null) { try { contentsModel = (OBJModel)OBJLoader.instance.loadModel(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_contents.obj")); - contentsMap = getModelsForGroups(contentsModel); + contentsMap = buildModelMap(contentsModel); } catch(Exception e) { e.printStackTrace(); } @@ -75,7 +78,7 @@ public abstract class RenderTransmitterBase extends MultipartSpecialRenderer } } - public static HashMap getModelsForGroups(OBJModel objModel) + public static HashMap buildModelMap(OBJModel objModel) { HashMap modelParts = new HashMap();