visiting Lucy

14 files changed, 113 insertions, 14 deletions

diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
index 8ca9a31fc0..3d1ce633c1 100644
--- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java
+++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
@@ -8,8 +8,8 @@ import net.minecraft.world.World;
 
 public abstract class BaseGTUpdateableBlock extends Block {
 
-    protected BaseGTUpdateableBlock(Material p_i45394_1_) {
-        super(p_i45394_1_);
+    protected BaseGTUpdateableBlock(Material material) {
+        super(material);
         GregTech_API.registerMachineBlock(this, -1);
     }
 
diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index d7a4a2dcb2..23f082a2bd 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -1,8 +1,8 @@
 package common.blocks;
 
+import common.itemBlocks.IB_ItemProxyCable;
 import common.tileentities.TE_ItemProxyCable;
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxyCable;
 import kekztech.KekzCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
index d2fdea8029..68aa206836 100644
--- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
+++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
@@ -2,9 +2,9 @@ package common.blocks;
 
 import java.util.UUID;
 
+import common.itemBlocks.IB_ItemProxyEndpoint;
 import common.tileentities.TE_ItemProxyEndpoint;
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxyEndpoint;
 import items.Item_Configurator;
 import kekztech.GuiHandler;
 import kekztech.KekzCore;
diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
index 715a6e2bdf..d09368a1a2 100644
--- a/src/main/java/common/blocks/Block_ItemProxySource.java
+++ b/src/main/java/common/blocks/Block_ItemProxySource.java
@@ -1,8 +1,8 @@
 package common.blocks;
 
+import common.itemBlocks.IB_ItemProxySource;
 import common.tileentities.TE_ItemProxySource;
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxySource;
 import items.Item_Configurator;
 import kekztech.GuiHandler;
 import kekztech.KekzCore;
diff --git a/src/main/java/common/blocks/Block_ItemServerDrive.java b/src/main/java/common/blocks/Block_ItemServerDrive.java
index 38b54da41a..e6268e5402 100644
--- a/src/main/java/common/blocks/Block_ItemServerDrive.java
+++ b/src/main/java/common/blocks/Block_ItemServerDrive.java
@@ -1,7 +1,7 @@
 package common.blocks;
 
+import common.itemBlocks.IB_ItemServerDrive;
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemServerDrive;
 import kekztech.KekzCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_ItemServerIOPort.java b/src/main/java/common/blocks/Block_ItemServerIOPort.java
index 1b40ae89a3..cae471dec4 100644
--- a/src/main/java/common/blocks/Block_ItemServerIOPort.java
+++ b/src/main/java/common/blocks/Block_ItemServerIOPort.java
@@ -1,8 +1,8 @@
 package common.blocks;
 
+import common.itemBlocks.IB_ItemServerIOPort;
 import common.tileentities.TE_ItemServerIOPort;
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemServerIOPort;
 import kekztech.KekzCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_ItemServerRackCasing.java b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
index fbddd34315..37cca58615 100644
--- a/src/main/java/common/blocks/Block_ItemServerRackCasing.java
+++ b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
@@ -1,7 +1,7 @@
 package common.blocks;
 
+import common.itemBlocks.IB_ItemServerRackCasing;
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemServerRackCasing;
 import kekztech.KekzCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
new file mode 100644
index 0000000000..bf6170ab65
--- /dev/null
+++ b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
@@ -0,0 +1,99 @@
+package common.blocks;
+
+import java.util.List;
+
+import common.itemBlocks.IB_LapotronicEnergyUnit;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
+	
+	private static final Block_LapotronicEnergyUnit instance = new Block_LapotronicEnergyUnit();
+	
+	private IIcon iconBaseSide;
+	private IIcon iconBaseTop;
+	
+	private IIcon iconLapoIVSide;
+	private IIcon iconLapoIVTop;
+	private IIcon iconLapoLuVSide;
+	private IIcon iconLapoLuVTop;
+	private IIcon iconLapoZPMSide;
+	private IIcon iconLapoZPMTop;
+	private IIcon iconLapoUVSide;
+	private IIcon iconLapoUVTop;
+	private IIcon iconUltimateSide;
+	private IIcon iconUltimateTop;
+	private IIcon iconReallyUltimateSide;
+	private IIcon iconReallyUltimateTop;
+	
+	private Block_LapotronicEnergyUnit() {
+		super(Material.iron);
+	}
+	
+	public static Block registerBlock() {
+		final String blockName = "kekztech_lapotronicenergyunit_block";
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setHardness(5.0f);
+		instance.setResistance(6.0f);
+		GameRegistry.registerBlock(instance, IB_LapotronicEnergyUnit.class, blockName);
+		
+		return instance;
+	}
+	
+	@Override
+	public void registerBlockIcons(IIconRegister ir) {
+		iconBaseSide = ir.registerIcon("kekztech:LSCBase_side");
+		iconBaseTop = ir.registerIcon("kekztech:LSCBase_top");
+		
+		iconLapoIVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit1_side");
+		iconLapoIVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit1_top");
+		iconLapoLuVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit2_side");
+		iconLapoLuVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit2_top");
+		iconLapoZPMSide = ir.registerIcon("kekztech:LapotronicEnergyUnit3_side");
+		iconLapoZPMTop = ir.registerIcon("kekztech:LapotronicEnergyUnit3_top");
+		iconLapoUVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit4_side");
+		iconLapoUVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit4_top");
+		
+		iconUltimateSide = ir.registerIcon("kekztech:UltimateEnergyUnit_side");
+		iconUltimateTop = ir.registerIcon("kekztech:UltimateEnergyUnit_top");
+		iconReallyUltimateSide = ir.registerIcon("kekztech:ReallyUltimateEnergyUnit_side");
+		iconReallyUltimateTop = ir.registerIcon("kekztech:ReallyUltimateEnergyUnit_top");
+	}
+	
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+		// Multi casing
+		par3List.add(new ItemStack(par1, 1, 0));
+		// Lapo units IV - UV
+		par3List.add(new ItemStack(par1, 1, 1));
+		par3List.add(new ItemStack(par1, 1, 2));
+		par3List.add(new ItemStack(par1, 1, 3));
+		par3List.add(new ItemStack(par1, 1, 4));
+		// Ultimate batteries
+		par3List.add(new ItemStack(par1, 1, 5));
+		par3List.add(new ItemStack(par1, 1, 6));
+	}
+	
+	@Override
+	public IIcon getIcon(int side, int meta) {
+		switch(meta) {
+		case 0: return (side < 2) ? iconBaseTop : iconBaseSide;
+		case 1: return (side < 2) ? iconLapoIVTop : iconLapoIVSide;
+		case 2: return (side < 2) ? iconLapoLuVTop : iconLapoLuVSide;
+		case 3: return (side < 2) ? iconLapoZPMTop : iconLapoZPMSide;
+		case 4: return (side < 2) ? iconLapoUVTop : iconLapoUVSide;
+		case 5: return (side < 2) ? iconUltimateTop : iconUltimateSide;
+		case 6: return (side < 2) ? iconReallyUltimateTop : iconReallyUltimateSide;
+		default: return iconUltimateTop;
+		}
+	}
+	
+}
diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
index 655b66006a..7759988645 100644
--- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java
+++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
@@ -1,11 +1,11 @@
 package common.blocks;
 
