Merge pull request #12 from GTNewHorizons/experimental

update

31 files changed, 962 insertions, 332 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
index 8d2c976b1b..0f3aac4518 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
@@ -15,18 +15,20 @@ public class GT_Block_Casings8
     //WATCH OUT FOR TEXTURE ID's
     public GT_Block_Casings8() {
         super(GT_Item_Casings8.class, "gt.blockcasings8", GT_Material_Casings.INSTANCE);
-        for (int i = 0; i < 4; i = (i + 1)) {
+        for (int i = 0; i < 5; i = (i + 1)) {
             Textures.BlockIcons.casingTexturePages[1][i+48] = new GT_CopiedBlockTexture(this, 6, i);
         }
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mining Neutronium Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Extreme Engine Intake Casing");
 
         ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 1));
         ItemList.Casing_MiningNeutronium.set(new ItemStack(this, 1, 2));
         ItemList.Casing_MiningBlackPlutonium.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_ExtremeEngineIntake.set(new ItemStack(this, 1, 4));
     }
 
     @Override
@@ -41,6 +43,8 @@ public class GT_Block_Casings8
             return Textures.BlockIcons.MACHINE_CASING_MINING_NEUTRONIUM.getIcon();
         case 3:
             return Textures.BlockIcons.MACHINE_CASING_MINING_BLACKPLUTONIUM.getIcon();
+        case 4:
+            return Textures.BlockIcons.MACHINE_CASING_EXTREME_ENGINE_INTAKE.getIcon();//changed color in a terrible way
         }
         return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
index 303f358a34..aee46b7aab 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
@@ -14,6 +14,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.Fluid;
 
