From 546b42d7440839477455b818133d80221c70c582 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Sat, 29 May 2021 23:52:15 +0800
Subject: Initial StructureLib integration

---
 .../api/metatileentity/BaseMetaTileEntity.java     |  35 +++++-
 .../GT_MetaTileEntity_EnhancedMultiBlockBase.java  | 122 +++++++++++++++++++++
 .../GT_MetaTileEntity_MultiBlockBase.java          |   9 +-
 3 files changed, 156 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java

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

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 6c43799638..d108236a39 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -8,6 +8,10 @@ import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.IGridProxyable;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
+import com.gtnewhorizon.structurelib.alignment.IAlignment;
+import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
+import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
+import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import cpw.mods.fml.common.Optional;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -25,11 +29,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachin
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.net.GT_Packet_TileEntity;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_CoverBehavior;
-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.api.util.*;
 import gregtech.common.GT_Client;
 import gregtech.common.GT_Pollution;
 import ic2.api.Direction;
@@ -73,7 +73,7 @@ import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 @Optional.InterfaceList(value = {
     @Optional.Interface(iface = "appeng.api.networking.security.IActionHost", modid = "appliedenergistics2", striprefs = true),
     @Optional.Interface(iface = "appeng.me.helpers.IGridProxyable", modid = "appliedenergistics2", striprefs = true)})
-public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileEntity, IActionHost, IGridProxyable {
+public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileEntity, IActionHost, IGridProxyable, IAlignmentProvider {
     private final GT_CoverBehavior[] mCoverBehaviors = new GT_CoverBehavior[]{GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior};
     protected MetaTileEntity mMetaTileEntity;
     protected long mStoredEnergy = 0, mStoredSteam = 0;
@@ -2368,4 +2368,27 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
     public void setShutdownStatus(boolean newStatus) {
          mWasShutdown = newStatus;
     }
+
+    @Override
+    public IAlignment getAlignment() {
+        return getMetaTileEntity() instanceof IAlignmentProvider ? ((IAlignmentProvider) getMetaTileEntity()).getAlignment() : new BasicAlignment();
+    }
+
+    private class BasicAlignment implements IAlignment {
+
+        @Override
+        public ExtendedFacing getExtendedFacing() {
+            return ExtendedFacing.of(ForgeDirection.getOrientation(getFrontFacing()));
+        }
+
+        @Override
+        public void setExtendedFacing(ExtendedFacing alignment) {
+            setFrontFacing((byte) Math.max(alignment.getDirection().ordinal(), 5));
+        }
+
+        @Override
+        public IAlignmentLimits getAlignmentLimits() {
+            return (direction, rotation, flip) -> rotation.isNotRotated() && flip.isNotFlipped();
+        }
+    }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
new file mode 100644
index 0000000000..7d06378ce1
--- /dev/null
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -0,0 +1,122 @@
+package gregtech.api.metatileentity.implementations;
+
+import com.gtnewhorizon.structurelib.StructureLibAPI;
+import com.gtnewhorizon.structurelib.alignment.IAlignment;
+import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
+import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
+import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
+import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
+import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+
+/**
+ * Enhanced multiblock base class, featuring following improvement over {@link GT_MetaTileEntity_MultiBlockBase}
+ * <p>
+ * 1. TecTech style declarative structure check utilizing StructureLib.
+ * 2. Arbitrarily rotating the whole structure, if allowed to.
+ *
+ * @param <T> type of this
+ */
+public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment {
+	private ExtendedFacing mExtendedFacing;
+	private final IAlignmentLimits mLimits;
+
+	protected GT_MetaTileEntity_EnhancedMultiBlockBase(int aID, String aName, String aNameRegional) {
+		super(aID, aName, aNameRegional);
+		mLimits = getInitialAlignmentLimits();
+	}
+
+	protected GT_MetaTileEntity_EnhancedMultiBlockBase(String aName) {
+		super(aName);
+		mLimits = getInitialAlignmentLimits();
+	}
+
+	@Override
+	public ExtendedFacing getExtendedFacing() {
+		return mExtendedFacing;
+	}
+
+	@Override
+	public void setExtendedFacing(ExtendedFacing newExtendedFacing) {
+		if (mExtendedFacing != newExtendedFacing) {
+			stopMachine();
+			mExtendedFacing = newExtendedFacing;
+			IGregTechTileEntity base = getBaseMetaTileEntity();
+			mMachine = false;
+			mUpdate = 100;
+			if (getBaseMetaTileEntity().isServerSide()) {
+				StructureLibAPI.sendAlignment((IAlignmentProvider) base,
+						new NetworkRegistry.TargetPoint(base.getWorld().provider.dimensionId,
+								base.getXCoord(), base.getYCoord(), base.getZCoord(), 512));
+			} else {
+				base.issueTextureUpdate();
+			}
+		}
+	}
+
+	@Override
+	public final boolean isFacingValid(byte aFacing) {
+		return canSetToDirectionAny(ForgeDirection.getOrientation(aFacing));
+	}
+
+	@Override
+	public void onFacingChange() {
+		toolSetDirection(ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()));
+	}
+
+	@Override
+	public IAlignmentLimits getAlignmentLimits() {
+		return mLimits;
+	}
+
+	public abstract IStructureDefinition<T> getStructureDefinition();
+
+	protected IAlignmentLimits getInitialAlignmentLimits() {
+		return UNLIMITED;
+	}
+
+	@Override
+	public void saveNBTData(NBTTagCompound aNBT) {
+		super.saveNBTData(aNBT);
+		aNBT.setByte("mRotation", (byte) mExtendedFacing.getRotation().getIndex());
+		aNBT.setByte("mFlip", (byte) mExtendedFacing.getFlip().getIndex());
+	}
+
+	@Override
+	public void loadNBTData(NBTTagCompound aNBT) {
+		super.loadNBTData(aNBT);
+		mExtendedFacing = ExtendedFacing.of(ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()),
+				Rotation.byIndex(aNBT.getByte("mRotation")),
+				Flip.byIndex(aNBT.getByte("mFlip")));
+	}
+
+	@Override
+	public abstract GT_MetaTileEntity_EnhancedMultiBlockBase<T> newMetaEntity(IGregTechTileEntity aTileEntity);
+
+	@SuppressWarnings("unchecked")
+	private IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>> getCastedStructureDefinition() {
+		return (IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>>) getStructureDefinition();
+	}
+
+	protected final boolean checkPiece(String piece, int horizontalOffset, int verticalOffset, int depthOffset) {
+		IGregTechTileEntity tTile = getBaseMetaTileEntity();
+		return getCastedStructureDefinition().check(this, piece, tTile.getWorld(), getExtendedFacing(), tTile.getXCoord(), tTile.getYCoord(), tTile.getZCoord(), horizontalOffset, verticalOffset, depthOffset, !mMachine);
+	}
+
+	protected final boolean buildPiece(String piece, ItemStack trigger, boolean hintOnly, int horizontalOffset, int verticalOffset, int depthOffset) {
+		IGregTechTileEntity tTile = getBaseMetaTileEntity();
+		return getCastedStructureDefinition().buildOrHints(this, trigger, piece, tTile.getWorld(), getExtendedFacing(), tTile.getXCoord(), tTile.getYCoord(), tTile.getZCoord(), horizontalOffset, verticalOffset, depthOffset, hintOnly);
+	}
+
+	@Override
+	public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
+		super.onFirstTick(aBaseMetaTileEntity);
+		if (aBaseMetaTileEntity.isClientSide())
+			StructureLibAPI.queryAlignment((IAlignmentProvider) aBaseMetaTileEntity);
+	}
+}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 0de4dfecbb..3b1a963c9e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -26,6 +26,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.input.Keyboard;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import static gregtech.api.enums.GT_Values.V;
 import static gregtech.api.enums.GT_Values.VN;
