Merge pull request #45 from GTNewHorizons/feature/tfft-rework

TFFT rework

7 files changed, 47 insertions, 157 deletions

diff --git a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
deleted file mode 100644
index 4e4da45b2d..0000000000
--- a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
+++ /dev/null
@@ -1,37 +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;
-
-@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"));
-    }
-}
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageField.java b/src/main/java/common/itemBlocks/IB_TFFTStorageField.java
new file mode 100644
index 0000000000..8e75a881f2
--- /dev/null
+++ b/src/main/java/common/itemBlocks/IB_TFFTStorageField.java
@@ -0,0 +1,47 @@
+package common.itemBlocks;
+
+import common.tileentities.GTMTE_TFFT;
+import java.text.NumberFormat;
+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.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+
+public class IB_TFFTStorageField extends ItemBlock {
+
+    public IB_TFFTStorageField(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) {
+        int meta = stack.getItemDamage();
+        if (meta > 0) {
+            lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefield_block.desc"));
+            lines.add("Capacity: " + EnumChatFormatting.BLUE
+                    + NumberFormat.getNumberInstance().format(GTMTE_TFFT.Field.VALUES[meta - 1].getCapacity())
+                    + EnumChatFormatting.GRAY + " L");
+            lines.add("Power Draw: " + EnumChatFormatting.BLUE + GTMTE_TFFT.Field.VALUES[meta - 1].getCost()
+                    + EnumChatFormatting.GRAY + " EU/t");
+        }
+    }
+}
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java
deleted file mode 100644
index adcf705bcb..0000000000
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package common.itemBlocks;
-
-import common.blocks.Block_TFFTStorageFieldBlockT1;
-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_TFFTStorageFieldBlockT1 extends ItemBlock {
-
-    public IB_TFFTStorageFieldBlockT1(Block block) {
-        super(block);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-        lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
-        lines.add("Capacity: " + Block_TFFTStorageFieldBlockT1.getCapacity() + "L");
-        lines.add("Power Draw: +0.5EU/t");
-    }
-}
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java
deleted file mode 100644
index 2ee7a632a7..0000000000
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package common.itemBlocks;
-
-import common.blocks.Block_TFFTStorageFieldBlockT2;
-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_TFFTStorageFieldBlockT2 extends ItemBlock {
-
-    public IB_TFFTStorageFieldBlockT2(Block block) {
-        super(block);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-        lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
-        lines.add("Capacity: " + Block_TFFTStorageFieldBlockT2.getCapacity() + "L");
-        lines.add("Power Draw: +1EU/t");
-    }
-}
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java
deleted file mode 100644
index 6305209bb3..0000000000
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package common.itemBlocks;
-
-import common.blocks.Block_TFFTStorageFieldBlockT3;
-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_TFFTStorageFieldBlockT3 extends ItemBlock {
-
-    public IB_TFFTStorageFieldBlockT3(Block block) {
-        super(block);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-        lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
-        lines.add("Capacity: " + Block_TFFTStorageFieldBlockT3.getCapacity() + "L");
-        lines.add("Power Draw: +2EU/t");
-    }
-}
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java
deleted file mode 100644
index f0ed537b66..0000000000
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package common.itemBlocks;
-
-import common.blocks.Block_TFFTStorageFieldBlockT4;
-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_TFFTStorageFieldBlockT4 extends ItemBlock {
-
-    public IB_TFFTStorageFieldBlockT4(Block block) {
-        super(block);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-        lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
-        lines.add("Capacity: " + Block_TFFTStorageFieldBlockT4.getCapacity() + "L");
-        lines.add("Power Draw: +4EU/t");
-    }
-}
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java
deleted file mode 100644
index 4913d791e0..0000000000
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package common.itemBlocks;
-
-import common.blocks.Block_TFFTStorageFieldBlockT5;
-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_TFFTStorageFieldBlockT5 extends ItemBlock {
-
-    public IB_TFFTStorageFieldBlockT5(Block block) {
-        super(block);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-        lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
-        lines.add("Capacity: " + Block_TFFTStorageFieldBlockT5.getCapacity() + "L");
-        lines.add("Power Draw: +8EU/t");
-    }
-}