+import common.itemBlocks.IB_TFFTMultiHatch;
 import common.tileentities.TE_TFFTMultiHatch;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
-import itemBlocks.IB_TFFTMultiHatch;
 import kekztech.KekzCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
index e8e69d2850..f7554c4724 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
@@ -1,7 +1,7 @@
 package common.blocks;

 

+import common.itemBlocks.IB_TFFTStorageFieldBlockT1;

 import cpw.mods.fml.common.registry.GameRegistry;

-import itemBlocks.IB_TFFTStorageFieldBlockT1;

 import kekztech.KekzCore;

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
index 747c2cd1a9..394fbcf90f 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
@@ -1,7 +1,7 @@
 package common.blocks;

 

+import common.itemBlocks.IB_TFFTStorageFieldBlockT2;

 import cpw.mods.fml.common.registry.GameRegistry;

-import itemBlocks.IB_TFFTStorageFieldBlockT2;

 import kekztech.KekzCore;

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
index 6b163d2b24..0b2123ae87 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
@@ -1,7 +1,7 @@
 package common.blocks;

 

+import common.itemBlocks.IB_TFFTStorageFieldBlockT3;

 import cpw.mods.fml.common.registry.GameRegistry;

-import itemBlocks.IB_TFFTStorageFieldBlockT3;

 import kekztech.KekzCore;

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
index e46686a86a..138c66ac0c 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
@@ -1,7 +1,7 @@
 package common.blocks;

 

+import common.itemBlocks.IB_TFFTStorageFieldBlockT4;

 import cpw.mods.fml.common.registry.GameRegistry;

-import itemBlocks.IB_TFFTStorageFieldBlockT4;

 import kekztech.KekzCore;

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
index b53de1dc8a..7e30695804 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
@@ -1,7 +1,7 @@
 package common.blocks;
 
+import common.itemBlocks.IB_TFFTStorageFieldBlockT5;
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_TFFTStorageFieldBlockT5;
 import kekztech.KekzCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;