From c4a6d1c721e8c880a1333701dd33b50f6f120573 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Fri, 14 Mar 2014 17:41:22 +0800
Subject: [PATCH] Fixed mixer model render and insulation localization

---
 .../mechanical/Mechanical.java                |  7 ++-
 .../process/purifier/BlockMixer.java          | 51 -------------------
 .../process/purifier/TileMixer.java           |  8 +++
 .../assets/resonantinduction/languages        |  2 +-
 4 files changed, 12 insertions(+), 56 deletions(-)
 delete mode 100644 mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java

diff --git a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java
index 31230131c..ef4e49bac 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java
@@ -31,7 +31,6 @@ import resonantinduction.mechanical.logistic.belt.TileManipulator;
 import resonantinduction.mechanical.logistic.belt.TileSorter;
 import resonantinduction.mechanical.process.crusher.TileMechanicalPiston;
 import resonantinduction.mechanical.process.grinder.TileGrindingWheel;
-import resonantinduction.mechanical.process.purifier.BlockMixer;
 import resonantinduction.mechanical.process.purifier.TileMixer;
 import calclavia.api.resonantinduction.IMechanicalNode;
 import calclavia.components.creative.BlockCreativeBuilder;
@@ -97,7 +96,7 @@ public class Mechanical
 
 	// Machines/Processes
 	public static Block blockGrinderWheel;
-	public static Block blockPurifier;
+	public static Block blockMixer;
 	public static Block blockMechanicalPiston;
 
 	@EventHandler
@@ -128,7 +127,7 @@ public class Mechanical
 
 		// Machines
 		blockGrinderWheel = contentRegistry.newBlock(TileGrindingWheel.class);
-		blockPurifier = contentRegistry.createTile(BlockMixer.class, TileMixer.class);
+		blockMixer = contentRegistry.newBlock(TileMixer.class);
 		blockMechanicalPiston = contentRegistry.newBlock(TileMechanicalPiston.class);
 		OreDictionary.registerOre("gear", itemGear);
 
@@ -184,6 +183,6 @@ public class Mechanical
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemPipe, 1, EnumPipeMaterial.FIBERGLASS.ordinal()), "BBB", "   ", "BBB", 'B', Item.diamond));
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(blockGrinderWheel, "III", "LGL", "III", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'L', "logWood", 'G', itemGear));
-		GameRegistry.addRecipe(new ShapedOreRecipe(blockPurifier, "IGI", "IGI", "IGI", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'G', itemGear));
+		GameRegistry.addRecipe(new ShapedOreRecipe(blockMixer, "IGI", "IGI", "IGI", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'G', itemGear));
 	}
 }
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java
deleted file mode 100644
index e32481a59..000000000
--- a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package resonantinduction.mechanical.process.purifier;
-
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import resonantinduction.core.Reference;
-import universalelectricity.api.UniversalElectricity;
-import calclavia.lib.prefab.block.BlockRotatable;
-import calclavia.lib.render.block.BlockRenderingHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/**
- * A block used to build machines.
- * 
- * @author Calclavia
- * 
- */
-public class BlockMixer extends BlockRotatable implements ITileEntityProvider
-{
-	public BlockMixer(int id)
-	{
-		super(id, UniversalElectricity.machine);
-		setTextureName(Reference.PREFIX + "material_metal_top");
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public int getRenderType()
-	{
-		return BlockRenderingHandler.ID;
-	}
-
-	@Override
-	public boolean isOpaqueCube()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean renderAsNormalBlock()
-	{
-		return false;
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world)
-	{
-		return new TileMixer();
-	}
-}
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java
index 4813f5647..22e6c3c9c 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Set;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -35,6 +36,8 @@ public class TileMixer extends TileMechanical implements IInventory
 
 	public TileMixer()
 	{
+		super(Material.iron);
+
 		mechanicalNode = new PacketMechanicalNode(this)
 		{
 			@Override
@@ -44,6 +47,11 @@ public class TileMixer extends TileMechanical implements IInventory
 			}
 
 		}.setConnection(Byte.parseByte("000011", 2));
+
+		isOpaqueCube = false;
+		normalRender = false;
+		customItemRender = true;
+		textureName = "material_metal_top";
 	}
 
 	@Override
diff --git a/src/main/resources/assets/resonantinduction/languages b/src/main/resources/assets/resonantinduction/languages
index 09738c5f8..de65db296 160000
--- a/src/main/resources/assets/resonantinduction/languages
+++ b/src/main/resources/assets/resonantinduction/languages
@@ -1 +1 @@
-Subproject commit 09738c5f87ec83d559c33492a440b0a666657663
+Subproject commit de65db296a225c74e7477bf5105c852fafc797da