+import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+
 public class GT_Cover_Conveyor extends GT_CoverBehavior {
     public final int mTickRate;
     private final int mMaxStacks;
@@ -42,19 +44,29 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
         boolean costsEnergy = ((aCoverVariable % 2 == 0) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= 128L);
         byte moved;
 
-        for(int i=0 ; i < this.mMaxStacks ; i++) {
-            // Costs energy but we don't have enough, bail
-            if ((costsEnergy && !aTileEntity.isUniversalEnergyStored(256L)))
-                break;
 
-            moved = GT_Utility.moveOneItemStack(fromEntity, toEntity, fromSide , toSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
+        if (costsEnergy) {
+            long tStoredEnergy = aTileEntity.getUniversalEnergyStored();
+            int tMaxStacks = (int)(tStoredEnergy/(4*64*this.mMaxStacks));
+            if (tMaxStacks > this.mMaxStacks)
+                tMaxStacks = this.mMaxStacks;
+            int tCost = moveMultipleItemStacks(fromEntity, toEntity, fromSide , toSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1,tMaxStacks);
+            aTileEntity.decreaseStoredEnergyUnits(4 * tCost, true);
+        } else {
+            moveMultipleItemStacks(fromEntity, toEntity, fromSide , toSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1,this.mMaxStacks);
+        }
 
-            if(moved == 0)
-                break;
 
-            if (costsEnergy)
-                aTileEntity.decreaseStoredEnergyUnits(4 * moved, true);
-        }
+//        for(int i=0 ; i < this.mMaxStacks ; i++) {
+//            // Costs energy but we don't have enough, bail
+//            if ((costsEnergy && !aTileEntity.isUniversalEnergyStored(256L)))
+//                break;
+//
+//            moved = GT_Utility.moveOneItemStack(fromEntity, toEntity, fromSide , toSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
+//
+//            if(moved == 0)
+//                break;
+//        }
 
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 67ce33f104..c90df2a7a7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -2,6 +2,8 @@ package gregtech.common.tileentities.machines.multi;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -14,6 +16,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -42,17 +45,34 @@ public class GT_MetaTileEntity_AssemblyLine
     }
 
     public String[] getDescription() {
-        return new String[]{"Assembling Line",
-                "Size: 3x(5-16)x4, variable length",
-                "From Bottom to Top, Left to Right",
-                "Layer 1 - Solid Steel Machine Casing, Input Bus (last is Output Bus), Solid Steel Machine Casing",
-                "        - Casings can be replaced by Maint or Input Hatch",
-                "Layer 2 - Reinforced Glass, Assembling Line Casing, Reinforced Glass",
-                "Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing",
-                "Layer 4 - Empty, Solid Steel Machine Casing, Empty - Casing can be replaced by Energy Hatch",
-                "Up to 16 repeating slices, First replaces 1 Grate with Assembly Line,",
-                "Last has Output Bus instead of Input Bus",
-                "Optional - Replace 1x Grate with Data Access Hatch next to the Controller"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Assembling Line")
+		.addInfo("Controller block for the Assembling Line")
+		.addInfo("Used to make complex machine parts (LuV+)")
+		.addInfo("Does not make Assembler items")
+		.addSeparator()
+		.beginVariableStructureBlock(5, 15, 4, 4, 3, 3, false)//?
+		.addStructureInfo("From Bottom to Top, Left to Right")
+		.addStructureInfo("Layer 1 - Solid Steel Machine Casing, Input Bus (last is Output Bus), Solid Steel Machine Casing")
+		.addStructureInfo("Layer 2 - Reinforced Glass, Assembling Line Casing, Reinforced Glass")
+		.addStructureInfo("Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing")
+		.addStructureInfo("Layer 4 - Empty, Solid Steel Machine Casing, Empty")
+		.addStructureInfo("Up to 16 repeating slices, each one allows for 1 more item in recipes, aside from the last")
+		.addStructureInfo("Optional - Replace 1x Grate with (Advanced) Data Access Hatch next to the Controller")
+		.addStructureInfo("Optional - Replace 1x Grate with (Advanced) Data Access Hatch next to the Controller")//TT
+		
+		.addController("Either Grate on layer 3 of the first slice")
+		.addEnergyHatch("Any layer 4 casing")
+		.addMaintenanceHatch("Any layer 1 casing")
+		.addInputBus("As specified on layer 1")
+		.addInputHatch("Any layer 1 casing")
+		.addOutputBus("Replaces Input Bus on final slice")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java
index 95b45e2cc4..eb1ce1348f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java
@@ -1,11 +1,14 @@
 package gregtech.common.tileentities.machines.multi;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.block.Block;
 
 public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_PrimitiveBlastFurnace{
@@ -26,13 +29,25 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Bricked Blast Furnace",
-                "Controller has to be placed in the (front) center of the second layer",
-                "Useable for Steel and general Pyrometallurgy",
-                "Size(WxHxD): 3x4x3 (Hollow, with opening on top)",
-                "Built from 32 Firebricks",
-                "Causes 200 Pollution per second"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Blast Furnace")
+		.addInfo("Controller Block for the Bricked Blast Furnace")
+		.addInfo("Usable for Steel and general Pyrometallurgy")
+		.addInfo("Has a useful interface, unlike other gregtech multis")
+		.addPollutionAmount(200)
+		.addSeparator()
+		.beginStructureBlock(3, 4, 3, true)
+		.addController("Front center")
+		.addOtherStructurePart("Firebricks", "Everything except the controller")
+		.addStructureInfo("The top block is also empty")
+		.addStructureInfo("You can share the walls of GT multis, so")
+		.addStructureInfo("each additional one costs less, up to 4")
+    	.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
 }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
index 0ca5b79d68..af388a790d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
@@ -27,12 +27,13 @@ public class GT_MetaTileEntity_BronzeBlastFurnace
 	}
 
     public String[] getDescription() {
-        return new String[]{
+    	return new String[]{"Disabled"};
+        /*return new String[]{
                 "Controller Block for the Bronze Blast Furnace",
                 "Useable for Steel and general Pyrometallurgy",
                 "Size(WxHxD): 3x4x3 (Hollow, with opening on top)",
                 "Built from 32 Bronze Plated Bricks",
-                "Causes 200 Pollution per second"};
+                "Causes 200 Pollution per second"};*/
     }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
index 8be3b10f54..8459f5e84b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
@@ -2,6 +2,8 @@ package gregtech.common.tileentities.machines.multi;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
@@ -10,6 +12,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import gregtech.common.GT_Pollution;
 import net.minecraft.block.Block;
@@ -38,15 +41,25 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller for the Charcoal Pit",
-                "Converts Logs into Brittle Charcoal blocks",
-                "Max Size(WxHxD): 11x6x11, Controller (Top layer, centered)",
-                "11x1x11 of Bricks (Bottom layer only)",
-                "11x5x11 of Logs (Above bottom Brick layer)",
-                "Only grass/dirt can touch Log blocks",
-                "No air between logs allowed",
-                "Causes 100 Pollution per second"};
+        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Charcoal Pile Igniter")
+		.addInfo("Controller for the Charcoal Pit")
+		.addInfo("Converts Logs into Brittle Charcoal blocks")
+		.addInfo("Will automatically start when valid")
+		.addPollutionAmount(100)
+		.addSeparator()
+		.beginVariableStructureBlock(3, 11, 3, 6, 3, 11, false)
+		.addStructureInfo("Can be up to 11x6x11 in size, shape doesn't matter")
+		.addOtherStructurePart("Bricks", "Bottom layer, under all wood logs")
+		.addOtherStructurePart("Dirt/Grass", "All logs must be covered by these, the controller, or bricks")
+		.addOtherStructurePart("Wood Logs", "Inside the previously mentioned blocks")
+		.addStructureInfo("No air between logs allowed")
+		.toolTipFinisher("Gregtech");
+        if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 21a407f6e2..606c63110f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -12,6 +12,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -20,6 +21,8 @@ import net.minecraft.tileentity.TileEntity;
 
 import static gregtech.api.enums.GT_Values.debugCleanroom;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBase {
     private int mHeight = -1;
 
@@ -38,21 +41,31 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 
 	@Override
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Cleanroom",
-                "Min(WxHxD): 3x4x3 (Hollow), Max(WxHxD): 15x15x15 (Hollow)",
-                "Controller (Top center)",
-                "Top besides contoller and edges: Filter Machine Casing",
-                "1 Reinforced Door (keep closed for 100% efficency)",
-				"1x LV or 1x MV Energy Hatch, 1x Maintainance Hatch",
-				"Up to 10 Machine Hull Item & Energy transfer through walls",
-				"Remaining Blocks: Plascrete, 20 min",
-				GT_Values.cleanroomGlass+"% of the Plascrete can be Reinforced Glass (min 20 Plascrete still apply)",
-				"Consumes 40 EU/t when first turned on and 4 EU/t once at 100% efficiency when not overclocked",
-				"An energy hatch accepts up to 2A, so you can use 2A LV or 1A MV",
-				"2 LV batteries + 1 LV generator or 1 MV generator",
-				"Time required to reach full efficiency is propotional to the height of empty space within.",
-				"Make sure your Energy Hatch matches!"};
+		final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Cleanroom")
+		.addInfo("Controller block for the Cleanroom")
+		.addInfo("Consumes 40 EU/t when first turned on and 4 EU/t once at 100% efficiency when not overclocked")//?
+		.addInfo("An energy hatch accepts up to 2A, so you can use 2A LV or 1A MV")
+		.addInfo("2 LV batteries + 1 LV generator or 1 MV generator")//?
+		.addInfo("Time required to reach full efficiency is propotional to the height of empty space within")
+		.addInfo("Make sure your Energy Hatch matches! ?")
+		.addSeparator()
+		.beginVariableStructureBlock(3, 15, 4, 15, 3, 15, true)
+		.addController("Top center")
+		.addCasingInfo("Plascrete", 20)
+		.addStructureInfo(GT_Values.cleanroomGlass+"% of the Plascrete can be replaced with Reinforced Glass")//check
+		.addOtherStructurePart("Filter Machine Casing", "Top besides controller and edges")
+		.addEnergyHatch("LV or MV, any casing")//check
+		.addMaintenanceHatch("Any casing")
+		.addStructureInfo("1x Reinforced Door (keep closed or efficiency will reduce)")
+		.addStructureInfo("Up to 10 Machine Hulls for Item & Energy transfer through walls")
+		.addStructureInfo("You can also use Diodes for more power")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
 	@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java
index 0a68bd7b03..ed6c028243 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java
@@ -4,9 +4,12 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 
 import static gregtech.api.enums.GT_Values.VN;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_ConcreteBackfiller2 extends GT_MetaTileEntity_ConcreteBackfillerBase {
     public GT_MetaTileEntity_ConcreteBackfiller2(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
@@ -19,18 +22,33 @@ public class GT_MetaTileEntity_ConcreteBackfiller2 extends GT_MetaTileEntity_Con
     @Override
     public String[] getDescription() {
         String casings = getCasingBlockItem().get(0).getDisplayName();
-        return new String[]{
-                "Controller Block for the Advanced Concrete Backfiller",
-                "Size(WxHxD): 3x7x3", "Controller (Front middle at bottom)",
-                "3x1x3 Base of " + casings,
-                "1x3x1 " + casings + " pillar (Center of base)",
-                "1x3x1 " + getFrameMaterial().mName + " Frame Boxes (Each pillar side and on top)",
-                "1x Input Hatch (One of base casings)",
-                "1x Maintenance Hatch (One of base casings)",
-                "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
-                "Put Programmed Circuits into Data Access to config radius",
-                "Radius = (total config value)x2 blocks",
-                "Default 64, Maximum 128",};
+        
+        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Concrete Backfiller")
+		.addInfo("Controller Block for the Advanced Concrete Backfiller")
+		.addInfo("Will fill in areas below it with light concrete. This goes through walls")
+		.addInfo("Use it to remove any spawning locations beneath your base to reduce lag")
+		.addInfo("Will pull back the pipes after it finishes that layer")
+		.addInfo("Put Programmed Circuits into a Data Access Hatch to config radius. Buggy")
+		.addInfo("Radius = (total config value)x2 blocks. Default 64, Maximum 128")//broken
+		.addSeparator()
+		.beginStructureBlock(3, 7, 3, false)
+		.addController("Front bottom")
+		.addStructureInfo(casings + " form the 3x1x3 Base")
+		.addOtherStructurePart(casings, " 1x3x1 pillar above the center of the base (2 minimum total)")
+		.addOtherStructurePart(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top")
+		.addEnergyHatch(VN[getMinTier()] + "+, Any base casing")
+		.addMaintenanceHatch("Any base casing")
+		.addStructureInfo("Data Access Hatch: Any base casing")
+		.addInputBus("Mining Pipes, optional, any base casing")
+		.addInputHatch("GT Concrete, any base casing")
+		.addOutputBus("Mining Pipes, optional, any base casing")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java
index a70b5d76b8..a65f4d0e86 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java
@@ -4,12 +4,15 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
 import static gregtech.api.enums.GT_Values.VN;
 
+import org.lwjgl.input.Keyboard;
+
 public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTileEntity_DrillerBase {
 
     private int mLastXOff = 0, mLastZOff = 0;
@@ -24,16 +27,31 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
 
     protected String[] getDescriptionInternal(String tierSuffix) {
         String casings = getCasingBlockItem().get(0).getDisplayName();
-        return new String[]{
-                "Controller Block for the Concrete Backfiller " + (tierSuffix != null ? tierSuffix : ""),
-                "Size(WxHxD): 3x7x3", "Controller (Front middle at bottom)",
-                "3x1x3 Base of " + casings,
-                "1x3x1 " + casings + " pillar (Center of base)",
-                "1x3x1 " + getFrameMaterial().mName + " Frame Boxes (Each pillar side and on top)",
-                "1x Input Hatch (One of base casings)",
-                "1x Maintenance Hatch (One of base casings)",
-                "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
-                "Radius is " + getRadius() + " blocks"};
+        
+        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Concrete Backfiller")
+		.addInfo("Controller Block for the Concrete Backfiller " + (tierSuffix != null ? tierSuffix : ""))//Unused?
+		.addInfo("Will fill in areas below it with light concrete. This goes through walls")
+		.addInfo("Use it to remove any spawning locations beneath your base to reduce lag")
+		.addInfo("Will pull back the pipes after it finishes that layer")
+		.addInfo("Radius is " + getRadius() + " blocks")
+		.addSeparator()
+		.beginStructureBlock(3, 7, 3, false)
+		.addController("Front bottom")
+		.addStructureInfo(casings + " form the 3x1x3 Base")
+		.addOtherStructurePart(casings, " 1x3x1 pillar above the center of the base (2 minimum total)")
+		.addOtherStructurePart(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top")
+		.addEnergyHatch(VN[getMinTier()] + "+, Any base casing")
+		.addMaintenanceHatch("Any base casing")
+		.addInputBus("Mining Pipes, optional, any base casing")
+		.addInputHatch("GT Concrete, any base casing")
+		.addOutputBus("Mining Pipes, optional, any base casing")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
index c37a5a9976..f16c9d2d4f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
+++ b/