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 000000000..f881af1fe Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png differ