From e4bd293915ea20359dc228a623c08f7a1055d843 Mon Sep 17 00:00:00 2001
From: moller21 <42100910+moller21@users.noreply.github.com>
Date: Mon, 1 Jun 2020 17:02:56 +0200
Subject: Added gui's for the rest of em covers.

---
 src/main/java/gregtech/api/util/GT_Utility.java | 58 +++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 8584e849bb..f5dfb42a2c 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -665,6 +665,64 @@ public class GT_Utility {
         return 0;
     }
 
+    /**
+     * Moves Stack from Inv-Side to Inv-Slot.
+     *
+     * @return the Amount of moved Items
+     */
+    public static byte moveFromSlotToSide(IInventory fromTile, Object toTile, int aGrabFrom, byte aPutTo, List<ItemStack> aFilter, boolean aInvertFilter, byte aMaxTargetStackSize, byte aMinTargetStackSize, byte aMaxMoveAtOnce, byte aMinMoveAtOnce, boolean aDoCheckChests) {
+        if (fromTile == null || aGrabFrom < 0 || aMinTargetStackSize <= 0 || aMaxMoveAtOnce <= 0 || aMinTargetStackSize > aMaxTargetStackSize || aMinMoveAtOnce > aMaxMoveAtOnce)
+            return 0;
+
+        if (!listContainsItem(aFilter, fromTile.getStackInSlot(aGrabFrom), true, aInvertFilter) ||
+            !isAllowedToTakeFromSlot(fromTile, aGrabFrom, (byte) 6, fromTile.getStackInSlot(aGrabFrom)))
+            return 0;
+
+        if (toTile instanceof IInventory) {
+            int[] tPutSlots = null;
+            if (toTile instanceof ISidedInventory)
+                tPutSlots = ((ISidedInventory) toTile).getAccessibleSlotsFromSide(aPutTo);
+
+            if (tPutSlots == null) {
+                tPutSlots = new int[((IInventory) toTile).getSizeInventory()];
+                for (int i = 0; i < tPutSlots.length; i++) tPutSlots[i] = i;
+            }
+
+            byte tMovedItemCount = 0;
+            for (int tPutSlot : tPutSlots) {
+                if (isAllowedToPutIntoSlot((IInventory) toTile, tPutSlot, aPutTo, fromTile.getStackInSlot(aGrabFrom), aMaxTargetStackSize)) {
+                    tMovedItemCount += moveStackFromSlotAToSlotB(fromTile, (IInventory) toTile, aGrabFrom, tPutSlot, aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItemCount), aMinMoveAtOnce);
+                    if (tMovedItemCount >= aMaxMoveAtOnce) {
+                        return tMovedItemCount;
+
+                    }
+                }
+            }
+            if (tMovedItemCount > 0) return tMovedItemCount;
+
+            if (aDoCheckChests && toTile instanceof TileEntityChest) {
+                TileEntityChest tTileEntity2 = (TileEntityChest) toTile;
+                if (tTileEntity2.adjacentChestChecked) {
+                    if (tTileEntity2.adjacentChestXNeg != null) {
+                        tMovedItemCount = moveFromSlotToSide(fromTile, tTileEntity2.adjacentChestXNeg, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce, false);
+                    } else if (tTileEntity2.adjacentChestZNeg != null) {
+                        tMovedItemCount = moveFromSlotToSide(fromTile, tTileEntity2.adjacentChestZNeg, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce, false);
+                    } else if (tTileEntity2.adjacentChestXPos != null) {
+                        tMovedItemCount = moveFromSlotToSide(fromTile, tTileEntity2.adjacentChestXPos, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce, false);
+                    } else if (tTileEntity2.adjacentChestZPos != null) {
+                        tMovedItemCount = moveFromSlotToSide(fromTile, tTileEntity2.adjacentChestZPos, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce, false);
+                    }
+                    if (tMovedItemCount > 0) return tMovedItemCount;
+                }
+            }
+        }
+        return moveStackIntoPipe(fromTile, toTile, new int[]{aGrabFrom}, (byte) 6, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce, aDoCheckChests);
+    }
+
+    public static byte moveFromSlotToSide(IInventory fromTile, Object toTile, int aGrabFrom, byte aPutTo, List<ItemStack> aFilter, boolean aInvertFilter, byte aMaxTargetStackSize, byte aMinTargetStackSize, byte aMaxMoveAtOnce, byte aMinMoveAtOnce) {
+        return moveFromSlotToSide(fromTile, toTile, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce, true);
+    }
+
     public static boolean listContainsItem(Collection<ItemStack> aList, ItemStack aStack, boolean aTIfListEmpty, boolean aInvertFilter) {
         if (aStack == null || aStack.stackSize < 1) return false;
         if (aList == null) return aTIfListEmpty;
-- 
cgit 


From 3a59a69ff4e4161b1040859420eea414d48b78e4 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Tue, 9 Jun 2020 21:20:32 +0200
Subject: Fixed NEI time value for Replicators

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
 src/main/java/gregtech/api/util/GT_Recipe.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index db8ecf73b6..2ae67a572a 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -23,6 +23,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static gregtech.api.enums.GT_Values.*;
 
@@ -1838,15 +1839,19 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         }
 
         public GT_Recipe addFakeRecipe(boolean aCheckForCollisions, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
+            AtomicInteger ai = new AtomicInteger();
             Optional.ofNullable(GT_OreDictUnificator.getAssociation(aOutputs[0]))
                     .map(itemData -> itemData.mMaterial)
                     .map(materialsStack -> materialsStack.mMaterial)
                     .map(materials -> materials.mElement)
                     .map(Element::getMass)
                     .ifPresent(e ->
-                        aFluidInputs[0].amount = (int) GT_MetaTileEntity_Replicator.cubicFluidMultiplier(e)
+                            {
+                                aFluidInputs[0].amount = (int) GT_MetaTileEntity_Replicator.cubicFluidMultiplier(e);
+                                ai.set(GT_Utility.safeInt(aFluidInputs[0].amount * 512L, 1));
+                            }
                     );
-            return addFakeRecipe(aCheckForCollisions, new GT_Recipe(false, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+            return addFakeRecipe(aCheckForCollisions, new GT_Recipe(false, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, ai.get(), aEUt, aSpecialValue));
         }
 
     }
-- 
cgit 


From 2fc039b454f70ac4422b5683ba005171ae5de97a Mon Sep 17 00:00:00 2001
From: Kalle <kalle.last@gmail.com>
Date: Wed, 29 Jul 2020 23:10:54 +0300
Subject: Simple optimization to GT_Utility.moveOneItemStack

---
 src/main/java/gregtech/api/util/GT_Utility.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index f5dfb42a2c..6798b5434d 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -559,10 +559,12 @@ public class GT_Utility {
 
             for (int i = 0; i < tGrabSlots.length; i++) {
             	byte tMovedItemCount = 0;
-                for (int j = 0; j < tPutSlots.length; j++) {
-                    if (listContainsItem(aFilter, aTileEntity1.getStackInSlot(tGrabSlots[i]), true, aInvertFilter)) {
-                        if (isAllowedToTakeFromSlot(aTileEntity1, tGrabSlots[i], aGrabFrom, aTileEntity1.getStackInSlot(tGrabSlots[i]))) {
-                            if (isAllowedToPutIntoSlot((IInventory) aTileEntity2, tPutSlots[j], aPutTo, aTileEntity1.getStackInSlot(tGrabSlots[i]), aMaxTargetStackSize)) {
+
+                if (listContainsItem(aFilter, aTileEntity1.getStackInSlot(tGrabSlots[i]), true, aInvertFilter)) {
+                    ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlots[i]);
+                    for (int j = 0; j < tPutSlots.length; j++) {
+                        if (isAllowedToTakeFromSlot(aTileEntity1, tGrabSlots[i], aGrabFrom, tGrabStack)) {
+                             if (isAllowedToPutIntoSlot((IInventory) aTileEntity2, tPutSlots[j], aPutTo, tGrabStack, aMaxTargetStackSize)) {
                                 tMovedItemCount += moveStackFromSlotAToSlotB(aTileEntity1, (IInventory) aTileEntity2, tGrabSlots[i], tPutSlots[j], aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItemCount), aMinMoveAtOnce);
                                  if (tMovedItemCount >= aMaxMoveAtOnce) {
                                      return tMovedItemCount;
-- 
cgit 


From e703df6cde3a293222702e7c7cc3109c1e5a6289 Mon Sep 17 00:00:00 2001
From: Kalle <kalle.last@gmail.com>
Date: Fri, 31 Jul 2020 19:05:52 +0300
Subject: Better optimization for moving items between inventories.

---
 src/main/java/gregtech/api/util/GT_Utility.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 6798b5434d..6df77f16bf 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -559,16 +559,14 @@ public class GT_Utility {
 
             for (int i = 0; i < tGrabSlots.length; i++) {
             	byte tMovedItemCount = 0;
-
-                if (listContainsItem(aFilter, aTileEntity1.getStackInSlot(tGrabSlots[i]), true, aInvertFilter)) {
-                    ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlots[i]);
-                    for (int j = 0; j < tPutSlots.length; j++) {
-                        if (isAllowedToTakeFromSlot(aTileEntity1, tGrabSlots[i], aGrabFrom, tGrabStack)) {
+                ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlots[i]);
+                if (listContainsItem(aFilter, tGrabStack, true, aInvertFilter)) {
+                    if (isAllowedToTakeFromSlot(aTileEntity1, tGrabSlots[i], aGrabFrom, tGrabStack)) {
+                        for (int j = 0; j < tPutSlots.length; j++) {
                              if (isAllowedToPutIntoSlot((IInventory) aTileEntity2, tPutSlots[j], aPutTo, tGrabStack, aMaxTargetStackSize)) {
-                                tMovedItemCount += moveStackFromSlotAToSlotB(aTileEntity1, (IInventory) aTileEntity2, tGrabSlots[i], tPutSlots[j], aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItemCount), aMinMoveAtOnce);
+                                 tMovedItemCount += moveStackFromSlotAToSlotB(aTileEntity1, (IInventory) aTileEntity2, tGrabSlots[i], tPutSlots[j], aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItemCount), aMinMoveAtOnce);
                                  if (tMovedItemCount >= aMaxMoveAtOnce) {
                                      return tMovedItemCount;
-
                                 }
                             }
                         }
-- 
cgit 


From 3a07aac9a56e9f340954e9092aecf85ba648c405 Mon Sep 17 00:00:00 2001
From: moller21 <42100910+moller21@users.noreply.github.com>
Date: Sun, 23 Aug 2020 15:33:20 +0200
Subject: Attempt at improving chest buffers, also slowing down lower tier
 ones.

---
 .../implementations/GT_MetaTileEntity_Buffer.java  | 23 +++---
 .../java/gregtech/api/util/GT_LanguageManager.java |  2 +-
 src/main/java/gregtech/api/util/GT_Utility.java    |  7 +-
 .../common/gui/GT_Container_ChestBuffer.java       |  2 +-
 .../common/gui/GT_Container_SuperBuffer.java       |  2 +-
 .../automation/GT_MetaTileEntity_ChestBuffer.java  | 86 ++++++++++++----------
 .../automation/GT_MetaTileEntity_SuperBuffer.java  |  3 +-
 .../automation/GT_MetaTileEntity_TypeFilter.java   |  6 +-
 8 files changed, 68 insertions(+), 63 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
index 73ab28822a..a57f2440a7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
@@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import static gregtech.api.enums.GT_Values.V;
 
 public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredMachineBlock {
-    public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bStockingMode = true;
+    public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bStockingMode = false;
     public int mSuccess = 0, mTargetStackSize = 0;
 
     public GT_MetaTileEntity_Buffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription) {
@@ -257,18 +257,15 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     }
 
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
-        if( bStockingMode ) {
-            int tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize, (byte) 64, (byte) 1);
-            if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) {
-                mSuccess = 50;
-                aBaseMetaTileEntity.decreaseStoredEnergyUnits(Math.abs(tCost), true);
-            }
-        } else {
-            int tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, (byte) 64, (byte) 1, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize);
-            if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) {
-                mSuccess = 50;
-                aBaseMetaTileEntity.decreaseStoredEnergyUnits(Math.abs(tCost), true);
-            }
+        int tCost;
+        if( bStockingMode )
+            tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, (byte) 1, (byte) 64, (byte) 1);
+        else
+            tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, (byte) 64, (byte) 1, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize);
+
+        if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) {
+            mSuccess = 50;
+            aBaseMetaTileEntity.decreaseStoredEnergyUnits(Math.abs(tCost), true);
         }
     }
 
diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java
index b44b6ffa40..c87e0f7417 100644
--- a/src/main/java/gregtech/api/util/GT_LanguageManager.java
+++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java
@@ -323,7 +323,7 @@ public class GT_LanguageManager {
         addStringLocalization("Interaction_DESCRIPTION_Index_214", "Connected");
         addStringLocalization("Interaction_DESCRIPTION_Index_215", "Disconnected");
 		addStringLocalization("Interaction_DESCRIPTION_Index_216", "Deprecated Recipe");
-		addStringLocalization("Interaction_DESCRIPTION_Index_217", "Stocking mode. Keeps this many items in destination input slots.");
+		addStringLocalization("Interaction_DESCRIPTION_Index_217", "Stocking mode. Keeps this many items in destination input slots. This mode can be server unfriendly.");
 		addStringLocalization("Interaction_DESCRIPTION_Index_218", "Transfer size mode. Add exactly this many items in destination input slots as long as there is room.");
 		addStringLocalization("Interaction_DESCRIPTION_Index_500", "Fitting: Loose - More Flow");
 		addStringLocalization("Interaction_DESCRIPTION_Index_501", "Fitting: Tight - More Efficiency");
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 6df77f16bf..a65ed00aed 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -547,7 +547,7 @@ public class GT_Utility {
             for (int i = 0; i < tGrabSlots.length; i++) tGrabSlots[i] = i;
         }
 
-        if (aTileEntity2 != null && aTileEntity2 instanceof IInventory) {
+        if (aTileEntity2 instanceof IInventory) {
             int[] tPutSlots = null;
             if (aTileEntity2 instanceof ISidedInventory)
                 tPutSlots = ((ISidedInventory) aTileEntity2).getAccessibleSlotsFromSide(aPutTo);
@@ -561,13 +561,12 @@ public class GT_Utility {
             	byte tMovedItemCount = 0;
                 ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlots[i]);
                 if (listContainsItem(aFilter, tGrabStack, true, aInvertFilter)) {
-                    if (isAllowedToTakeFromSlot(aTileEntity1, tGrabSlots[i], aGrabFrom, tGrabStack)) {
+                    if (tGrabStack.stackSize >= aMinMoveAtOnce && isAllowedToTakeFromSlot(aTileEntity1, tGrabSlots[i], aGrabFrom, tGrabStack)) {
                         for (int j = 0; j < tPutSlots.length; j++) {
                              if (isAllowedToPutIntoSlot((IInventory) aTileEntity2, tPutSlots[j], aPutTo, tGrabStack, aMaxTargetStackSize)) {
                                  tMovedItemCount += moveStackFromSlotAToSlotB(aTileEntity1, (IInventory) aTileEntity2, tGrabSlots[i], tPutSlots[j], aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItemCount), aMinMoveAtOnce);
-                                 if (tMovedItemCount >= aMaxMoveAtOnce) {
+                                 if (tMovedItemCount >= aMaxMoveAtOnce ||(tMovedItemCount > 0 && aMaxTargetStackSize < 64))
                                      return tMovedItemCount;
-                                }
                             }
                         }
                     }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
index 016d0889f7..d465134d5e 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
@@ -67,7 +67,7 @@ public class GT_Container_ChestBuffer
             if (aSlotIndex == 30) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bStockingMode = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bStockingMode);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bStockingMode) {
-                    GT_Utility.sendChatToPlayer(aPlayer, trans("217","Stocking mode. Keeps this many items in destination input slots."));
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("217","Stocking mode. Keeps this many items in destination input slots. This mode can be server unfriendly."));
                 } else {
                     GT_Utility.sendChatToPlayer(aPlayer, trans("218", "Transfer size mode. Add exactly this many items in destination input slots as long as there is room."));
                 }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
index 5a59cb5aa9..530e64aa68 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
@@ -62,7 +62,7 @@ public class GT_Container_SuperBuffer
             if (aSlotIndex == 3) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bStockingMode = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bStockingMode);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bStockingMode) {
-                    GT_Utility.sendChatToPlayer(aPlayer, trans("217","Stocking mode. Keeps this many items in destination input slots."));
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("217","Stocking mode. Keeps this many items in destination input slots. This mode can be server unfriendly."));
                 } else {
                     GT_Utility.sendChatToPlayer(aPlayer, trans("218", "Transfer size mode. Add exactly this many items in destination input slots as long as there is room."));
                 }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index d11b1f2f81..6605d4fc35 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -19,11 +19,15 @@ import java.util.Comparator;
 
 public class GT_MetaTileEntity_ChestBuffer
         extends GT_MetaTileEntity_Buffer {
+    private static final int[] tickRate = {400, 200, 100, 20, 4, 1, 1, 1,1,1};
+
+
     public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 28, new String[]{
                         		"Buffers up to 27 Item Stacks",
                         		"Use Screwdriver to regulate output stack size",
-                        		"Consumes 3EU per moved Item"});
+                        		"Consumes 3EU per moved Item",
+                        		getTickRateDesc(aTier)});
     }
 
     public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription) {
@@ -55,6 +59,8 @@ public class GT_MetaTileEntity_ChestBuffer
     }
 
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
+        if (aTimer % tickRate[mTier] > 0) return;
+
         if(aBaseMetaTileEntity.hasInventoryBeenModified()) {
             fillStacksIntoFirstSlots();
         }
