From 20bef9c94fb0b110d3ddbb34b55533b8ddbaa384 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 20:37:35 -0400 Subject: [PATCH] More things are now rendering properly, we're almost done --- .../java/mekanism/client/ClientProxy.java | 21 +- .../client/model/ModelEnergyCube.java | 53 +-- .../mekanism/client/model/ModelLaser.java | 187 ----------- .../client/model/ModelLaserAmplifier.java | 85 ----- .../model/ModelQuantumEntangloporter.java | 9 +- .../client/model/ModelResistiveHeater.java | 9 +- .../client/model/ModelSecurityDesk.java | 9 - .../client/render/MekanismRenderer.java | 3 +- .../render/item/BakedCustomItemModel.java | 94 +++++- .../tileentity/RenderConfigurableMachine.java | 12 +- .../render/tileentity/RenderEnergyCube.java | 7 +- .../RenderQuantumEntangloporter.java | 2 +- .../tileentity/RenderResistiveHeater.java | 4 +- .../tileentity/RenderSeismicVibrator.java | 2 +- .../block/states/BlockStateMachine.java | 2 +- .../mekanism/blockstates/BoundingBlock.json | 5 +- .../mekanism/blockstates/EnergyCube.json | 15 +- .../mekanism/blockstates/electric_pump.json | 10 +- .../mekanism/blockstates/security_desk.json | 2 +- .../mekanism/models/block/energy_cube.json | 312 ------------------ .../models/block/quantum_entangloporter.json | 28 +- .../mekanism/models/block/security_desk.json | 138 -------- .../mekanism/render/SeismicVibratorOn.png | Bin 9416 -> 0 bytes .../blocks/models/chemical_crystallizer.png | Bin 4964 -> 0 bytes .../models/chemical_dissolution_chamber.png | Bin 6241 -> 0 bytes .../blocks/models/quantum_entangloporter.png | Bin 0 -> 7655 bytes 26 files changed, 156 insertions(+), 853 deletions(-) delete mode 100644 src/main/java/mekanism/client/model/ModelLaser.java delete mode 100644 src/main/java/mekanism/client/model/ModelLaserAmplifier.java delete mode 100644 src/main/resources/assets/mekanism/models/block/security_desk.json delete mode 100755 src/main/resources/assets/mekanism/render/SeismicVibratorOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_dissolution_chamber.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/quantum_entangloporter.png 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 RenderConfigurableMachineR|u?AOJ~3 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 O0000w9AW diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png deleted file mode 100644 index 02805a3132a2a0d8dfc3b5d2cc9714d310b5ebac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4964 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 Rl=^kwX>|)0{{R3Up005AD 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 wf-OCoN{|mor~CiM|JULFtO+cW(HFo=1