Fuelwood Heater textures

src/main/java/mekanism/client/ClientProxy.java

@@ -90,7 +90,6 @@ import mekanism.client.render.tileentity.RenderElectrolyticSeparator;
 import mekanism.client.render.tileentity.RenderEnergyCube;
 import mekanism.client.render.tileentity.RenderFluidTank;
 import mekanism.client.render.tileentity.RenderFluidicPlenisher;
-import mekanism.client.render.tileentity.RenderFuelwoodHeater;
 import mekanism.client.render.tileentity.RenderGasTank;
 import mekanism.client.render.tileentity.RenderLaser;
 import mekanism.client.render.tileentity.RenderLaserAmplifier;
@@ -323,7 +322,7 @@ public class ClientProxy extends CommonProxy
 		ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler());
 		ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk());
 		ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter());
-		ClientRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater", new RenderFuelwoodHeater());
+		GameRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater");
 	}
 
 	@Override

src/main/java/mekanism/client/render/block/MachineRenderingHandler.java

@@ -61,7 +61,6 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
 	public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator();
 	public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater();
 	public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter();
-	public ModelResistiveHeater fuelwoodHeater = new ModelResistiveHeater();
 
 	@Override
 	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
@@ -227,14 +226,6 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
 			mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png"));
 			resistiveHeater.render(0.0625F, false, mc.renderEngine);
 		}
-		else if(type == MachineType.FUELWOOD_HEATER)
-		{
-			GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
-			GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
-			GL11.glTranslatef(0.05F, -0.96F, 0.05F);
-			mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FuelwoodHeater.png"));
-			fuelwoodHeater.render(0.0625F, false, mc.renderEngine);
-		}
 		else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR)
 		{
 			GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);

src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java

@@ -1,44 +0,0 @@
-package mekanism.client.render.tileentity;
-
-import mekanism.client.model.ModelResistiveHeater;
-import mekanism.common.tile.TileEntityFuelwoodHeater;
-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 RenderFuelwoodHeater extends TileEntitySpecialRenderer
-{
-	private ModelResistiveHeater model = new ModelResistiveHeater();
-
-	@Override
-	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick)
-	{
-		renderAModelAt((TileEntityFuelwoodHeater)tileEntity, x, y, z, partialTick);
-	}
-
-	private void renderAModelAt(TileEntityFuelwoodHeater 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, "FuelwoodHeater.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, tileEntity.isActive, field_147501_a.field_147553_e);
-		GL11.glPopMatrix();
-	}
-}

src/main/java/mekanism/common/block/BlockBasic.java

@@ -189,14 +189,10 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
 				icons[5][0] = register.registerIcon("mekanism:SteelBlock");
 				icons[6][0] = register.registerIcon(ICON_BASE);
 				
-				MekanismRenderer.loadDynamicTextures(register, "bin/BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinBasicSide"), 3, 4, 5),
-						new DefIcon(register.registerIcon("mekanism:bin/BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinBasicTopOn"), 6));
-				MekanismRenderer.loadDynamicTextures(register, "bin/BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinAdvancedSide"), 3, 4, 5),
-						new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTopOn"), 6));
-				MekanismRenderer.loadDynamicTextures(register, "bin/BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinEliteSide"), 3, 4, 5),
-						new DefIcon(register.registerIcon("mekanism:bin/BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinEliteTopOn"), 6));
-				MekanismRenderer.loadDynamicTextures(register, "bin/BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinUltimateSide"), 3, 4, 5),
-						new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTopOn"), 6));
+				MekanismRenderer.loadDynamicTextures(register, "bin/BinBasic", binIcons[0], new DefIcon(register.registerIcon("mekanism:bin/BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinBasicTopOn"), 6));
+				MekanismRenderer.loadDynamicTextures(register, "bin/BinAdvanced", binIcons[1], new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTopOn"), 6));
+				MekanismRenderer.loadDynamicTextures(register, "bin/BinElite", binIcons[2], new DefIcon(register.registerIcon("mekanism:bin/BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinEliteTopOn"), 6));
+				MekanismRenderer.loadDynamicTextures(register, "bin/BinUltimate", binIcons[3], new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTopOn"), 6));
 				
 				icons[7][0] = ctms[7][0].mainTextureData.icon;
 				icons[8][0] = register.registerIcon("mekanism:SteelCasing");

src/main/java/mekanism/common/block/BlockMachine.java

@@ -230,9 +230,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
 			case MACHINE_BLOCK_3:
 				icons[0][0] = BASE_ICON;
 				icons[2][0] = BASE_ICON;
-				MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:oredictionificator/OredictionificatorSide")));
+				MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3]);
 				icons[4][0] = BASE_ICON;
-				MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5], DefIcon.getAll(register.registerIcon("mekanism:formulaic_assemblicator/FormulaicAssemblicatorSide")));
+				MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5]);
+				MekanismRenderer.loadDynamicTextures(register, "fuelwood_heater/" + MachineType.FUELWOOD_HEATER.name, icons[6]);
 				
 				break;
 		}
@@ -433,6 +434,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
 				{
 					case 3:
 					case 5:
+					case 6:
 						return icons[meta][side];
 					default:
 						return icons[meta][0] != null ? icons[meta][0] : BASE_ICON;
@@ -487,6 +489,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
 				{
 					case 3:
 					case 5:
+					case 6:
 						boolean active = MekanismUtils.isActive(world, x, y, z);
 						return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
 					default:
@@ -1190,7 +1193,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
 		OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false),
 		RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, true, false),
 		FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true),
-		FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, true, false);
+		FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false);
 
 		public MachineBlock typeBlock;
 		public int meta;