@@ -64,9 +70,9 @@ public class GT_MetaTileEntity_ChestBuffer
             super.moveItems(aBaseMetaTileEntity, aTimer);
         }
         // mSuccesss is set to 50 on a successful move
-        if(mSuccess == 50) {
-            fillStacksIntoFirstSlots();
-        }
+        //if(mSuccess == 50) {
+        //    fillStacksIntoFirstSlots();
+        //}
         if(mSuccess < 0) {
             mSuccess = 0;
         }
@@ -85,47 +91,32 @@ public class GT_MetaTileEntity_ChestBuffer
                         return 1;
                     Item item1 = o1.getItem();
                     Item item2 = o2.getItem();
-                
-                    // If item1 is a block and item2 isn't, sort item1 before item2
-                    if (((item1 instanceof ItemBlock)) && (!(item2 instanceof ItemBlock))) {
+
+                    if(item1 instanceof ItemBlock) {
+                        if (!(item2 instanceof ItemBlock))
+                            return -1; // If item1 is a block and item2 isn't, sort item1 before item2
+                    } else if (item2 instanceof ItemBlock)
+                        return 1; // If item2 is a block and item1 isn't, sort item1 after item2
+
+                    int id1 = Item.getIdFromItem( item1 );
+                    int id2 = Item.getIdFromItem( item2 );
+                    if ( id1 < id2 ) {
                         return -1;
                     }
-                
-                    // If item2 is a block and item1 isn't, sort item1 after item2
-                    if (((item2 instanceof ItemBlock)) && (!(item1 instanceof ItemBlock))) {
+                    if ( id1 > id2 ) {
                         return 1;
                     }
 
-                    // If the items are blocks, use the string comparison
-                    if ((item1 instanceof ItemBlock)) { // only need to check one since we did the check above
-                        String displayName1 = o1.getDisplayName();
-                        String displayName2 = o2.getDisplayName();
-                        int result = displayName1.compareToIgnoreCase(displayName2);
-                        //GT_FML_LOGGER.info("sorter: " + displayName1 + " " + displayName2 + " " + result);
-                        return result;
-                    } else
-                    {
-                        // Not a block.  Use the ID and damage to compare them.
-                        int id1 = Item.getIdFromItem( item1 );
-                        int id2 = Item.getIdFromItem( item2 );
-                        if ( id1 < id2 ) {
-                            return -1;
-                        }
-                        if ( id1 > id2 ) {
-                            return 1;
-                        }
-                        // id1 must equal id2, get their damage and compare
-                        id1 = o1.getItemDamage();
-                        id2 = o2.getItemDamage();
-                        
-                        if ( id1 < id2 ) {
-                        	return -1;
-                        }
-                        if ( id1 > id2 ) {
-                        	return 1;
-                        }
-                        return 0;
+                    id1 = o1.getItemDamage();
+                    id2 = o2.getItemDamage();
+
+                    if ( id1 < id2 ) {
+                        return -1;
+                    }
+                    if ( id1 > id2 ) {
+                        return 1;
                     }
+                    return 0;
                 }
             });
     }
@@ -155,4 +146,21 @@ public class GT_MetaTileEntity_ChestBuffer
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
         return new GT_GUIContainer_ChestBuffer(aPlayerInventory, aBaseMetaTileEntity);
     }
+
+    protected static String getTickRateDesc(int tier){
+        int tickRate = getTickRate(tier);
+        String s = "";
+        if (tickRate < 20)
+            s = "1/" + 20/tickRate + " ";
+        else if (tickRate > 20) {
+            s = (tickRate / 20) + "th ";
+        }
+        return "Moves items every " + s + "second";
+    }
+
+    protected static int getTickRate(int tier) {
+        if (tier > 9)
+            return 1;
+        return tickRate[tier];
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
index 10fcb47d12..da35f17518 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
@@ -15,7 +15,8 @@ public class GT_MetaTileEntity_SuperBuffer
         super(aID, aName, aNameRegional, aTier, 257, new String[]{
                         		"Buffers up to 256 Item Stacks",
                         		"Use Screwdriver to regulate output stack size",
-                        		"Consumes 1EU per moved Item"});
+                        		"Consumes 1EU per moved Item",
+                                getTickRateDesc(aTier)});
     }
 
     public GT_MetaTileEntity_SuperBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
index 9b9f782601..6292a769a2 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
@@ -83,17 +83,17 @@ public class GT_MetaTileEntity_TypeFilter
                     }
                 }
             }
-            this.mRotationIndex = 0;
+            this.mRotationIndex = -1;
         }
     }
 
     public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPreTick(aBaseMetaTileEntity, aTick);
