diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index d10e243da..0a1edd775 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -189,7 +190,7 @@ public class GuiDigitalMiner extends GuiMekanism mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO itemRender.renderIcon(144, 27, MekanismRenderer.getColorIcon(EnumColor.DARK_RED), 16, 16); + drawTexturedRectFromIcon(144, 27, MekanismRenderer.getColorIcon(EnumColor.DARK_RED), 16, 16); itemRender.renderItemAndEffectIntoGUI(tileEntity.missingStack, 144, 27); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index ca23b0e40..708ef04cc 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -572,7 +572,7 @@ public class GuiLogisticalSorter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO itemRender.renderIcon(13, 137, MekanismRenderer.getColorIcon(tileEntity.color), 16, 16); + drawTexturedRectFromIcon(13, 137, MekanismRenderer.getColorIcon(tileEntity.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 2d3485ac0..968f7dc49 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -83,8 +83,6 @@ public class GuiMFilterSelect extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFilterSelect.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -101,6 +99,8 @@ public class GuiMFilterSelect extends GuiMekanism else { drawTexturedModalRect(guiWidth + 5, guiHeight + 5, 176, 11, 11, 11); } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index c669a773a..36d0faf69 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -98,8 +98,7 @@ public class GuiMItemStackFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } - else - { + else { status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; } @@ -174,8 +173,6 @@ public class GuiMItemStackFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiMItemStackFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -212,32 +209,38 @@ public class GuiMItemStackFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 12; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 149; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glPopAttrib(); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 7b68b84ee..f859a30e0 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -169,8 +169,6 @@ public class GuiMMaterialFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiMMaterialFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -199,32 +197,38 @@ public class GuiMMaterialFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 12; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 149; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glPopAttrib(); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 0c9140abb..48129026a 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -196,8 +196,6 @@ public class GuiMModIDFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiMModIDFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -231,22 +229,26 @@ public class GuiMModIDFilter extends GuiMekanism drawTexturedModalRect(guiWidth + 148, guiHeight + 45, 176 + 23, 14, 14, 14); } + modIDText.drawTextBox(); + if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 149; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glPopAttrib(); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } - - modIDText.drawTextBox(); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 9bf25e8b9..d0dae91c3 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -196,8 +196,6 @@ public class GuiMOreDictFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiMOreDictFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -231,22 +229,26 @@ public class GuiMOreDictFilter extends GuiMekanism drawTexturedModalRect(guiWidth + 148, guiHeight + 45, 176 + 23, 14, 14, 14); } + oreDictText.drawTextBox(); + if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 149; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glPopAttrib(); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } - - oreDictText.drawTextBox(); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 117dca81b..7dd53e4c6 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -198,7 +198,7 @@ public class GuiTItemStackFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); @@ -238,8 +238,6 @@ public class GuiTItemStackFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTItemStackFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -271,17 +269,21 @@ public class GuiTItemStackFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 12; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 6e1fc3431..2f6d92375 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -146,7 +146,7 @@ public class GuiTMaterialFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); @@ -183,8 +183,6 @@ public class GuiTMaterialFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTMaterialFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -205,17 +203,21 @@ public class GuiTMaterialFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { GlStateManager.pushMatrix(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); int x = guiWidth + 12; int y = guiHeight + 19; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); GlStateManager.popMatrix(); } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 8963c1267..436e94462 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -184,7 +184,7 @@ public class GuiTModIDFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); @@ -207,8 +207,6 @@ public class GuiTModIDFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTModIDFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -235,6 +233,8 @@ public class GuiTModIDFilter extends GuiMekanism } modIDText.drawTextBox(); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 1c0220a5c..4901d66f1 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -184,7 +184,7 @@ public class GuiTOreDictFilter extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); + drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); @@ -207,8 +207,6 @@ public class GuiTOreDictFilter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTOreDictFilter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -235,6 +233,8 @@ public class GuiTOreDictFilter extends GuiMekanism } oreDictText.drawTextBox(); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index 531910dd0..daea668d2 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.tile.TileEntityBoilerCasing; @@ -151,7 +152,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism } mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, MekanismRenderer.getFluidTexture(fluid.getFluid(), FluidType.STILL), 16, 16 - (16 - renderRemaining)); start+=16; if(renderRemaining == 0 || scale == 0) diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 5f78634b6..f4896c16c 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -141,7 +141,7 @@ public class GuiTransporterConfig extends GuiMekanism GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); - //TODO itemRender.renderIcon(122, 49, MekanismRenderer.getColorIcon(configurable.getEjector().getOutputColor()), 16, 16); + drawTexturedRectFromIcon(122, 49, MekanismRenderer.getColorIcon(configurable.getEjector().getOutputColor()), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index 80f32d65b..3c402bfdd 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -31,109 +31,108 @@ public class ModelElectrolyticSeparator extends ModelBase textureWidth = 128; textureHeight = 64; - tank2 = new ModelRenderer(this, 64, 0); - tank2.addBox(0F, 0F, 0F, 7, 10, 7); - tank2.setRotationPoint(1F, 10F, 1F); - tank2.setTextureSize(128, 64); - tank2.mirror = true; - setRotation(tank2, 0F, 0F, 0F); - tank1 = new ModelRenderer(this, 0, 20); - tank1.addBox(0F, 0F, 0F, 8, 12, 16); - tank1.setRotationPoint(-8F, 8F, -8F); - tank1.setTextureSize(128, 64); - tank1.mirror = true; - setRotation(tank1, 0F, 0F, 0F); - tank3 = new ModelRenderer(this, 64, 0); - tank3.addBox(0F, 0F, 0F, 7, 10, 7); - tank3.setRotationPoint(1F, 10F, -8F); - tank3.setTextureSize(128, 64); - tank3.mirror = true; - setRotation(tank3, 0F, 0F, 0F); - tube6 = new ModelRenderer(this, 0, 0); - tube6.addBox(0F, 0F, 0F, 1, 1, 1); - tube6.setRotationPoint(4F, 9F, 4F); - tube6.setTextureSize(128, 64); - tube6.mirror = true; - setRotation(tube6, 0F, 0F, 0F); - tube5 = new ModelRenderer(this, 0, 0); - tube5.addBox(0F, 0F, 0F, 1, 1, 1); - tube5.setRotationPoint(4F, 9F, -5F); - tube5.setTextureSize(128, 64); - tube5.mirror = true; - setRotation(tube5, 0F, 0F, 0F); - tube4 = new ModelRenderer(this, 0, 48); - tube4.addBox(0F, 0F, 0F, 1, 1, 10); - tube4.setRotationPoint(4F, 8F, -5F); - tube4.setTextureSize(128, 64); - tube4.mirror = true; - setRotation(tube4, 0F, 0F, 0F); - tube3 = new ModelRenderer(this, 0, 0); - tube3.addBox(0F, 0F, 0F, 1, 3, 1); - tube3.setRotationPoint(4F, 9F, -0.5F); - tube3.setTextureSize(128, 64); - tube3.mirror = true; - setRotation(tube3, 0F, 0F, 0F); - tube2 = new ModelRenderer(this, 0, 0); - tube2.addBox(-4F, -1F, 0F, 4, 1, 1); - tube2.setRotationPoint(5F, 12F, -0.5F); - tube2.setTextureSize(128, 64); - tube2.mirror = true; - //TODO - setRotation(tube2, 0F, 0F, -0.5235988F); - tube1 = new ModelRenderer(this, 0, 0); - tube1.addBox(-3F, -1F, 0F, 3, 1, 1); - tube1.setRotationPoint(1.5F, 14F, -0.5F); - tube1.setTextureSize(128, 64); - tube1.mirror = true; - setRotation(tube1, 0F, 0F, 0F); - base = new ModelRenderer(this, 0, 0); - base.addBox(0F, 0F, 0F, 16, 4, 16); - base.setRotationPoint(-8F, 20F, -8F); - base.setTextureSize(128, 64); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - portToggle1 = new ModelRenderer(this, 48, 36); - portToggle1.addBox(0F, 0F, 0F, 1, 10, 10); - portToggle1.setRotationPoint(-8.01F, 11F, -5F); - portToggle1.setTextureSize(128, 64); - portToggle1.mirror = true; - setRotation(portToggle1, 0F, 0F, 0F); - portToggle2a = new ModelRenderer(this, 48, 20); - portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); - portToggle2a.setRotationPoint(7.01F, 12F, -4F); - portToggle2a.setTextureSize(128, 64); - portToggle2a.mirror = true; - setRotation(portToggle2a, 0F, 0F, 0F); - portToggle2b = new ModelRenderer(this, 0, 4); - portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); - portToggle2b.setRotationPoint(5F, 13F, -1F); - portToggle2b.setTextureSize(128, 64); - portToggle2b.mirror = true; - setRotation(portToggle2b, 0F, 0F, 0F); - portToggle3a = new ModelRenderer(this, 66, 20); - portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); - portToggle3a.setRotationPoint(-4F, 12F, -8.01F); - portToggle3a.setTextureSize(128, 64); - portToggle3a.mirror = true; - setRotation(portToggle3a, 0F, 0F, 0F); - portToggle3b = new ModelRenderer(this, 0, 4); - portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); - portToggle3b.setRotationPoint(0F, 13F, -7F); - portToggle3b.setTextureSize(128, 64); - portToggle3b.mirror = true; - setRotation(portToggle3b, 0F, 0F, 0F); - portToggle4a = new ModelRenderer(this, 66, 20); - portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); - portToggle4a.setRotationPoint(-4F, 12F, 7.01F); - portToggle4a.setTextureSize(128, 64); - portToggle4a.mirror = true; - setRotation(portToggle4a, 0F, 0F, 0F); - portToggle4b = new ModelRenderer(this, 0, 4); - portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); - portToggle4b.setRotationPoint(0F, 13F, 5F); - portToggle4b.setTextureSize(128, 64); - portToggle4b.mirror = true; - setRotation(portToggle4b, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 64, 0); + tank2.addBox(0F, 0F, 0F, 7, 10, 7); + tank2.setRotationPoint(1F, 10F, 1F); + tank2.setTextureSize(128, 64); + tank2.mirror = true; + setRotation(tank2, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 20); + tank1.addBox(0F, 0F, 0F, 8, 12, 16); + tank1.setRotationPoint(-8F, 8F, -8F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 64, 0); + tank3.addBox(0F, 0F, 0F, 7, 10, 7); + tank3.setRotationPoint(1F, 10F, -8F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 1, 1, 1); + tube6.setRotationPoint(4F, 9F, 4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 1, 1, 1); + tube5.setRotationPoint(4F, 9F, -5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 48); + tube4.addBox(0F, 0F, 0F, 1, 1, 10); + tube4.setRotationPoint(4F, 8F, -5F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 1, 3, 1); + tube3.setRotationPoint(4F, 9F, -0.5F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(-4F, -1F, 0F, 4, 1, 1); + tube2.setRotationPoint(5F, 12F, -0.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, -0.5235988F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(-3F, -1F, 0F, 3, 1, 1); + tube1.setRotationPoint(1.5F, 14F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 48, 36); + portToggle1.addBox(0F, 0F, 0F, 1, 10, 10); + portToggle1.setRotationPoint(-8.01F, 11F, -5F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2a = new ModelRenderer(this, 48, 20); + portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2a.setRotationPoint(7.01F, 12F, -4F); + portToggle2a.setTextureSize(128, 64); + portToggle2a.mirror = true; + setRotation(portToggle2a, 0F, 0F, 0F); + portToggle2b = new ModelRenderer(this, 0, 4); + portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); + portToggle2b.setRotationPoint(5F, 13F, -1F); + portToggle2b.setTextureSize(128, 64); + portToggle2b.mirror = true; + setRotation(portToggle2b, 0F, 0F, 0F); + portToggle3a = new ModelRenderer(this, 66, 20); + portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle3a.setRotationPoint(-4F, 12F, -8.01F); + portToggle3a.setTextureSize(128, 64); + portToggle3a.mirror = true; + setRotation(portToggle3a, 0F, 0F, 0F); + portToggle3b = new ModelRenderer(this, 0, 4); + portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle3b.setRotationPoint(0F, 13F, -7F); + portToggle3b.setTextureSize(128, 64); + portToggle3b.mirror = true; + setRotation(portToggle3b, 0F, 0F, 0F); + portToggle4a = new ModelRenderer(this, 66, 20); + portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle4a.setRotationPoint(-4F, 12F, 7.01F); + portToggle4a.setTextureSize(128, 64); + portToggle4a.mirror = true; + setRotation(portToggle4a, 0F, 0F, 0F); + portToggle4b = new ModelRenderer(this, 0, 4); + portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle4b.setRotationPoint(0F, 13F, 5F); + portToggle4b.setTextureSize(128, 64); + portToggle4b.mirror = true; + setRotation(portToggle4b, 0F, 0F, 0F); } public void render(float size) diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index 5f56d3f46..284bc981c 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -104,7 +104,6 @@ public class ModelQuantumEntangloporter extends ModelBase energyCubeCore.setRotationPoint(0F, 16F, 0F); energyCubeCore.setTextureSize(128, 64); energyCubeCore.mirror = true; - //TODO setRotation(energyCubeCore, 0.7132579F, 0.403365F, 0.645384F); frameEdge1 = new ModelRenderer(this, 0, 16); frameEdge1.addBox(0F, 0F, 0F, 1, 10, 1); diff --git a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java index 80f542a39..67c34d645 100644 --- a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java @@ -85,56 +85,48 @@ public class ModelSolarNeutronActivator extends ModelBase panel1.addBox(0F, 0F, -16F, 6, 1, 16); panel1.setRotationPoint(2.75F, -4.95F, 8F); panel1.setTextureSize(128, 64); - //TODO setRotation(panel1, -0.1082104F, -0.0279253F, -0.2617994F); panel2 = new ModelRenderer(this, 84, 15); panel2.addBox(0F, 0F, -16F, 6, 1, 16); panel2.setRotationPoint(-3F, -5F, 8F); panel2.setTextureSize(128, 64); panel2.mirror = true; - //TODO setRotation(panel2, -0.1047198F, 0F, 0F); panelBase = new ModelRenderer(this, 28, 45); panelBase.addBox(0F, 1F, -16F, 6, 1, 14); panelBase.setRotationPoint(-3F, -5F, 9F); panelBase.setTextureSize(128, 64); panelBase.mirror = true; - //TODO setRotation(panelBase, -0.1047198F, 0F, 0F); panelBraceLeft2 = new ModelRenderer(this, 64, 15); panelBraceLeft2.addBox(-4F, 0.5F, -5F, 5, 1, 2); panelBraceLeft2.setRotationPoint(-3F, -5F, 9F); panelBraceLeft2.setTextureSize(128, 64); panelBraceLeft2.mirror = true; - //TODO setRotation(panelBraceLeft2, -0.1047198F, 0F, 0.2505517F); panelBraceRight2 = new ModelRenderer(this, 64, 15); panelBraceRight2.addBox(-1F, 0.5F, -5F, 5, 1, 2); panelBraceRight2.setRotationPoint(3F, -5F, 9F); panelBraceRight2.setTextureSize(128, 64); panelBraceRight2.mirror = true; - //TODO setRotation(panelBraceRight2, -0.1047198F, 0F, -0.2555938F); panelBraceLeft1 = new ModelRenderer(this, 64, 15); panelBraceLeft1.addBox(-4F, 0.5F, -15F, 5, 1, 2); panelBraceLeft1.setRotationPoint(-3F, -5F, 9F); panelBraceLeft1.setTextureSize(128, 64); panelBraceLeft1.mirror = true; - //TODO setRotation(panelBraceLeft1, -0.1047198F, 0F, 0.2505517F); panelBraceRight1 = new ModelRenderer(this, 64, 15); panelBraceRight1.addBox(-1F, 0.5F, -15F, 5, 1, 2); panelBraceRight1.setRotationPoint(3F, -5F, 9F); panelBraceRight1.setTextureSize(128, 64); panelBraceRight1.mirror = true; - //TODO setRotation(panelBraceRight1, -0.1047198F, 0F, -0.2555938F); panelBrace = new ModelRenderer(this, 56, 18); panelBrace.addBox(0F, 1.2F, -10F, 2, 2, 9); panelBrace.setRotationPoint(-1F, -5F, 8F); panelBrace.setTextureSize(128, 64); panelBrace.mirror = true; - //TODO setRotation(panelBrace, -0.1047198F, 0F, 0F); bridge = new ModelRenderer(this, 65, 1); bridge.addBox(0F, 0F, 0F, 12, 1, 13); @@ -147,42 +139,36 @@ public class ModelSolarNeutronActivator extends ModelBase platform.setRotationPoint(-0.5F, 8F, -2.5F); platform.setTextureSize(128, 64); platform.mirror = true; - //TODO setRotation(platform, -0.1047198F, 0F, 0F); hole2 = new ModelRenderer(this, 0, 6); hole2.addBox(1F, 0F, 0F, 1, 2, 1); hole2.setRotationPoint(-0.5F, 8F, -2.5F); hole2.setTextureSize(128, 64); hole2.mirror = true; - //TODO setRotation(hole2, -0.1047198F, 0F, 0F); hole4 = new ModelRenderer(this, 0, 3); hole4.addBox(-1F, 0F, 1F, 3, 2, 1); hole4.setRotationPoint(-0.5F, 8F, -2.5F); hole4.setTextureSize(128, 64); hole4.mirror = true; - //TODO setRotation(hole4, -0.1047198F, 0F, 0F); hole1 = new ModelRenderer(this, 0, 3); hole1.addBox(-1F, 0F, -1F, 3, 2, 1); hole1.setRotationPoint(-0.5F, 8F, -2.5F); hole1.setTextureSize(128, 64); hole1.mirror = true; - //TODO setRotation(hole1, -0.1047198F, 0F, 0F); hole3 = new ModelRenderer(this, 0, 6); hole3.addBox(-1F, 0F, 0F, 1, 2, 1); hole3.setRotationPoint(-0.5F, 8F, -2.5F); hole3.setTextureSize(128, 64); hole3.mirror = true; - //TODO setRotation(hole3, -0.1047198F, 0F, 0F); brace2 = new ModelRenderer(this, 0, 11); brace2.addBox(0F, 0F, 0F, 1, 1, 2); brace2.setRotationPoint(1F, 9.5F, -7.1F); brace2.setTextureSize(128, 64); brace2.mirror = true; - //TODO setRotation(brace2, 0.1745329F, 0F, 0F); tube2c = new ModelRenderer(this, 0, 9); tube2c.addBox(0F, 0F, 0F, 1, 1, 1); @@ -231,7 +217,6 @@ public class ModelSolarNeutronActivator extends ModelBase brace1.setRotationPoint(-2F, 9.5F, -7.1F); brace1.setTextureSize(128, 64); brace1.mirror = true; - //TODO setRotation(brace1, 0.1745329F, 0F, 0F); tank = new ModelRenderer(this, 0, 0); tank.addBox(0F, 0F, 0F, 16, 9, 16); @@ -244,7 +229,6 @@ public class ModelSolarNeutronActivator extends ModelBase laser.setRotationPoint(-1F, -5F, 8F); laser.setTextureSize(128, 64); laser.mirror = true; - //TODO setRotation(laser, -0.1117011F, 0F, 0F); base = new ModelRenderer(this, 0, 25); base.addBox(0F, 0F, 0F, 16, 4, 16); @@ -359,7 +343,6 @@ public class ModelSolarNeutronActivator extends ModelBase laserBeamToggle.setRotationPoint(-1F, -5F, 8F); laserBeamToggle.setTextureSize(128, 64); laserBeamToggle.mirror = true; - //TODO setRotation(laserBeamToggle, -0.1117011F, 0F, 0F); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 25297b9c6..d55ee4cc3 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -100,7 +100,7 @@ import buildcraft.api.tools.IToolWrench; * @author AidanBrady * */ -public abstract class BlockBasic extends Block implements ICTMBlock//TODO? implements ICustomBlockIcon +public abstract class BlockBasic extends Block implements ICTMBlock { public CTMData[][] ctmData = new CTMData[16][4]; diff --git a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java index e6d92dd5d..79b008e41 100644 --- a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java +++ b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java @@ -20,7 +20,6 @@ public class EntityObsidianTNT extends Entity fuse = 0; preventEntitySpawning = true; setSize(0.98F, 0.98F); -//TODO yOffset = height / 2.0F; } public EntityObsidianTNT(World world, double x, double y, double z) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 03d155cea..7378939ea 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -26,7 +26,7 @@ public class ContainerRobitSmelting extends Container addSlotToContainer(new Slot(entity, 28, 56, 17)); addSlotToContainer(new Slot(entity, 29, 56, 53)); - addSlotToContainer(new SlotFurnaceOutput(inventory.player, entity, 30, 116, 35)); //TODO: ? + addSlotToContainer(new SlotFurnaceOutput(inventory.player, entity, 30, 116, 35)); int slotY; diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index 44aebbc92..0f537748d 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -127,11 +127,6 @@ public class PartThermodynamicConductor extends PartTransmitter