disabled experimental blocks for upcoming release. Added one more tier of storage fields to the TFFT. Added Item Server textures.

12 files changed, 104 insertions, 18 deletions

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
index cf8fb23245..d90838325f 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
@@ -20,6 +20,10 @@ public class Block_TFFTStorageFieldBlockT1 extends Block {
 		return instance;

 	}

 	

+	public static int getCapacity() {

+		return 500000;

+	}

+	

 	public void registerBlock() {

 		final String blockName = "kekztech_tfftstoragefieldblock1_block";

 		super.setBlockName(blockName);

@@ -30,5 +34,4 @@ public class Block_TFFTStorageFieldBlockT1 extends Block {
 		GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT1.class, blockName);

 	}

 	

-	

 }

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
index 1d465dbd08..08094338d5 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
@@ -20,6 +20,10 @@ public class Block_TFFTStorageFieldBlockT2 extends Block {
 		return instance;

 	}

 	

+	public static int getCapacity() {

+		return 4000000;

+	}

+	

 	public void registerBlock() {

 		final String blockName = "kekztech_tfftstoragefieldblock2_block";

 		super.setBlockName(blockName);

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
index b08c071836..987cf54b63 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
@@ -20,6 +20,10 @@ public class Block_TFFTStorageFieldBlockT3 extends Block {
 		return instance;

 	}

 	

+	public static int getCapacity() {

+		return 16000000;

+	}

+	

 	public void registerBlock() {

 		final String blockName = "kekztech_tfftstoragefieldblock3_block";

 		super.setBlockName(blockName);

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
index f1bf45ead4..4ba363cfbb 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
@@ -20,6 +20,10 @@ public class Block_TFFTStorageFieldBlockT4 extends Block {
 		return instance;

 	}

 	

+	public static int getCapacity() {

+		return 64000000;

+	}

+	

 	public void registerBlock() {

 		final String blockName = "kekztech_tfftstoragefieldblock4_block";

 		super.setBlockName(blockName);

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java
new file mode 100644
index 0000000000..61ed1decf3
--- /dev/null
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java
@@ -0,0 +1,36 @@
+package blocks;
+
+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;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_TFFTStorageFieldBlockT5 extends Block {
+	
+	private static Block_TFFTStorageFieldBlockT5 instance = new Block_TFFTStorageFieldBlockT5();
+	
+	private Block_TFFTStorageFieldBlockT5() {
+		// I am a singleton
+		super(Material.iron);
+	}
+	
+	public static Block_TFFTStorageFieldBlockT5 getInstance() {
+		return instance;
+	}
+	
+	public static int getCapacity() {
+		return 256000000;
+	}
+	
+	public void registerBlock() {
+		final String blockName = "kekztech_tfftstoragefieldblock5_block";
+		super.setBlockName(blockName);
+		super.setCreativeTab(CreativeTabs.tabMisc);
+		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock5");
+		super.setHardness(5.0f);
+		super.setResistance(6.0f);
+		GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT5.class, blockName);
+	} 
+}
\ No newline at end of file
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
index a3c3b8567d..783db3ec00 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
@@ -2,6 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
+import blocks.Block_TFFTStorageFieldBlockT1;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
@@ -17,7 +18,7 @@ public class IB_TFFTStorageFieldBlockT1 extends ItemBlock {
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
 		lines.add("This is not a fluid tank");
-		lines.add("Capacity: 500 000L");
+		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT1.getCapacity() + "L");
 		lines.add("Power Draw: 0.5EU/t");
 	}
 	
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java
index 32f4998ce1..b9fee22647 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java
@@ -2,6 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
+import blocks.Block_TFFTStorageFieldBlockT2;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
@@ -17,7 +18,7 @@ public class IB_TFFTStorageFieldBlockT2 extends ItemBlock {
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
 		lines.add("This is not a fluid tank");
-		lines.add("Capacity: 4 000 000L");
+		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT2.getCapacity() + "L");
 		lines.add("Power Draw: 1EU/t");
 	}
 	
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
index 0aef351021..889470644d 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
@@ -2,6 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
+import blocks.Block_TFFTStorageFieldBlockT3;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
@@ -17,7 +18,7 @@ public class IB_TFFTStorageFieldBlockT3 extends ItemBlock {
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
 		lines.add("This is not a fluid tank");
-		lines.add("Capacity: 16 000 000L");
+		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT3.getCapacity() + "L");
 		lines.add("Power Draw: 2EU/t");
 	}
 	
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
index b8889bde4d..960dee7f6b 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
@@ -2,6 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
+import blocks.Block_TFFTStorageFieldBlockT4;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
@@ -17,7 +18,7 @@ public class IB_TFFTStorageFieldBlockT4 extends ItemBlock {
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
 		lines.add("This is not a fluid tank");
-		lines.add("Capacity: 64 000 000L");
+		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT4.getCapacity() + "L");
 		lines.add("Power Draw: 4EU/t");
 	}
 	
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java
new file mode 100644
index 0000000000..caef257f93
--- /dev/null
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java
@@ -0,0 +1,25 @@
+package itemBlocks;
+
+import java.util.List;
+
+import blocks.Block_TFFTStorageFieldBlockT5;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+public class IB_TFFTStorageFieldBlockT5 extends ItemBlock {
+
+	public IB_TFFTStorageFieldBlockT5(Block block) {
+		super(block);
+	}
+	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
+		lines.add("This is not a fluid tank");
+		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT5.getCapacity() + "L");
+		lines.add("Power Draw: 0.5EU/t");
+	}
+	
+}
\ No newline at end of file
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index f93b5a9802..17ca145d6f 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -2,8 +2,6 @@ package kekztech;
 

 import blocks.Block_ControlRod;

 import blocks.Block_GDCUnit;