-        if ((getBaseMetaTileEntity().isServerSide()) && (aTick % 8L == 0L)) {
+        if ((getBaseMetaTileEntity().isServerSide()) && ((aTick % 8L == 0L) || mRotationIndex == -1)) {
             if (this.mPrefix.mPrefixedItems.isEmpty()) {
                 this.mInventory[9] = null;
             } else {
-                this.mInventory[9] = GT_Utility.copyAmount(1L, new Object[]{this.mPrefix.mPrefixedItems.get(this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size())});
+                this.mInventory[9] = GT_Utility.copyAmount(1L, this.mPrefix.mPrefixedItems.get(this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size()));
                 if (this.mInventory[9].getItemDamage() == 32767) {
                     this.mInventory[9].setItemDamage(0);
                 }
-- 
cgit 


From 9f4b4a2358b11a33d8d323a2c92a551a11e2ab51 Mon Sep 17 00:00:00 2001
From: repo_alt <wvk17@yandex.ru>
Date: Tue, 8 Sep 2020 00:37:20 +0300
Subject: A simple cache for the furnace recipes, to avoid linear iteration
 (Should help with
 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6416)

---
 build.properties                                   | 2 +-
 src/main/java/gregtech/api/util/GT_ModHandler.java | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/build.properties b/build.properties
index 212a1b999c..633a84e787 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1614-1.7.10
-gt.version=5.09.33.53
+gt.version=5.09.33.54
 
 ae2.version=rv3-beta-22
 applecore.version=1.7.10-1.2.1+107.59407
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index e195bf9b02..4f318bb752 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -122,6 +122,7 @@ public class GT_ModHandler {
     public static List<Integer> sSingleNonBlockDamagableRecipeList_warntOutput = new ArrayList<Integer>(50);
     public static List<Integer> sVanillaRecipeList_warntOutput = new ArrayList<Integer>(50);
     public static final List<IRecipe> sSingleNonBlockDamagableRecipeList_verified = new ArrayList<IRecipe>(1000);
+    private static HashMap<GT_ItemStack, ItemStack> smeltingRecipeCache = new LinkedHashMap<>();
 
     static {
         sNativeRecipeClasses.add(ShapedRecipes.class.getName());
@@ -1566,7 +1567,13 @@ public class GT_ModHandler {
      */
     public static ItemStack getSmeltingOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) {
         if (aInput == null || aInput.stackSize < 1) return null;
-        ItemStack rStack = GT_OreDictUnificator.get(FurnaceRecipes.smelting().getSmeltingResult(aInput));
+        GT_ItemStack gtInput = new GT_ItemStack(aInput);
+        ItemStack rStack = smeltingRecipeCache.get(gtInput);
+        if (rStack == null) {
+            rStack = GT_OreDictUnificator.get(FurnaceRecipes.smelting().getSmeltingResult(aInput));
+            if (rStack != null)
+                smeltingRecipeCache.put(gtInput, rStack);
+        }
         if (rStack != null && (aOutputSlot == null || (GT_Utility.areStacksEqual(rStack, aOutputSlot) && rStack.stackSize + aOutputSlot.stackSize <= aOutputSlot.getMaxStackSize()))) {
             if (aRemoveInput) aInput.stackSize--;
             return rStack;
-- 
cgit 


From 726e3d0fe46e3ba793f3c3e9b7acc3fd00a752ef Mon Sep 17 00:00:00 2001
From: repo_alt <wvk17@yandex.ru>
Date: Wed, 9 Sep 2020 08:24:03 +0300
Subject: replace HashMap with a (bounded) Guava Cache

---
 src/main/java/gregtech/api/util/GT_ModHandler.java | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index 4f318bb752..4d264bec9b 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -1,5 +1,7 @@
 package gregtech.api.util;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.GT_Mod;
@@ -122,7 +124,7 @@ public class GT_ModHandler {
     public static List<Integer> sSingleNonBlockDamagableRecipeList_warntOutput = new ArrayList<Integer>(50);
     public static List<Integer> sVanillaRecipeList_warntOutput = new ArrayList<Integer>(50);
     public static final List<IRecipe> sSingleNonBlockDamagableRecipeList_verified = new ArrayList<IRecipe>(1000);
-    private static HashMap<GT_ItemStack, ItemStack> smeltingRecipeCache = new LinkedHashMap<>();
+    private static Cache<GT_ItemStack, ItemStack> sSmeltingRecipeCache = CacheBuilder.newBuilder().maximumSize(1000).build();
 
     static {
         sNativeRecipeClasses.add(ShapedRecipes.class.getName());
@@ -1566,14 +1568,14 @@ public class GT_ModHandler {
      * Used in my own Furnace.
      */
     public static ItemStack getSmeltingOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) {
-        if (aInput == null || aInput.stackSize < 1) return null;
-        GT_ItemStack gtInput = new GT_ItemStack(aInput);
-        ItemStack rStack = smeltingRecipeCache.get(gtInput);
-        if (rStack == null) {
-            rStack = GT_OreDictUnificator.get(FurnaceRecipes.smelting().getSmeltingResult(aInput));
-            if (rStack != null)
-                smeltingRecipeCache.put(gtInput, rStack);
+        if (aInput == null || aInput.stackSize < 1)
+            return null;
+        ItemStack rStack = null;
+        try {
+            rStack = sSmeltingRecipeCache.get(new GT_ItemStack(aInput), () -> GT_OreDictUnificator.get(FurnaceRecipes.smelting().getSmeltingResult(aInput)));
+        } catch (Exception ignored){
         }
+
         if (rStack != null && (aOutputSlot == null || (GT_Utility.areStacksEqual(rStack, aOutputSlot) && rStack.stackSize + aOutputSlot.stackSize <= aOutputSlot.getMaxStackSize()))) {
             if (aRemoveInput) aInput.stackSize--;
             return rStack;
-- 
cgit 


From 861d9e5f29aecd68220841a66f75e7ce0bc107c2 Mon Sep 17 00:00:00 2001
From: Prometheus0000000 <prometheus0000000@gmail.com>
Date: Tue, 3 Nov 2020 19:21:06 -0500
Subject: Minor text fixes

---
 src/main/java/gregtech/api/util/GT_Recipe.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 2ae67a572a..82e466257b 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -614,12 +614,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public static final GT_Recipe_Map sHammerRecipes = new GT_Recipe_Map(new HashSet<>(3800), "gt.recipe.hammer", "Forge Hammer", null, RES_PATH_GUI + "basicmachines/Hammer", 1, 1, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sAmplifiers = new GT_Recipe_Map(new HashSet<>(2), "gt.recipe.uuamplifier", "Amplifabricator", null, RES_PATH_GUI + "basicmachines/Amplifabricator", 1, 0, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sMassFabFakeRecipes = new GT_Recipe_Map(new HashSet<>(2), "gt.recipe.massfab", "Mass Fabrication", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 0, 1, 0, 10, E, 1, E, true, true);
-        public static final GT_Recipe_Map_Fuel sDieselFuels = new GT_Recipe_Map_Fuel(new HashSet<>(20), "gt.recipe.dieselgeneratorfuel", "Diesel Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
+        public static final GT_Recipe_Map_Fuel sDieselFuels = new GT_Recipe_Map_Fuel(new HashSet<>(20), "gt.recipe.dieselgeneratorfuel", "Combustion Generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sTurbineFuels = new GT_Recipe_Map_Fuel(new HashSet<>(25), "gt.recipe.gasturbinefuel", "Gas Turbine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
-        public static final GT_Recipe_Map_Fuel sHotFuels = new GT_Recipe_Map_Fuel(new HashSet<>(10), "gt.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, false);
+        public static final GT_Recipe_Map_Fuel sHotFuels = new GT_Recipe_Map_Fuel(new HashSet<>(10), "gt.recipe.thermalgeneratorfuel", "Thermal Generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, false);
         public static final GT_Recipe_Map_Fuel sDenseLiquidFuels = new GT_Recipe_Map_Fuel(new HashSet<>(15), "gt.recipe.semifluidboilerfuels", "Semifluid Boiler Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sPlasmaFuels = new GT_Recipe_Map_Fuel(new HashSet<>(100), "gt.recipe.plasmageneratorfuels", "Plasma Generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
-        public static final GT_Recipe_Map_Fuel sMagicFuels = new GT_Recipe_Map_Fuel(new HashSet<>(100), "gt.recipe.magicfuels", "Magic Energy Absorber", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
+        public static final GT_Recipe_Map_Fuel sMagicFuels = new GT_Recipe_Map_Fuel(new HashSet<>(100), "gt.recipe.magicfuels", "Magic Energy Absorber Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sSmallNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<>(1), "gt.recipe.smallnaquadahreactor", "Naquadah Reactor MkI", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sLargeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<>(1), "gt.recipe.largenaquadahreactor", "Naquadah Reactor MkII", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sHugeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<>(1), "gt.recipe.fluidnaquadahreactor", "Naquadah Reactor MkIII", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
-- 
cgit 


From b0b861120f91a2bf060c0fc6c6a2c0b20bce06df Mon Sep 17 00:00:00 2001
From: repo_alt <wvk17@yandex.ru>
Date: Sat, 14 Nov 2020 01:48:21 +0300
Subject: Miners may actually detect ores by the oredict
 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5468

---
 src/main/java/gregtech/api/util/GT_Utility.java       |  8 ++++++++
 .../machines/basic/GT_MetaTileEntity_Miner.java       | 19 ++++---------------
 .../multi/GT_MetaTileEntity_OreDrillingPlantBase.java | 16 ++--------------
 3 files changed, 14 insertions(+), 29 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index a65ed00aed..cf7b86fe94 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -65,6 +65,7 @@ import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fluids.*;
 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
+import net.minecraftforge.oredict.OreDictionary;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -2489,5 +2490,12 @@ public class GT_Utility {
     public static boolean isPartOfOrePrefix(ItemStack aStack, OrePrefixes aPrefix){
         return GT_OreDictUnificator.getAssociation(aStack) != null ? GT_OreDictUnificator.getAssociation(aStack).mPrefix.equals(aPrefix) : false;
     }
+    public static boolean isOre(ItemStack aStack) {
+        for (int id: OreDictionary.getOreIDs(aStack)) {
+            if (OreDictionary.getOreName(id).startsWith("ore"))
+                return true;
+        }
+        return false;
+    }
 
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
index 67683e4635..0db6b09a73 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
@@ -6,19 +6,14 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.ChunkPosition;
@@ -192,15 +187,8 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
             for (int x = -radiusConfig; x <= radiusConfig; ++x) {
                 Block block = aBaseMetaTileEntity.getBlockOffset(x, drillY, z);
                 int blockMeta = aBaseMetaTileEntity.getMetaIDOffset(x, drillY, z);
-                if (block instanceof GT_Block_Ores_Abstract) {
-                    TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, drillY, z);
-                    if (tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural)
-                        oreBlockPositions.add(new ChunkPosition(x, drillY, z));
-                } else {
-                    ItemData association = GT_OreDictUnificator.getAssociation(new ItemStack(block, 1, blockMeta));
-                    if (association != null && association.mPrefix.toString().startsWith("ore"))
-                        oreBlockPositions.add(new ChunkPosition(x, drillY, z));
-                }
+                if (GT_Utility.isOre(new ItemStack(block, 1, blockMeta)))
+                    oreBlockPositions.add(new ChunkPosition(x, drillY, z));
             }
         }
     }
@@ -253,7 +241,8 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
     }
 
     public void mineBlock(IGregTechTileEntity aBaseMetaTileEntity, int x, int y, int z) {
-        if (!GT_Utility.eraseBlockByFakePlayer(getFakePlayer(aBaseMetaTileEntity), aBaseMetaTileEntity.getXCoord() + x, aBaseMetaTileEntity.getYCoord() + y, aBaseMetaTileEntity.getZCoord() + z, true));
+        if (!GT_Utility.eraseBlockByFakePlayer(getFakePlayer(aBaseMetaTileEntity), aBaseMetaTileEntity.getXCoord() + x, aBaseMetaTileEntity.getYCoord() + y, aBaseMetaTileEntity.getZCoord() + z, true))
+            return;
         ArrayList<ItemStack> drops = getBlockDrops(aBaseMetaTileEntity.getBlockOffset(x, y, z), aBaseMetaTileEntity.getXCoord() + x, aBaseMetaTileEntity.getYCoord() + y, aBaseMetaTileEntity.getZCoord() + z);
         if (drops.size() > 0)
             mOutputItems[0] = drops.get(0);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
index 3c59bee520..3bfb18be2b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -11,8 +11,6 @@ import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -318,17 +316,8 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         Block block = getBaseMetaTileEntity().getBlock(x, y, z);
         int blockMeta = getBaseMetaTileEntity().getMetaID(x, y, z);
         ChunkPosition blockPos = new ChunkPosition(x, y, z);
-        if (oreBlockPositions.contains(blockPos))
-            return;
-        if (block instanceof GT_Block_Ores_Abstract) {
-            TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(x, y, z);
-            if (tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural)
-                oreBlockPositions.add(blockPos);
-        } else {
-            ItemData association = GT_OreDictUnificator.getAssociation(new ItemStack(block, 1, blockMeta));
-            if (association != null && association.mPrefix.toString().startsWith("ore"))
-                oreBlockPositions.add(blockPos);
-        }
+        if (!oreBlockPositions.contains(blockPos) && GT_Utility.isOre(new ItemStack(block, 1, blockMeta)))
+            oreBlockPositions.add(blockPos);
     }
 
     protected abstract int getRadiusInChunks();
@@ -337,7 +326,6 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
 
     protected String[] getDescriptionInternal(String tierSuffix) {
         String casings = getCasingBlockItem().get(0).getDisplayName();
-        int d = getRadiusInChunks() * 2;
         return new String[]{
                 "Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : ""),
                 "Size(WxHxD): 3x7x3, Controller (Front middle bottom)",
-- 
cgit 


From 5b19a45b3a5278213da2181c11c9b3084f0e4a14 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Sun, 15 Nov 2020 14:33:11 +0800
Subject: Clean up Extreme Diesel Engine

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 src/main/java/gregtech/GT_Mod.java                 |   1 +
 src/main/java/gregtech/api/util/GT_Recipe.java     |   1 +
 .../multi/GT_MetaTileEntity_DieselEngine.java      |   7 +-
 .../GT_MetaTileEntity_ExtremeDieselEngine.java     | 152 ++-------------------
 .../postload/GT_ExtremeDieselFuelLoader.java       |  19 +++
 5 files changed, 42 insertions(+), 138 deletions(-)
 create mode 100644 src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 27932b98c2..55ee8f3c55 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -936,6 +936,7 @@ public class GT_Mod implements IGT_Mod {
             Items.diamond_axe.setMaxDamage(768);
             Items.diamond_hoe.setMaxDamage(768);
         }
+        new GT_ExtremeDieselFuelLoader().run();
         GT_Log.out.println("GT_Mod: Adding buffered Recipes.");
         GT_ModHandler.stopBufferingCraftingRecipes();
 
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 2ae67a572a..abbb6aef1b 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -615,6 +615,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public static final GT_Recipe_Map sAmplifiers = new GT_Recipe_Map(new HashSet<>(2), "gt.recipe.uuamplifier", "Amplifabricator", null, RES_PATH_GUI + "basicmachines/Amplifabricator", 1, 0, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sMassFabFakeRecipes = new GT_Recipe_Map(new HashSet<>(2), "gt.recipe.massfab", "Mass Fabrication", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 0, 1, 0, 10, E, 1, E, true, true);
         public static final GT_Recipe_Map_Fuel sDieselFuels = new GT_Recipe_Map_Fuel(new HashSet<>(20), "gt.recipe.dieselgeneratorfuel", "Diesel Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
+        public static final GT_Recipe_Map_Fuel sExtremeDieselFuels = new GT_Recipe_Map_Fuel(new HashSet<>(20), "gt.recipe.extremedieselgeneratorfuel", "Extreme Diesel Engine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sTurbineFuels = new GT_Recipe_Map_Fuel(new HashSet<>(25), "gt.recipe.gasturbinefuel", "Gas Turbine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sHotFuels = new GT_Recipe_Map_Fuel(new HashSet<>(10), "gt.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, false);
         public static final GT_Recipe_Map_Fuel sDenseLiquidFuels = new GT_Recipe_Map_Fuel(new HashSet<>(15), "gt.recipe.semifluidboilerfuels", "Semifluid Boiler Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
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..a957535990 100644
--- 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
@@ -74,10 +74,15 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
         return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeDieselEngine.png");
     }
 
+    // can't use getRecipeMap() or else the fluid hatch will reject oxygen
+    protected GT_Recipe.GT_Recipe_Map_Fuel getFuelMap() {
+        return GT_Recipe.GT_Recipe_Map.sDieselFuels;
+    }
+
     @Override
     public boolean checkRecipe(ItemStack aStack) {
         ArrayList<FluidStack> tFluids = getStoredFluids();
-        Collection<GT_Recipe> tRecipeList = GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList;
+        Collection<GT_Recipe> tRecipeList = getFuelMap().mRecipeList;
 
         if(tFluids.size() > 0 && tRecipeList != null) { //Does input hatch have a diesel fuel?
             for (FluidStack hatchFluid1 : tFluids) { //Loops through hatches
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java
index f38f0a1de2..b13ed587e3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java
@@ -25,7 +25,7 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.FluidStack;
 
-public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_MultiBlockBase {
+public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_DieselEngine {
 	protected int fuelConsumption = 0;
     protected int fuelValue = 0;
     protected int fuelRemaining = 0;
@@ -39,6 +39,7 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Mul
         super(aName);
     }
 
+    @Override
     public String[] getDescription() {
         return new String[]{
                 "Controller Block for the Extreme Combustion Engine",
@@ -59,6 +60,12 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Mul
                 "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
     }
 
+    @Override
+    protected GT_Recipe.GT_Recipe_Map_Fuel getFuelMap() {
+        return GT_Recipe.GT_Recipe_Map.sExtremeDieselFuels;
+    }
+
+    @Override
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
         if (aSide == aFacing) {
             return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][60], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_EXTREME_DIESEL_ENGINE)};
@@ -67,181 +74,58 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Mul
     }
 
     @Override
-    public boolean isCorrectMachinePart(ItemStack aStack) {
-        return getMaxEfficiency(aStack) > 0;
-    }
-
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
         return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeExtremeDieselEngine.png");//change
     }
-    
-    @Override
-    public boolean checkRecipe(ItemStack aStack) {
-        ArrayList<FluidStack> tFluids = getStoredFluids();
-        Collection<GT_Recipe> tRecipeList = GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList;
-
-        if(tFluids.contains(Materials.GasolinePremium.getFluid(4L))) { //Does input hatch contain HOG?
-            for (FluidStack hatchFluid1 : tFluids) { //Loops through hatches
-                for(GT_Recipe aFuel : tRecipeList) { //Loops through diesel fuel recipes dd. Can't remove because I suck at coding
-                    FluidStack tLiquid;
-                    
-                    if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null) { //Create fluidstack from current recipe
-                        if (hatchFluid1.isFluidEqual(tLiquid)) { //Has a diesel fluid
-                            fuelConsumption = tLiquid.amount = boostEu ? (8192 / aFuel.mSpecialValue) : (2048 / aFuel.mSpecialValue); //Calc fuel consumption
-                            if(depleteInput(tLiquid)) { //Deplete that amount		^Doesn't give bonus to fuel usage anymore
-                                boostEu = depleteInput(Materials.LiquidOxygen.getGas(16L));//x8, and LOX instead
 
-                                if(tFluids.contains(Materials.Lubricant.getFluid(8L))) { //Has lubricant?
-                                    //Deplete Lubricant. 8000L should = 1 hour of runtime (if baseEU = 8192)
-                                    if(mRuntime % 72 == 0 || mRuntime == 0) depleteInput(Materials.Lubricant.getFluid(boostEu ? 16 : 8));//x8
-                                } else return false;
-
-                                fuelValue = aFuel.mSpecialValue;
-                                fuelRemaining = hatchFluid1.amount; //Record available fuel
-                                this.mEUt = mEfficiency < 2000 ? 0 : 8192; //Output 0 if startup is less than 20%
-                                this.mProgresstime = 1;				//will output 8192 normally, 32768 boosted
-                                this.mMaxProgresstime = 1;
-                                this.mEfficiencyIncrease = 15;
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        this.mEUt = 0;
-        this.mEfficiency = 0;
-        return false;
-    }
-    
     @Override
-    public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
-        byte tSide = getBaseMetaTileEntity().getBackFacing();
-        int tX = getBaseMetaTileEntity().getXCoord();
-        int tY = getBaseMetaTileEntity().getYCoord();
-        int tZ = getBaseMetaTileEntity().getZCoord();
-
-        if(getBaseMetaTileEntity().getBlockAtSideAndDistance(tSide, 1) != getGearboxBlock() && getBaseMetaTileEntity().getBlockAtSideAndDistance(tSide, 2) != getGearboxBlock()) {
-            return false;
-        }
-        if(getBaseMetaTileEntity().getMetaIDAtSideAndDistance(tSide, 1) != getGearboxMeta() && getBaseMetaTileEntity().getMetaIDAtSideAndDistance(tSide, 2) != getGearboxMeta()) {
-            return false;
-        }
-        for (byte i = -1; i < 2; i = (byte) (i + 1)) {
-            for (byte j = -1; j < 2; j = (byte) (j + 1)) {
-                if ((i != 0) || (j != 0)) {
-                    for (byte k = 0; k < 4; k = (byte) (k + 1)) {
-
-                        final int fX = tX - (tSide == 5 ? 1 : tSide == 4 ? -1 : i),
-                                  fZ = tZ - (tSide == 2 ? -1 : tSide == 3 ? 1 : i),
-                                  aY = tY + j,
-                                  aX = tX + (tSide == 5 ? k : tSide == 4 ? -k : i),
-                                  aZ = tZ + (tSide == 2 ? -k : tSide == 3 ? k : i);
-
-                        final Block frontAir = getBaseMetaTileEntity().getBlock(fX, aY, fZ);
-                        final String frontAirName = frontAir.getUnlocalizedName();
-                        if(!(getBaseMetaTileEntity().getAir(fX, aY, fZ) || frontAirName.equalsIgnoreCase("tile.air") || frontAirName.equalsIgnoreCase("tile.railcraft.residual.heat"))) {
-                            return false; //Fail if vent blocks are obstructed
-                        }
-
-                        if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2))) {
-                            if (getBaseMetaTileEntity().getBlock(aX, aY, aZ) == getCasingBlock() && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) == getCasingMeta()) {
-                                // Do nothing
-                            } else if (!addMufflerToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? 2 : tSide == 4 ? -2 : 0), tY + 1, tZ + (tSide == 3 ? 2 : tSide == 2 ? -2 : 0)), getCasingTextureIndex())) {
-                                return false; //Fail if no muffler top middle back
-                            } else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(aX, aY, aZ))) {
-                                return false;
-                            }
-                        } else if (k == 0) {
-                          if(!(getBaseMetaTileEntity().getBlock(aX, aY, aZ) == getIntakeBlock() && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) == getIntakeMeta())) {
-                              return false;
-                          }
-                        } else if (getBaseMetaTileEntity().getBlock(aX, aY, aZ) == getCasingBlock() && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) == getCasingMeta()) {
-                            // Do nothing
-                        } else {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        this.mDynamoHatches.clear();
-        IGregTechTileEntity tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 3);
-        if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
-            if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Dynamo)) {
-                this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) tTileEntity.getMetaTileEntity());
-                ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).updateTexture(getCasingTextureIndex());
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
     public Block getCasingBlock() {//changed to RTSMC
         return GregTech_API.sBlockCasings4;
     }
 
+    @Override
     public byte getCasingMeta() {//same
         return 0;
     }
 
+    @Override
     public Block getIntakeBlock() {
         return GregTech_API.sBlockCasings8;//added new
     }
 
+    @Override
     public byte getIntakeMeta() {//same
         return 4;
     }
 
+    @Override
     public Block getGearboxBlock() {
         return GregTech_API.sBlockCasings2;
     }
 
+    @Override
     public byte getGearboxMeta() {
         return 4;
     }
 
+    @Override
     public byte getCasingTextureIndex() {//should be what hatches/busses change to?
         return 60;
     }
 
-    private boolean addToMachineList(IGregTechTileEntity tTileEntity) {
-        return ((addMaintenanceToMachineList(tTileEntity, getCasingTextureIndex())) || (addInputToMachineList(tTileEntity, getCasingTextureIndex())) || (addOutputToMachineList(tTileEntity, getCasingTextureIndex())) || (addMufflerToMachineList(tTileEntity, getCasingTextureIndex())));
-    }
-
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         return new GT_MetaTileEntity_ExtremeDieselEngine(this.mName);
     }
 
     @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        super.saveNBTData(aNBT);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound aNBT) {
-        super.loadNBTData(aNBT);
-    }
-
-    @Override
-    public int getDamageToComponent(ItemStack aStack) {
-        return 1;
-    }
-
     public int getMaxEfficiency(ItemStack aStack) {
         return boostEu ? 40000 : 10000;//4x output if boosted instead of x3
     }
 
     @Override
     public int getPollutionPerTick(ItemStack aStack) {
-        return 192;//x8
-    }
-    
-    @Override
-    public boolean explodesOnComponentBreak(ItemStack aStack) {
-        return true;
+        return super.getPollutionPerTick(aStack) * 8;//x8
     }
 
     @Override
@@ -280,10 +164,4 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Mul
 
         };
     }
-
-    @Override
-    public boolean isGivingInformation() {
-        return true;
-    }
-
 }
diff --git a/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java b/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java
new file mode 100644
index 0000000000..9828ea33af
--- /dev/null
+++ b/src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java
@@ -0,0 +1,19 @@
+package gregtech.loaders.postload;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Recipe;
+
+public class GT_ExtremeDieselFuelLoader implements Runnable {
+    @Override
+    public void run() {
+        GT_Log.out.println("GT_Mod: Adding extreme diesel fuel.");
+        for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList) {
+            if (r.mFluidInputs.length == 1 && Materials.GasolinePremium.getFluid(1).isFluidEqual(r.mFluidInputs[0])) {
+                GT_Recipe.GT_Recipe_Map.sExtremeDieselFuels.add(r);
+                return;
+            }
+        }
+        GT_Log.out.println("GT_Mod: No extreme diesel fuel found.");
+    }
+}
-- 
cgit 


From 9b78fafdd1c78ff95c095cf25c2c54c368a7cf23 Mon Sep 17 00:00:00 2001
From: korneel vandamme <Krampus.sack.never@gmail.com>
Date: Mon, 16 Nov 2020 00:40:25 +0100
Subject: add moveMultipleItemStacks to utils

---
 src/main/java/gregtech/api/util/GT_Utility.java | 103 +++++++++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index cf7b86fe94..9f39ac3522 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -522,6 +522,107 @@ public class GT_Utility {
         return aSlot < aTileEntity.getSizeInventory() && aTileEntity.isItemValidForSlot(aSlot, aStack);
     }
 
+    /**
+     * moves multiple stacks from Inv-Side to Inv-Side
+     *
+     * @return the Amount of moved Items
+     */
+
+    public static int moveMultipleItemStacks(Object aTileEntity1, Object aTileEntity2, byte aGrabFrom, byte aPutTo, List<ItemStack> aFilter, boolean aInvertFilter, byte aMaxTargetStackSize, byte aMinTargetStackSize, byte aMaxMoveAtOnce, byte aMinMoveAtOnce,int aStackAmount) {
+        if (aTileEntity1 instanceof  IInventory)
+            return moveMultipleItemStacks((IInventory) aTileEntity1, aTileEntity2, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,aStackAmount, true);
+        return 0;
+    }
+
+    public static int moveMultipleItemStacks(IInventory aTileEntity1, Object aTileEntity2, byte aGrabFrom, byte aPutTo, List<ItemStack> aFilter, boolean aInvertFilter, byte aMaxTargetStackSize, byte aMinTargetStackSize, byte aMaxMoveAtOnce, byte aMinMoveAtOnce,int aMaxStackTransfer, boolean aDoCheckChests) {
+        if (aTileEntity1 == null || aMaxTargetStackSize <= 0 || aMinTargetStackSize <= 0 || aMaxMoveAtOnce <= 0 || aMinTargetStackSize > aMaxTargetStackSize || aMinMoveAtOnce > aMaxMoveAtOnce || aMaxStackTransfer == 0)
+            return 0;
+        int tGrabInventorySize = aTileEntity1.getSizeInventory();
+        if (aTileEntity2 instanceof IInventory)
+        {
+            IInventory tPutInventory = (IInventory) aTileEntity2;
+            int tPutInventorySize = tPutInventory.getSizeInventory();
+            int tFirstsValidSlot = 0,tStacksMoved = 0,tTotalItemsMoved = 0;
+            for (int tGrabSlot = 0;tGrabSlot<tGrabInventorySize;tGrabSlot++)
+            {
+                //ItemStack tInventoryStack : mInventory
+                ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlot);
+                if (listContainsItem(aFilter, tGrabStack, true, aInvertFilter) &&
+                        (tGrabStack.stackSize >= aMinMoveAtOnce && isAllowedToTakeFromSlot(aTileEntity1, tGrabSlot, aGrabFrom, tGrabStack))) {
+                    int tStackSize = tGrabStack.stackSize;
+                    int tMovedItems = 0;
+                    for (int tPutSlot = tFirstsValidSlot;tPutSlot<tPutInventorySize;tPutSlot++)
+                    {
+                        if (isAllowedToPutIntoSlot(tPutInventory,tPutSlot,aPutTo,tGrabStack,(byte)64))
+                        {
+                            int tMoved = moveStackFromSlotAToSlotB(aTileEntity1, tPutInventory, tGrabSlot, tPutSlot, aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItems), aMinMoveAtOnce);
+                            tTotalItemsMoved += tMoved;
+                            tMovedItems += tMoved;
+                            if (tMovedItems == tStackSize)
+                                break;
+                        }
+                    }
+                    if (tMovedItems > 0) {
+                        if (++tStacksMoved >= aMaxStackTransfer)
+                            return tTotalItemsMoved;
+                    }
+                }
+            }
+            if (aDoCheckChests && aTileEntity1 instanceof TileEntityChest) {
+                TileEntityChest tTileEntity1 = (TileEntityChest) aTileEntity1;
+                int tAmount = 0;
+                int maxStackTransfer = aMaxStackTransfer - tStacksMoved;
+                if (tTileEntity1.adjacentChestXNeg != null) {
+                    tAmount = moveMultipleItemStacks(tTileEntity1.adjacentChestXNeg, aTileEntity2, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                } else if (tTileEntity1.adjacentChestZNeg != null) {
+                    tAmount = moveMultipleItemStacks(tTileEntity1.adjacentChestZNeg, aTileEntity2, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                } else if (tTileEntity1.adjacentChestXPos != null) {
+                    tAmount = moveMultipleItemStacks(tTileEntity1.adjacentChestXPos, aTileEntity2, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                } else if (tTileEntity1.adjacentChestZPos != null) {
+                    tAmount = moveMultipleItemStacks(tTileEntity1.adjacentChestZPos, aTileEntity2, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                }
+                if (tAmount != 0) return tAmount+tTotalItemsMoved;
+            }
+
+            if (aDoCheckChests && aTileEntity2 instanceof TileEntityChest) {
+                TileEntityChest tTileEntity2 = (TileEntityChest) aTileEntity2;
+                if (tTileEntity2.adjacentChestChecked) {
+                    int tAmount = 0;
+                    int maxStackTransfer = aMaxStackTransfer - tStacksMoved;
+                    if (tTileEntity2.adjacentChestXNeg != null) {
+                        tAmount = moveMultipleItemStacks(aTileEntity1, tTileEntity2.adjacentChestXNeg, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                    } else if (tTileEntity2.adjacentChestZNeg != null) {
+                        tAmount = moveMultipleItemStacks(aTileEntity1, tTileEntity2.adjacentChestZNeg, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                    } else if (tTileEntity2.adjacentChestXPos != null) {
+                        tAmount = moveMultipleItemStacks(aTileEntity1, tTileEntity2.adjacentChestXPos, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                    } else if (tTileEntity2.adjacentChestZPos != null) {
+                        tAmount = moveMultipleItemStacks(aTileEntity1, tTileEntity2.adjacentChestZPos, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce,maxStackTransfer, false);
+                    }
+                    if (tAmount != 0) return tAmount+tTotalItemsMoved;
+                }
+            }
+
+            return tTotalItemsMoved;
+
+        }
+        //there should be a function to transfer more then 1 stack in a pipe
+        //ut i dont see any ways to improve it too much work for what it is worth
+        int[] tGrabSlots = new int[tGrabInventorySize];
+        for (int i = 0; i < tGrabInventorySize; i++) {
+            tGrabSlots[i] = i;
+        }
+        int tTotalItemsMoved = 0;
+        for (int i = 0; i < tGrabInventorySize; i++) {
+            int tMoved = moveStackIntoPipe(aTileEntity1, aTileEntity2, tGrabSlots, aGrabFrom, aPutTo, aFilter, aInvertFilter, aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce, aDoCheckChests);
+            if (tMoved == 0)
+                return tTotalItemsMoved;
+            else
+                tTotalItemsMoved += tMoved;
+        }
+        return  0;
+    }
+
+
     /**
      * Moves Stack from Inv-Side to Inv-Side.
      *
@@ -539,7 +640,7 @@ public class GT_Utility {
     private static byte moveOneItemStack(IInventory aTileEntity1, Object aTileEntity2, byte aGrabFrom, byte aPutTo, List<ItemStack> aFilter, boolean aInvertFilter, byte aMaxTargetStackSize, byte aMinTargetStackSize, byte aMaxMoveAtOnce, byte aMinMoveAtOnce, boolean aDoCheckChests) {
         if (aTileEntity1 == null || aMaxTargetStackSize <= 0 || aMinTargetStackSize <= 0 || aMaxMoveAtOnce <= 0 || aMinTargetStackSize > aMaxTargetStackSize || aMinMoveAtOnce > aMaxMoveAtOnce)
             return 0;
-
+            
         int[] tGrabSlots = null;
         if (aTileEntity1 instanceof ISidedInventory)
             tGrabSlots = ((ISidedInventory) aTileEntity1).getAccessibleSlotsFromSide(aGrabFrom);
-- 
cgit 


From 26fa46e05a12d507b484c86935574a078b58164b Mon Sep 17 00:00:00 2001
From: Prometheus0000000 <prometheus0000000@gmail.com>
Date: Wed, 18 Nov 2020 22:12:43 -0500
Subject: Add new method of displaying MB tooltips. LCR as example for now

---
 .../api/util/GT_Multiblock_Tooltip_Builder.java    | 309 +++++++++++++++++++++
 .../GT_MetaTileEntity_LargeChemicalReactor.java    |  40 ++-
 src/main/resources/assets/gregtech/lang/en_US.lang |  21 ++
 3 files changed, 356 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java
new file mode 100644
index 0000000000..c8914c0b7d
--- /dev/null
+++ b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java
@@ -0,0 +1,309 @@
+package gregtech.api.util;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+
+/**
+ * This makes it easier to build multi tooltips, with a standardized format. <br>
+ * Info section order should be:<br>
+ * addMachineType<br>
+ * addInfo, for what it does, special notes, etc.<br>
+ * addSeparator, if you need it<br>
+ * addPollutionAmount<br>
+ * <br>
+ * Structure order should be:<br>
+ * beginStructureBlock<br>
+ * addController<br>
+ * addCasingInfo<br>
+ * addOtherStructurePart, for secondary structure block info (pipes, coils, etc)<br>
+ * addEnergyHatch/addDynamoHatch<br>
+ * addMaintenanceHatch<br>
+ * addMufflerHatch<br>
+ * addInputBus/addInputHatch/addOutputBus/addOutputHatch, in that order<br>
+ * Use addStructureInfo for any comments on nonstandard structure info wherever needed
+ * <br>
+ * toolTipFinisher<br>
+ * <br>
+ * Originally created by kekzdealer
+ */
+public class GT_Multiblock_Tooltip_Builder {
+	private static final String TAB = "   ";
+	private static final String COLON = ": ";
+	
+	private final List<String> iLines;
+	private final List<String> sLines;
+	
+	private String[] iArray;
+	private String[] sArray;
+
+	//Localized tooltips
+	private static final String TT_machineType = StatCollector.translateToLocal("GT5U.MBTT.MachineType");
+	private static final String TT_dimensions = StatCollector.translateToLocal("GT5U.MBTT.Dimensions");
+	private static final String TT_structure = StatCollector.translateToLocal("GT5U.MBTT.Structure");
+	private static final String TT_controller = StatCollector.translateToLocal("GT5U.MBTT.Controller");
+	private static final String TT_minimum = StatCollector.translateToLocal("GT5U.MBTT.Minimum");
+	private static final String TT_maintenancehatch = StatCollector.translateToLocal("GT5U.MBTT.MaintenanceHatch");
+	private static final String TT_energyhatch = StatCollector.translateToLocal("GT5U.MBTT.EnergyHatch");
+	private static final String TT_dynamohatch = StatCollector.translateToLocal("GT5U.MBTT.DynamoHatch");
+	private static final String TT_mufflerhatch = StatCollector.translateToLocal("GT5U.MBTT.MufflerHatch");
+	private static final String TT_inputbus = StatCollector.translateToLocal("GT5U.MBTT.InputBus");
+	private static final String TT_inputhatch = StatCollector.translateToLocal("GT5U.MBTT.InputHatch");
+	private static final String TT_outputbus = StatCollector.translateToLocal("GT5U.MBTT.OutputBus");
+	private static final String TT_outputhatch = StatCollector.translateToLocal("GT5U.MBTT.OutputHatch");
+	private static final String TT_causes = StatCollector.translateToLocal("GT5U.MBTT.Causes");
+	private static final String TT_pps = StatCollector.translateToLocal("GT5U.MBTT.PPS");
+	private static final String TT_hold = StatCollector.translateToLocal("GT5U.MBTT.Hold");
+	private static final String TT_todisplay = StatCollector.translateToLocal("GT5U.MBTT.Display");
+	private static final String TT_mod = StatCollector.translateToLocal("GT5U.MBTT.Mod");
+
+	public GT_Multiblock_Tooltip_Builder() {
+		iLines = new LinkedList<>();
+		sLines = new LinkedList<>();
+	}
+	
+	/**
+	 * Add a line telling you what the machine type is. Usually, this will be the name of a SB version.<br>
+	 * Machine Type: machine
+	 * 
+	 * @param machine
+	 * 		Name of the machine type
+	 * 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addMachineType(String machine) {
+		iLines.add(TT_machineType + EnumChatFormatting.YELLOW + machine + EnumChatFormatting.RESET);
+		return this;
+	}
+	
+	/**
+	 * Add a basic line of information about this structure
+	 * 
+	 * @param info
+	 * 		The line to be added.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addInfo(String info) {
+		iLines.add(info);
+		return this;
+	}
+	
+	/**
+	 * Add a separator line like this:<br>
+	 * -----------------------------------------
+	 * 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addSeparator() {
+		iLines.add("-----------------------------------------");
+		return this;
+	}
+	
+	/**
+	 * Add a line telling you what the machine type is. Usually, this will be the name of a SB version.<br>
+	 * Machine Type: machine
+	 * 
+	 * @param machine
+	 * 		Name of the machine type
+	 * 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addPollutionAmount(int pollution) {
+		iLines.add(TT_causes + " " + EnumChatFormatting.DARK_PURPLE + pollution + " " + TT_pps + EnumChatFormatting.RESET);
+		return this;
+	}
+
+	/**
+	 * Begin adding structural information by adding a line about the structure's dimensions
+	 * and then inserting a "Structure:" line.
+	 * 
+	 * @param w
+	 * 		Structure width.
+	 * @param h
+	 * 		Structure height.
+	 * @param l
+	 * 		Structure depth/length.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder beginStructureBlock(int w, int h, int l) {
+		sLines.add(TT_dimensions + w + "x" + h + "x" + l + " (WxHxL)");
+		sLines.add(TT_structure);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Controller: info
+	 * @param info
+	 * 		Positional information.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addController(String info) {
+		sLines.add(TAB + TT_controller + info);
+		return this;
+	}
+		
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)minCountx casingName (minimum)
+	 * @param casingName
+	 * 		Name of the Casing.
+	 * @param minCount
+	 * 		Minimum needed for valid structure check.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addCasingInfo(String casingName, int minCount) {
+		sLines.add(TAB + minCount +"x " + casingName + " " + TT_minimum);
+		return this;
+	}
+	
+	/**
+	 * Use this method to add a structural part that isn't covered by the other methods.<br>
+	 * (indent)name: info
+	 * @param name
+	 * 		Name of the hatch or other component.
+	 * @param info
+	 * 		Positional information.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addOtherStructurePart(String name, String info) {
+		sLines.add(TAB + name + info);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Maintenance Hatch: info
+	 * @param info
+	 * 		Positional information.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addMaintenanceHatch(String info) {
+		sLines.add(TAB + TT_maintenancehatch + info);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Muffler Hatch: info
+	 * @param info
+	 * 		Location where the hatch goes 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addMufflerHatch(String info) {
+		sLines.add(TAB + TT_mufflerhatch + info);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Energy Hatch: info
+	 * @param info
+	 * 		Positional information.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addEnergyHatch(String info) {
+		sLines.add(TAB + TT_energyhatch + info);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Dynamo Hatch: info
+	 * @param info
+	 * 		Positional information.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addDynamoHatch(String info) {
+		sLines.add(TAB + TT_dynamohatch + info);
+		return this;
+	}
+
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Input Bus: info
+	 * @param info
+	 * 		Location where the bus goes 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addInputBus(String info) {
+		sLines.add(TAB + TT_inputbus + info);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Input Hatch: info
+	 * @param info
+	 * 		Location where the hatch goes 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addInputHatch(String info) {
+		sLines.add(TAB + TT_inputhatch + info);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Output Bus: info
+	 * @param info
+	 * 		Location where the bus goes 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addOutputBus(String info) {
+		sLines.add(TAB + TT_outputbus + info);
+		return this;
+	}
+	
+	/**
+	 * Add a line of information about the structure:<br>
+	 * 	(indent)Output Hatch: info
+	 * @param info
+	 * 		Location where the bus goes 
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addOutputHatch(String info) {
+		sLines.add(TAB + TT_outputhatch + info);
+		return this;
+	}
+	
+	/**
+	 * Use this method to add non-standard structural info.<br>
+	 * (indent)info
+	 * @param info
+	 * 		The line to be added.
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder addStructureInfo(String info) {
+		sLines.add(TAB + info);
+		return this;
+	}
+	
+	/**
+	 * Call at the very end.<br>
+	 * Adds a final line with the mod name and information on how to display the structure guidelines.<br>
+	 * Ends the building process.
+	 * 
+	 * @param mod
+	 * 		Name of the mod that adds this multiblock machine
+	 */
+	public void toolTipFinisher(String mod) {
+		iLines.add(TT_hold + " " + EnumChatFormatting.BOLD + "[LSHIFT]" + EnumChatFormatting.RESET + EnumChatFormatting.GRAY + " " + TT_todisplay);
+		iLines.add(TT_mod + " " + EnumChatFormatting.GREEN + mod + EnumChatFormatting.RESET);
+		iArray = new String[iLines.size()];
+		sArray = new String[sLines.size()];
+		iLines.toArray(iArray);
+		sLines.toArray(sArray);
+	}
+	
+	public String[] getInformation() {
+		return iArray;
+	}
+	
+	public String[] getStructureInformation() {
+		return sArray;
+	}
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
index fad880e5e4..c5f1852629 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
@@ -8,6 +8,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.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -18,6 +19,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_MultiBlockBase {
 
 	private final int CASING_INDEX = 176;
@@ -37,20 +40,29 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu
 
 	@Override
 	public String[] getDescription() {
-		return new String[] {
-				"Controller block for the Large Chemical Reactor",
-				"Has the same recipes as the Chemical Reactor",
-				"Does not lose efficiency when overclocked",
-				"Accepts fluids instead of fluid cells",
-				"Size(WxHxD): 3x3x3",
-				"3x3x3 of Chemically Inert Machine Casings (hollow, min 8!)",
-				"Controller (Front centered)",
-				"1x PTFE Pipe Machine Casing (inside the hollow casings)",
-				"1x Cupronickel Coil Block (next to PTFE Pipe Machine Casing)",
-				"1x Input Bus/Hatch (Any inert casing)",
-				"1x Output Bus/Hatch (Any inert casing)",
-				"1x Maintenance Hatch (Any inert casing)",
-				"1x Energy Hatch (Any inert casing)"};
+		final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Chemical Reactor")
+		.addInfo("Controller block for the Large Chemical Reactor")
+		.addInfo("Does not lose efficiency when overclocked")
+		.addInfo("Accepts fluids instead of fluid cells")
+		.beginStructureBlock(3, 3, 3)
+		.addController("Front centered")
+		.addCasingInfo("Chemically Inert Machine Casings", 8)
+		.addOtherStructurePart("PTFE Pipe Machine Casing", "Center")
+		.addOtherStructurePart("Cupronickel Coil Block", "Adjacent to the PTFE Pipe Machine Casing")
+		.addEnergyHatch("Any Casing")
+		.addMaintenanceHatch("Any Casing")
+		.addInputBus("Any Casing")
+		.addInputHatch("Any Casing")
+		.addOutputBus("Any Casing")
+		.addOutputHatch("Any Casing")
+		.addStructureInfo("You can have multiple I/O hatches/busses")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
 	}
 
 	@Override
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 88616c6041..53970634f9 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -1,3 +1,24 @@
+# Multiblock Tooltip Builder Keywords
+# Context can be found in the class gregtech.api.util.GT_Multiblock_Tooltip_Builder
+GT5U.MBTT.MachineType=Machine Type:
+GT5U.MBTT.Dimensions=Dimensions:
+GT5U.MBTT.Structure=Structure:
+GT5U.MBTT.Controller=Controller:
+GT5U.MBTT.Minimum=(minimum)
+GT5U.MBTT.MaintenanceHatch=Maintenance Hatch:
+GT5U.MBTT.MufflerHatch=Muffler Hatch:
+GT5U.MBTT.EnergyHatch=Energy Hatch:
+GT5U.MBTT.DynamoHatch=Dynamo Hatch:
+GT5U.MBTT.InputBus=Input Bus/ses:
+GT5U.MBTT.InputHatch=Input Hatch/es:
+GT5U.MBTT.OutputBus=Output Bus/ses:
+GT5U.MBTT.OutputHatch=Output Hatch/es:
+GT5U.MBTT.Causes=Causes:
+GT5U.MBTT.PPS=pollution per second
+GT5U.MBTT.Hold=Hold
+GT5U.MBTT.Display=to display structure guidelines
+GT5U.MBTT.Mod=Added by
+
 GT5U.turbine.running.true=Turbine running
 GT5U.turbine.running.false=Turbine stopped
 GT5U.turbine.maintenance.false=No Maintainance issues
-- 
cgit 


From dc56ad792448b7e5caa489841c71926a81afb840 Mon Sep 17 00:00:00 2001
From: korneel vandamme <Krampus.sack.never@gmail.com>
Date: Fri, 20 Nov 2020 03:15:33 +0100
Subject: add suport for drawers and barrels

---
 src/main/java/gregtech/api/util/GT_Utility.java | 39 +++++++++++++------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 9f39ac3522..b06cc1d82a 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -546,27 +546,28 @@ public class GT_Utility {
             for (int tGrabSlot = 0;tGrabSlot<tGrabInventorySize;tGrabSlot++)
             {
                 //ItemStack tInventoryStack : mInventory
-                ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlot);
-                if (listContainsItem(aFilter, tGrabStack, true, aInvertFilter) &&
-                        (tGrabStack.stackSize >= aMinMoveAtOnce && isAllowedToTakeFromSlot(aTileEntity1, tGrabSlot, aGrabFrom, tGrabStack))) {
-                    int tStackSize = tGrabStack.stackSize;
-                    int tMovedItems = 0;
-                    for (int tPutSlot = tFirstsValidSlot;tPutSlot<tPutInventorySize;tPutSlot++)
-                    {
-                        if (isAllowedToPutIntoSlot(tPutInventory,tPutSlot,aPutTo,tGrabStack,(byte)64))
-                        {
-                            int tMoved = moveStackFromSlotAToSlotB(aTileEntity1, tPutInventory, tGrabSlot, tPutSlot, aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItems), aMinMoveAtOnce);
-                            tTotalItemsMoved += tMoved;
-                            tMovedItems += tMoved;
-                            if (tMovedItems == tStackSize)
-                                break;
+                int tMovedItems = 0;
+                do {
+                    ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlot);
+                    if (listContainsItem(aFilter, tGrabStack, true, aInvertFilter) &&
+                            (tGrabStack.stackSize >= aMinMoveAtOnce && isAllowedToTakeFromSlot(aTileEntity1, tGrabSlot, aGrabFrom, tGrabStack))) {
+                        int tStackSize = tGrabStack.stackSize;
+                        tMovedItems = 0;
+                        for (int tPutSlot = tFirstsValidSlot; tPutSlot < tPutInventorySize; tPutSlot++) {
+                            if (isAllowedToPutIntoSlot(tPutInventory, tPutSlot, aPutTo, tGrabStack, (byte) 64)) {
+                                int tMoved = moveStackFromSlotAToSlotB(aTileEntity1, tPutInventory, tGrabSlot, tPutSlot, aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItems), aMinMoveAtOnce);
+                                tTotalItemsMoved += tMoved;
+                                tMovedItems += tMoved;
+                                if (tMovedItems == tStackSize)
+                                    break;
+                            }
+                        }
+                        if (tMovedItems > 0) {
+                            if (++tStacksMoved >= aMaxStackTransfer)
+                                return tTotalItemsMoved;
                         }
                     }
-                    if (tMovedItems > 0) {
-                        if (++tStacksMoved >= aMaxStackTransfer)
-                            return tTotalItemsMoved;
-                    }
-                }
+                } while (tGrabInventorySize == 2 && tMovedItems > 0); //to suport draweres and barrels
             }
             if (aDoCheckChests && aTileEntity1 instanceof TileEntityChest) {
                 TileEntityChest tTileEntity1 = (TileEntityChest) aTileEntity1;
-- 
cgit 


From 9d13d05f76fb34c5827959acb802b519531d3289 Mon Sep 17 00:00:00 2001
From: Prometheus0000000 <prometheus0000000@gmail.com>
Date: Thu, 19 Nov 2020 23:28:05 -0500
Subject: Change all the multi tooltips over. Also changed tooltip class a bit

---
 .../api/util/GT_Multiblock_Tooltip_Builder.java    | 75 ++++++++++++++++------
 .../multi/GT_MetaTileEntity_AssemblyLine.java      | 42 ++++++++----
 .../GT_MetaTileEntity_BrickedBlastFurnace.java     | 29 +++++++--
 .../GT_MetaTileEntity_BronzeBlastFurnace.java      |  5 +-
 .../multi/GT_MetaTileEntity_Charcoal_Pit.java      | 31 ++++++---
 .../multi/GT_MetaTileEntity_Cleanroom.java         | 43 ++++++++-----
 .../GT_MetaTileEntity_ConcreteBackfiller2.java     | 42 ++++++++----
 .../GT_MetaTileEntity_ConcreteBackfillerBase.java  | 38 ++++++++---
 .../multi/GT_MetaTileEntity_DieselEngine.java      | 47 +++++++++-----
 .../multi/GT_MetaTileEntity_DistillationTower.java | 35 ++++++----
 .../GT_MetaTileEntity_ElectricBlastFurnace.java    | 48 +++++++++-----
 .../multi/GT_MetaTileEntity_FusionComputer1.java   | 33 ++++++++--
 .../multi/GT_MetaTileEntity_FusionComputer2.java   | 34 +++++++---
 .../multi/GT_MetaTileEntity_FusionComputer3.java   | 34 +++++++---
 .../multi/GT_MetaTileEntity_HeatExchanger.java     | 37 ++++++++---
 .../GT_MetaTileEntity_ImplosionCompressor.java     | 35 ++++++----
 .../multi/GT_MetaTileEntity_LargeBoiler.java       | 44 ++++++++-----
 .../GT_MetaTileEntity_LargeChemicalReactor.java    | 21 +++---
 .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java  | 33 ++++++----
 .../GT_MetaTileEntity_LargeTurbine_HPSteam.java    | 35 ++++++----
 .../GT_MetaTileEntity_LargeTurbine_Plasma.java     | 32 ++++++---
 .../GT_MetaTileEntity_LargeTurbine_Steam.java      | 35 ++++++----
 .../multi/GT_MetaTileEntity_MultiFurnace.java      | 37 +++++++----
 .../multi/GT_MetaTileEntity_OilCracker.java        | 38 +++++++----
 .../multi/GT_MetaTileEntity_OilDrillBase.java      | 39 +++++++----
 .../GT_MetaTileEntity_OreDrillingPlantBase.java    | 46 ++++++++-----
 .../multi/GT_MetaTileEntity_ProcessingArray.java   | 39 +++++++----
 .../multi/GT_MetaTileEntity_PyrolyseOven.java      | 44 ++++++++-----
 .../multi/GT_MetaTileEntity_VacuumFreezer.java     | 30 ++++++---
 src/main/resources/assets/gregtech/lang/en_US.lang | 27 ++++----
 30 files changed, 766 insertions(+), 342 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java
index c8914c0b7d..e30fe5d606 100644
--- a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java
+++ b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java
@@ -25,7 +25,7 @@ import net.minecraft.util.StatCollector;
  * addInputBus/addInputHatch/addOutputBus/addOutputHatch, in that order<br>
  * Use addStructureInfo for any comments on nonstandard structure info wherever needed
  * <br>
- * toolTipFinisher<br>
+ * toolTipFinisher goes at the very end<br>
  * <br>
  * Originally created by kekzdealer
  */
@@ -42,6 +42,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	//Localized tooltips
 	private static final String TT_machineType = StatCollector.translateToLocal("GT5U.MBTT.MachineType");
 	private static final String TT_dimensions = StatCollector.translateToLocal("GT5U.MBTT.Dimensions");
+	private static final String TT_hollow = StatCollector.translateToLocal("GT5U.MBTT.Hollow");
 	private static final String TT_structure = StatCollector.translateToLocal("GT5U.MBTT.Structure");
 	private static final String TT_controller = StatCollector.translateToLocal("GT5U.MBTT.Controller");
 	private static final String TT_minimum = StatCollector.translateToLocal("GT5U.MBTT.Minimum");
@@ -74,7 +75,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addMachineType(String machine) {
-		iLines.add(TT_machineType + EnumChatFormatting.YELLOW + machine + EnumChatFormatting.RESET);
+		iLines.add(TT_machineType + COLON + EnumChatFormatting.YELLOW + machine + EnumChatFormatting.RESET);
 		return this;
 	}
 	
@@ -111,7 +112,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addPollutionAmount(int pollution) {
-		iLines.add(TT_causes + " " + EnumChatFormatting.DARK_PURPLE + pollution + " " + TT_pps + EnumChatFormatting.RESET);
+		iLines.add(TT_causes + COLON + EnumChatFormatting.DARK_PURPLE + pollution + " " + EnumChatFormatting.GRAY + TT_pps);
 		return this;
 	}
 
@@ -125,12 +126,50 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * 		Structure height.
 	 * @param l
 	 * 		Structure depth/length.
+	 * @param hollow
+	 * 		T/F, adds a (hollow) comment if true
 	 * @return Instance this method was called on.
 	 */
-	public GT_Multiblock_Tooltip_Builder beginStructureBlock(int w, int h, int l) {
-		sLines.add(TT_dimensions + w + "x" + h + "x" + l + " (WxHxL)");
-		sLines.add(TT_structure);
-		return this;
+	public GT_Multiblock_Tooltip_Builder beginStructureBlock(int w, int h, int l, boolean hollow) {
+		if (hollow) {
+			sLines.add(TT_dimensions + COLON + w + "x" + h + "x" + l + " (WxHxL) " + TT_hollow);
+		}
+		else {
+			sLines.add(TT_dimensions + COLON + w + "x" + h + "x" + l + " (WxHxL)");
+		}
+			sLines.add(TT_structure + COLON);
+			return this;
+	}
+	
+	/**
+	 * Begin adding structural information by adding a line about the structure's dimensions<br>
+	 * and then inserting a "Structure:" line. Variable version displays min and max
+	 *  
+	 * @param wmin
+	 * 		Structure min width.
+	 * @param wmax
+	 * 		Structure max width.
+	 * @param hmin
+	 * 		Structure min height.
+	 * @param hmax
+	 * 		Structure max height.
+	 * @param lmin
+	 * 		Structure min depth/length.
+	 * @param lmax
+	 * 		Structure max depth/length.
+	 * @param hollow
+	 * 		T/F, adds a (hollow) comment if true
+	 * @return Instance this method was called on.
+	 */
+	public GT_Multiblock_Tooltip_Builder beginVariableStructureBlock(int wmin, int wmax, int hmin, int hmax, int lmin, int lmax, boolean hollow) {
+		if (hollow) {
+			sLines.add(TT_dimensions + COLON + wmin + "-" + wmax + "x" + hmin + "-" + hmax + "x" + lmin + "-" + lmax + " (WxHxL) " + TT_hollow);
+		}
+		else {
+			sLines.add(TT_dimensions + COLON + wmin + "-" + wmax + "x" + hmin + "-" + hmax + "x" + lmin + "-" + lmax + " (WxHxL)");
+		}
+			sLines.add(TT_structure + COLON);
+			return this;
 	}
 	
 	/**
@@ -141,7 +180,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addController(String info) {
-		sLines.add(TAB + TT_controller + info);
+		sLines.add(TAB + TT_controller + COLON + info);
 		return this;
 	}
 		
@@ -169,7 +208,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addOtherStructurePart(String name, String info) {
-		sLines.add(TAB + name + info);
+		sLines.add(TAB + name + COLON + info);
 		return this;
 	}
 	
@@ -181,7 +220,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addMaintenanceHatch(String info) {
-		sLines.add(TAB + TT_maintenancehatch + info);
+		sLines.add(TAB + TT_maintenancehatch + COLON + info);
 		return this;
 	}
 	
@@ -193,7 +232,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addMufflerHatch(String info) {
-		sLines.add(TAB + TT_mufflerhatch + info);
+		sLines.add(TAB + TT_mufflerhatch + COLON + info);
 		return this;
 	}
 	
@@ -205,7 +244,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addEnergyHatch(String info) {
-		sLines.add(TAB + TT_energyhatch + info);
+		sLines.add(TAB + TT_energyhatch + COLON + info);
 		return this;
 	}
 	
@@ -217,7 +256,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addDynamoHatch(String info) {
-		sLines.add(TAB + TT_dynamohatch + info);
+		sLines.add(TAB + TT_dynamohatch + COLON + info);
 		return this;
 	}
 
@@ -229,7 +268,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addInputBus(String info) {
-		sLines.add(TAB + TT_inputbus + info);
+		sLines.add(TAB + TT_inputbus + COLON + info);
 		return this;
 	}
 	
@@ -241,7 +280,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addInputHatch(String info) {
-		sLines.add(TAB + TT_inputhatch + info);
+		sLines.add(TAB + TT_inputhatch + COLON + info);
 		return this;
 	}
 	
@@ -253,7 +292,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addOutputBus(String info) {
-		sLines.add(TAB + TT_outputbus + info);
+		sLines.add(TAB + TT_outputbus + COLON + info);
 		return this;
 	}
 	
@@ -265,7 +304,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 * @return Instance this method was called on.
 	 */
 	public GT_Multiblock_Tooltip_Builder addOutputHatch(String info) {
-		sLines.add(TAB + TT_outputhatch + info);
+		sLines.add(TAB + TT_outputhatch + COLON + info);
 		return this;
 	}
 	
@@ -291,7 +330,7 @@ public class GT_Multiblock_Tooltip_Builder {
 	 */
 	public void toolTipFinisher(String mod) {
 		iLines.add(TT_hold + " " + EnumChatFormatting.BOLD + "[LSHIFT]" + EnumChatFormatting.RESET + EnumChatFormatting.GRAY + " " + TT_todisplay);
-		iLines.add(TT_mod + " " + EnumChatFormatting.GREEN + mod + EnumChatFormatting.RESET);
+		iLines.add(TT_mod + COLON + EnumChatFormatting.GREEN + mod + EnumChatFormatting.GRAY);
 		iArray = new String[iLines.size()];
 		sArray = new String[sLines.size()];
 		iLines.toArray(iArray);
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..36e607ce93 100644
--- 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
@@ -3,6 +3,8 @@ package gregtech.common.tileentities.machines.multi;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
@@ -15,6 +17,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynam
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
 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.block.Block;
@@ -40,22 +43,34 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Large Combustion Engine",
-                "Size(WxHxD): 3x3x4, Controller (front centered)",
-                "3x3x4 of Stable Titanium Machine Casing (hollow, Min 16!)",
-                "2x Titanium Gear Box Machine Casing inside the Hollow Casing",
-                "8x Engine Intake Machine Casing (around controller)",
-                "2x Input Hatch (Fuel/Lubricant) (one of the Casings next to a Gear Box)",
-                "1x Maintenance Hatch (one of the Casings next to a Gear Box)",
-                "1x Muffler Hatch (top middle back, next to the rear Gear Box)",
-                "1x Dynamo Hatch (back centered)",
-                "Engine Intake Casings must not be obstructed in front (only air blocks)",
-                "Supply Flammable Fuels and 1000L of Lubricant per hour to run.",
-                "Supply 40L of Oxygen per second to boost output (optional).",
-                "Default: Produces 2048EU/t at 100% efficiency",
-                "Boosted: Produces 6144EU/t at 150% efficiency",
-                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Combustion Generator")
+		.addInfo("Controller block for the Large Combustion Engine")
+		.addInfo("Supply Diesel Fuels and 1000L of Lubricant per hour to run")
+		.addInfo("Supply 40L/s of Oxygen to boost output (optional)")
+		.addInfo("Default: Produces 2048EU/t at 100% fuel efficiency")
+		.addInfo("Boosted: Produces 6144EU/t at 150% fuel efficiency")
+		.addInfo("You need to wait for it to reach 300% to output full power")
+		.addPollutionAmount(20 * getPollutionPerTick(null))
+		.addSeparator()
+		.beginStructureBlock(3, 3, 4, false)
+		.addController("Front center")
+		.addCasingInfo("Stable Titanium Machine Casing", 16)
+		.addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks")
+		.addOtherStructurePart("Engine Intake Machine Casing", "8x, ring around controller")
+		.addStructureInfo("Engine Intake Casings must not be obstructed in front (only air blocks)")
+		.addDynamoHatch("Back center")
+		.addMaintenanceHatch("One of the casings next to a Gear Box")
+		.addMufflerHatch("Top middle back, above the rear Gear Box")
+		.addInputHatch("Diesel Fuel, next to a Gear Box")
+		.addInputHatch("Lubricant, next to a Gear Box")
+		.addInputHatch("Oxygen, optional, next to a Gear Box")
+		.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_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
index 45ba3c97f5..12ab91d876 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -10,6 +10,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -20,6 +21,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_DistillationTower
         extends GT_MetaTileEntity_MultiBlockBase {
     private static final int CASING_INDEX = 49;
@@ -38,18 +41,26 @@ public class GT_MetaTileEntity_DistillationTower
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Distillation Tower",
-                "Size(WxHxD): 3xhx3 (Hollow), with h ranging from 3 to 12",
-                "Controller (Front bottom)",
-                "1x Input Hatch (Any bottom layer casing)",
-                "2-11x Output Hatch (One per layer except bottom layer)",
-                "1x Output Bus (Any bottom layer casing)",
-                "1x Maintenance Hatch (Any casing)",
-                "1x Energy Hatch (Any casing)",
-                "Fluids are only put out at the correct height",
-                "The correct height equals the slot number in the NEI recipe",
-                "Clean Stainless Steel Machine Casings for the rest (7 x h - 5 at least!)"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Distillery")
+		.addInfo("Controller block for the Distillation Tower")
+		.addInfo("Fluids are only put out at the correct height")
+		.addInfo("The correct height equals the slot number in the NEI recipe")
+		.addSeparator()
+		.beginVariableStructureBlock(3, 3, 3, 12, 3, 3, true)
+		.addController("Front bottom")
+		.addOtherStructurePart("Clean Stainless Steel Machine Casing", "7 x h - 5 (minimum)")
+		.addEnergyHatch("Any casing")
+		.addMaintenanceHatch("Any casing")
+		.addInputHatch("Any bottom layer casing")
+		.addOutputBus("Any bottom layer casing")
+		.addOutputHatch("2-11x Output Hatches (One per layer except bottom layer)")
+		.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_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index df3dea34fa..061db80ece 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -5,6 +5,8 @@ import static gregtech.api.enums.GT_Values.VN;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
@@ -18,6 +20,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
+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;
@@ -47,22 +50,35 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Blast Furnace",
-                "Size(WxHxD): 3x4x3 (Hollow), Controller (Front middle bottom)",
-                "16x Heating Coils (Two middle Layers, hollow)",
-                "1x Input Hatch/Bus (Any bottom layer casing)",
-                "1x Output Hatch/Bus (Any bottom layer casing)",
-                "1x Energy Hatch (Any bottom layer casing)",
-                "1x Maintenance Hatch (Any bottom layer casing)",
-                "1x Muffler Hatch (Top middle)",
-                "1x Output Hatch to recover CO2/CO/SO2 (optional, any top layer casing),",
-                "    Recovery scales with Muffler Hatch tier",
-                "Heat Proof Machine Casings for the rest",
-                "Each 900K over the min. Heat Capacity multiplies eu/t by 0.95",
-                "Each 1800K over the min. Heat Capacity allows for one upgraded overclock",
-                "Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%",
-                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Blast Furnace")
+		.addInfo("Controller block for the Electric Blast Furnace")
+		.addInfo("You can use some fluids to reduce recipe time. Place the circuit in the Input Bus")
+		.addInfo("Each 900K over the min. Heat required multiplies EU/t by 0.95")
+		.addInfo("Each 1800K over the min. Heat required allows for one upgraded overclock instead of normal")
+		.addInfo("Upgraded overclocks reduce recipe time to 25% (instead of 50%) and increase EU/t to 400%")
+		.addInfo("Additionally gives +100K for every tier past MV")
+		.addPollutionAmount(20 * getPollutionPerTick(null))
+		.addSeparator()
+		.beginStructureBlock(3, 4, 3, true)
+		.addController("Front bottom")
+		.addCasingInfo("Heat Proof Machine Casing", 0)
+		.addOtherStructurePart("Heating Coils (any tier)", "Two middle Layers")
+		.addEnergyHatch("Any bottom layer casing")
+		.addMaintenanceHatch("Any bottom layer casing")
+		.addMufflerHatch("Top middle")
+		.addInputBus("Any bottom layer casing")
+		.addInputHatch("Any bottom layer casing")
+		.addOutputBus("Any bottom layer casing")
+		.addOutputHatch("Gasses, Any top layer casing")
+		.addStructureInfo("Recovery amount scales with Muffler Hatch tier")
+		.addOutputHatch("Platline fluids, Any bottom layer casing")
+		.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_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
index 77290441cd..9da832c81a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
@@ -1,10 +1,13 @@
 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.IIconContainer;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.block.Block;
 
 public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionComputer {
@@ -48,13 +51,29 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
     }
 
     public String[] getDescription() {
-        return new String[]{
-        		"It's over 9000!!!", 
-        		"LuV Machine Casings around Superconducting Coil Blocks", 
-        		"2-16 Input Hatches", "1-16 Output Hatches", 
-        		"1-16 Energy Hatches", 
-        		"All Hatches must be LuV or better", 
-        		"2048EU/t and 10mio EU Cap per Energy Hatch"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Fusion Reactor")
+		.addInfo("It's over 9000!!!")
+		.addInfo("Controller block for the Fusion Reactor Mk I")
+		.addInfo("2048EU/t and 10M EU capacity per Energy Hatch")
+		.addInfo("If the recipe has a startup cost greater than the")
+		.addInfo("number of energy hatches * cap, you can't do it")
+		.addSeparator()
+		.beginStructureBlock(15, 3, 15, false)
+		.addController("See diagram when placed")
+		.addCasingInfo("LuV Machine Casing", 79)
+		.addStructureInfo("Cover the coils with casing")
+		.addOtherStructurePart("Superconducting Coil Block", "Center part of the ring")
+		.addEnergyHatch("1-16, Specified casings")
+		.addInputHatch("2-16, Specified casings")
+		.addOutputHatch("1-16, Specified casings")
+		.addStructureInfo("ALL Hatches must be LuV or better")
+		.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_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java
index c091d637bc..7a363f8f6f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java
@@ -1,10 +1,13 @@
 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.IIconContainer;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.block.Block;
 
 public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionComputer {
@@ -48,14 +51,29 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC
     }
 
     public String[] getDescription() {
-        return new String[]{
-        		"It's over 9000!!!", 
-        		"Fusion Machine Casings around Fusion Coil Blocks", 
-        		"2-16 Input Hatches", 
-        		"1-16 Output Hatches", 
-        		"1-16 Energy Hatches", 
-        		"All Hatches must be ZPMV or better", 
-        		"4096EU/t and 20mio EU Cap per Energy Hatch"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Fusion Reactor")
+		.addInfo("It's over 9000!!!")
+		.addInfo("Controller block for the Fusion Reactor Mk II")
+		.addInfo("4096EU/t and 20M EU capacity per Energy Hatch")
+		.addInfo("If the recipe has a startup cost greater than the")
+		.addInfo("number of energy hatches * cap, you can't do it")
+		.addSeparator()
+		.beginStructureBlock(15, 3, 15, false)
+		.addController("See diagram when placed")
+		.addCasingInfo("Fusion Machine Casing", 79)
+		.addStructureInfo("Cover the coils with casing")
+		.addOtherStructurePart("Fusion Coil Block", "Center part of the ring")
+		.addEnergyHatch("1-16, Specified casings")
+		.addInputHatch("2-16, Specified casings")
+		.addOutputHatch("1-16, Specified casings")
+		.addStructureInfo("ALL Hatches must be ZPM or better")
+		.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_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java
index bc50b5ee5f..a575427791 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java
@@ -1,10 +1,13 @@
 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.IIconContainer;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.block.Block;
 
 public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionComputer {
@@ -48,14 +51,29 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC
     }
 
     public String[] getDescription() {
-        return new String[]{
-        		"A SUN DOWN ON EARTH", 
-        		"Fusion Machine Casings MK II around Fusion Coil Blocks", 
-        		"2-16 Input Hatches", 
-        		"1-16 Output Hatches", 
-        		"1-16 Energy Hatches", 
-        		"All Hatches must be UV or better", 
-        		"8192EU/t and 40mio EU Cap per Energy Hatch"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Fusion Reactor")
+		.addInfo("A SUN DOWN ON EARTH")
+		.addInfo("Controller block for the Fusion Reactor Mk III")
+		.addInfo("8192EU/t and 40M EU capacity per Energy Hatch")
+		.addInfo("If the recipe has a startup cost greater than the")
+		.addInfo("number of energy hatches * cap, you can't do it")
+		.addSeparator()
+		.beginStructureBlock(15, 3, 15, false)
+		.addController("See diagram when placed")
+		.addCasingInfo("Fusion Machine Casing Mk II", 79)
+		.addStructureInfo("Cover the coils with casing")
+		.addOtherStructurePart("Fusion Coil Block", "Center part of the ring")
+		.addEnergyHatch("1-16, Specified casings")
+		.addInputHatch("2-16, Specified casings")
+		.addOutputHatch("1-16, Specified casings")
+		.addStructureInfo("ALL Hatches must be UV or better")
+		.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_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
index 4dcd9121a8..dfa58c6407 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
@@ -1,5 +1,7 @@
 package gregtech.common.tileentities.machines.multi;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -13,6 +15,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -41,16 +44,30 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Heat Exchanger",
-                "Size(WxHxD): 3x4x3, Controller (Front middle at bottom)",
-                "3x3x4 of Stable Titanium Machine Casings (hollow, Min 20!)",
-                "2x Titanium Pipe Casing (Inside the Hollow Machine Casings)",
-                "1x Distillated Water Input (Any casing)",
-                "1x Steam Output (Any casing)",
-                "1x Hot Fluid Input (Bottom center)",
-                "1x Cold Fluid Output (Top Center)",
-                "1x Maintenance Hatch (Any casing)"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Heat Exchanger")
+		.addInfo("Controller Block for the Large Heat Exchanger")
+		.addInfo("More complicated than a Fusion Reactor. Seriously")
+		.addInfo("Inputs are Hot Coolant or Lava")
+		.addInfo("Outputs Coolant or Pahoehoe Lava and SH Steam/Steam")
+		.addInfo("Read the wiki article to understand how it works")
+		.addInfo("Then go to the Discord to understand the wiki")
+		.addSeparator()
+		.beginStructureBlock(3, 4, 3, false)
+		.addController("Front bottom")
+		.addCasingInfo("Stable Titanium Machine Casing", 20)
+		.addOtherStructurePart("Titanium Pipe Casing", "Center 2 blocks")
+		.addMaintenanceHatch("Any casing")
+		.addInputHatch("Hot fluid, bottom center")
+		.addInputHatch("Distilled water, any casing")
+		.addOutputHatch("Cold fluid, top center")
+		.addOutputHatch("Steam/SH Steam, any 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_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
index edce80fdf4..9e002badbf 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
@@ -8,6 +8,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.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -17,6 +18,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_ImplosionCompressor
         extends GT_MetaTileEntity_MultiBlockBase {
     public GT_MetaTileEntity_ImplosionCompressor(int aID, String aName, String aNameRegional) {
@@ -32,17 +35,27 @@ public class GT_MetaTileEntity_ImplosionCompressor
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Implosion Compressor",
-                "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)",
-                "1x Input Bus (Any casing)",
-                "1x Output Bus (Any casing)",
-                "1x Maintenance Hatch (Any casing)",
-                "1x Muffler Hatch (Any casing)",
-                "1x Energy Hatch (Any casing)",
-                "Solid Steel Machine Casings for the rest (16 at least!)",
-                "Casings can be replaced with Explosion Warning Signs",
-                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Implosion Compressor")
+		.addInfo("Explosions are fun")
+		.addInfo("Controller block for the Implosion Compressor")
+		.addPollutionAmount(20 * getPollutionPerTick(null))
+		.addSeparator()
+		.beginStructureBlock(3, 3, 3, true)
+		.addController("Front center")
+		.addCasingInfo("Solid Steel Machine Casing", 16)
+		.addStructureInfo("Casings can be replaced with Explosion Warning Signs")
+		.addEnergyHatch("Any casing")
+		.addMaintenanceHatch("Any casing")
+		.addMufflerHatch("Any casing")
+		.addInputBus("Any casing")
+		.addOutputBus("Any casing")
+		.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_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 0781397ecc..551abdf38a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -18,6 +18,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 public abstract class GT_MetaTileEntity_LargeBoiler
         extends GT_MetaTileEntity_MultiBlockBase {
     private boolean firstRun = true;
@@ -35,22 +37,32 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Large Boiler",
-                "Produces " + (getEUt() * 40) * (runtimeBoost(20) / 20f) + "L of Steam with 1 Coal at " + getEUt() * 40 + "L/s",
-                "A programmed circuit in the main block throttles the boiler (-1000L/s per config)",
-                "Size(WxHxD): 3x5x3, Controller (Front middle in Fireboxes)",
-                "3x1x3 of "+getCasingMaterial()+" Fire Boxes (Bottom layer, Min 3)",
-                "3x4x3 of "+getCasingMaterial()+" " +getCasingBlockType()+ " Casings (Above Fireboxes, hollow, Min 24!)",
-                "3 "+getCasingMaterial()+" Pipe Casing Blocks (Inside the Hollow Casing)",
-                "1x Input Fuel Hatch/Bus (Any Firebox)",
-                "1x Input Water Hatch (Any Firebox)",
-                "1x Output Hatch (Any Casing)",
-                "1x Maintenance Hatch (Any Firebox)",
-                "1x Muffler Hatch (Any Firebox)",
-                String.format("Diesel fuels have 1/4 efficiency - Takes %.2f seconds to heat up", 500.0 / getEfficiencyIncrease()),
-                "Causes up to " + 20 * getPollutionPerTick(null) + " Pollution per second"
-};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Boiler")
+		.addInfo("Controller block for the Large " + getCasingMaterial() + " Boiler")
+		.addInfo("Produces " + (getEUt() * 40) * (runtimeBoost(20) / 20f) + "L of Steam with 1 Coal at " + getEUt() * 40 + "L/s")//?
+		.addInfo("A programmed circuit in the main block throttles the boiler (-1000L/s per config)")
+		.addInfo(String.format("Diesel fuels have 1/4 efficiency - Takes %.2f seconds to heat up", 500.0 / getEfficiencyIncrease()))//? check semifluid again
+		.addPollutionAmount(20 * getPollutionPerTick(null))
+		.addSeparator()
+		.beginStructureBlock(3, 5, 3, false)
+		.addController("Front bottom")
+		.addCasingInfo(getCasingMaterial() + " " + getCasingBlockType() + " Casing", 24)//?
+		.addOtherStructurePart(getCasingMaterial() + " Fire Boxes", "Bottom layer, 3 minimum")
+		.addOtherStructurePart(getCasingMaterial() + " Pipe Casing Blocks", "Inner 3 blocks")
+		.addMaintenanceHatch("Any firebox")
+		.addMufflerHatch("Any firebox")
+		.addInputBus("Solid fuel, Any firebox")
+		.addInputHatch("Liquid fuel, Any firebox")
+		.addStructureInfo("You can use either, or both")
+		.addInputHatch("Water, Any firebox")
+		.addOutputHatch("Steam, any casing")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
     
     public abstract String getCasingMaterial();
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
index c5f1852629..d462b9a36d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
@@ -45,18 +45,19 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu
 		.addInfo("Controller block for the Large Chemical Reactor")
 		.addInfo("Does not lose efficiency when overclocked")
 		.addInfo("Accepts fluids instead of fluid cells")
-		.beginStructureBlock(3, 3, 3)
-		.addController("Front centered")
-		.addCasingInfo("Chemically Inert Machine Casings", 8)
+		.addSeparator()
+		.beginStructureBlock(3, 3, 3, false)
+		.addController("Front center")
+		.addCasingInfo("Chemically Inert Machine Casing", 8)
 		.addOtherStructurePart("PTFE Pipe Machine Casing", "Center")
 		.addOtherStructurePart("Cupronickel Coil Block", "Adjacent to the PTFE Pipe Machine Casing")
-		.addEnergyHatch("Any Casing")
-		.addMaintenanceHatch("Any Casing")
-		.addInputBus("Any Casing")
-		.addInputHatch("Any Casing")
-		.addOutputBus("Any Casing")
-		.addOutputHatch("Any Casing")
-		.addStructureInfo("You can have multiple I/O hatches/busses")
+		.addEnergyHatch("Any casing")
+		.addMaintenanceHatch("Any casing")
+		.addInputBus("Any casing")
+		.addInputHatch("Any casing")
+		.addOutputBus("Any casing")
+		.addOutputHatch("Any casing")
+		.addStructureInfo("You can have multiple hatches/busses")
 		.toolTipFinisher("Gregtech");
 		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
 			return tt.getInformation();
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
index 4bd44ef80c..6c482db6e7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
@@ -3,12 +3,15 @@ package gregtech.common.tileentities.machines.multi;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 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_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
@@ -31,18 +34,26 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
         return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS5) : Textures.BlockIcons.casingTexturePages[0][58]};
     }
 
-
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Large Gas Turbine",
-                "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)",
-                "1x Gas Input Hatch (Side centered)",
-                "1x Maintenance Hatch (Side centered)",
-                "1x Muffler Hatch (Side centered)",
-                "1x Dynamo Hatch (Back centered)",
-                "Stainless Steel Turbine Casings for the rest (24 at least!)",
-                "Needs a Turbine Item (Inside controller GUI)",
-                "Produces " + getPollutionPerTick(null)*20 + " pollution per second"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Gas Turbine")
+		.addInfo("Controller block for the Large Gas Turbine")
+		.addInfo("Needs a Turbine, place inside controller")
+		.addPollutionAmount(20 * getPollutionPerTick(null))
+		.addSeparator()
+		.beginStructureBlock(3, 3, 4, true)
+		.addController("Front center")
+		.addCasingInfo("Stainless Steel Turbine Casing", 24)
+		.addDynamoHatch("Back center")
+		.addMaintenanceHatch("Side centered")
+		.addMufflerHatch("Side centered")
+		.addInputHatch("Gas Fuel, Side centered")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
     public int getFuelValue(FluidStack aLiquid) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index c6f6e36c44..2355b89fa8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -4,6 +4,8 @@ import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -12,6 +14,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -38,17 +41,27 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Large High Pressure Steam Turbine",
-                "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)",
-                "1x Superheated Steam Input Hatch (Side centered)",
-                "1x Maintenance Hatch (Side centered)",
-                "1x Dynamo Hatch (Back centered)",
-                "1x Output Hatch for Steam (Side centered)",
-                "Titanium Turbine Casings for the rest (24 at least!)",
-                "Needs a Turbine Item (Inside controller GUI)",
-                "Output depending on Rotor and fitting",
-                "Use screwdriver to adjust fitting of turbine"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Steam Turbine")
+		.addInfo("Controller block for the Large High Pressure Steam Turbine")
+		.addInfo("Needs a Turbine, place inside controller")
+		.addInfo("Outputs Steam as well as producing power")
+		.addInfo("Power output depends on turbine and fitting")
+		.addInfo("Use screwdriver to adjust fitting of turbine")
+		.addSeparator()
+		.beginStructureBlock(3, 3, 4, true)
+		.addController("Front center")
+		.addCasingInfo("Titanium Turbine Casing", 24)
+		.addDynamoHatch("Back center")
+		.addMaintenanceHatch("Side centered")
+		.addInputHatch("Superheated Steam, Side centered")
+		.addOutputHatch("Steam, Side centered")
+		.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_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
index be62ff2d97..bb5134097a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
@@ -3,6 +3,8 @@ package gregtech.common.tileentities.machines.multi;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -10,6 +12,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 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_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
@@ -33,17 +36,26 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
         return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_TU5) : Textures.BlockIcons.casingTexturePages[0][60]};
     }
 
-
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Large Plasma Generator",
-                "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)",
-                "1x Plasma Input Hatch (Side centered)",
-                "1x Maintenance Hatch (Side centered)",
-                "1x Output Hatch (Side centered, optional)",
-                "1x Dynamo Hatch (Back centered)",
-                "Tungstensteel Turbine Casings for the rest (24 at least!)",
-                "Needs a Turbine Item (Inside controller GUI)"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Plasma Turbine")
+		.addInfo("Controller block for the Large Plasma Generator")
+		.addInfo("Needs a Turbine, place inside controller")
+		.addInfo("Use your Fusion Reactor to produce the Plasma")
+		.addSeparator()
+		.beginStructureBlock(3, 3, 4, true)
+		.addController("Front center")
+		.addCasingInfo("Tungstensteel Turbine Casing", 24)
+		.addDynamoHatch("Back center")
+		.addMaintenanceHatch("Side centered")
+		.addInputHatch("Plasma Fluid, Side centered")
+		.addOutputHatch("Molten Fluid, optional, Side centered")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
     public int getFuelValue(FluidStack aLiquid) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 2943f6f946..20bcbf10d0 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -4,6 +4,8 @@ import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -12,6 +14,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -40,17 +43,27 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Large Steam Turbine",
-                "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)",
-                "1x Steam Input Hatch (Side centered)",
-                "1x Maintenance Hatch (Side centered)",
-                "1x Dynamo Hatch (Back centered)",
-                "1x Output Hatch for Distilled Water (Side centered)",
-                "Turbine Casings for the rest (24 at least!)",
-                "Needs a Turbine Item (Inside controller GUI)",
-                "Output depending on Rotor and fitting",
-                "Use screwdriver to adjust fitting of turbine"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Steam Turbine")
+		.addInfo("Controller block for the Large Steam Turbine")
+		.addInfo("Needs a Turbine, place inside controller")
+		.addInfo("Outputs Distilled Water as well as producing power")
+		.addInfo("Power output depends on turbine and fitting")
+		.addInfo("Use screwdriver to adjust fitting of turbine")
+		.addSeparator()
+		.beginStructureBlock(3, 3, 4, true)
+		.addController("Front center")
+		.addCasingInfo("Turbine Casing", 24)
+		.addDynamoHatch("Back center")
+		.addMaintenanceHatch("Side centered")
+		.addInputHatch("Steam, Side centered")
+		.addOutputHatch("Distilled Water, Side centered")
+		.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_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
index cdc68702d2..5eca30def1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
@@ -4,6 +4,8 @@ import static gregtech.api.enums.GT_Values.VN;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -15,6 +17,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffl
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
+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;
@@ -41,18 +44,28 @@ public class GT_MetaTileEntity_MultiFurnace
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Multi Smelter",
-                "Smelts up to 8-128 Items at once",
-                "Size(WxHxD): 3x3x3 (Hollow), Controller (Front middle at bottom)",
-                "8x Heating Coils (Middle layer, hollow)",
-                "1x Input Bus (One of bottom)",
-                "1x Output Bus (One of bottom)",
-                "1x Maintenance Hatch (One of bottom)",
-                "1x Muffler Hatch (Top middle)",
-                "1x Energy Hatch (One of bottom)",
-                "Heat Proof Machine Casings for the rest",
-                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Furnace")
+		.addInfo("Controller Block for the Multi Smelter")
+		.addInfo("Smelts up to 8-128 items at once")
+		.addInfo("Items smelted increases with coil tier")
+		.addPollutionAmount(20 * getPollutionPerTick(null))
+		.addSeparator()
+		.beginStructureBlock(3, 3, 3, true)
+		.addController("Front bottom")
+		.addCasingInfo("Heat Proof Machine Casing", 8)
+		.addOtherStructurePart("Heating Coils (any tier)", "Middle layer")
+		.addEnergyHatch("Any bottom casing")
+		.addMaintenanceHatch("Any bottom casing")
+		.addMufflerHatch("Top Middle")
+		.addInputBus("Any bottom casing")
+		.addOutputBus("Any bottom casing")
+		.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_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
index 9519d901d7..e4ad65e4a4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
@@ -11,6 +11,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
+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;
@@ -20,6 +21,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBase {
     private ForgeDirection orientation;
     private int controllerX, controllerZ;
@@ -33,18 +36,29 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Oil Cracking Unit",
-                "Thermally cracks heavy hydrocarbons into lighter fractions",
-                "Size(WxHxD): 5x3x3 (Hollow), Controller (Front center)",
-                "Ring of 8 Cupronickel Coils (Each side of Controller)",
-                "1x Hydrocarbon Input Bus/Hatch (Any left/right side casing)",
-                "1x Steam/Hydrogen Input Hatch (Any middle ring casing)",
-                "1x Cracked Hydrocarbon Output Hatch (Any left/right side casing)",
-                "1x Maintenance Hatch (Any casing)",
-                "1x Energy Hatch (Any casing)",
-                "Clean Stainless Steel Machine Casings for the rest (18 at least!)",
-                "Input/Output Hatches must be on opposite sides"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Cracker")
+		.addInfo("Controller block for the Oil Cracking Unit")
+		.addInfo("Thermally cracks heavy hydrocarbons into lighter fractions")
+		.addInfo("More efficient than the Chemical Reactor")
+		.addInfo("Place the appropriate circuit in the controller")
+		.addSeparator()
+		.beginStructureBlock(5, 3, 3, true)
+		.addController("Front center")
+		.addCasingInfo("Clean Stainless Steel Machine Casing", 18)
+		.addOtherStructurePart("2 Rings of 8 Cupronickel Coils", "Each side of the controller")
+		.addEnergyHatch("Any casing")
+		.addMaintenanceHatch("Any casing")
+		.addInputHatch("Steam/Hydrogen, Any middle ring casing")
+		.addInputHatch("Any left/right side casing")
+		.addOutputHatch("Any left/right side casing")
+		.addStructureInfo("Input/Output Hatches must be on opposite sides!")
+		.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_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
index 76f8e7f87f..a7a7023d34 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
@@ -3,6 +3,7 @@ package gregtech.common.tileentities.machines.multi;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -16,6 +17,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 import static gregtech.api.enums.GT_Values.VN;
 import static gregtech.api.enums.GT_Values.debugDriller;
 import static gregtech.common.GT_UndergroundOil.undergroundOil;
@@ -55,18 +58,30 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
 
     protected String[] getDescriptionInternal(String tierSuffix) {
         String casings = getCasingBlockItem().get(0).getDisplayName();
-        return new String[]{
-                "Controller Block for the Oil/Gas/Fluid Drilling Rig " + (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 Output Hatch (One of base casings)",
-                "1x Maintenance Hatch (One of base casings)",
-                "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
-                "Working on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks",
-                "Use Screwdriver to configure range",
-                "Use Programmed Circuits to ignore near exhausted oil field"};
+        
+        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Pump")
+		.addInfo("Controller Block for the Oil/Gas/Fluid Drilling Rig " + (tierSuffix != null ? tierSuffix : ""))
+		.addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks")
+		.addInfo("Use a Screwdriver to configure range")
+		.addInfo("Use Programmed Circuits to ignore near exhausted oil field")
+		.addInfo("If total circuit # is greater than output amount it will halt. If it worked right.")//doesn't work
+		.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 or Circuits, optional, any base casing")
+		.addOutputHatch("Any base casing")
+		.toolTipFinisher("Gregtech");
+		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return tt.getInformation();
+		} else {
+			return tt.getStructureInformation();
+		}
     }
 
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
index 5ead0bf896..2e367e63e8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -8,6 +8,7 @@ import gregtech.api.interfaces.IChunkLoader;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_ChunkManager;
 import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
@@ -32,6 +33,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 
+import org.lwjgl.input.Keyboard;
+
 import static gregtech.api.enums.GT_Values.VN;
 
 public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTileEntity_DrillerBase implements IChunkLoader {
@@ -335,22 +338,33 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
 
     protected String[] getDescriptionInternal(String tierSuffix) {
         String casings = getCasingBlockItem().get(0).getDisplayName();
-        return new String[]{
-                "Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : ""),
-                "Size(WxHxD): 3x7x3, Controller (Front middle 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 for drilling fluid (Any bottom layer casing)",
-                "1x Input Bus for mining pipes (Any bottom layer casing; not necessary)",
-                "1x Output Bus (Any bottom layer casing)",
-                "1x Maintenance Hatch (Any bottom layer casing)",
-                "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
-                "Use Screwdriver to configure block radius",
-                "Use Soldering iron to turn off chunk mode",
-                "Maximum radius is " + (getRadiusInChunks() << 4) + " blocks",
-                "In chunk mode working area center is the chunk corner nearest to the drill",
-                "Fortune bonus of " + (mTier + 3)};
+        
+        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Miner")
+		.addInfo("Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : ""))
+		.addInfo("Use a Screwdriver to configure block radius")
+		.addInfo("Maximum radius is " + (getRadiusInChunks() << 4) + " blocks")
+		.addInfo("Use Soldering iron to turn off chunk mode")
+		.addInfo("In chunk mode, working area center is the chunk corner nearest to the drill")
+		.addInfo("Gives ~3x as much crushed ore vs normal processing")
+		.addInfo("Fortune bonus of " + (mTier + 3) + ". Only works on small ores")
+		.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("Drilling Fluid, any base casing")
+		.addOutputBus("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_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 850908104b..2496d02a42 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -12,6 +12,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
 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_ProcessingArray_Manager;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -25,6 +26,7 @@ import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.ArrayUtils;
+import org.lwjgl.input.Keyboard;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,18 +56,31 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Processing Array",
-                "Runs supplied machines as if placed in the world",
-                "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)",
-                "1x Input Hatch/Bus (Any casing)",
-                "1x Output Hatch/Bus (Any casing)",
-                "1x Maintenance Hatch (Any casing)",
-                "1x Energy Hatch (Any casing)",
-                "Robust Tungstensteel Machine Casings for the rest (14 at least!)",
-                "Place up to 64 Single Block GT Machines into the Controller Inventory",
-                "Use screwdriver to enable separate input busses",
-                "Maximal overclockedness of machines inside: Tier 9"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Processing Array")
+		.addInfo("Runs supplied machines as if placed in the world")
+		.addInfo("Place up to 64 singleblock GT machines into the controller")
+		.addInfo("Note that tou still need to supply power to them all")
+		.addInfo("Use a screwdriver to enable separate input busses")
+		.addInfo("Maximal overclockedness of machines inside: Tier 9")
+		.addInfo("Doesn't work on certain machines, deal with it")
+		.addInfo("Use it if you hate GT++, or want even more speed later on")
+		.addSeparator()
+		.beginStructureBlock(3, 3, 3, true)
+		.addController("Front center")
+		.addCasingInfo("Robust Tungstensteel Machine Casing", 14)
+		.addEnergyHatch("Any casing")
+		.addMaintenanceHatch("Any casing")
+		.addInputBus("Any casing")
+		.addInputHatch("Any casing")
+		.addOutputBus("Any casing")
+		.addOutputHatch("Any casing")
+		.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_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
index eee88dfb21..1d9b360338 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
@@ -10,6 +10,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.api.util.GT_Utility;
 import gregtech.loaders.oreprocessing.ProcessingLog;
@@ -23,6 +24,8 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlockBase {
 	
 	private int coilMetaID;
@@ -38,21 +41,32 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Pyrolyse Oven",
-                "Industrial Charcoal producer and Oil from Plants",
-                "Size(WxHxD): 5x4x5, Controller (Bottom center)",
-                "3x1x3 of Heating Coils (At the center of the bottom layer)",
-                "1x Input Hatch/Bus (Centered 3x1x3 area in Top layer)",
-                "1x Output Hatch/Bus (Any bottom layer casing)",
-                "1x Maintenance Hatch (Any bottom layer casing)",
-                "1x Muffler Hatch (Centered 3x1x3 area in Top layer)",
-                "1x Energy Hatch (Any bottom layer casing)",
-                "Pyrolyse Oven Casings for the rest (60 at least!)",
-                "Processing speed scales linearly with Coil tier:",
-                "CuNi: 50%, FeAlCr: 100%, Ni4Cr: 150%, Fe50CW: 200%, etc.",
-                "EU/t is not affected by Coil tier",
-                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Coke Oven")
+		.addInfo("Controller block for the Pyrolyse Oven")
+		.addInfo("Industrial Charcoal producer")
+		.addInfo("Processing speed scales linearly with Coil tier:")
+		.addInfo("CuNi: 50%, FeAlCr: 100%, Ni4Cr: 150%, Fe50CW: 200%, etc.")
+		.addInfo("EU/t is not affected by Coil tier")
+		.addPollutionAmount(20 * getPollutionPerTick(null))
+		.addSeparator()
+		.beginStructureBlock(5, 4, 5, true)
+		.addController("Front center")
+		.addCasingInfo("Pyrolyse Oven Casing", 60)
+		.addOtherStructurePart("Heating Coils (any tier)", "Center 3x1x3 of the bottom layer")
+		.addEnergyHatch("Any bottom layer casing")
+		.addMaintenanceHatch("Any bottom layer casing")
+		.addMufflerHatch("Center 3x1x3 area in top layer")
+		.addInputBus("Center 3x1x3 area in top layer")
+		.addInputHatch("Center 3x1x3 area in top layer")
+		.addOutputBus("Any bottom layer casing")
+		.addOutputHatch("Any bottom layer casing")
+		.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_VacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
index 834b97aa9d..bf4b1e9db7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
@@ -8,6 +8,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.api.util.GT_Utility;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -16,6 +17,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import java.util.ArrayList;
 
+import org.lwjgl.input.Keyboard;
+
 public class GT_MetaTileEntity_VacuumFreezer
         extends GT_MetaTileEntity_MultiBlockBase {
     public GT_MetaTileEntity_VacuumFreezer(int aID, String aName, String aNameRegional) {
@@ -31,15 +34,24 @@ public class GT_MetaTileEntity_VacuumFreezer
     }
 
     public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Vacuum Freezer",
-                "Super cools hot ingots and cells",
-                "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)",
-                "1x Input Bus (Any casing)",
-                "1x Output Bus (Any casing)",
-                "1x Maintenance Hatch (Any casing)",
-                "1x Energy Hatch (Any casing)",
-                "Frost Proof Machine Casings for the rest (16 at least!)"};
+    	final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType("Vacuum Freezer")
+		.addInfo("Controller Block for the Vacuum Freezer")
+		.addInfo("Cools hot ingots and cells")
+		.addSeparator()
+		.beginStructureBlock(3, 3, 3, true)
+		.addController("Front center")
+		.addCasingInfo("Frost Proof Machine Casing", 16)
+		.addEnergyHatch("Any casing")
+		.addMaintenanceHatch("Any casing")
+		.addInputBus("Any casing")
+		.addOutputBus("Any casing")
+		.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/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 53970634f9..c3c5a574af 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -1,19 +1,20 @@
 # Multiblock Tooltip Builder Keywords
 # Context can be found in the class gregtech.api.util.GT_Multiblock_Tooltip_Builder
-GT5U.MBTT.MachineType=Machine Type:
-GT5U.MBTT.Dimensions=Dimensions:
-GT5U.MBTT.Structure=Structure:
-GT5U.MBTT.Controller=Controller:
+GT5U.MBTT.MachineType=Machine Type
+GT5U.MBTT.Dimensions=Dimensions
+GT5U.MBTT.Hollow=(Hollow)
+GT5U.MBTT.Structure=Structure
+GT5U.MBTT.Controller=Controller
 GT5U.MBTT.Minimum=(minimum)
-GT5U.MBTT.MaintenanceHatch=Maintenance Hatch:
-GT5U.MBTT.MufflerHatch=Muffler Hatch:
-GT5U.MBTT.EnergyHatch=Energy Hatch:
-GT5U.MBTT.DynamoHatch=Dynamo Hatch:
-GT5U.MBTT.InputBus=Input Bus/ses:
-GT5U.MBTT.InputHatch=Input Hatch/es:
-GT5U.MBTT.OutputBus=Output Bus/ses:
-GT5U.MBTT.OutputHatch=Output Hatch/es:
-GT5U.MBTT.Causes=Causes:
+GT5U.MBTT.MaintenanceHatch=Maintenance Hatch
+GT5U.MBTT.MufflerHatch=Muffler Hatch
+GT5U.MBTT.EnergyHatch=Energy Hatch
+GT5U.MBTT.DynamoHatch=Dynamo Hatch
+GT5U.MBTT.InputBus=Input Bus
+GT5U.MBTT.InputHatch=Input Hatch
+GT5U.MBTT.OutputBus=Output Bus
+GT5U.MBTT.OutputHatch=Output Hatch
+GT5U.MBTT.Causes=Causes
 GT5U.MBTT.PPS=pollution per second
 GT5U.MBTT.Hold=Hold
 GT5U.MBTT.Display=to display structure guidelines
-- 
cgit 


From 5679f2c3aa052b4f5909a04cb350fd1da08b39ff Mon Sep 17 00:00:00 2001
From: Prometheus0000000 <prometheus0000000@gmail.com>
Date: Fri, 20 Nov 2020 01:12:02 -0500
Subject: Fix merger problem

---
 src/main/java/gregtech/api/util/GT_Recipe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index abbb6aef1b..a9a001a0d4 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -614,7 +614,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public static final GT_Recipe_Map sHammerRecipes = new GT_Recipe_Map(new HashSet<>(3800), "gt.recipe.hammer", "Forge Hammer", null, RES_PATH_GUI + "basicmachines/Hammer", 1, 1, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sAmplifiers = new GT_Recipe_Map(new HashSet<>(2), "gt.recipe.uuamplifier", "Amplifabricator", null, RES_PATH_GUI + "basicmachines/Amplifabricator", 1, 0, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sMassFabFakeRecipes = new GT_Recipe_Map(new HashSet<>(2), "gt.recipe.massfab", "Mass Fabrication", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 0, 1, 0, 10, E, 1, E, true, true);
-        public static final GT_Recipe_Map_Fuel sDieselFuels = new GT_Recipe_Map_Fuel(new HashSet<>(20), "gt.recipe.dieselgeneratorfuel", "Diesel Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
+        public static final GT_Recipe_Map_Fuel sDieselFuels = new GT_Recipe_Map_Fuel(new HashSet<>(20), "gt.recipe.dieselgeneratorfuel", "Combustion Generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sExtremeDieselFuels = new GT_Recipe_Map_Fuel(new HashSet<>(20), "gt.recipe.extremedieselgeneratorfuel", "Extreme Diesel Engine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sTurbineFuels = new GT_Recipe_Map_Fuel(new HashSet<>(25), "gt.recipe.gasturbinefuel", "Gas Turbine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
         public static final GT_Recipe_Map_Fuel sHotFuels = new GT_Recipe_Map_Fuel(new HashSet<>(10), "gt.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, false);
-- 
cgit 


From a65bc5d9189095398d85b36cb0e2890ef5f106ce Mon Sep 17 00:00:00 2001
From: Uristqwerty <Uristqwerty@gmail.com>
Date: Thu, 26 Nov 2020 04:29:20 -0500
Subject: isRecipeInputEqual optimization (#351)

* Optimize GT_Recipe.isRecipeInputEqual

Used HEAVILY to catch duplicate recipes during game startup. Worst-case, it
would result in 5 GT_OreDictUnificator.get calls for each pair of inputs.
Instead, this is closer to 1 + 1/N, and as an added bonus, the modified
unification it now uses doesn't copy its output only for it to be discarded
immediately after comparison.

Apart from inproved startup times, this might make a small difference when
machines switch recipes.

I am making an assumption that
GT_OreDictUnificator.get(true, GT_OreDictUnificator.get(false, stack))
is equivalent to a just GT_OreDictUnificator.get(false, stack), and the
original code only double-unificated because it was easier to code. If this
turns out to be false, there's still some performance gain from factoring
out the tStack unification, but some of the optimization here would be lost.

* Changed method visibility according to PR feedback
---
 .../gregtech/api/util/GT_OreDictUnificator.java    | 53 ++++++++++++++++++++++
 src/main/java/gregtech/api/util/GT_Recipe.java     |  5 +-
 2 files changed, 56 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
index 9d9b45cecf..188af9cfaa 100644
--- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
+++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
@@ -156,6 +156,59 @@ public class GT_OreDictUnificator {
         return GT_Utility.copyAmount(aStack.stackSize, rStack);
     }
 
+    /** Doesn't copy the returned stack or set quantity. Be careful and do not mutate it;
+     * intended only to optimize comparisons */
+    static ItemStack get_nocopy(boolean aUseBlackList, ItemStack aStack) {
+        if (GT_Utility.isStackInvalid(aStack)) return null;
+        ItemData tPrefixMaterial = getAssociation(aStack);
+        ItemStack rStack = null;
+        if (tPrefixMaterial == null || !tPrefixMaterial.hasValidPrefixMaterialData() || (aUseBlackList && tPrefixMaterial.mBlackListed))
+            return aStack;
+        if (aUseBlackList && !GregTech_API.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
+            tPrefixMaterial.mBlackListed = true;
+            return aStack;
+        }
+        if (tPrefixMaterial.mUnificationTarget == null)
+            tPrefixMaterial.mUnificationTarget = sName2StackMap.get(tPrefixMaterial.toString());
+        rStack = tPrefixMaterial.mUnificationTarget;
+        if (GT_Utility.isStackInvalid(rStack)) return aStack;
+        assert rStack != null;
+        rStack.setTagCompound(aStack.getTagCompound());
+        return rStack;
+    }
+
+    /** Compares the first argument against an already-unificated second argument as if
+     * aUseBlackList was both true and false. */
+    public static boolean isInputStackEqual(ItemStack aStack, ItemStack unified_tStack) {
+        boolean alreadyCompared = false;
+        if (GT_Utility.isStackInvalid(aStack)) return false;
+        ItemData tPrefixMaterial = getAssociation(aStack);
+        ItemStack rStack = null;
+        if (tPrefixMaterial == null || !tPrefixMaterial.hasValidPrefixMaterialData())
+            return GT_Utility.areStacksEqual(aStack, unified_tStack, true);
+        else if(tPrefixMaterial.mBlackListed) {
+            if (GT_Utility.areStacksEqual(aStack, unified_tStack, true))
+                return true;
+            else
+                alreadyCompared = true;
+        }
+        if (!alreadyCompared && !GregTech_API.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
+            tPrefixMaterial.mBlackListed = true;
+            if (GT_Utility.areStacksEqual(aStack, unified_tStack, true))
+                return true;
+            else
+                alreadyCompared = true;
+        }
+        if (tPrefixMaterial.mUnificationTarget == null)
+            tPrefixMaterial.mUnificationTarget = sName2StackMap.get(tPrefixMaterial.toString());
+        rStack = tPrefixMaterial.mUnificationTarget;
+        if (GT_Utility.isStackInvalid(rStack))
+            return !alreadyCompared && GT_Utility.areStacksEqual(aStack, unified_tStack, true);
+        assert rStack != null;
+        rStack.setTagCompound(aStack.getTagCompound());
+        return GT_Utility.areStacksEqual(rStack, unified_tStack, true);
+    }
+
     public static List<ItemStack> getNonUnifiedStacks(Object obj) {
     	synchronized (sUnificationTable) {
     		if (sUnificationTable.isEmpty() && !sItemStack2DataMap.isEmpty()) {
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index bf091695c7..537d92b365 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -389,11 +389,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         if (mInputs.length > 0 && aInputs == null) return false;
 
         for (ItemStack tStack : mInputs) {
-            if (tStack != null) {
+            ItemStack unified_tStack = GT_OreDictUnificator.get_nocopy(true, tStack);
+            if (unified_tStack != null) {
                 amt = tStack.stackSize;
                 boolean temp = true;
                 for (ItemStack aStack : aInputs) {
-                    if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
+                    if (GT_OreDictUnificator.isInputStackEqual(aStack, unified_tStack)) {
                         if (GTppRecipeHelper) {//remove once the fix is out
                             if (GT_Utility.areStacksEqual(aStack, Ic2Items.FluidCell.copy(), true) || GT_Utility.areStacksEqual(aStack, ItemList.Tool_DataStick.get(1L), true) || GT_Utility.areStacksEqual(aStack, ItemList.Tool_DataOrb.get(1L), true)) {
                                 if (!GT_Utility.areStacksEqual(aStack, tStack, false))
-- 
cgit 


From 98e9d3a4a2a9a5246608387d305818c52879c9c8 Mon Sep 17 00:00:00 2001
From: botn365 <42187820+botn365@users.noreply.github.com>
Date: Fri, 27 Nov 2020 00:24:32 +0100
Subject: fix-infinit-while

fix porention infinit while loop wit barrels/drawers
---
 src/main/java/gregtech/api/util/GT_Utility.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index b06cc1d82a..05e0874e7a 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -546,13 +546,14 @@ public class GT_Utility {
             for (int tGrabSlot = 0;tGrabSlot<tGrabInventorySize;tGrabSlot++)
             {
                 //ItemStack tInventoryStack : mInventory
-                int tMovedItems = 0;
+                int tMovedItems;
                 do {
+		    tMovedItems = 0;
                     ItemStack tGrabStack = aTileEntity1.getStackInSlot(tGrabSlot);
                     if (listContainsItem(aFilter, tGrabStack, true, aInvertFilter) &&
                             (tGrabStack.stackSize >= aMinMoveAtOnce && isAllowedToTakeFromSlot(aTileEntity1, tGrabSlot, aGrabFrom, tGrabStack))) {
                         int tStackSize = tGrabStack.stackSize;
-                        tMovedItems = 0;
+                        
                         for (int tPutSlot = tFirstsValidSlot; tPutSlot < tPutInventorySize; tPutSlot++) {
                             if (isAllowedToPutIntoSlot(tPutInventory, tPutSlot, aPutTo, tGrabStack, (byte) 64)) {
                                 int tMoved = moveStackFromSlotAToSlotB(aTileEntity1, tPutInventory, tGrabSlot, tPutSlot, aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItems), aMinMoveAtOnce);
-- 
cgit 


From 81008e38ac10436a7d447a20d8deac693e311bdf Mon Sep 17 00:00:00 2001
From: David Lindström <info@davidlindstrom.se>
Date: Sat, 5 Dec 2020 02:14:43 +0100
Subject: This makes batteries drain/charge their tier loss extra charging
 their contained machines buffer

---
 src/main/java/gregtech/api/util/GT_ModHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index 4d264bec9b..5cfcac0a89 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -1685,7 +1685,7 @@ public class GT_ModHandler {
                 int tTier = ((ic2.api.item.IElectricItem) aStack.getItem()).getTier(aStack);
                 if (tTier < 0 || tTier == aTier || aTier == Integer.MAX_VALUE) {
                     if (!aIgnoreLimit && tTier >= 0)
-                        aCharge = (int) Math.min(aCharge, V[Math.max(0, Math.min(V.length - 1, tTier))]);
+                        aCharge = (int) Math.min(aCharge, V[Math.max(0, Math.min(V.length - 1, tTier))] + B[Math.max(0, Math.min(V.length - 1, tTier))]);
                     if (aCharge > 0) {
 //						int rCharge = Math.max(0, ic2.api.item.ElectricItem.manager.discharge(aStack, aCharge + (aCharge * 4 > aTier ? aTier : 0), tTier, T, aSimulate));
                         int rCharge = (int) Math.max(0, ic2.api.item.ElectricItem.manager.discharge(aStack, aCharge + (aCharge * 4 > aTier ? aTier : 0), tTier, true, !aIgnoreDischargability, aSimulate));
-- 
cgit