% Book work.

% Improved the way that custom scanner info is added to GT++ multiblocks.
$ Fixed annoying single block boiler logging.

10 files changed, 286 insertions, 95 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index ea73a836b4..8849b61fe7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -29,6 +29,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -88,9 +89,29 @@ GT_MetaTileEntity_MultiBlockBase {
 		}		
 	}
 
+	public String[] getExtraInfoData() {
+		return new String[0];
+	};
+
 	@Override
 	public String[] getInfoData() {		
 
+		AutoMap<String> mInfo = new AutoMap<String>();
+		if (this.getMetaName() != "") {
+			mInfo.put(this.getMetaName());
+		}
+
+		String[] extra = getExtraInfoData();
+
+		if (extra == null) {
+			extra = new String[0];
+		}
+		if (extra.length > 0) {
+			for (String s : extra) {
+				mInfo.put(s);
+			}
+		}
+
 		long seconds = (this.mTotalRunTime/20);
 		int weeks = (int) (TimeUnit.SECONDS.toDays(seconds) / 7);
 		int days = (int) (TimeUnit.SECONDS.toDays(seconds) - 7 * weeks);
@@ -98,15 +119,15 @@ GT_MetaTileEntity_MultiBlockBase {
 		long minutes = TimeUnit.SECONDS.toMinutes(seconds) - (TimeUnit.SECONDS.toHours(seconds) * 60);
 		long second = TimeUnit.SECONDS.toSeconds(seconds) - (TimeUnit.SECONDS.toMinutes(seconds) *60);
 
-		String[] g = {
-				"Progress: " + (this.mProgresstime / 20) +" / "+ (this.mMaxProgresstime / 20) + " secs",
-				"Efficiency: "+(this.mEfficiency / 100.0F) + "%",
-				"Problems: " + "" + (this.getIdealStatus() - this.getRepairStatus()),
-				"Total Time Since Built: " + ""+weeks+" Weeks, " + ""+days+" Days, ",
-				""+hours+" Hours, " + ""+minutes+" Minutes, " + ""+second+" Seconds.",
-				"Total Time in ticks: "+this.mTotalRunTime};
-		
-		return g;
+		mInfo.put("Progress: " + (this.mProgresstime / 20) +" / "+ (this.mMaxProgresstime / 20) + " secs");
+		mInfo.put("Efficiency: "+(this.mEfficiency / 100.0F) + "%");
+		mInfo.put("Problems: " + "" + (this.getIdealStatus() - this.getRepairStatus()));
+		mInfo.put("Total Time Since Built: " + ""+weeks+" Weeks, " + ""+days+" Days, ");
+		mInfo.put(""+hours+" Hours, " + ""+minutes+" Minutes, " + ""+second+" Seconds.");
+		mInfo.put("Total Time in ticks: "+this.mTotalRunTime);
+
+		String[] mInfo2 = mInfo.toArray();		
+		return mInfo2;
 
 
 
@@ -135,7 +156,7 @@ GT_MetaTileEntity_MultiBlockBase {
 	public boolean explodesOnComponentBreak(ItemStack p0) {
 		return false;
 	}
-	
+
 	@Override
 	public void startSoundLoop(final byte aIndex, final double aX, final double aY, final double aZ) {
 		super.startSoundLoop(aIndex, aX, aY, aZ);
@@ -427,19 +448,19 @@ GT_MetaTileEntity_MultiBlockBase {
 	@Override
 	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity,
 			final long aTick) {
-		
+
 		//Time Counter
 		if (aBaseMetaTileEntity.isServerSide()){
 			this.mTotalRunTime++;
 		}
-		
+
 		if (aBaseMetaTileEntity.isServerSide()) {
 			if (mUpdate == 0 || this.mStartUpCheck == 0) {
 				this.mChargeHatches.clear();
 				this.mDischargeHatches.clear();
 			}
 		}
-		
+
 		super.onPostTick(aBaseMetaTileEntity, aTick);
 	}
 
@@ -484,7 +505,7 @@ GT_MetaTileEntity_MultiBlockBase {
 		}
 		return mMode;
 	}
-	
+
 	protected ItemStack getGUIItemStack() {
 		ItemStack guiSlot = this.mInventory[1];		
 		return guiSlot;
@@ -621,7 +642,7 @@ GT_MetaTileEntity_MultiBlockBase {
 
 	public boolean updateTexture(final IGregTechTileEntity aTileEntity, int aCasingID){
 		try { //gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch.updateTexture(int)
-			
+
 			final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
 			if (aMetaTileEntity == null) {
 				return false;
@@ -634,7 +655,7 @@ GT_MetaTileEntity_MultiBlockBase {
 					Logger.REFLECTION("Good Method Call for updateTexture.");
 					return true;
 				}
-						
+
 			}
 			else {
 				Logger.REFLECTION("Bad Method Call for updateTexture.");
@@ -660,7 +681,7 @@ GT_MetaTileEntity_MultiBlockBase {
 		e.printStackTrace();
 		return false;	
 		}	
-		
+
 	}
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index 0ec3ce53b2..179e75d3e7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -201,14 +201,14 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 	@Override
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
 		if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {
-			// Utils.LOG_INFO("Ticking Boiler");
+			// Utils.LOG_MACHINE_INFO("Ticking Boiler");
 
 			//if (aTick % 60L == 0L) {
-				// Utils.LOG_INFO("Temp:"+this.mTemperature);
-				// Utils.LOG_INFO("getCapacity():"+this.getCapacity());
-				// Utils.LOG_INFO("maxProgresstime():"+this.maxProgresstime());
-				// Utils.LOG_INFO("mSteamPerSecond:"+this.mSteamPerSecond);
-				// Utils.LOG_INFO("mProcessingEnergy:"+this.mProcessingEnergy);
+				// Utils.LOG_MACHINE_INFO("Temp:"+this.mTemperature);
+				// Utils.LOG_MACHINE_INFO("getCapacity():"+this.getCapacity());
+				// Utils.LOG_MACHINE_INFO("maxProgresstime():"+this.maxProgresstime());
+				// Utils.LOG_MACHINE_INFO("mSteamPerSecond:"+this.mSteamPerSecond);
+				// Utils.LOG_MACHINE_INFO("mProcessingEnergy:"+this.mProcessingEnergy);
 			//}
 
 			if (this.mTemperature <= 20) {
@@ -247,7 +247,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 							return;
 						}
 						this.mFluid.amount -= (10 * this.mBoilerTier);
-						// Utils.LOG_INFO("Draining "+(10*this.mBoilerTier)+"L
+						// Utils.LOG_MACHINE_INFO("Draining "+(10*this.mBoilerTier)+"L
 						// of water. There is "+this.mFluid.amount+"L left.");
 						if (this.mSteam == null) {
 							this.mSteam = GT_ModHandler.getSteam((this.mSteamPerSecond));
@@ -272,7 +272,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 			if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (fuelSlot != null)) {
 
 				if (isInputFuelItem(fuelSlot) && (this.mTemperature < (maxProgresstime() - 250))) {
-					Logger.INFO("Current Heat:" + this.mTemperature + "/" + (maxProgresstime() - 250)
+					Logger.MACHINE_INFO("Current Heat:" + this.mTemperature + "/" + (maxProgresstime() - 250)
 							+ " Burning fuel because not yet at a suitable temp.");
 					useInputFuelItem(aBaseMetaTileEntity, fuelSlot);
 				}
@@ -280,12 +280,12 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 			}
 
 			if ((this.mTemperature < maxProgresstime()) && (this.mProcessingEnergy > 0) && (aTick % 10L == 0L)) {
-				// Utils.LOG_INFO("Adding +1 Temp.");
+				// Utils.LOG_MACHINE_INFO("Adding +1 Temp.");
 				this.mProcessingEnergy -= 2;
 				this.mTemperature += 1;
 			}
 			if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {
-				// Utils.LOG_INFO("Current Temp is at: "+this.mTemperature+"C");
+				// Utils.LOG_MACHINE_INFO("Current Temp is at: "+this.mTemperature+"C");
 				// GT_Pollution.addPollution(getBaseMetaTileEntity(),
 				// this.mPollutionPerSecond);
 			}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
index 2ffe6c5121..172dba45b7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
@@ -15,7 +15,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
@@ -27,13 +26,14 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.helpers.CraftingHelper;
 import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
 public class GT4Entity_AutoCrafter
-extends GT_MetaTileEntity_MultiBlockBase
+extends GregtechMeta_MultiBlockBase
 {
 
 	private MODE mMachineMode = MODE.ASSEMBLY;
@@ -367,7 +367,7 @@ extends GT_MetaTileEntity_MultiBlockBase
 							}
 						}
 					}
-					
+
 					if (this.mTier > 5) {
 						this.mMaxProgresstime >>= this.mTier - 5;
 					}
@@ -531,10 +531,8 @@ extends GT_MetaTileEntity_MultiBlockBase
 		return false;
 	}
 
-
 	@Override
-	public String[] getInfoData() {
-
+	public String[] getExtraInfoData() {
 		final String tRunning = (this.mMaxProgresstime>0 ? "Auto-Crafter running":"Auto-Crafter stopped");
 		final String tMaintainance = (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance");
 		String tSpecialText = ""+(60 + 12 * this.mTier)+"% chance to recover disassembled parts.";
@@ -565,14 +563,6 @@ extends GT_MetaTileEntity_MultiBlockBase
 				tSpecialText};
 	}
 
-	@Override
-	public boolean isGivingInformation() {
-		return true;
-	}
-
-
-	//else if (mMachineMode == MODE.ASEEMBLY){
-
 	private String getMode(){
 		return this.mMachineMode.name();
 	}
@@ -617,4 +607,9 @@ extends GT_MetaTileEntity_MultiBlockBase
 		super.doExplosion(aExplosionPower);
 	}
 
+	@Override
+	public boolean hasSlotInGUI() {
+		return true;
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
index cc189b6f97..98347522a7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
@@ -15,11 +15,12 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.general.ItemLavaFilter;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
 public class GT4Entity_ThermalBoiler
-extends GT_MetaTileEntity_MultiBlockBase
+extends GregtechMeta_MultiBlockBase
 {
 
 	private int mSuperEfficencyIncrease = 0;
@@ -261,4 +262,9 @@ extends GT_MetaTileEntity_MultiBlockBase
 		super.onPostTick(aBaseMetaTileEntity, aTick);
 	}
 
+	@Override
+	public boolean hasSlotInGUI() {
+		return true;
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java
new file mode 100644
index 0000000000..6cd9f826f6
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java
@@ -0,0 +1,210 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
+
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.enums.*;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.*;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GregtechMTE_FastNeutronReactor
+extends GregtechMeta_MultiBlockBase
+{
+
+	private int mSuperEfficencyIncrease = 0;
+
+
+	public GregtechMTE_FastNeutronReactor(int aID, String aName, String aNameRegional)
+	{
+		super(aID, aName, aNameRegional);
+	}
+
+	public GregtechMTE_FastNeutronReactor(String mName) {
+		super(mName);
+	}
+
+	@Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	{
+		return new GregtechMTE_FastNeutronReactor(this.mName);
+	}
+	@Override
+	public boolean isFacingValid(byte aFacing)
+	{
+		return aFacing > 1;
+	}
+
+	@Override
+	public boolean isCorrectMachinePart(ItemStack aStack)
+	{
+		return true;
+	}
+
+	@Override
+	public int getDamageToComponent(ItemStack aStack){
+		return 0;
+	}
+
+	@Override
+	public boolean checkRecipe(final ItemStack aStack) {
+		this.mSuperEfficencyIncrease=0;
+		if (processing_Stage_1()) {
+			if (processing_Stage_2()) {
+				if (processing_Stage_3()) {
+					if (processing_Stage_4()) {
+						
+					}
+					else {
+						//Stage 4
+					}
+				}
+				else {
+					//Stage 3
+				}
+			}
+			else {
+				//Stage 2
+			}
+		}
+		else {
+			//Stage 1
+		}
+		return false;
+	}
+
+	public boolean processing_Stage_1() { //Deplete Water, Add More Progress Time
+		for (GT_MetaTileEntity_Hatch_Input tRecipe : this.mInputHatches) {
+			if (tRecipe.getFluid() != null){
+				FluidStack tFluid = FluidUtils.getFluidStack(tRecipe.getFluid(), 200);
+				if (tFluid != null) {					
+					if (tFluid == GT_ModHandler.getDistilledWater(1)) {
+						if (depleteInput(tFluid)) {
+							this.mMaxProgresstime = Math.max(1, runtimeBoost(8 * 2));
+							this.mEUt = getEUt();
+							this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease());
+							return true;
+						}
+					}				
+					
+				}
+			}		
+	}
+	this.mMaxProgresstime = 0;
+	this.mEUt = 0;
+	return false;
+	}
+	public boolean processing_Stage_2() {
+		return false;
+	}
+	public boolean processing_Stage_3() {
+		return false;
+	}
+	public boolean processing_Stage_4() {
+		return false;
+	}
+
+	@Override
+	public boolean onRunningTick(ItemStack aStack) {
+		if (this.mEUt > 0) {
+			if(this.mSuperEfficencyIncrease>0){
+				this.mEfficiency = Math.min(10000, this.mEfficiency + this.mSuperEfficencyIncrease);
+			}
+			int tGeneratedEU = (int) (this.mEUt * 2L * this.mEfficiency / 10000L);
+			if (tGeneratedEU > 0) {
+				long amount = (tGeneratedEU + 160) / 160;
+				if (!depleteInput(GT_ModHandler.getDistilledWater(amount))) {
+					explodeMultiblock();
+				} else {
+					addOutput(GT_ModHandler.getSteam(tGeneratedEU));
+				}
+			}
+			return true;
+		}
+		return true;
+	}
+	
+	public int getEUt() {
+		return 0; //Default 400
+	}
+	
+	public int getEfficiencyIncrease() {
+		return 0; //Default 12
+	}
+
+	int runtimeBoost(int mTime) {
+		return mTime * 150 / 100;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(ItemStack aStack)
+	{
+		return true;
+	}
+
+	@Override
+	public int getMaxEfficiency(ItemStack aStack)
+	{
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(ItemStack aStack)
+	{
+		return 0;
+	}
+
+	public int getAmountOfOutputs()
+	{
+		return 1;
+	}
+
+	@Override
+	public String[] getDescription()
+	{
+		return new String[]{
+				"Fukushima-Daiichi Reactor No. 6",
+				"------------------------------------------",
+				"Boiling Water Reactor",
+				"Harness the power of Nuclear Fission",
+				"------------------------------------------",
+				"Consult user manual for more information",
+				CORE.GT_Tooltip};
+	}
+
+	@Override
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(1)],
+					new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER)};
+		}
+		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(1)]};
+	}
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack arg1) {
+		return true;
+	}
+
+	public boolean damageFilter(){		
+		return false;
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		super.onPostTick(aBaseMetaTileEntity, aTick);
+	}
+
+	@Override
+	public boolean hasSlotInGUI() {
+		return false;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index a2dba63e68..3f2d622c70 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -79,8 +79,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public String[] getInfoData() {
-
+	public String[] getExtraInfoData() {
 		final String tRunning = (this.mMaxProgresstime>0 ? "Reactor running":"Reactor stopped");
 		final String tMaintainance = (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance");
 
@@ -100,11 +99,6 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public boolean isGivingInformation() {
-		return true;
-	}
-
-	@Override
 	public boolean allowCoverOnSide(final byte aSide, final GT_ItemStack aStack) {
 		return aSide != this.getBaseMetaTileEntity().getFrontFacing();
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index e64b38e382..56e46c0d4c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -181,22 +181,16 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		return 10000;
 	}
 
-
-	@Override
-	public boolean isGivingInformation() {
-		return true;
-	}
-
 	@Override
-	public String[] getInfoData() {
-		String[] mSuper = super.getInfoData();
+	public String[] getExtraInfoData() {
+		String[] mSuper = new String[0];
 		String[] mDesc = new String[mSuper.length+1];		
 		mDesc[0] = "Yggdrasil"; // Machine name		
 		for (int i=0;i<mSuper.length;i++) {
 			mDesc[i+1] = mSuper[i];
 		}
 		return mDesc;
-	};
+	}
 
 	@Override
 	public boolean explodesOnComponentBreak(ItemStack p0) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
index d4ea9cd6db..d26b805ebd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
@@ -462,7 +462,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
 	}
 
 	@Override
-	public String[] getInfoData() {
+	public String[] getExtraInfoData() {
 		String tier = tier() == 5 ? "I" : "II";
 		float plasmaOut = 0;
 		int powerRequired = 0;
@@ -480,11 +480,6 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
 	}
 
 	@Override
-	public boolean isGivingInformation() {
-		return true;
-	}
-
-	@Override
 	public int getAmountOfOutputs() {
 		return 1;
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java
index c5ae643bf3..1c859433d8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java
@@ -45,9 +45,9 @@ extends GregtechMeta_MultiBlockBase {
 	private int maximumFluidStorage = 128000;
 	private FluidStack internalStorageTank = null;
 	private final NBTTagCompound internalCraftingComponentsTag = new NBTTagCompound();
-
+	
 	@Override
-	public String[] getInfoData() {
+	public String[] getExtraInfoData() {
 		final ArrayList<GT_MetaTileEntity_Hatch_Energy> mTier = this.mEnergyHatches;
 		if (!mTier.isEmpty()){
 			final int temp = mTier.get(0).mTier;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index a501061849..d0045280f9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -22,6 +22,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
@@ -60,19 +61,13 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 	@Override
 	public String[] getDescription() {
 		return new String[]{
-				"Controller Block for the Power Sub-Station",
+				"[BUG] GUI does not work until structure is assembled correctly. (Do Not Report issue)",
 				"Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches",
-				"Power can be Input/Extracted from the rear face at any time, change with screwdriver",
 				"Can be built with variable height between " + (CELL_HEIGHT_MIN + 2) + "-" + (CELL_HEIGHT_MAX + 2) + "",
-				"Redox Cells can be upgraded via the GUI without having to deconstruct the multiblock (WIP)",
+				"Hatches can be placed nearly anywhere",
 				"Size(WxHxD): External 5xHx5, Sub-Station Casings, Controller (Bottom, Centre)",
 				"Size(WxHxD): Internal 3x(H-2)x3, Energy Storage Cells",
-				"Number and quality of cells determines power storage",
-				"Hatches can be placed nearly anywhere",
-				"(Dis) Charging Hatches are valid",
-				"1x Energy Input Hatch (Minimum)",
-				"1x Energy Dynamo Hatch (Minimum)",
-				"1x Maintenance Hatch",
+				"Read '"+BookHandler.ItemBookWritten_MultiPowerStorage.getDisplayName()+"' for more info.",
 				CORE.GT_Tooltip};
 	}
 
@@ -458,15 +453,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 	}
 
 	@Override
-	public String[] getInfoData() {
-		long seconds = (this.mTotalRunTime/20);
-
-		int weeks = (int) (TimeUnit.SECONDS.toDays(seconds) / 7);
-		int days = (int) (TimeUnit.SECONDS.toDays(seconds) - 7 * weeks);
-		long hours = TimeUnit.SECONDS.toHours(seconds) - TimeUnit.DAYS.toHours(days) - TimeUnit.DAYS.toHours(7*weeks);
-		long minutes = TimeUnit.SECONDS.toMinutes(seconds) - (TimeUnit.SECONDS.toHours(seconds) * 60);
-		long second = TimeUnit.SECONDS.toSeconds(seconds) - (TimeUnit.SECONDS.toMinutes(seconds) *60);
-
+	public String[] getExtraInfoData() {
 		String mode;
 		if (mIsOutputtingPower) {
 			mode = EnumChatFormatting.GOLD + "Output" + EnumChatFormatting.RESET;
@@ -496,18 +483,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 				"Total Input: " + EnumChatFormatting.BLUE + GT_Utility.formatNumbers(this.mTotalEnergyAdded) + EnumChatFormatting.RESET + " EU",
 				"Total Output: " + EnumChatFormatting.GOLD + GT_Utility.formatNumbers(this.mTotalEnergyConsumed) + EnumChatFormatting.RESET + " EU",
 				"Total Costs: " + EnumChatFormatting.RED + GT_Utility.formatNumbers(this.mTotalEnergyLost) + EnumChatFormatting.RESET + " EU",
-
-				"Total Time Since Built: ",
-				""+weeks+" Weeks, "+days+" Days,",
-				""+hours+" Hours, "+minutes+" Minutes, "+second+" Seconds.",
-				"Total Time in ticks: "+this.mTotalRunTime
 		};
-
-	}
-
-	@Override
-	public boolean isGivingInformation() {
-		return true;
 	}
 
 	@Override