From 74ffe253aedfee7a62eb5f5be2317e995004007d Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Sun, 18 Sep 2022 23:44:15 +0800
Subject: fix incorrect code path for legacy survival autoplace

---
 .../GT_MetaTileEntity_EnhancedMultiBlockBase.java  | 43 ++++++++++++----------
 .../GT_MetaTileEntity_PrimitiveBlastFurnace.java   |  9 +++++
 2 files changed, 33 insertions(+), 19 deletions(-)

(limited to 'src')

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 1f4b6dccc3..32f607c0a7 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
@@ -196,6 +196,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
                         hintOnly);
     }
 
+    @Deprecated
     protected final int survivialBuildPiece(
             String piece,
             ItemStack trigger,
@@ -206,15 +207,24 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
             IItemSource source,
             EntityPlayerMP actor,
             boolean check) {
-        return survivialBuildPiece(
-                piece,
-                trigger,
-                horizontalOffset,
-                verticalOffset,
-                depthOffset,
-                elementsBudget,
-                ISurvivalBuildEnvironment.create(source, actor),
-                check);
+        final IGregTechTileEntity tTile = getBaseMetaTileEntity();
+        return getCastedStructureDefinition()
+                .survivalBuild(
+                        this,
+                        trigger,
+                        piece,
+                        tTile.getWorld(),
+                        getExtendedFacing(),
+                        tTile.getXCoord(),
+                        tTile.getYCoord(),
+                        tTile.getZCoord(),
+                        horizontalOffset,
+                        verticalOffset,
+                        depthOffset,
+                        elementsBudget,
+                        source,
+                        actor,
+                        check);
     }
 
     protected final int survivialBuildPiece(
@@ -245,6 +255,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
                         check);
     }
 
+    @Deprecated
     protected final int survivialBuildPiece(
             String piece,
             ItemStack trigger,
@@ -256,16 +267,10 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
             EntityPlayerMP actor,
             boolean check,
             boolean checkIfPlaced) {
-        return survivialBuildPiece(
-                piece,
-                trigger,
-                horizontalOffset,
-                verticalOffset,
-                depthOffset,
-                elementsBudget,
-                ISurvivalBuildEnvironment.create(source, actor),
-                check,
-                checkIfPlaced);
+        int built = survivialBuildPiece(
+                piece, trigger, horizontalOffset, verticalOffset, depthOffset, elementsBudget, source, actor, check);
+        if (checkIfPlaced && built > 0) checkStructure(true, getBaseMetaTileEntity());
+        return built;
     }
 
     protected final int survivialBuildPiece(
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java
index 296b79a57d..bd1638780a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java
@@ -3,8 +3,10 @@ package gregtech.common.tileentities.machines.multi;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
+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.ISurvivalConstructable;
 import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -318,6 +320,13 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
         }
     }
 
+    @Override
+    public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
+        super.onFirstTick(aBaseMetaTileEntity);
+        if (aBaseMetaTileEntity.isClientSide())
+            StructureLibAPI.queryAlignment((IAlignmentProvider) aBaseMetaTileEntity);
+    }
+
     /**
      * Draws random flames and smoke particles in front of Primitive Blast
      * Furnace when active
-- 
cgit