@@ -676,8 +677,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
         return false;
     }
 
-    private boolean dumpFluid(FluidStack copiedFluidStack, boolean restrictiveHatchesOnly){
-        for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) {
+    protected static boolean dumpFluid(List<GT_MetaTileEntity_Hatch_Output> aOutputHatches, FluidStack copiedFluidStack, boolean restrictiveHatchesOnly){
+        for (GT_MetaTileEntity_Hatch_Output tHatch : aOutputHatches) {
         	if (!isValidMetaTileEntity(tHatch) || (restrictiveHatchesOnly && tHatch.mMode == 0)) {
         		continue;
         	}
@@ -709,8 +710,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
     public boolean addOutput(FluidStack aLiquid) {
         if (aLiquid == null) return false;
         FluidStack copiedFluidStack = aLiquid.copy();
-        if (!dumpFluid(copiedFluidStack, true)){
-            dumpFluid(copiedFluidStack, false);        	
+        if (!dumpFluid(mOutputHatches, copiedFluidStack, true)){
+            dumpFluid(mOutputHatches, copiedFluidStack, false);
         }
         return false;
     }
-- 
cgit 


From cb876c46e9f185b73556c1c8ed7ca2751cac2cdc Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Mon, 31 May 2021 01:09:30 +0800
Subject: Implement IConstructable for demo multis

---
 .../api/metatileentity/BaseMetaTileEntity.java     |  2 +-
 .../GT_MetaTileEntity_EnhancedMultiBlockBase.java  | 35 +++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index d108236a39..6eb06d8fae 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -2383,7 +2383,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
 
         @Override
         public void setExtendedFacing(ExtendedFacing alignment) {
-            setFrontFacing((byte) Math.max(alignment.getDirection().ordinal(), 5));
+            setFrontFacing((byte) Math.min(alignment.getDirection().ordinal(), ForgeDirection.UNKNOWN.ordinal() - 1));
         }
 
         @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index 7d06378ce1..c3d41664b7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -4,15 +4,21 @@ import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.alignment.IAlignment;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.common.network.NetworkRegistry;
+import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
+import org.lwjgl.input.Keyboard;
+
+import java.util.concurrent.atomic.AtomicReferenceArray;
 
 /**
  * Enhanced multiblock base class, featuring following improvement over {@link GT_MetaTileEntity_MultiBlockBase}
@@ -22,7 +28,8 @@ import net.minecraftforge.common.util.ForgeDirection;
  *
  * @param <T> type of this
  */
-public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment {
+public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment, IConstructable {
+	private static final AtomicReferenceArray<GT_Multiblock_Tooltip_Builder> tooltips = new AtomicReferenceArray<>(GregTech_API.METATILEENTITIES.length);
 	private ExtendedFacing mExtendedFacing;
 	private final IAlignmentLimits mLimits;
 
@@ -76,6 +83,32 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 
 	public abstract IStructureDefinition<T> getStructureDefinition();
 
+	protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
+
+	@Override
+	public String[] getDescription() {
+		if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+			return getTooltip().getStructureInformation();
+		} else {
+			return getTooltip().getInformation();
+		}
+	}
+
+	protected GT_Multiblock_Tooltip_Builder getTooltip() {
+		int tId = getBaseMetaTileEntity().getMetaTileID();
+		GT_Multiblock_Tooltip_Builder tooltip = tooltips.get(tId);
+		if (tooltip == null) {
+			tooltip = createTooltip();
+			tooltips.set(tId, tooltip);
+		}
+		return tooltip;
+	}
+
+	@Override
+	public String[] getStructureDescription(ItemStack stackSize) {
+		return getTooltip().getStructureInformation();
+	}
+
 	protected IAlignmentLimits getInitialAlignmentLimits() {
 		return UNLIMITED;
 	}
-- 
cgit 


From f812b4a50c922290d6cdee4d1e5e20530814abdc Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Mon, 31 May 2021 22:59:51 +0800
Subject: Add GT_MetaTileEntity_CubicMultiBlockBase and a few minor changes

1. add ofCoil() IStructureElement to standardise how to add a homogeneous set of coils to the structure definition
2. Changed newMetaEntity's return type back to IMetaTileEntity to prevent addons crying out
3. Initialize mExtendedFacing to ensure rendering code don't step on null
---
 .../GT_MetaTileEntity_CubicMultiBlockBase.java     | 111 +++++++++++++++++++++
 .../GT_MetaTileEntity_EnhancedMultiBlockBase.java  |   9 +-
 2 files changed, 113 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
new file mode 100644
index 0000000000..ef53c1bca2
--- /dev/null
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
@@ -0,0 +1,111 @@
+package gregtech.api.metatileentity.implementations;
+
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.IStructureElement;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.item.ItemStack;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+
+/**
+ * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing and accepts hatches everywhere.
+ * Controller will be placed in front center of the structure.
+ * <p>
+ * Note: You cannot use different casing for the same Class. Make a new subclass for it.
+ * <p>
+ * Implementation tips:
+ * 1. To restrict hatches, override {@link #addDynamoToMachineList(IGregTechTileEntity, int)} and its cousins instead of overriding the whole
+ * {@link #getStructureDefinition()} or change {@link #checkHatches(IGregTechTileEntity, ItemStack)}. The former is a total overkill, while the later cannot
+ * stop the structure check early.
+ * 2. To limit rotation, override {@link #getInitialAlignmentLimits()}
+ *
+ * @param <T>
+ */
+public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTileEntity_CubicMultiBlockBase<T>> extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> {
+	protected static final String STRUCTURE_PIECE_MAIN = "main";
+	private static final ConcurrentMap<Integer, IStructureDefinition<?>> STRUCTURE_DEFINITIONS = new ConcurrentHashMap<>();
+	private int mCasingAmount = 0;
+
+	protected GT_MetaTileEntity_CubicMultiBlockBase(int aID, String aName, String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	protected GT_MetaTileEntity_CubicMultiBlockBase(String aName) {
+		super(aName);
+	}
+
+
+	private static IStructureDefinition<? extends GT_MetaTileEntity_CubicMultiBlockBase<?>> createStructure(GT_MetaTileEntity_CubicMultiBlockBase<?> aTile) {
+		return StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
+				.addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{
+						{"hhh", "hhh", "hhh"},
+						{"h-h", "hhh", "hhh"},
+						{"hhh", "hhh", "hhh"},
+				}))
+				.addElement('h', ofChain(
+						ofHatchAdder(GT_MetaTileEntity_CubicMultiBlockBase::addToMachineList, aTile.getHatchTextureIndex(), 1),
+						onElementPass(
+								GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded,
+								aTile.getCasingElement()
+						)
+				))
+				.build();
+	}
+
+	/**
+	 * Create a simple 3x3x3 hollow cubic structure made of a single type of machine casing and accepts hatches everywhere.
+	 * <p>
+	 * The created definition contains a single piece named {@link #STRUCTURE_PIECE_MAIN}.
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public IStructureDefinition<T> getStructureDefinition() {
+		return (IStructureDefinition<T>) STRUCTURE_DEFINITIONS.computeIfAbsent(getBaseMetaTileEntity().getMetaTileID(), o -> createStructure(this));
+	}
+
+	@Override
+	public void construct(ItemStack aStack, boolean aHintsOnly) {
+		buildPiece(STRUCTURE_PIECE_MAIN, aStack, aHintsOnly, 1, 1, 0);
+	}
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		mCasingAmount = 0;
+		return checkPiece(STRUCTURE_PIECE_MAIN, 1, 1, 0) &&
+				mCasingAmount > getRequiredCasingCount() &&
+				checkHatches(aBaseMetaTileEntity, aStack);
+	}
+
+	/**
+	 * Called by {@link #checkMachine(IGregTechTileEntity, ItemStack)} to check if all required hatches are present.
+	 * <p>
+	 * Default implementation requires EXACTLY ONE maintenance hatch to be present, and ignore all other conditions.
+	 *
+	 * @param aBaseMetaTileEntity the tile entity of self
+	 * @param aStack              The item stack inside the controller
+	 * @return true if the test passes, false otherwise
+	 */
+	protected boolean checkHatches(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		return mMaintenanceHatches.size() == 1;
+	}
+
+	protected abstract IStructureElement<GT_MetaTileEntity_CubicMultiBlockBase<?>> getCasingElement();
+
+	/**
+	 * The hatch's texture index.
+	 */
+	protected abstract int getHatchTextureIndex();
+
+	protected abstract int getRequiredCasingCount();
+
+	protected void onCorrectCasingAdded() {
+		mCasingAmount++;
+	}
+}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index c3d41664b7..89d2ce765e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -30,17 +30,15 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
  */
 public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment, IConstructable {
 	private static final AtomicReferenceArray<GT_Multiblock_Tooltip_Builder> tooltips = new AtomicReferenceArray<>(GregTech_API.METATILEENTITIES.length);
-	private ExtendedFacing mExtendedFacing;
-	private final IAlignmentLimits mLimits;
+	private ExtendedFacing mExtendedFacing = ExtendedFacing.DEFAULT;
+	private final IAlignmentLimits mLimits = getInitialAlignmentLimits();
 
 	protected GT_MetaTileEntity_EnhancedMultiBlockBase(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional);
-		mLimits = getInitialAlignmentLimits();
 	}
 
 	protected GT_MetaTileEntity_EnhancedMultiBlockBase(String aName) {
 		super(aName);
-		mLimits = getInitialAlignmentLimits();
 	}
 
 	@Override
@@ -128,9 +126,6 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 				Flip.byIndex(aNBT.getByte("mFlip")));
 	}
 
-	@Override
-	public abstract GT_MetaTileEntity_EnhancedMultiBlockBase<T> newMetaEntity(IGregTechTileEntity aTileEntity);
-
 	@SuppressWarnings("unchecked")
 	private IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>> getCastedStructureDefinition() {
 		return (IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>>) getStructureDefinition();
-- 
cgit 


From d736caaf43e43c2bd250f1b5d9a91c8dd06a6147 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Tue, 8 Jun 2021 06:31:42 +0800
Subject: allow gt wrench to rotate the front of controller

also cleaned up GT_Client.java a little bit.

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../GT_MetaTileEntity_EnhancedMultiBlockBase.java           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index 89d2ce765e..d925cc1d84 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -13,6 +13,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -69,6 +70,18 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 		return canSetToDirectionAny(ForgeDirection.getOrientation(aFacing));
 	}
 
+	@Override
+	public boolean onWrenchRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+		if (aWrenchingSide != getBaseMetaTileEntity().getFrontFacing())
+			return super.onWrenchRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ);
+		if (aPlayer.isSneaking()) {
+			toolSetFlip(null);
+		} else {
+			toolSetRotation(null);
+		}
+		return true;
+	}
+
 	@Override
 	public void onFacingChange() {
 		toolSetDirection(ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()));
