From b97c6d8f4b21910425ffbaeca58daf69b5bc33e2 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Apr 2016 23:15:18 -0400 Subject: [PATCH] Quantum Entangloporter model! --- .../java/mekanism/client/ClientProxy.java | 2 + .../model/ModelQuantumEntangloporter.java | 383 ++++++++++++++++++ .../render/block/MachineRenderingHandler.java | 10 + .../RenderQuantumEntangloporter.java | 48 +++ .../java/mekanism/common/CommonProxy.java | 1 + src/main/java/mekanism/common/Mekanism.java | 2 - .../mekanism/common/block/BlockMachine.java | 2 +- .../assets/mekanism/gui/GuiTeleporter.png | Bin 20127 -> 6367 bytes .../mekanism/render/QuantumEntangloporter.png | Bin 0 -> 5759 bytes .../render/QuantumEntangloporter_Overlay.png | Bin 0 -> 5181 bytes 10 files changed, 445 insertions(+), 3 deletions(-) create mode 100644 src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java create mode 100644 src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java create mode 100644 src/main/resources/assets/mekanism/render/QuantumEntangloporter.png create mode 100644 src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 0b68bc909..a8ae79c71 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -98,6 +98,7 @@ import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; import mekanism.client.render.tileentity.RenderPersonalChest; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; +import mekanism.client.render.tileentity.RenderQuantumEntangloporter; import mekanism.client.render.tileentity.RenderResistiveHeater; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderSecurityDesk; @@ -318,6 +319,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); + ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter()); } @Override diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java new file mode 100644 index 000000000..4597cfeba --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -0,0 +1,383 @@ +package mekanism.client.model; + +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelQuantumEntangloporter extends ModelBase +{ + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter_Overlay.png"); + + ModelRenderer portTop; + ModelRenderer portBottom; + ModelRenderer portLeft; + ModelRenderer portRight; + ModelRenderer portBack; + ModelRenderer portFront; + ModelRenderer energyCubeCore; + ModelRenderer frameEdge1; + ModelRenderer frameEdge2; + ModelRenderer frameEdge3; + ModelRenderer frameEdge4; + ModelRenderer frameEdge5; + ModelRenderer frameEdge6; + ModelRenderer frameEdge7; + ModelRenderer frameEdge8; + ModelRenderer frameEdge9; + ModelRenderer frameEdge10; + ModelRenderer frameEdge11; + ModelRenderer frameEdge12; + ModelRenderer frame1; + ModelRenderer frame2; + ModelRenderer frame3; + ModelRenderer frame4; + ModelRenderer frame5; + ModelRenderer frame6; + ModelRenderer frame7; + ModelRenderer frame8; + ModelRenderer frame9; + ModelRenderer frame10; + ModelRenderer frame11; + ModelRenderer frame12; + ModelRenderer corner1; + ModelRenderer corner2; + ModelRenderer corner3; + ModelRenderer corner4; + ModelRenderer corner5; + ModelRenderer corner6; + ModelRenderer corner7; + ModelRenderer corner8; + ModelRenderer portRightLarge; + ModelRenderer portLeftLarge; + + public ModelQuantumEntangloporter() + { + textureWidth = 128; + textureHeight = 64; + + portTop = new ModelRenderer(this, 36, 0); + portTop.addBox(0F, 0F, 0F, 8, 1, 8); + portTop.setRotationPoint(-4F, 8F, -4F); + portTop.setTextureSize(128, 64); + portTop.mirror = true; + setRotation(portTop, 0F, 0F, 0F); + portBottom = new ModelRenderer(this, 36, 9); + portBottom.addBox(0F, 0F, 0F, 8, 1, 8); + portBottom.setRotationPoint(-4F, 23F, -4F); + portBottom.setTextureSize(128, 64); + portBottom.mirror = true; + setRotation(portBottom, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 0, 0); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 0, 0); + portRight.mirror = true; + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7F, 12F, -4F); + portRight.setTextureSize(128, 64); + setRotation(portRight, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 18, 9); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 7F); + portBack.setTextureSize(128, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + portFront = new ModelRenderer(this, 18, 0); + portFront.addBox(0F, 0F, 0F, 8, 8, 1); + portFront.setRotationPoint(-4F, 12F, -8F); + portFront.setTextureSize(128, 64); + portFront.mirror = true; + setRotation(portFront, 0F, 0F, 0F); + energyCubeCore = new ModelRenderer(this, 0, 41); + energyCubeCore.addBox(-2F, -2F, -2F, 4, 4, 4); + energyCubeCore.setRotationPoint(0F, 16F, 0F); + energyCubeCore.setTextureSize(128, 64); + energyCubeCore.mirror = true; + setRotation(energyCubeCore, 0.7132579F, 0.403365F, 0.645384F); + frameEdge1 = new ModelRenderer(this, 0, 16); + frameEdge1.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge1.setRotationPoint(-7.5F, 11F, -7.5F); + frameEdge1.setTextureSize(128, 64); + frameEdge1.mirror = true; + setRotation(frameEdge1, 0F, 0F, 0F); + frameEdge2 = new ModelRenderer(this, 0, 16); + frameEdge2.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge2.setRotationPoint(6.5F, 11F, -7.5F); + frameEdge2.setTextureSize(128, 64); + frameEdge2.mirror = true; + setRotation(frameEdge2, 0F, 0F, 0F); + frameEdge3 = new ModelRenderer(this, 0, 16); + frameEdge3.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge3.setRotationPoint(-7.5F, 11F, 6.5F); + frameEdge3.setTextureSize(128, 64); + frameEdge3.mirror = true; + setRotation(frameEdge3, 0F, 0F, 0F); + frameEdge4 = new ModelRenderer(this, 0, 16); + frameEdge4.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge4.setRotationPoint(6.5F, 11F, 6.5F); + frameEdge4.setTextureSize(128, 64); + frameEdge4.mirror = true; + setRotation(frameEdge4, 0F, 0F, 0F); + frameEdge5 = new ModelRenderer(this, 4, 27); + frameEdge5.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge5.setRotationPoint(-5F, 22.5F, -7.5F); + frameEdge5.setTextureSize(128, 64); + frameEdge5.mirror = true; + setRotation(frameEdge5, 0F, 0F, 0F); + frameEdge6 = new ModelRenderer(this, 4, 16); + frameEdge6.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge6.setRotationPoint(-7.5F, 22.5F, -5F); + frameEdge6.setTextureSize(128, 64); + frameEdge6.mirror = true; + setRotation(frameEdge6, 0F, 0F, 0F); + frameEdge7 = new ModelRenderer(this, 4, 16); + frameEdge7.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge7.setRotationPoint(6.5F, 22.5F, -5F); + frameEdge7.setTextureSize(128, 64); + frameEdge7.mirror = true; + setRotation(frameEdge7, 0F, 0F, 0F); + frameEdge8 = new ModelRenderer(this, 4, 27); + frameEdge8.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge8.setRotationPoint(-5F, 22.5F, 6.5F); + frameEdge8.setTextureSize(128, 64); + frameEdge8.mirror = true; + setRotation(frameEdge8, 0F, 0F, 0F); + frameEdge9 = new ModelRenderer(this, 4, 27); + frameEdge9.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge9.setRotationPoint(-5F, 8.5F, -7.5F); + frameEdge9.setTextureSize(128, 64); + frameEdge9.mirror = true; + setRotation(frameEdge9, 0F, 0F, 0F); + frameEdge10 = new ModelRenderer(this, 4, 16); + frameEdge10.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge10.setRotationPoint(-7.5F, 8.5F, -5F); + frameEdge10.setTextureSize(128, 64); + frameEdge10.mirror = true; + setRotation(frameEdge10, 0F, 0F, 0F); + frameEdge11 = new ModelRenderer(this, 4, 16); + frameEdge11.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge11.setRotationPoint(6.5F, 8.5F, -5F); + frameEdge11.setTextureSize(128, 64); + frameEdge11.mirror = true; + setRotation(frameEdge11, 0F, 0F, 0F); + frameEdge12 = new ModelRenderer(this, 4, 27); + frameEdge12.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge12.setRotationPoint(-5F, 8.5F, 6.5F); + frameEdge12.setTextureSize(128, 64); + frameEdge12.mirror = true; + setRotation(frameEdge12, 0F, 0F, 0F); + frame1 = new ModelRenderer(this, 0, 29); + frame1.addBox(0F, 0F, 0F, 2, 10, 2); + frame1.setRotationPoint(-7F, 11F, -7F); + frame1.setTextureSize(128, 64); + frame1.mirror = true; + setRotation(frame1, 0F, 0F, 0F); + frame2 = new ModelRenderer(this, 0, 29); + frame2.mirror = true; + frame2.addBox(0F, 0F, 0F, 2, 10, 2); + frame2.setRotationPoint(5F, 11F, -7F); + frame2.setTextureSize(128, 64); + setRotation(frame2, 0F, 0F, 0F); + frame3 = new ModelRenderer(this, 8, 29); + frame3.addBox(0F, 0F, 0F, 2, 10, 2); + frame3.setRotationPoint(-7F, 11F, 5F); + frame3.setTextureSize(128, 64); + frame3.mirror = true; + setRotation(frame3, 0F, 0F, 0F); + frame4 = new ModelRenderer(this, 8, 29); + frame4.mirror = true; + frame4.addBox(0F, 0F, 0F, 2, 10, 2); + frame4.setRotationPoint(5F, 11F, 5F); + frame4.setTextureSize(128, 64); + setRotation(frame4, 0F, 0F, 0F); + frame5 = new ModelRenderer(this, 16, 45); + frame5.addBox(0F, 0F, 0F, 10, 2, 2); + frame5.setRotationPoint(-5F, 21F, -7F); + frame5.setTextureSize(128, 64); + frame5.mirror = true; + setRotation(frame5, 0F, 0F, 0F); + frame6 = new ModelRenderer(this, 40, 29); + frame6.addBox(0F, 0F, 0F, 2, 2, 10); + frame6.setRotationPoint(-7F, 21F, -5F); + frame6.setTextureSize(128, 64); + frame6.mirror = true; + setRotation(frame6, 0F, 0F, 0F); + frame7 = new ModelRenderer(this, 40, 29); + frame7.mirror = true; + frame7.addBox(0F, 0F, 0F, 2, 2, 10); + frame7.setRotationPoint(5F, 21F, -5F); + frame7.setTextureSize(128, 64); + setRotation(frame7, 0F, 0F, 0F); + frame8 = new ModelRenderer(this, 16, 49); + frame8.addBox(0F, 0F, 0F, 10, 2, 2); + frame8.setRotationPoint(-5F, 21F, 5F); + frame8.setTextureSize(128, 64); + frame8.mirror = true; + setRotation(frame8, 0F, 0F, 0F); + frame9 = new ModelRenderer(this, 16, 41); + frame9.addBox(0F, 0F, 0F, 10, 2, 2); + frame9.setRotationPoint(-5F, 9F, -7F); + frame9.setTextureSize(128, 64); + frame9.mirror = true; + setRotation(frame9, 0F, 0F, 0F); + frame10 = new ModelRenderer(this, 16, 29); + frame10.addBox(0F, 0F, 0F, 2, 2, 10); + frame10.setRotationPoint(-7F, 9F, -5F); + frame10.setTextureSize(128, 64); + frame10.mirror = true; + setRotation(frame10, 0F, 0F, 0F); + frame11 = new ModelRenderer(this, 16, 29); + frame11.mirror = true; + frame11.addBox(0F, 0F, 0F, 2, 2, 10); + frame11.setRotationPoint(5F, 9F, -5F); + frame11.setTextureSize(128, 64); + setRotation(frame11, 0F, 0F, 0F); + frame12 = new ModelRenderer(this, 16, 53); + frame12.addBox(0F, 0F, 0F, 10, 2, 2); + frame12.setRotationPoint(-5F, 9F, 5F); + frame12.setTextureSize(128, 64); + frame12.mirror = true; + setRotation(frame12, 0F, 0F, 0F); + corner1 = new ModelRenderer(this, 0, 49); + corner1.addBox(0F, 0F, 0F, 3, 3, 3); + corner1.setRotationPoint(-8F, 8F, -8F); + corner1.setTextureSize(128, 64); + corner1.mirror = true; + setRotation(corner1, 0F, 0F, 0F); + corner2 = new ModelRenderer(this, 0, 49); + corner2.addBox(0F, 0F, 0F, 3, 3, 3); + corner2.setRotationPoint(5F, 8F, -8F); + corner2.setTextureSize(128, 64); + corner2.mirror = true; + setRotation(corner2, 0F, 0F, 0F); + corner3 = new ModelRenderer(this, 0, 49); + corner3.addBox(0F, 0F, 0F, 3, 3, 3); + corner3.setRotationPoint(-8F, 8F, 5F); + corner3.setTextureSize(128, 64); + corner3.mirror = true; + setRotation(corner3, 0F, 0F, 0F); + corner4 = new ModelRenderer(this, 0, 49); + corner4.addBox(0F, 0F, 0F, 3, 3, 3); + corner4.setRotationPoint(5F, 8F, 5F); + corner4.setTextureSize(128, 64); + corner4.mirror = true; + setRotation(corner4, 0F, 0F, 0F); + corner5 = new ModelRenderer(this, 0, 49); + corner5.addBox(0F, 0F, 0F, 3, 3, 3); + corner5.setRotationPoint(-8F, 21F, -8F); + corner5.setTextureSize(128, 64); + corner5.mirror = true; + setRotation(corner5, 0F, 0F, 0F); + corner6 = new ModelRenderer(this, 0, 49); + corner6.addBox(0F, 0F, 0F, 3, 3, 3); + corner6.setRotationPoint(5F, 21F, -8F); + corner6.setTextureSize(128, 64); + corner6.mirror = true; + setRotation(corner6, 0F, 0F, 0F); + corner7 = new ModelRenderer(this, 0, 49); + corner7.addBox(0F, 0F, 0F, 3, 3, 3); + corner7.setRotationPoint(-8F, 21F, 5F); + corner7.setTextureSize(128, 64); + corner7.mirror = true; + setRotation(corner7, 0F, 0F, 0F); + corner8 = new ModelRenderer(this, 0, 49); + corner8.addBox(0F, 0F, 0F, 3, 3, 3); + corner8.setRotationPoint(5F, 21F, 5F); + corner8.setTextureSize(128, 64); + corner8.mirror = true; + setRotation(corner8, 0F, 0F, 0F); + portRightLarge = new ModelRenderer(this, 68, 0); + portRightLarge.mirror = true; + portRightLarge.addBox(0F, 0F, 0F, 1, 10, 10); + portRightLarge.setRotationPoint(7F, 11F, -5F); + portRightLarge.setTextureSize(128, 64); + setRotation(portRightLarge, 0F, 0F, 0F); + portLeftLarge = new ModelRenderer(this, 68, 0); + portLeftLarge.addBox(0F, 0F, 0F, 1, 10, 10); + portLeftLarge.setRotationPoint(-8F, 11F, -5F); + portLeftLarge.setTextureSize(128, 64); + portLeftLarge.mirror = true; + setRotation(portLeftLarge, 0F, 0F, 0F); + } + + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + + public void doRender(float size) + { + portTop.render(size); + portBottom.render(size); + portLeft.render(size); + portRight.render(size); + portBack.render(size); + portFront.render(size); + energyCubeCore.render(size); + frameEdge1.render(size); + frameEdge2.render(size); + frameEdge3.render(size); + frameEdge4.render(size); + frameEdge5.render(size); + frameEdge6.render(size); + frameEdge7.render(size); + frameEdge8.render(size); + frameEdge9.render(size); + frameEdge10.render(size); + frameEdge11.render(size); + frameEdge12.render(size); + frame1.render(size); + frame2.render(size); + frame3.render(size); + frame4.render(size); + frame5.render(size); + frame6.render(size); + frame7.render(size); + frame8.render(size); + frame9.render(size); + frame10.render(size); + frame11.render(size); + frame12.render(size); + corner1.render(size); + corner2.render(size); + corner3.render(size); + corner4.render(size); + corner5.render(size); + corner6.render(size); + corner7.render(size); + corner8.render(size); + //portRightLarge.render(size); + //portLeftLarge.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/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 68eeb63c3..a0baa5454 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -16,6 +16,7 @@ import mekanism.client.model.ModelLaserAmplifier; import mekanism.client.model.ModelLogisticalSorter; import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.client.model.ModelPressurizedReactionChamber; +import mekanism.client.model.ModelQuantumEntangloporter; import mekanism.client.model.ModelResistiveHeater; import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.client.model.ModelSeismicVibrator; @@ -59,6 +60,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelLaserAmplifier laserAmplifier = new ModelLaserAmplifier(); public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); + public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -233,6 +235,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } + else if(type == MachineType.QUANTUM_ENTANGLOPORTER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); + quantumEntangloporter.render(0.0625F, mc.renderEngine); + } else { GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderItem(renderer, metadata, block); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java new file mode 100644 index 000000000..1187767e5 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java @@ -0,0 +1,48 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelQuantumEntangloporter; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderQuantumEntangloporter extends TileEntitySpecialRenderer +{ + private ModelQuantumEntangloporter model = new ModelQuantumEntangloporter(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityQuantumEntangloporter)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityQuantumEntangloporter tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + model.render(0.0625F, field_147501_a.field_147553_e); + GL11.glPopMatrix(); + + MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); + } +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index bbc363944..ed46e1993 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -208,6 +208,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); GameRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk"); + GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 653f1f048..4a84ad285 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -79,7 +79,6 @@ import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityPressureDisperser; -import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; @@ -1143,7 +1142,6 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename - GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 96f02c739..09efe6fb7 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1182,7 +1182,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false), LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false), - QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, false, false), + QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, true, false), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), diff --git a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png index c2731f41d35e94dd00ef0cba129a73d0cde54c08..3ac1693621aed35a8b2b8e63cb0420282861663b 100644 GIT binary patch literal 6367 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 literal 20127 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 LR!3f#5TgDA*l2s+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png b/src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..b4fce7ad941cb08083a56b0ca82d27b66bd22388 GIT binary patch literal 5181 zcmcgwc|4Ts+kb4s5uq#z8JryZ%#dX;#$J@NlqK2C*v({UMz+x;gj6adOSC9!M8a4S z5~5RLJ@23I^T+eKpZmG4?{!_@>wDdw=kp}no;)hZe~=#l z070u`=Jo)$nWCnv)4P@ z5P9&fNq7)K{;#B*ZEV42m@pJrTSG_P2L^+Ib>SK?Z9OebZ8fka6s8S}X-WXnlKg%fDl>pAho?;o(?)2n3JEYv8psFkyZW7#t3VKs6znn(Ax| zbzEd%L^`}+QSE_(m!3t=Y%*=g>7HT%~VTR}U^ zf27NP_(%MxP`2X3*wS8y4m<_`;W8_8lhcHe1vi^?=>aiX2dUSy+owg`q@dKdElXv+&<(Sn2rG0jn&6E9Lsji`_QPrI6B}~QQuHMBmLxz17iG4h5Ks5>=ZFErK)@;)L5Z?{vTn^zm+)E@}6w5Lb}`SskoH+oKOq15dS z!rx%>b)vYG-T=4wb?VaKFoL^tESan=?Ye$y`O7Bt74L7jrsYM`&M(6SP1{?npp1-+ z8dnT?06`hYQ`}hJiqb(?nUWALT^Q{BA!04YlJiPmd3$PmGJc}|$>t^7BZVZQPSyen z>4~O0&pgi*1l{TFxTllUQb34@(@@*h64!hL0!iEN4Ctk_Pt~0W`p1u_HHWeHoC{=x zbkH{$r1R$yKjXgL%zD=1x3n!UYCP;Tv8gg&pP=pyfGU6{^hvEFQ^2c1P!d_lXG$4p zyC!20h#xzDbjZa1wP(Ye{@~yUX<}HGOFAwQG}#~C7Sas9^%jU;YM1CL@$X1Qopj{X zDPF=4u7y-4%&KuF>X32{EXZ+s^0Qi!w@xMR<_%6^YZ)#j{sRY|^>lT%7Sz(Sr21{%i^7MY zl{9_Aq!}!mgRf{wry-u6085qk1{SE*VP@N5+iY|N2LRU7B@mcTQw-sK0+f;mLxV_e zT(wviteZ}aG7mU4fumAZ8`7lAg}c;c3aV)h5uo()RQ8Q{wlS|>4ahog%A(alJsDL@ zvoD?w`J^l!qKM#ts48&o1)8fC^tO4gX9gVhP-1-}H*1Bm9o2RQa4J7%1-hwTLYuiH zV9s&Ry=-&kMS5+p0VXAT&@m&c{qszrqFR`y0-6PB-h3oVw2kEgKpJm7xT(gEMm>La zyUvcpKFJljDH}(6*>caT0V^%_F+Y0QYG1{-!NGLomY!tr_-F3O^4YIZPSigruE*Y` zwZ?qT)y<$*wI3hc%A~|91XR#g_{s8)iiO+#9$wqu_kEN1Gv-z%-hlbNDUi@OSDb5r z*MNa)RVrOgZ6v*d*2pz1!vZh8-@hc3a~o-CWmNs#RP4qYtJBZFdRRF%i%7V!+BUl~ zjX0_Ir9WA2Evjcjj>QPe&2?`0u!=Q6@QA5AI7$1;>KJY0bGR`q?kf*H+o?$l96cfebO@4{l^F~mfdQ$kZk$`bQ@KG-3Z+zj={2< zr`$nlJgP+*f1F}$xTTO0$CHlzeZ5IjI)Evr!+p;jYqIC45pp@R45w5hf z&4J#{0W>Xs&N47A_KPkmzdFVs;fiav7=Rj=>uhoW<@L6W7K&rQm!_^Hms%SYq5Fq# zM_VXAZ>((HPC?!)9*uN2Ts2uXAk5WB#jO1qRG~Nt90C=GYngT6V z6=tZ996=hC-Eh3fQ<)vXTp>~XWwuup%JOv>HSUCshO+$L@ek{)il*wNEkxOubmX7w z(or#{D2TU2F0qx4)lBU9f0BW`>j1-9`I=}$dl1pt8-Wn ziBnh|s^XS#a?Ehy+#~vk;pCKYYckyDC_o%Xq6d#+3yA?nh)?(K^A| zQ`s-cPwRTjdtOJ!Eac!C)>eAz4y`z-0I>KXHYDxZ+9a&yn>5{dm++Rk-}K`Gq1SrMx67yGW$A$`{b8b0Q*TgmsTK$OT#HB1-Dii`|tlpy9Y1sI+yAF+r&Y9UOH1Wsq>yYBi~6XeX2LbudK#T zHhZ+2!knR!R|r(4evh&Au~2i`OSe)mG>2IB_=j`XZ}z|?aB2zXq<>9j*-Yh~ zK;D~C+A}ZLmz(aTrq;&%#=@7MsuB}rWA&zkIP-)8Su>9>ZuhM>O})9HKx3v{;{{*c zT$|0uk3kG92V&iqlCy|AGB7DpM@6r9kF^q^5kfZpk#Oci{pJ5s^a4Rjvd*6=Dn-XAn$oI;-Wh>UWp9kKy zsWdar?beHXl)!BjX? zs*@Fi6s)=!|D}}AyKno)hf_kUyii@;Onab_6N^Gw6q)ZR!MX#es%mb0ys*5&odsXE zykVzKI2SWNydosEal*7*2>gq#Qy*3jT*{_Ijf6Iz%AAe>ejYk-oBEq)$~FnU6k~L) zv(A$sjR_0W9N6;8-Db;2HbginkKe844~yLiCGdlTnldHxB-64BDTZN&F#i(E&7*?l z9B*#N?>1EB>iY8Xa&>Mr!4c%%4n_-K6NG;FUfQ~_5FD6m{GJLxOZw?*#7rqHoy^>O zT0|g9#<=MHv2mfrOmy`VJNX?V5BmT;-}C6aXl|{^l{{~t<)?HA!}f1?YDDv z*!vYL)!r(j`oME8=3#0q|L(-wuqPe?Jo>DLgvw>*HRp>-dFIQm(KpvO8ZOZ0=W)2G ztR*~sBG-Fkb#?XHEafH6uY4uy>X&T4JjppBB0UG6|4Wj?%UW8Mm?U*o&gg4?`@h2- zIX%tGHf7bb=3bI_4`(q8w^a&{37dItN%kS=%N~d89Kzftp#QIp%SKCa93bG~>$1C# T`&7(!e&|_QoHQ>t^}O^y*Hb#@ literal 0 HcmV?d00001