From 4e4d98427b50dcac97a28a3268052d52a8ec7d88 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 18 Feb 2016 14:13:45 +0000 Subject: [PATCH] Some more models --- .../java/mekanism/client/ClientProxy.java | 3 +- .../RenderRotaryCondensentrator.java | 39 ------------------ .../tile/TileEntityMetallurgicInfuser.java | 2 +- .../mekanism/blockstates/electric_chest.json | 17 ++++++++ .../mekanism/blockstates/electric_pump.json | 17 ++++++++ .../mekanism/blockstates/teleporter.json | 14 +++++++ .../mekanism/models/block/electric_pump.json | 2 +- .../assets/mekanism/models/block/nothing.json | 17 ++++++++ .../textures/blocks/models/electric_pump.png | Bin 0 -> 3253 bytes 9 files changed, 68 insertions(+), 43 deletions(-) delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java create mode 100644 src/main/resources/assets/mekanism/blockstates/electric_chest.json create mode 100644 src/main/resources/assets/mekanism/blockstates/electric_pump.json create mode 100644 src/main/resources/assets/mekanism/blockstates/teleporter.json create mode 100644 src/main/resources/assets/mekanism/models/block/nothing.json create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index b9ceb957e..d013fabaf 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -85,7 +85,6 @@ import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderPortableTank; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; -import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderSalinationController; import mekanism.client.render.tileentity.RenderSeismicVibrator; import mekanism.client.render.tileentity.RenderTeleporter; @@ -303,7 +302,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityLogisticalSorter.class, "LogisticalSorter", new RenderLogisticalSorter()); ClientRegistry.registerTileEntity(TileEntityBin.class, "Bin", new RenderBin()); ClientRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner", new RenderDigitalMiner()); - ClientRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator", new RenderRotaryCondensentrator()); + GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator"); ClientRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter", new RenderTeleporter()); ClientRegistry.registerTileEntity(TileEntityChemicalOxidizer.class, "ChemicalOxidizer", new RenderChemicalOxidizer()); ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser()); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java deleted file mode 100644 index 86d4b922f..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ /dev/null @@ -1,39 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelRotaryCondensentrator; -import mekanism.common.tile.TileEntityRotaryCondensentrator; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer -{ - private ModelRotaryCondensentrator model = new ModelRotaryCondensentrator(); - - @Override - public void renderTileEntityAt(TileEntityRotaryCondensentrator tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - } - - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 9d5679b3f..97ba1ceed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -381,7 +381,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i @Override public void handlePacketData(ByteBuf dataStream) { - if(!worldObj.isRemote) + if(!worldObj.isRemote) { infuseStored.amount = dataStream.readInt(); return; diff --git a/src/main/resources/assets/mekanism/blockstates/electric_chest.json b/src/main/resources/assets/mekanism/blockstates/electric_chest.json new file mode 100644 index 000000000..6a5f14b82 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/electric_chest.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:nothing" + }, + "variants": { + "normal": [{}], + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/electric_pump.json b/src/main/resources/assets/mekanism/blockstates/electric_pump.json new file mode 100644 index 000000000..b2bbe5969 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/electric_pump.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:electric_pump" + }, + "variants": { + "normal": [{}], + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/teleporter.json b/src/main/resources/assets/mekanism/blockstates/teleporter.json new file mode 100644 index 000000000..ef65e97a5 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/teleporter.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/Teleporter" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/models/block/electric_pump.json b/src/main/resources/assets/mekanism/models/block/electric_pump.json index c487b23e6..b61d39437 100644 --- a/src/main/resources/assets/mekanism/models/block/electric_pump.json +++ b/src/main/resources/assets/mekanism/models/block/electric_pump.json @@ -158,7 +158,7 @@ } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/electric_pump", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/nothing.json b/src/main/resources/assets/mekanism/models/block/nothing.json new file mode 100644 index 000000000..a1bfd3bcf --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/nothing.json @@ -0,0 +1,17 @@ +{ + "elements": [ + { + "__comment": "nothing", + "from": [0, 0, 0], + "to": [0, 0, 0], + "faces": { + "down": {}, + "up": {}, + "north": {}, + "south": {}, + "west": {}, + "east": {} + } + } + ] +} diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png b/src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png new file mode 100644 index 0000000000000000000000000000000000000000..f881af1fe17ccddbe2ca2fec6e3dad5f83463814 GIT binary patch literal 3253 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 a->36L=R@hufDZmI2Ef(|VM#IfO87VIltu*r literal 0 HcmV?d00001