-- 
cgit 


From 38e0b4eb935f8aa4d5950889eb1928af085af192 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Tue, 8 Jun 2021 08:54:20 +0800
Subject: migrate a few more multis over

also removed the stupid ConcurrentHashMap in GT_MetaTileEntity_CubicMultiBlockBase

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../GT_MetaTileEntity_CubicMultiBlockBase.java     | 39 +++++++++-------------
 1 file changed, 16 insertions(+), 23 deletions(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
index ef53c1bca2..c84ca61eec 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
@@ -6,9 +6,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.item.ItemStack;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
@@ -30,7 +28,20 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
  */
 public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTileEntity_CubicMultiBlockBase<T>> extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> {
 	protected static final String STRUCTURE_PIECE_MAIN = "main";
-	private static final ConcurrentMap<Integer, IStructureDefinition<?>> STRUCTURE_DEFINITIONS = new ConcurrentHashMap<>();
+	protected static final IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
+			.addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{
+					{"hhh", "hhh", "hhh"},
+					{"h-h", "hhh", "hhh"},
+					{"hhh", "hhh", "hhh"},
+			}))
+			.addElement('h', ofChain(
+					defer(t -> ofHatchAdder(GT_MetaTileEntity_CubicMultiBlockBase::addToMachineList, t.getHatchTextureIndex(), 1)),
+					onElementPass(
+							GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded,
+							defer(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement)
+					)
+			))
+			.build();
 	private int mCasingAmount = 0;
 
 	protected GT_MetaTileEntity_CubicMultiBlockBase(int aID, String aName, String aNameRegional) {
@@ -41,24 +52,6 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
 		super(aName);
 	}
 
