Merge pull request #2 from GTNewHorizons/master

kekztech-0.5.6

5 files changed, 20 insertions, 70 deletions

diff --git a/src/main/java/common/itemBlocks/IB_ItemServerDrive.java b/src/main/java/common/itemBlocks/IB_ItemServerDrive.java
deleted file mode 100644
index a937230da5..0000000000
--- a/src/main/java/common/itemBlocks/IB_ItemServerDrive.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package common.itemBlocks;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-
-public class IB_ItemServerDrive extends ItemBlock {
-	
-	public IB_ItemServerDrive(Block block) {
-		super(block);
-	}
-	
-	@SuppressWarnings({"unchecked"})
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add(StatCollector.translateToLocal("tile.kekztech_itemserverdrive_block.0.desc"));
-	}
-}
diff --git a/src/main/java/common/itemBlocks/IB_ItemServerIOPort.java b/src/main/java/common/itemBlocks/IB_ItemServerIOPort.java
deleted file mode 100644
index 10803af14c..0000000000
--- a/src/main/java/common/itemBlocks/IB_ItemServerIOPort.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package common.itemBlocks;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-
-public class IB_ItemServerIOPort extends ItemBlock {
-	
-	public IB_ItemServerIOPort(Block block) {
-		super(block);
-	}
-	
-	@SuppressWarnings({"unchecked"})
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add(StatCollector.translateToLocal("tile.kekztech_itemserverioport_block.0.desc"));
-	}
-}
diff --git a/src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java b/src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java
deleted file mode 100644
index f1da1fcb5e..0000000000
--- a/src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package common.itemBlocks;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-
-public class IB_ItemServerRackCasing extends ItemBlock {
-	
-	public IB_ItemServerRackCasing(Block block) {
-		super(block);
-	}
-	
-	@SuppressWarnings({"unchecked"})
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add(StatCollector.translateToLocal("tile.kekztech_itemserverrackcasing_block.0.desc="));
-	}
-}
diff --git a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
index 7891be8ea1..b6a8fc2468 100644
--- a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
+++ b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
@@ -39,6 +39,8 @@ public class IB_LapotronicEnergyUnit extends ItemBlock {
 		case 3: lines.add("Capacity: 10,000,000,000 EU"); break;
 		case 4: lines.add("Capacity: 100,000,000,000 EU"); break;
 		case 5: lines.add("Capacity: 9,223,372,036,854,775,807 EU"); break;
+		case 6: lines.add("Capacity: None"); break;
+		case 7: lines.add("Capacity: 10,000,000 EU"); break;
 		}
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
index 38b8997f0f..f00c5ef0c2 100644
--- a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
+++ b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
@@ -2,24 +2,38 @@ package common.itemBlocks;
 
 import java.util.List;
 
+import common.tileentities.TE_TFFTMultiHatch;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 
+@Deprecated
 public class IB_TFFTMultiHatch extends ItemBlock {
 	
 	public IB_TFFTMultiHatch(Block block) {
 		super(block);
 	}
-	
+
+	@Override
+	public int getMetadata(int meta) {
+		return meta;
+	}
+
+	@Override
+	public boolean getHasSubtypes() {
+		return true;
+	}
+
+	@Override
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName() + "." + stack.getItemDamage();
+	}
+
 	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
 		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.0.desc"));
-		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.1.desc"));
-		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.2.desc"));
-		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.3.desc"));
 	}
 }