diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 78b228d0d..7bfaeec45 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -103,9 +103,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.Tier.BaseTier; -import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.GasTankTier; -import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; @@ -225,7 +223,8 @@ public class ClientProxy extends CommonProxy public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest", - "solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator"}; + "solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator", "security_desk", + "quantum_entangloporter", "resistive_heater", "EnergyCube"}; @Override public void loadConfiguration() @@ -393,6 +392,7 @@ public class ClientProxy extends CommonProxy ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.EnergyCube), 0, new ModelResourceLocation("mekanism:EnergyCube", "inventory")); for(MachineType type : MachineType.values()) { @@ -481,7 +481,7 @@ public class ClientProxy extends CommonProxy while(true) { - if(machineResources.get(resource) == null) + if(basicResources.get(resource) == null) { List entries = new ArrayList(); @@ -507,7 +507,7 @@ public class ClientProxy extends CommonProxy } } - if(type == BasicBlockType.BIN) + if(type == BasicBlockType.BIN || Arrays.asList(CUSTOM_RENDERS).contains(type.getName())) { properties = "inventory"; } @@ -554,17 +554,6 @@ public class ClientProxy extends CommonProxy ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); } - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); - ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube"); - - return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); - } - }); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index ebd548e15..d810d0e5d 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -15,8 +15,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { @@ -351,33 +349,36 @@ public class ModelEnergyCube extends ModelBase connectors = new ModelRenderer[] {connectorBottomToggle, connectorTopToggle, connectorFrontToggle, connectorBackToggle, connectorLeftToggle, connectorRightToggle}; } - public void render(float size, EnergyCubeTier tier, TextureManager manager) + public void render(float size, EnergyCubeTier tier, TextureManager manager, boolean renderMain) { - frame12.render(size); - frame11.render(size); - frame10.render(size); - frame9.render(size); - frame8.render(size); - frame7.render(size); - frame6.render(size); - frame5.render(size); - frame4.render(size); - frame3.render(size); - frame2.render(size); - frame1.render(size); - - corner8.render(size); - corner7.render(size); - corner6.render(size); - corner5.render(size); - corner4.render(size); - corner3.render(size); - corner2.render(size); - corner1.render(size); + if(renderMain) + { + frame12.render(size); + frame11.render(size); + frame10.render(size); + frame9.render(size); + frame8.render(size); + frame7.render(size); + frame6.render(size); + frame5.render(size); + frame4.render(size); + frame3.render(size); + frame2.render(size); + frame1.render(size); + + corner8.render(size); + corner7.render(size); + corner6.render(size); + corner5.render(size); + corner4.render(size); + corner3.render(size); + corner2.render(size); + corner1.render(size); + } GlStateManager.pushMatrix(); - GlStateManager.scale(1.0001F, 1.0001F, 1.0001F); - GlStateManager.translate(0, -0.00011F, 0); + GlStateManager.scale(1.001F, 1.005F, 1.001F); + GlStateManager.translate(0, -0.0061F, 0); manager.bindTexture(RenderEnergyCube.resources.get(tier)); MekanismRenderer.glowOn(); diff --git a/src/main/java/mekanism/client/model/ModelLaser.java b/src/main/java/mekanism/client/model/ModelLaser.java deleted file mode 100644 index 8a277f998..000000000 --- a/src/main/java/mekanism/client/model/ModelLaser.java +++ /dev/null @@ -1,187 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelLaser extends ModelBase -{ - ModelRenderer connector; - ModelRenderer center; - ModelRenderer shaft; - ModelRenderer ring1; - ModelRenderer port; - ModelRenderer rod1; - ModelRenderer fin1; - ModelRenderer fin2; - ModelRenderer fin3; - ModelRenderer fin4; - ModelRenderer ring2; - ModelRenderer body; - ModelRenderer rod2; - ModelRenderer wire; - ModelRenderer rod3; - ModelRenderer fin5; - ModelRenderer fin6; - ModelRenderer fin7; - ModelRenderer fin8; - ModelRenderer rod4; - - public ModelLaser() - { - textureWidth = 64; - textureHeight = 32; - - connector = new ModelRenderer(this, 32, 15); - connector.addBox(0F, 0F, 0F, 6, 1, 6); - connector.setRotationPoint(-3F, 22F, -3F); - connector.setTextureSize(64, 32); - connector.mirror = true; - setRotation(connector, 0F, 0F, 0F); - center = new ModelRenderer(this, 18, 9); - center.addBox(0F, 0F, 0F, 2, 15, 2); - center.setRotationPoint(-1F, 8F, -1F); - center.setTextureSize(64, 32); - center.mirror = true; - setRotation(center, 0F, 0F, 0F); - shaft = new ModelRenderer(this, 0, 18); - shaft.addBox(0F, 0F, 0F, 3, 2, 3); - shaft.setRotationPoint(-1.5F, 13F, -1.5F); - shaft.setTextureSize(64, 32); - shaft.mirror = true; - setRotation(shaft, 0F, 0F, 0F); - ring1 = new ModelRenderer(this, 0, 23); - ring1.addBox(0F, 0F, 0F, 4, 1, 4); - ring1.setRotationPoint(-2F, 10F, -2F); - ring1.setTextureSize(64, 32); - ring1.mirror = true; - setRotation(ring1, 0F, 0F, 0F); - port = new ModelRenderer(this, 0, 0); - port.addBox(0F, 0F, 0F, 8, 1, 8); - port.setRotationPoint(-4F, 23F, -4F); - port.setTextureSize(64, 32); - port.mirror = true; - setRotation(port, 0F, 0F, 0F); - rod1 = new ModelRenderer(this, 0, 9); - rod1.addBox(0F, 0F, 0F, 1, 5, 1); - rod1.setRotationPoint(2.8F, 16F, 1F); - rod1.setTextureSize(64, 32); - rod1.mirror = true; - setRotation(rod1, 0F, 0F, 0F); - fin1 = new ModelRenderer(this, 0, 9); - fin1.addBox(0F, 0F, 0F, 1, 1, 8); - fin1.setRotationPoint(3F, 21F, -4F); - fin1.setTextureSize(64, 32); - fin1.mirror = true; - setRotation(fin1, 0F, 0F, 0F); - fin2 = new ModelRenderer(this, 0, 9); - fin2.addBox(0F, 0F, 0F, 1, 1, 8); - fin2.setRotationPoint(3F, 19F, -4F); - fin2.setTextureSize(64, 32); - fin2.mirror = true; - setRotation(fin2, 0F, 0F, 0F); - fin3 = new ModelRenderer(this, 0, 9); - fin3.addBox(0F, 0F, 0F, 1, 1, 8); - fin3.setRotationPoint(3F, 17F, -4F); - fin3.setTextureSize(64, 32); - fin3.mirror = true; - setRotation(fin3, 0F, 0F, 0F); - fin4 = new ModelRenderer(this, 0, 9); - fin4.addBox(0F, 0F, 0F, 1, 1, 8); - fin4.setRotationPoint(3F, 15F, -4F); - fin4.setTextureSize(64, 32); - fin4.mirror = true; - setRotation(fin4, 0F, 0F, 0F); - ring2 = new ModelRenderer(this, 0, 23); - ring2.addBox(0F, 0F, 0F, 4, 1, 4); - ring2.setRotationPoint(-2F, 12F, -2F); - ring2.setTextureSize(64, 32); - ring2.mirror = true; - setRotation(ring2, 0F, 0F, 0F); - body = new ModelRenderer(this, 32, 0); - body.addBox(0F, 0F, 0F, 6, 7, 8); - body.setRotationPoint(-3F, 15F, -4F); - body.setTextureSize(64, 32); - body.mirror = true; - setRotation(body, 0F, 0F, 0F); - rod2 = new ModelRenderer(this, 0, 9); - rod2.addBox(0F, 0F, 0F, 1, 5, 1); - rod2.setRotationPoint(2.8F, 16F, -2F); - rod2.setTextureSize(64, 32); - rod2.mirror = true; - setRotation(rod2, 0F, 0F, 0F); - wire = new ModelRenderer(this, 10, 9); - wire.addBox(0F, -1F, 0F, 1, 6, 1); - wire.setRotationPoint(-1.5F, 11F, -0.5F); - wire.setTextureSize(64, 32); - wire.mirror = true; - //TODO - setRotation(wire, 0F, 0F, 0.1919862F); - rod3 = new ModelRenderer(this, 0, 9); - rod3.addBox(0F, 0F, 0F, 1, 5, 1); - rod3.setRotationPoint(-3.8F, 16F, 1F); - rod3.setTextureSize(64, 32); - rod3.mirror = true; - setRotation(rod3, 0F, 0F, 0F); - fin5 = new ModelRenderer(this, 0, 9); - fin5.addBox(0F, 0F, 0F, 1, 1, 8); - fin5.setRotationPoint(-4F, 15F, -4F); - fin5.setTextureSize(64, 32); - fin5.mirror = true; - setRotation(fin5, 0F, 0F, 0F); - fin6 = new ModelRenderer(this, 0, 9); - fin6.addBox(0F, 0F, 0F, 1, 1, 8); - fin6.setRotationPoint(-4F, 17F, -4F); - fin6.setTextureSize(64, 32); - fin6.mirror = true; - setRotation(fin6, 0F, 0F, 0F); - fin7 = new ModelRenderer(this, 0, 9); - fin7.addBox(0F, 0F, 0F, 1, 1, 8); - fin7.setRotationPoint(-4F, 19F, -4F); - fin7.setTextureSize(64, 32); - fin7.mirror = true; - setRotation(fin7, 0F, 0F, 0F); - fin8 = new ModelRenderer(this, 0, 9); - fin8.addBox(0F, 0F, 0F, 1, 1, 8); - fin8.setRotationPoint(-4F, 21F, -4F); - fin8.setTextureSize(64, 32); - fin8.mirror = true; - setRotation(fin8, 0F, 0F, 0F); - rod4 = new ModelRenderer(this, 0, 9); - rod4.addBox(0F, 0F, 0F, 1, 5, 1); - rod4.setRotationPoint(-3.8F, 16F, -2F); - rod4.setTextureSize(64, 32); - rod4.mirror = true; - setRotation(rod4, 0F, 0F, 0F); - } - - public void render(float size) - { - connector.render(size); - center.render(size); - shaft.render(size); - ring1.render(size); - port.render(size); - rod1.render(size); - fin1.render(size); - fin2.render(size); - fin3.render(size); - fin4.render(size); - ring2.render(size); - body.render(size); - rod2.render(size); - wire.render(size); - rod3.render(size); - fin5.render(size); - fin6.render(size); - fin7.render(size); - fin8.render(size); - rod4.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java b/src/main/java/mekanism/client/model/ModelLaserAmplifier.java deleted file mode 100644 index 559ca73d8..000000000 --- a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelLaserAmplifier extends ModelBase -{ - ModelRenderer S1; - ModelRenderer S2; - ModelRenderer S3; - ModelRenderer S4; - ModelRenderer S5; - ModelRenderer Base; - ModelRenderer S6; - - public ModelLaserAmplifier() - { - textureWidth = 64; - textureHeight = 64; - - S1 = new ModelRenderer(this, 0, 39); - S1.addBox(0F, 0F, 0F, 1, 10, 10); - S1.setRotationPoint(7F, 11F, -5F); - S1.setTextureSize(64, 64); - S1.mirror = true; - setRotation(S1, 0F, 0F, 0F); - S2 = new ModelRenderer(this, 22, 39); - S2.addBox(0F, 0F, 0F, 10, 10, 1); - S2.setRotationPoint(-5F, 11F, 7F); - S2.setTextureSize(64, 64); - S2.mirror = true; - setRotation(S2, 0F, 0F, 0F); - S3 = new ModelRenderer(this, 0, 39); - S3.addBox(0F, 0F, 0F, 1, 10, 10); - S3.setRotationPoint(-8F, 11F, -5F); - S3.setTextureSize(64, 64); - S3.mirror = true; - setRotation(S3, 0F, 0F, 0F); - S4 = new ModelRenderer(this, 0, 28); - S4.addBox(0F, 0F, 0F, 10, 1, 10); - S4.setRotationPoint(-5F, 23F, -5F); - S4.setTextureSize(64, 64); - S4.mirror = true; - setRotation(S4, 0F, 0F, 0F); - S5 = new ModelRenderer(this, 22, 39); - S5.addBox(0F, 0F, 0F, 10, 10, 1); - S5.setRotationPoint(-5F, 11F, -8F); - S5.setTextureSize(64, 64); - S5.mirror = true; - setRotation(S5, 0F, 0F, 0F); - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 14, 14); - Base.setRotationPoint(-7F, 9F, -7F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - S6 = new ModelRenderer(this, 0, 28); - S6.addBox(0F, 0F, 0F, 10, 1, 10); - S6.setRotationPoint(-5F, 8F, -5F); - S6.setTextureSize(64, 64); - S6.mirror = true; - setRotation(S6, 0F, 0F, 0F); - } - - public void render(float size) - { - S1.render(size); - S2.render(size); - S3.render(size); - S4.render(size); - S5.render(size); - Base.render(size); - S6.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index b64aa357a..5f56d3f46 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelQuantumEntangloporter extends ModelBase { @@ -314,12 +312,15 @@ public class ModelQuantumEntangloporter extends ModelBase setRotation(portLeftLarge, 0F, 0F, 0F); } - public void render(float size, TextureManager manager) + public void render(float size, TextureManager manager, boolean renderMain) { GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); - doRender(size); + if(renderMain) + { + doRender(size); + } manager.bindTexture(OVERLAY); GlStateManager.scale(1.001F, 1.001F, 1.001F); diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java index c8b922ee9..11dd13fca 100644 --- a/src/main/java/mekanism/client/model/ModelResistiveHeater.java +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelResistiveHeater extends ModelBase { @@ -167,12 +165,15 @@ public class ModelResistiveHeater extends ModelBase setRotation(portLeft, 0F, 0F, 0F); } - public void render(float size, boolean on, TextureManager manager) + public void render(float size, boolean on, TextureManager manager, boolean renderMain) { GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); - doRender(size); + if(renderMain) + { + doRender(size); + } manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); GlStateManager.scale(1.001F, 1.001F, 1.001F); diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index a0e2cd9fc..6b51e1620 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelSecurityDesk extends ModelBase { @@ -51,42 +49,36 @@ public class ModelSecurityDesk extends ModelBase led.setRotationPoint(-7F, 5F, 4F); led.setTextureSize(128, 64); led.mirror = true; - //TODO setRotation(led, -0.4712389F, 0F, 0F); monitorBack = new ModelRenderer(this, 82, 0); monitorBack.addBox(1F, -3F, 0F, 12, 6, 1); monitorBack.setRotationPoint(-7F, 5F, 4F); monitorBack.setTextureSize(128, 64); monitorBack.mirror = true; - //TODO setRotation(monitorBack, -0.4712389F, 0F, 0F); keyboard = new ModelRenderer(this, 64, 27); keyboard.addBox(0F, 0F, 0F, 10, 1, 5); keyboard.setRotationPoint(-5F, 10.5F, -6F); keyboard.setTextureSize(128, 64); keyboard.mirror = true; - //TODO setRotation(keyboard, 0.0872665F, 0F, 0F); monitor = new ModelRenderer(this, 64, 10); monitor.addBox(0F, -5F, -2F, 14, 10, 2); monitor.setRotationPoint(-7F, 5F, 4F); monitor.setTextureSize(128, 64); monitor.mirror = true; - //TODO setRotation(monitor, -0.4712389F, 0F, 0F); standNeck = new ModelRenderer(this, 96, 7); standNeck.addBox(0F, -7F, -1F, 2, 7, 1); standNeck.setRotationPoint(-1F, 10F, 6F); standNeck.setTextureSize(128, 64); standNeck.mirror = true; - //TODO setRotation(standNeck, 0.0698132F, 0F, 0F); standBase = new ModelRenderer(this, 64, 22); standBase.addBox(0F, 0F, -4F, 8, 1, 4); standBase.setRotationPoint(-4F, 10F, 6F); standBase.setTextureSize(128, 64); standBase.mirror = true; - //TODO setRotation(standBase, 0.1047198F, 0F, 0F); deskMiddle = new ModelRenderer(this, 0, 23); deskMiddle.addBox(0F, 0F, 0F, 14, 1, 14); @@ -99,7 +91,6 @@ public class ModelSecurityDesk extends ModelBase monitorScreen.setRotationPoint(-7F, 5F, 4F); monitorScreen.setTextureSize(128, 64); monitorScreen.mirror = true; - //TODO setRotation(monitorScreen, -0.4712389F, 0F, 0F); } diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index ef2bedf23..924ef0b06 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -226,7 +226,7 @@ public class MekanismRenderer public double textureSizeX = 16, textureSizeY = 16, textureSizeZ = 16; public double textureOffsetX = 0, textureOffsetY = 0, textureOffsetZ = 0; - public int[] textureFlips = new int[6]; + public int[] textureFlips = new int[] {2, 2, 2, 2, 2, 2}; public TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; @@ -296,7 +296,6 @@ public class MekanismRenderer TextureAtlasSprite flowing = getFluidTexture(fluid, FluidType.FLOWING); model.setTextures(still, still, flowing, flowing, flowing, flowing); - model.textureFlips = new int[] {0, 0, 2, 2, 2, 2}; } public static void renderObject(Model3D object) diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 0fbbb7e82..cd26301ca 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -5,27 +5,38 @@ import java.util.List; import javax.vecmath.Matrix4f; +import mekanism.api.energy.IEnergizedItem; import mekanism.client.model.ModelArmoredJetpack; import mekanism.client.model.ModelAtomicDisassembler; import mekanism.client.model.ModelChemicalCrystallizer; import mekanism.client.model.ModelChemicalDissolutionChamber; +import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelFlamethrower; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelJetpack; +import mekanism.client.model.ModelQuantumEntangloporter; +import mekanism.client.model.ModelResistiveHeater; import mekanism.client.model.ModelScubaTank; +import mekanism.client.model.ModelSecurityDesk; import mekanism.client.model.ModelSeismicVibrator; import mekanism.client.model.ModelSolarNeutronActivator; +import mekanism.client.render.MekanismRenderer; import mekanism.client.render.ctm.ModelChiselBlock; import mekanism.client.render.tileentity.RenderBin; +import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.common.MekanismItems; +import mekanism.common.SideData.IOState; +import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FluidTankTier; +import mekanism.common.base.IEnergyCube; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBlockBasic; +import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; @@ -56,7 +67,6 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.fluids.Fluid; import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.opengl.GL11; public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { @@ -80,6 +90,10 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel public static ModelSeismicVibrator seismicVibrator = new ModelSeismicVibrator(); public static ModelChemicalDissolutionChamber chemicalDissolutionChamber = new ModelChemicalDissolutionChamber(); public static ModelChemicalCrystallizer chemicalCrystallizer = new ModelChemicalCrystallizer(); + public static ModelSecurityDesk securityDesk = new ModelSecurityDesk(); + public static ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); + public static ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); + public static ModelEnergyCube energyCube = new ModelEnergyCube(); public BakedCustomItemModel(IBakedModel model, ItemStack s) { @@ -108,6 +122,15 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.popMatrix(); } + else if(basicType == BasicBlockType.SECURITY_DESK) + { + GlStateManager.rotate(180, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); + GlStateManager.scale(0.8F, 0.8F, 0.8F); + GlStateManager.translate(0.0F, -0.8F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); + securityDesk.render(0.0625F, mc.renderEngine); + } return; } @@ -142,38 +165,77 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel } else if(machineType == MachineType.SOLAR_NEUTRON_ACTIVATOR) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + GlStateManager.translate(0.0F, -0.55F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } else if(machineType == MachineType.SEISMIC_VIBRATOR) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + GlStateManager.translate(0.0F, -0.55F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); seismicVibrator.render(0.0625F); } else if(machineType == MachineType.CHEMICAL_CRYSTALLIZER) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.05F, -1.02F, 0.05F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.05F, -1.001F, 0.05F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); chemicalCrystallizer.render(0.0625F); } else if(machineType == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.05F, -1.02F, 0.05F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.05F, -1.001F, 0.05F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); chemicalDissolutionChamber.render(0.0625F); } + else if(machineType == MachineType.QUANTUM_ENTANGLOPORTER) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); + quantumEntangloporter.render(0.0625F, mc.renderEngine, true); + } + else if(machineType == MachineType.RESISTIVE_HEATER) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); + resistiveHeater.render(0.0625F, false, mc.renderEngine, true); + } return; } + if(stack.getItem() instanceof ItemBlockEnergyCube) + { + GlStateManager.pushMatrix(); + EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); + IEnergizedItem energized = (IEnergizedItem)stack.getItem(); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); + + MekanismRenderer.blendOn(); + + energyCube.render(0.0625F, tier, mc.renderEngine, true); + + for(EnumFacing side : EnumFacing.VALUES) + { + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + energyCube.renderSide(0.0625F, side, side == EnumFacing.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine); + } + + MekanismRenderer.blendOff(); + GlStateManager.popMatrix(); + } + if(type == TransformType.GUI) { GlStateManager.scale(0.625, 0.625, 0.625); @@ -304,7 +366,15 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel if(Block.getBlockFromItem(stack.getItem()) != null) { - faceQuads.addAll(baseModel.getFaceQuads(facing)); + MachineType machineType = MachineType.get(stack); + + if(machineType != MachineType.QUANTUM_ENTANGLOPORTER && machineType != MachineType.RESISTIVE_HEATER) + { + if(!(stack.getItem() instanceof ItemBlockEnergyCube)) + { + faceQuads.addAll(baseModel.getFaceQuads(facing)); + } + } } return faceQuads; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index bba54ec96..554b370b8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -127,7 +127,7 @@ public class RenderConfigurableMachine