-
-	private static IStructureDefinition<? extends GT_MetaTileEntity_CubicMultiBlockBase<?>> createStructure(GT_MetaTileEntity_CubicMultiBlockBase<?> aTile) {
-		return StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
-				.addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{
-						{"hhh", "hhh", "hhh"},
-						{"h-h", "hhh", "hhh"},
-						{"hhh", "hhh", "hhh"},
-				}))
-				.addElement('h', ofChain(
-						ofHatchAdder(GT_MetaTileEntity_CubicMultiBlockBase::addToMachineList, aTile.getHatchTextureIndex(), 1),
-						onElementPass(
-								GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded,
-								aTile.getCasingElement()
-						)
-				))
-				.build();
-	}
-
 	/**
 	 * Create a simple 3x3x3 hollow cubic structure made of a single type of machine casing and accepts hatches everywhere.
 	 * <p>
@@ -67,7 +60,7 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
 	@Override
 	@SuppressWarnings("unchecked")
 	public IStructureDefinition<T> getStructureDefinition() {
-		return (IStructureDefinition<T>) STRUCTURE_DEFINITIONS.computeIfAbsent(getBaseMetaTileEntity().getMetaTileID(), o -> createStructure(this));
+		return (IStructureDefinition<T>) STRUCTURE_DEFINITION;
 	}
 
 	@Override
-- 
cgit 


From 03a45da45fdd85f1276416c2586a98eba79a9b50 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Fri, 11 Jun 2021 02:48:50 +0800
Subject: migrate all other multis over

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../GT_MetaTileEntity_EnhancedMultiBlockBase.java             | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index d925cc1d84..e4bfef4a48 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -144,6 +144,17 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 		return (IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>>) getStructureDefinition();
 	}
 
+	/**
+	 * Explanation of the world coordinate these offset means:
+	 *
+	 * Imagine you stand in front of the controller, with controller facing towards you not rotated or flipped.
+	 *
+	 * The horizontalOffset would be the number of blocks on the left side of the controller, not counting controller itself.
+	 * The verticalOffset would be the number of blocks on the top side of the controller, not counting controller itself.
+	 * The depthOffset would be the number of blocks between you and controller, not counting controller itself.
+	 *
+	 * All these offsets can be negative.
+	 */
 	protected final boolean checkPiece(String piece, int horizontalOffset, int verticalOffset, int depthOffset) {
 		IGregTechTileEntity tTile = getBaseMetaTileEntity();
 		return getCastedStructureDefinition().check(this, piece, tTile.getWorld(), getExtendedFacing(), tTile.getXCoord(), tTile.getYCoord(), tTile.getZCoord(), horizontalOffset, verticalOffset, depthOffset, !mMachine);
-- 
cgit 


From 6ea3101f0b5604f3f9260a41af6ef1848355c95f Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Tue, 15 Jun 2021 02:16:40 +0800
Subject: use TT serialization form

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index e4bfef4a48..e871146d4b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -127,16 +127,16 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 	@Override
 	public void saveNBTData(NBTTagCompound aNBT) {
 		super.saveNBTData(aNBT);
-		aNBT.setByte("mRotation", (byte) mExtendedFacing.getRotation().getIndex());
-		aNBT.setByte("mFlip", (byte) mExtendedFacing.getFlip().getIndex());
+		aNBT.setByte("eRotation", (byte) mExtendedFacing.getRotation().getIndex());
+		aNBT.setByte("eFlip", (byte) mExtendedFacing.getFlip().getIndex());
 	}
 
 	@Override
 	public void loadNBTData(NBTTagCompound aNBT) {
 		super.loadNBTData(aNBT);
 		mExtendedFacing = ExtendedFacing.of(ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()),
-				Rotation.byIndex(aNBT.getByte("mRotation")),
-				Flip.byIndex(aNBT.getByte("mFlip")));
+				Rotation.byIndex(aNBT.getByte("eRotation")),
+				Flip.byIndex(aNBT.getByte("eFlip")));
 	}
 
 	@SuppressWarnings("unchecked")
