Made a builder class for tooltips?

10 files changed, 130 insertions, 40 deletions

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
index 28d23eec73..cf8fb23245 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
@@ -1,6 +1,7 @@
 package blocks;

 

 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;

@@ -26,7 +27,7 @@ public class Block_TFFTStorageFieldBlockT1 extends Block {
 		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");

 		super.setHardness(5.0f);

 		super.setResistance(6.0f);

-		GameRegistry.registerBlock(getInstance(), blockName);

+		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 51ddd93a7b..1d465dbd08 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
@@ -1,6 +1,7 @@
 package blocks;

 

 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;

@@ -26,6 +27,6 @@ public class Block_TFFTStorageFieldBlockT2 extends Block {
 		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");

 		super.setHardness(5.0f);

 		super.setResistance(6.0f);

-		GameRegistry.registerBlock(getInstance(), blockName);

+		GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT2.class, blockName);

 	} 

 }

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
index 174812bc48..b08c071836 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
@@ -1,6 +1,7 @@
 package blocks;

 

 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;

@@ -26,6 +27,6 @@ public class Block_TFFTStorageFieldBlockT3 extends Block {
 		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");

 		super.setHardness(5.0f);

 		super.setResistance(6.0f);

-		GameRegistry.registerBlock(getInstance(), blockName);

+		GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT3.class, blockName);

 	} 

 }

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
index 0ea69237e6..f1bf45ead4 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
@@ -1,6 +1,7 @@
 package blocks;

 

 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;

@@ -26,6 +27,6 @@ public class Block_TFFTStorageFieldBlockT4 extends Block {
 		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");

 		super.setHardness(5.0f);

 		super.setResistance(6.0f);

-		GameRegistry.registerBlock(getInstance(), blockName);

+		GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT4.class, blockName);

 	} 

 }

diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
new file mode 100644
index 0000000000..a3c3b8567d
--- /dev/null
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
@@ -0,0 +1,24 @@
+package 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;
+
+public class IB_TFFTStorageFieldBlockT1 extends ItemBlock {
+
+	public IB_TFFTStorageFieldBlockT1(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: 500 000L");
+		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
new file mode 100644
index 0000000000..32f4998ce1
--- /dev/null
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java
@@ -0,0 +1,24 @@
+package 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;
+
+public class IB_TFFTStorageFieldBlockT2 extends ItemBlock {
+
+	public IB_TFFTStorageFieldBlockT2(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: 4 000 000L");
+		lines.add("Power Draw: 1EU/t");
+	}
+	
+}
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
new file mode 100644
index 0000000000..0aef351021
--- /dev/null
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
@@ -0,0 +1,24 @@
+package 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;
+
+public class IB_TFFTStorageFieldBlockT3 extends ItemBlock {
+
+	public IB_TFFTStorageFieldBlockT3(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: 16 000 000L");
+		lines.add("Power Draw: 2EU/t");
+	}
+	
+}
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
new file mode 100644
index 0000000000..b8889bde4d
--- /dev/null
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
@@ -0,0 +1,24 @@
+package 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;
+
+public class IB_TFFTStorageFieldBlockT4 extends ItemBlock {
+
+	public IB_TFFTStorageFieldBlockT4(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: 64 000 000L");
+		lines.add("Power Draw: 4EU/t");
+	}
+	
+}
diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java
index c19200bf2e..f4c674c092 100644
--- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java
+++ b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java
@@ -3,6 +3,9 @@ package tileentities;
 import java.util.ArrayList;

 import java.util.HashSet;

 import java.util.Iterator;

+

+import org.lwjgl.input.Keyboard;

+

 import blocks.Block_TFFTCasing;

 import blocks.Block_TFFTMultiHatch;

 import blocks.Block_TFFTStorageFieldBlockT1;

@@ -18,6 +21,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;

 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;

 import gregtech.api.objects.GT_RenderedTexture;

+import kekztech.MultiBlockTooltipBuilder;

 import kekztech.MultiFluidHandler;

 import net.minecraft.block.Block;

 import net.minecraft.entity.player.EntityPlayer;

@@ -64,29 +68,28 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 

 	@Override

 	public String[] getDescription() {

-		return new String[] {

-				"High-Tech fluid tank that can hold up to 25 different fluids",

-				"Has 1/25th of the total capacity as capacity for each fluid",

-				"Rightclicking the controller with a screwdriver will turn on excess voiding",

-				"Fluid storage amount and running cost depends on the storage field blocks used",

-				"Tier I:   500,000L per block, 0.5EU/t",

-				"Tier II:  4,000,000L per block, 1EU/t",

-				"Tier III: 16,000,000L per block, 2EU/t",

-				"Tier IV:  64,000,000L per block, 4EU/t",

-				"------------------------------------------",

-				"Note on hatch locking:",

-				"Use an Integrated Circuit in the GUI slot to limit which fluid is output",

-				"The index of a stored fluid can be obtained through the Tricorder.",

-				"------------------------------------------",

-				"Dimensions: 5x9x5 (WxHxL)",

-				"Structure:",

-				"   Controller: Top center",

-				"   Energy Hatch: Any top or bottom casing",

-				"   Inner 3x7x3 tube are Storage Field Blocks",

-				"   Outer 5x7x5 glass shell is AE2 Quartz Glass or Vanilla Stained Glass",

-				"   Maintenance Hatch: Any top or bottom casing",

-				"   I/O Hatches: Instead of any casing or glass, have to touch storage field"

-		};

+		final MultiBlockTooltipBuilder b = new MultiBlockTooltipBuilder();

+		b.addInfo("High-Tech fluid tank that can hold up to 25 different fluids!")

+				.addInfo("Has 1/25th of the total capacity as capacity for each fluid.")

+				.addInfo("Rightclicking the controller with a screwdriver will turn on excess voiding.")

+				.addInfo("Fluid storage amount and running cost depends on the storage field blocks used.")

+				.addSeparator()

+				.addInfo("Note on hatch locking:")

+				.addInfo("Use an Integrated Circuit in the GUI slot to limit which fluid is output.")

+				.addInfo("The index of a stored fluid can be obtained through the Tricorder.")

+				.addSeparator()

+				.beginStructureBlock(5, 9, 5)

+				.addController("Top Center")

+				.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")

+				.signAndFinalize("Kekzdealer");

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

+			return b.getInformation();

+		} else {

+			return b.getStructureInformation();

+		}

 	}

 

 	@Override

@@ -158,7 +161,6 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 					possibleOutput += outputHatch.getCapacity() - outputHatch.getFluidAmount();

 				}

 			}

-			System.out.println("Output Capacity: " + possibleOutput);

 			// Output as much as possible

 			final FluidStack tempStack = storedFluid.copy();

 			tempStack.amount = possibleOutput;

diff --git a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java
index 89c5ec9ef6..901716dc6e 100644
--- a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java
+++ b/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java
@@ -57,18 +57,6 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas
 		} else {

 			return b.getStructureInformation();

 		}

-		/*return new String[] { 

-				"DO NOT CHEAT IN THIS MACHINE",

-				"I'm not quite finished yet",

-				"------------------------------------------",

-				"Dimensions: 5x5x5 (WxHxL)",

-				"Structure:",

-				"   Controller: Front center",

-				"   80x Radiation Proof Machine Casing (at least)",

-				"   Dynamo Hatch: ONLY in EU-mode, at least one",

-				"   Input Bus, Output Bus: Optional but required for automation",

-				"   Input Hatch, Output Hatch: ONLY in Coolant-Mode, at least one each"

-				};*/

 	}

 

 	@Override