From 961537a56046c44197bfb8ba297be544f6503a98 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Tue, 5 Nov 2013 20:35:02 -0500 Subject: [PATCH] Revert to old Crusher texture --- common/mekanism/client/ClientProxy.java | 2 +- .../client/render/block/MachineRenderingHandler.java | 4 ++-- common/mekanism/common/block/BlockMachine.java | 2 +- common/mekanism/common/tileentity/TileEntityCrusher.java | 6 ------ 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 9d42f12d8..9d1e9d807 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -223,7 +223,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityEnrichmentChamber.class, "EnrichmentChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityOsmiumCompressor.class, "OsmiumCompressor", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityCombiner.class, "Combiner", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityCrusher.class, "Crusher", new RenderCrusher()); + ClientRegistry.registerTileEntity(TileEntityCrusher.class, "Crusher", new RenderConfigurableMachine()); //TODO model ClientRegistry.registerTileEntity(TileEntityFactory.class, "SmeltingFactory", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityAdvancedFactory.class, "AdvancedSmeltingFactory", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine()); diff --git a/common/mekanism/client/render/block/MachineRenderingHandler.java b/common/mekanism/client/render/block/MachineRenderingHandler.java index e6cb82a6d..2789ed1ab 100644 --- a/common/mekanism/client/render/block/MachineRenderingHandler.java +++ b/common/mekanism/client/render/block/MachineRenderingHandler.java @@ -75,14 +75,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); logisticalSorter.render(0.0625F, false); } - else if(metadata == MachineType.CRUSHER.meta) + /*else if(metadata == MachineType.CRUSHER.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Crusher.png")); crusher.render(0.0625F, 0.0F); - } + } TODO model */ else { MekanismRenderer.renderItem(renderer, metadata, block); } diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index 792c4e66a..5024f24bd 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -877,7 +877,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds ENRICHMENT_CHAMBER(0, "EnrichmentChamber", 3, Mekanism.enrichmentChamberUsage*400, TileEntityEnrichmentChamber.class, false), OSMIUM_COMPRESSOR(1, "OsmiumCompressor", 4, Mekanism.osmiumCompressorUsage*400, TileEntityOsmiumCompressor.class, false), COMBINER(2, "Combiner", 5, Mekanism.combinerUsage*400, TileEntityCombiner.class, false), - CRUSHER(3, "Crusher", 6, Mekanism.crusherUsage*400, TileEntityCrusher.class, true), + CRUSHER(3, "Crusher", 6, Mekanism.crusherUsage*400, TileEntityCrusher.class, false), BASIC_FACTORY(5, "BasicFactory", 11, Mekanism.factoryUsage*3*400, TileEntityFactory.class, false), ADVANCED_FACTORY(6, "AdvancedFactory", 11, Mekanism.factoryUsage*5*400, TileEntityAdvancedFactory.class, false), ELITE_FACTORY(7, "EliteFactory", 11, Mekanism.factoryUsage*7*400, TileEntityEliteFactory.class, false), diff --git a/common/mekanism/common/tileentity/TileEntityCrusher.java b/common/mekanism/common/tileentity/TileEntityCrusher.java index 85731cad2..4da03067b 100644 --- a/common/mekanism/common/tileentity/TileEntityCrusher.java +++ b/common/mekanism/common/tileentity/TileEntityCrusher.java @@ -48,12 +48,6 @@ public class TileEntityCrusher extends TileEntityElectricMachine } } - @Override - protected EnumSet getConsumingSides() - { - return EnumSet.of(ForgeDirection.getOrientation(0)); - } - @Override public Map getRecipes() {