-- 
cgit 


From b0903281c7f2688724335a0a0684f9faeb96d9fc Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:05:12 +0800
Subject: optimize fuel recipe lookup

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../GT_MetaTileEntity_BasicGenerator.java          | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
index 9bbfbf0a3a..63151bde59 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
@@ -18,8 +18,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import java.util.Collection;
-
 import static gregtech.api.enums.GT_Values.V;
 
 public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity_BasicTank {
@@ -271,19 +269,18 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
 
     public int getFuelValue(FluidStack aLiquid) {
         //System.out.println("Fluid stack check");
-        if (aLiquid == null || getRecipes() == null) return 0;
-        FluidStack tLiquid;
-        Collection<GT_Recipe> tRecipeList = getRecipes().mRecipeList;
-        if (tRecipeList != null) for (GT_Recipe tFuel : tRecipeList)
-            if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null)
-                if (aLiquid.isFluidEqual(tLiquid)){
-                    long val=(long)tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(tLiquid) / 100;
-                    if(val> Integer.MAX_VALUE){
-                        throw new ArithmeticException("Integer LOOPBACK!");
-                    }
-                    return (int) val;
-                }
-        return 0;
+        GT_Recipe_Map tRecipes = getRecipes();
+        if (aLiquid == null || !(tRecipes instanceof GT_Recipe.GT_Recipe_Map_Fuel)) return 0;
+        GT_Recipe.GT_Recipe_Map_Fuel tFuels = (GT_Recipe.GT_Recipe_Map_Fuel) tRecipes;
+        GT_Recipe tFuel = tFuels.findFuel(aLiquid);
+        if (tFuel == null) {
+            return 0;
+        }
+        long val=(long)tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(aLiquid) / 100;
+        if(val> Integer.MAX_VALUE){
+            throw new ArithmeticException("Integer LOOPBACK!");
+        }
+        return (int) val;
     }
 
     public int getFuelValue(ItemStack aStack) {
-- 
cgit 


From 62f04c2893a66c4f80383da1a973fad4708171d4 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Wed, 16 Jun 2021 16:15:18 +0800
Subject: draw flipped textures & flipping markers

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index e871146d4b..76dbca86b1 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -75,7 +75,9 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 		if (aWrenchingSide != getBaseMetaTileEntity().getFrontFacing())
 			return super.onWrenchRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ);
 		if (aPlayer.isSneaking()) {
-			toolSetFlip(null);
+			// we won't be allowing horizontal flips, as it can be perfectly emulated by rotating twice and flipping horizontally
+			// allowing an extra round of flip make it hard to draw meaningful flip markers in GT_Proxy#drawGrid
+			toolSetFlip(getFlip().isHorizontallyFlipped() ? Flip.NONE : Flip.HORIZONTAL);
 		} else {
 			toolSetRotation(null);
 		}