-import blocks.Block_ItemDistributionCable;

-import blocks.Block_ItemDistributionNode;

 import blocks.Block_ReactorChamber_OFF;

 import blocks.Block_ReactorChamber_ON;

 import blocks.Block_TFFTCasing;

@@ -87,8 +85,9 @@ public class KekzCore {
 		Block_ReactorChamber_OFF.getInstance().registerBlock();

 		Block_ReactorChamber_ON.getInstance().registerBlock();

 		Block_ControlRod.getInstance().registerBlock();

-		Block_ItemDistributionCable.getInstance().registerBlock();

-		Block_ItemDistributionNode.getInstance().registerBlock();

+		// TODO: Disabled for new release

+		//Block_ItemDistributionCable.getInstance().registerBlock();

+		//Block_ItemDistributionNode.getInstance().registerBlock();

 		// Register TileEntities

 		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");

 		GameRegistry.registerTileEntity(TE_ItemDistributionCable.class, "kekztech_itemdistributioncable_tile");

diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java
index 61b8e558f5..945309ad80 100644
--- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java
+++ b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java
@@ -12,6 +12,7 @@ import blocks.Block_TFFTStorageFieldBlockT1;
 import blocks.Block_TFFTStorageFieldBlockT2;

 import blocks.Block_TFFTStorageFieldBlockT3;

 import blocks.Block_TFFTStorageFieldBlockT4;

+import blocks.Block_TFFTStorageFieldBlockT5;

 import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.gui.GT_GUIContainer_MultiMachine;

 import gregtech.api.interfaces.ITexture;

@@ -40,10 +41,11 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 	private final String glassNameAE2 = "tile.appliedenergistics2.BlockQuartzGlass";

 	private final String glassNameStained = "tile.stainedGlass";

 	private final Block CASING = Block_TFFTCasing.getInstance();

-	private final Block STORAGE_FIELD1 = Block_TFFTStorageFieldBlockT1.getInstance();

-	private final Block STORAGE_FIELD2 = Block_TFFTStorageFieldBlockT2.getInstance();

-	private final Block STORAGE_FIELD3 = Block_TFFTStorageFieldBlockT3.getInstance();

-	private final Block STORAGE_FIELD4 = Block_TFFTStorageFieldBlockT4.getInstance();

+	private final Block_TFFTStorageFieldBlockT1 STORAGE_FIELD1 = Block_TFFTStorageFieldBlockT1.getInstance();

+	private final Block_TFFTStorageFieldBlockT2 STORAGE_FIELD2 = Block_TFFTStorageFieldBlockT2.getInstance();

+	private final Block_TFFTStorageFieldBlockT3 STORAGE_FIELD3 = Block_TFFTStorageFieldBlockT3.getInstance();

+	private final Block_TFFTStorageFieldBlockT4 STORAGE_FIELD4 = Block_TFFTStorageFieldBlockT4.getInstance();

+	private final Block_TFFTStorageFieldBlockT5 STORAGE_FIELD5 = Block_TFFTStorageFieldBlockT5.getInstance();

 	private final Block MULTI_HATCH = Block_TFFTMultiHatch.getInstance();

 	private final int CASING_TEXTURE_ID = 176;

 	

@@ -83,7 +85,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 				.addEnergyHatch("Any top or bottom casing")

 				.addOtherStructurePart("Inner 3x7x3 tube", "Storage Field Blocks")

 				.addOtherStructurePart("Outer 5x7x5 glass shell", "AE2 Quartz Glass of Vanilla Stained Glass")

-				.addIOHatches("Instead of any casing or glass, have to touch storage field")

+				.addIOHatches("Instead of any casing or glass, have to touch storage field. True for the Multi-Hatch as well.")

 				.signAndFinalize("Kekzdealer");

 		if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {

 			return b.getInformation();

@@ -249,6 +251,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 	 * 						References the item stack that can be placed in that GUI slot

 	 * 						in the top right.

 	 */

+	@SuppressWarnings("static-access")

 	@Override

 	public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) {

 		// Figure out the vector for the direction the back face of the controller is facing

@@ -326,19 +329,23 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 						if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()

 								.equals(STORAGE_FIELD1.getUnlocalizedName())) {

 							runningCostAcc += 0.5f;

-							fluidCapacityAcc += 500000.0f;

+							fluidCapacityAcc += (float) STORAGE_FIELD1.getCapacity();

 						} else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()

 								.equals(STORAGE_FIELD2.getUnlocalizedName())) {

 							runningCostAcc += 1.0f;

-							fluidCapacityAcc += 4000000.0f;

+							fluidCapacityAcc += (float) STORAGE_FIELD2.getCapacity();

 						} else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()

 								.equals(STORAGE_FIELD3.getUnlocalizedName())) {

 							runningCostAcc += 2.0f;

-							fluidCapacityAcc += 16000000.0f;

+							fluidCapacityAcc += (float) STORAGE_FIELD3.getCapacity();

 						} else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()

 								.equals(STORAGE_FIELD4.getUnlocalizedName())) {

 							runningCostAcc += 4.0f;

-							fluidCapacityAcc += 64000000.0f;

+							fluidCapacityAcc += (float) STORAGE_FIELD4.getCapacity();

+						} else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()

+								.equals(STORAGE_FIELD4.getUnlocalizedName())) {

+							runningCostAcc += 8.0f;

+							fluidCapacityAcc += (float) STORAGE_FIELD5.getCapacity();

 						} else {

 							formationChecklist = false;

 						}