From dec2c68e86c46dc849af2a13fd4f95c00167aa1f Mon Sep 17 00:00:00 2001
From: Gig <thegigabit101@gmail.com>
Date: Sun, 3 May 2015 22:15:39 +0100
Subject: [PATCH] More texture changes

---
 .../techreborn/blocks/BlockBlastFurnace.java  |  7 +--
 .../techreborn/blocks/BlockCentrifuge.java    |  2 +-
 .../blocks/BlockImplosionCompressor.java      |  2 +-
 .../blocks/BlockMagicEnergyConverter.java     | 61 +++++++++++++++++++
 .../techreborn/blocks/BlockQuantumChest.java  | 30 ++++-----
 .../blocks/BlockRollingMachine.java           |  9 ++-
 .../blocks/BlockThermalGenerator.java         |  6 +-
 src/main/java/techreborn/init/ModBlocks.java  |  5 ++
 8 files changed, 94 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java

diff --git a/src/main/java/techreborn/blocks/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/BlockBlastFurnace.java
index 224c3ac71..d300fc1fa 100644
--- a/src/main/java/techreborn/blocks/BlockBlastFurnace.java
+++ b/src/main/java/techreborn/blocks/BlockBlastFurnace.java
@@ -72,10 +72,9 @@ public class BlockBlastFurnace extends BlockMachineBase {
 	public void registerBlockIcons(IIconRegister icon)
 	{
 		this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
-		this.iconFront = icon
-				.registerIcon("techreborn:machine/industrial_blast_furnace_front_off");
-		this.iconTop = icon.registerIcon("techreborn:machine/machine_side");
-		this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
+		this.iconFront = icon.registerIcon("techreborn:machine/industrial_blast_furnace_front_off");
+		this.iconTop = icon.registerIcon("techreborn:machine/advanced_machine_side");
+		this.iconBottom = icon.registerIcon("techreborn:machine/advanced_machine_side");
 	}
 
 	@SideOnly(Side.CLIENT)
diff --git a/src/main/java/techreborn/blocks/BlockCentrifuge.java b/src/main/java/techreborn/blocks/BlockCentrifuge.java
index 978acde2f..05ed96ec8 100644
--- a/src/main/java/techreborn/blocks/BlockCentrifuge.java
+++ b/src/main/java/techreborn/blocks/BlockCentrifuge.java
@@ -54,7 +54,7 @@ public class BlockCentrifuge extends BlockMachineBase {
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
+		this.blockIcon = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off");
 		this.iconFront = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off");
 		this.iconTop = icon.registerIcon("techreborn:machine/industrial_centrifuge_top_off");
 		this.iconBottom = icon.registerIcon("techreborn:machine/industrial_centrifuge_bottom");
diff --git a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/BlockImplosionCompressor.java
index d777fc0f2..f990046c9 100644
--- a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java
+++ b/src/main/java/techreborn/blocks/BlockImplosionCompressor.java
@@ -57,7 +57,7 @@ public class BlockImplosionCompressor extends BlockMachineBase{
 	{
 		this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
 		this.iconFront = icon.registerIcon("techreborn:machine/implosion_compressor_front_off");
-		this.iconTop = icon.registerIcon("techreborn:machine/machine_side");
+		this.iconTop = icon.registerIcon("techreborn:machine/advanced_machine_side");
 		this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
 	}
 
diff --git a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java
new file mode 100644
index 000000000..fae07f7a6
--- /dev/null
+++ b/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java
@@ -0,0 +1,61 @@
+package techreborn.blocks;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import techreborn.Core;
+import techreborn.client.GuiHandler;
+import techreborn.client.TechRebornCreativeTab;
+import techreborn.tiles.TileAlloySmelter;
+import techreborn.tiles.TileBlastFurnace;
+import techreborn.tiles.TileMachineCasing;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockMagicEnergyConverter extends BlockMachineBase {
+
+	@SideOnly(Side.CLIENT)
+	private IIcon iconFront;
+
+	@SideOnly(Side.CLIENT)
+	private IIcon iconTop;
+
+	@SideOnly(Side.CLIENT)
+	private IIcon iconBottom;
+
+	public BlockMagicEnergyConverter(Material material)
+	{
+		super(material);
+		setBlockName("techreborn.magicrnergyconverter");
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister icon)
+	{
+		this.blockIcon = icon.registerIcon("techreborn:machine/magic_energy_absorber_side");
+		this.iconFront = icon.registerIcon("techreborn:machine/magic_energy_converter_front on");
+		this.iconTop = icon.registerIcon("techreborn:machine/magic_energy_absorber_top");
+		this.iconBottom = icon.registerIcon("techreborn:machine/magic_energy_absorber_bottom");
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int metadata)
+	{
+
+		return metadata == 0 && side == 3 ? this.iconFront
+				: side == 1 ? this.iconTop : (side == 0 ? this.iconTop
+						: (side == metadata ? this.iconFront : this.blockIcon));
+
+	}
+
+}
diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java
index c1ceca46a..adb654d06 100644
--- a/src/main/java/techreborn/blocks/BlockQuantumChest.java
+++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java
@@ -16,9 +16,13 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class BlockQuantumChest extends BlockMachineBase {
 
 	@SideOnly(Side.CLIENT)
-	private IIcon top;
+	private IIcon iconFront;
+
 	@SideOnly(Side.CLIENT)
-	private IIcon other;
+	private IIcon iconTop;
+
+	@SideOnly(Side.CLIENT)
+	private IIcon iconBottom;
 
 	public BlockQuantumChest()
 	{
@@ -46,21 +50,19 @@ public class BlockQuantumChest extends BlockMachineBase {
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		top = icon.registerIcon("techreborn:machine/quantum_top");
-		other = icon.registerIcon("techreborn:machine/quantum_chest");
+		this.blockIcon = icon.registerIcon("techreborn:machine/qchest_side");
+		this.iconFront = icon.registerIcon("techreborn:machine/quantum_chest");
+		this.iconTop = icon.registerIcon("techreborn:machine/quantum_top");
+		this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom");
 	}
 
-	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int currentSide, int meta)
+	public IIcon getIcon(int side, int metadata)
 	{
-		// TODO chest rotation
-		if (currentSide == 1)
-		{
-			return top;
-		} else
-		{
-			return other;
-		}
+
+		return metadata == 0 && side == 3 ? this.iconFront
+				: side == 1 ? this.iconTop : (side == 0 ? this.iconTop
+						: (side == metadata ? this.iconFront : this.blockIcon));
+
 	}
 }
diff --git a/src/main/java/techreborn/blocks/BlockRollingMachine.java b/src/main/java/techreborn/blocks/BlockRollingMachine.java
index c1114213b..60394f052 100644
--- a/src/main/java/techreborn/blocks/BlockRollingMachine.java
+++ b/src/main/java/techreborn/blocks/BlockRollingMachine.java
@@ -55,11 +55,10 @@ public class BlockRollingMachine extends BlockMachineBase {
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
-		this.iconFront = icon.registerIcon("techreborn:machine/machine_side");
-		this.iconTop = icon
-				.registerIcon("techreborn:machine/rollingmachine_top");
-		this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
+		this.blockIcon = icon.registerIcon("techreborn:machine/rolling_machine_side_off");
+		this.iconFront = icon.registerIcon("techreborn:machine/rolling_machine_side_off");
+		this.iconTop = icon.registerIcon("techreborn:machine/rollingmachine_top");
+		this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom");
 	}
 
 	@SideOnly(Side.CLIENT)
diff --git a/src/main/java/techreborn/blocks/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/BlockThermalGenerator.java
index a26643c0f..64cca4c9f 100644
--- a/src/main/java/techreborn/blocks/BlockThermalGenerator.java
+++ b/src/main/java/techreborn/blocks/BlockThermalGenerator.java
@@ -59,10 +59,10 @@ public class BlockThermalGenerator extends BlockMachineBase {
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
-		this.iconFront = icon.registerIcon("techreborn:machine/machine_side");
+		this.blockIcon = icon.registerIcon("techreborn:machine/thermal_generator_side_off");
+		this.iconFront = icon.registerIcon("techreborn:machine/thermal_generator_side_off");
 		this.iconTop = icon.registerIcon("techreborn:machine/thermal_generator_top_off");
-		this.iconBottom = icon.registerIcon("techreborn:machine/thermal_generator_side_off");
+		this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom");
 	}
 
 	@SideOnly(Side.CLIENT)
diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java
index e2a0433ac..ef6bcda6d 100644
--- a/src/main/java/techreborn/init/ModBlocks.java
+++ b/src/main/java/techreborn/init/ModBlocks.java
@@ -13,6 +13,7 @@ import techreborn.blocks.BlockGrinder;
 import techreborn.blocks.BlockHighlyAdvancedMachine;
 import techreborn.blocks.BlockImplosionCompressor;
 import techreborn.blocks.BlockMachineCasing;
+import techreborn.blocks.BlockMagicEnergyConverter;
 import techreborn.blocks.BlockMatterFabricator;
 import techreborn.blocks.BlockOre;
 import techreborn.blocks.BlockQuantumChest;
@@ -57,6 +58,7 @@ public class ModBlocks {
 	public static Block ChunkLoader;
 	public static Block HighAdvancedMachineBlock;
 	public static Block Dragoneggenergysiphoner;
+	public static Block Magicenergeyconverter;
 
 	public static Block ore;
 	public static Block storage;
@@ -137,6 +139,9 @@ public class ModBlocks {
 		
 		Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.rock);
 		GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon");
+		
+		Magicenergeyconverter = new BlockMagicEnergyConverter(Material.rock);
+		GameRegistry.registerBlock(Magicenergeyconverter, "magicenergyconverter");
 
 		registerOreDict();
 	}