-- 
cgit 


From cb5c00dbf4100abfec238fd52722e9dfe60292e1 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:45:04 +0800
Subject: turn off flipping as it bothers some people too much

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index 76dbca86b1..5897de8f68 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -123,7 +123,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 	}
 
 	protected IAlignmentLimits getInitialAlignmentLimits() {
-		return UNLIMITED;
+		return (d, r, f) -> f.isNotFlipped();
 	}
 
 	@Override
-- 
cgit 


From 5bd3126615e09906d4bf769c063cedea68e10d43 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Wed, 16 Jun 2021 18:00:35 +0800
Subject: Allow modifying alignment limits after instance initialization

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index 5897de8f68..e4169c58be 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment, IConstructable {
 	private static final AtomicReferenceArray<GT_Multiblock_Tooltip_Builder> tooltips = new AtomicReferenceArray<>(GregTech_API.METATILEENTITIES.length);
 	private ExtendedFacing mExtendedFacing = ExtendedFacing.DEFAULT;
-	private final IAlignmentLimits mLimits = getInitialAlignmentLimits();
+	private IAlignmentLimits mLimits = getInitialAlignmentLimits();
 
 	protected GT_MetaTileEntity_EnhancedMultiBlockBase(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional);
@@ -94,6 +94,10 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 		return mLimits;
 	}
 
+	protected void setAlignmentLimits(IAlignmentLimits mLimits) {
+		this.mLimits = mLimits;
+	}
+
 	public abstract IStructureDefinition<T> getStructureDefinition();
 
 	protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
-- 
cgit 


From d80698def4c2c6fe6ee7875e08836563c630271c Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Thu, 17 Jun 2021 23:28:54 +0800
Subject: fix distillation tower not outputting bottom fluid

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java    | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index e4169c58be..597a645699 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -98,6 +98,11 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 		this.mLimits = mLimits;
 	}
 
+	/**
+	 * Due to limitation of Java type system, you might need to do an unchecked cast.
+	 * HOWEVER, the returned IStructureDefinition is expected to be evaluated against current instance only, and should
+	 * not be used against other instances, even for those of the same class.
+	 */
 	public abstract IStructureDefinition<T> getStructureDefinition();
 
 	protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
-- 
cgit 


From 3d5ac0c8953df1249b964335452d45ffee75c8a7 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Fri, 18 Jun 2021 00:19:14 +0800
Subject: re-enable flipping, but add an option to render them not flipped

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index 597a645699..a9b50e6662 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -132,7 +132,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 	}
 
 	protected IAlignmentLimits getInitialAlignmentLimits() {
-		return (d, r, f) -> f.isNotFlipped();
+		return (d, r, f) -> !f.isVerticallyFliped();
 	}
 
 	@Override
-- 
cgit 


From bfe1836ddc069653d9af9d59008ec23f4dcb6c05 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Mon, 19 Jul 2021 15:51:27 +0800
Subject: Fixes related to coil hint blocks

Also updates StructureLib to fix invisible block hint and pulled the utility methods up.

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../java/gregtech/api/metatileentity/BaseMetaTileEntity.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 6eb06d8fae..1adcb41259 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -11,6 +11,8 @@ import appeng.tile.events.TileEventType;
 import com.gtnewhorizon.structurelib.alignment.IAlignment;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructableProvider;
 import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import cpw.mods.fml.common.Optional;
 import gregtech.GT_Mod;
@@ -54,6 +56,7 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -73,7 +76,7 @@ import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 @Optional.InterfaceList(value = {
     @Optional.Interface(iface = "appeng.api.networking.security.IActionHost", modid = "appliedenergistics2", striprefs = true),
     @Optional.Interface(iface = "appeng.me.helpers.IGridProxyable", modid = "appliedenergistics2", striprefs = true)})
-public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileEntity, IActionHost, IGridProxyable, IAlignmentProvider {
+public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileEntity, IActionHost, IGridProxyable, IAlignmentProvider, IConstructableProvider {
     private final GT_CoverBehavior[] mCoverBehaviors = new GT_CoverBehavior[]{GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior};
     protected MetaTileEntity mMetaTileEntity;
     protected long mStoredEnergy = 0, mStoredSteam = 0;
@@ -2374,6 +2377,12 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
         return getMetaTileEntity() instanceof IAlignmentProvider ? ((IAlignmentProvider) getMetaTileEntity()).getAlignment() : new BasicAlignment();
     }
 
+    @Nullable
+    @Override
+    public IConstructable getConstructable() {
+        return getMetaTileEntity() instanceof IConstructable ? (IConstructable) getMetaTileEntity() : null;
+    }
+
     private class BasicAlignment implements IAlignment {
 
         @Override
-- 
cgit 


From 875ff766ce3801918c9d726a8a14a6710e655147 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Mon, 19 Jul 2021 19:25:36 +0800
Subject: Make block hint text more informative

Also migrated from defer to lazy where possible

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../GT_MetaTileEntity_CubicMultiBlockBase.java     | 38 +++++++++++++---------
 .../GT_MetaTileEntity_EnhancedMultiBlockBase.java  |  2 +-
 2 files changed, 23 insertions(+), 17 deletions(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
index c84ca61eec..5499e756ba 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
@@ -6,7 +6,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.item.ItemStack;
 
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
@@ -16,7 +16,8 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
  * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing and accepts hatches everywhere.
  * Controller will be placed in front center of the structure.
  * <p>
- * Note: You cannot use different casing for the same Class. Make a new subclass for it.
+ * Note: You cannot use different casing for the same Class. Make a new subclass for it. You also should not change the casing
+ * dynamically, i.e. it should be a dumb method returning some sort of constant.
  * <p>
  * Implementation tips:
  * 1. To restrict hatches, override {@link #addDynamoToMachineList(IGregTechTileEntity, int)} and its cousins instead of overriding the whole
@@ -28,20 +29,25 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
  */
 public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTileEntity_CubicMultiBlockBase<T>> extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> {
 	protected static final String STRUCTURE_PIECE_MAIN = "main";
-	protected static final IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
-			.addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{
-					{"hhh", "hhh", "hhh"},
-					{"h-h", "hhh", "hhh"},
-					{"hhh", "hhh", "hhh"},
-			}))
-			.addElement('h', ofChain(
-					defer(t -> ofHatchAdder(GT_MetaTileEntity_CubicMultiBlockBase::addToMachineList, t.getHatchTextureIndex(), 1)),
-					onElementPass(
-							GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded,
-							defer(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement)
-					)
-			))
-			.build();
+	protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>>>() {
+		@Override
+		protected IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>> computeValue(Class<?> type) {
+			return StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
+					.addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{
+							{"hhh", "hhh", "hhh"},
+							{"h-h", "hhh", "hhh"},
+							{"hhh", "hhh", "hhh"},
+					}))
+					.addElement('h', ofChain(
+							lazy(t -> ofHatchAdder(GT_MetaTileEntity_CubicMultiBlockBase::addToMachineList, t.getHatchTextureIndex(), 1)),
+							onElementPass(
+									GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded,
+									lazy(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement)
+							)
+					))
+					.build();
+		}
+	};
 	private int mCasingAmount = 0;
 
 	protected GT_MetaTileEntity_CubicMultiBlockBase(int aID, String aName, String aNameRegional) {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index a9b50e6662..cc2513f5c2 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -128,7 +128,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 
 	@Override
 	public String[] getStructureDescription(ItemStack stackSize) {
-		return getTooltip().getStructureInformation();
+		return getTooltip().getStructureHint();
 	}
 
 	protected IAlignmentLimits getInitialAlignmentLimits() {
-- 
cgit 


From 77f1cb5502d0efad3b76453b2b577d0105e5fd11 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Wed, 21 Jul 2021 18:58:04 +0800
Subject: Fix ClassCastException in GT_MetaTileEntity_CubicMultiBlockBase

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_CubicMultiBlockBase.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
index 5499e756ba..b9a3df5e73 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
@@ -66,7 +66,7 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
 	@Override
 	@SuppressWarnings("unchecked")
 	public IStructureDefinition<T> getStructureDefinition() {
-		return (IStructureDefinition<T>) STRUCTURE_DEFINITION;
+		return (IStructureDefinition<T>) STRUCTURE_DEFINITION.get(getClass());
 	}
 
 	@Override
-- 
cgit 


From b7257bb6f7f19400dfdf00c858b1377b32c4dffe Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Thu, 22 Jul 2021 20:35:16 +0800
Subject: Fix typo in cubic base structure definition

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../implementations/GT_MetaTileEntity_CubicMultiBlockBase.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
index b9a3df5e73..fa7bb739a9 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
@@ -35,7 +35,7 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
 			return StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
 					.addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{
 							{"hhh", "hhh", "hhh"},
-							{"h-h", "hhh", "hhh"},
+							{"h~h", "h-h", "hhh"},
 							{"hhh", "hhh", "hhh"},
 					}))
 					.addElement('h', ofChain(
-- 
cgit 


From ea5c515f4769fa83f4eb6268f0b8048f76fbb0ac Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Fri, 30 Jul 2021 17:34:20 +0800
Subject: Make GT_MetaTileEntity_CubicMultiBlockBase easier to use

---
 .../GT_MetaTileEntity_CubicMultiBlockBase.java     | 55 ++++++++++++++++++++--
 1 file changed, 50 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
index fa7bb739a9..de36b845b2 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
@@ -13,19 +13,56 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
 import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 /**
- * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing and accepts hatches everywhere.
+ * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing, accepts hatches everywhere.
+ *
  * Controller will be placed in front center of the structure.
  * <p>
  * Note: You cannot use different casing for the same Class. Make a new subclass for it. You also should not change the casing
  * dynamically, i.e. it should be a dumb method returning some sort of constant.
  * <p>
  * Implementation tips:
- * 1. To restrict hatches, override {@link #addDynamoToMachineList(IGregTechTileEntity, int)} and its cousins instead of overriding the whole
+ * <ul>
+ * <li>To restrict hatches, override {@link #addDynamoToMachineList(IGregTechTileEntity, int)} and its cousins instead of overriding the whole
  * {@link #getStructureDefinition()} or change {@link #checkHatches(IGregTechTileEntity, ItemStack)}. The former is a total overkill, while the later cannot
  * stop the structure check early.
- * 2. To limit rotation, override {@link #getInitialAlignmentLimits()}
- *
- * @param <T>
+ *   Example 1: Require ULV input only:
+ * <pre>
+ * {@code
+ * @Override
+ * public boolean addInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+ *     if (aTileEntity == null) return false;
+ *     IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
+ *     if (aMetaTileEntity == null) return false;
+ *     if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
+ *         if (((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mTier != 0) return false; // addition
+ *         ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+ *         ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = getRecipeMap();
+ *         return mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
+ *     }
+ *     if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
+ *         if (((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mTier != 0) return false; // addition
+ *         ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+ *         ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = getRecipeMap();
+ *         return mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity);
+ *     }
+ *     return false;
+ * }
+ * }</pre>
+ *   Example 2: Allow dynamo, muffler and prevent energy hatch
+ * <pre>
+ * {@code
+ * @Override
+ * public boolean addToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+ *     return addInputToMachineList(aTileEntity, aBaseCasingIndex) ||
+ *         addOutputToMachineList(aTileEntity, aBaseCasingIndex) ||
+ *         addDynamoToMachineList(aTileEntity, aBaseCasingIndex) ||
+ *         addMufflerToMachineList(aTileEntity, aBaseCasingIndex) ||
+ *         addMaintenanceToMachineList(aTileEntity, aBaseCasingIndex);
+ * }
+ * }</pre></li>
+ * <li>To limit rotation, override {@link #getInitialAlignmentLimits()}</li>
+ *</ul>
+ * @param <T> this
  */
 public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTileEntity_CubicMultiBlockBase<T>> extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> {
 	protected static final String STRUCTURE_PIECE_MAIN = "main";
@@ -58,6 +95,14 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
 		super(aName);
 	}
 
+	@Override
+	public boolean addToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+		return addInputToMachineList(aTileEntity, aBaseCasingIndex) ||
+				addOutputToMachineList(aTileEntity, aBaseCasingIndex) ||
+				addEnergyInputToMachineList(aTileEntity, aBaseCasingIndex) ||
+				addMaintenanceToMachineList(aTileEntity, aBaseCasingIndex);
+	}
+
 	/**
 	 * Create a simple 3x3x3 hollow cubic structure made of a single type of machine casing and accepts hatches everywhere.
 	 * <p>
-- 
cgit 


From 6f3bddfb296a249040835e5f90bc45f5f7c8b024 Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Sat, 31 Jul 2021 02:16:02 -0600
Subject: Fix iteration over invalid slots

---
 .../implementations/GT_MetaTileEntity_Buffer.java          | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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

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 7f9e21ff65..faea347c67 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
@@ -330,10 +330,20 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
 
     protected void fillStacksIntoFirstSlots() {
         if (bSortStacks) {
-            for (int i = 0; i < mInventory.length; i++)
-                for (int j = i + 1; j < mInventory.length; j++)
+            for (int i = 0; i < mInventory.length - 1; i++) {
+                if (!isValidSlot(i)) {
+                    continue;
+                }
+
+                for (int j = i + 1; j < mInventory.length; j++) {
+                    if (!isValidSlot(j)) {
+                        continue;
+                    }
+
                     if (mInventory[j] != null && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j])))
                         GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
+                }
+            }
         }
     }
 
-- 
cgit 


From 290e3d4ddf85fa6f912f5c81028a3032fb6ca1c7 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Sun, 1 Aug 2021 02:59:57 +0800
Subject: Fix off by one in cubic multi base and tooltip builder

Also added a command to toggle structure lib debug print.

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 .../GT_MetaTileEntity_CubicMultiBlockBase.java     | 57 +++-------------------
 1 file changed, 6 insertions(+), 51 deletions(-)

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

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
index de36b845b2..3854a96cda 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
@@ -13,56 +13,19 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
 import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 /**
- * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing, accepts hatches everywhere.
- *
+ * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing and accepts hatches everywhere.
  * Controller will be placed in front center of the structure.
  * <p>
  * Note: You cannot use different casing for the same Class. Make a new subclass for it. You also should not change the casing
  * dynamically, i.e. it should be a dumb method returning some sort of constant.
  * <p>
  * Implementation tips:
- * <ul>
- * <li>To restrict hatches, override {@link #addDynamoToMachineList(IGregTechTileEntity, int)} and its cousins instead of overriding the whole
+ * 1. To restrict hatches, override {@link