Added survival autobuild for Bacterial Vat and fixed survival autobui…

…ld for Fluid Shaper
GTNewHorizons · Sep 24, 2024 · 207b170 · 207b170
1 parent 0c442d9
commit 207b170
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java
@@ -33,6 +33,7 @@
 
 import javax.annotation.Nullable;
 
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
@@ -83,8 +84,11 @@
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.ParallelHelper;
+import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 
-public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat> {
+public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat>
+    implements ISurvivalConstructable{
 
     public static final HashMap<Coords, Integer> staticColorMap = new HashMap<>();
 
@@ -782,7 +786,11 @@ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirec
     public void construct(ItemStack itemStack, boolean b) {
         this.buildPiece(STRUCTURE_PIECE_MAIN, itemStack, b, 2, 3, 0);
     }
-
+    @Override
+    public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
+        if (mMachine) return -1;
+        return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 2, 3, 0, elementBudget, env, false, true);
+    }
     @Override
     public String[] getInfoData() {
         final String[] baseInfoData = super.getInfoData();

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java
@@ -248,34 +248,37 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu
         int built = survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 3, 4, 0, elementBudget, env, false, true);
         if (built >= 0) return built;
         int tTotalWidth = Math.min(stackSize.stackSize + 1, 6);
-        for (int i = 1; i < tTotalWidth - 1; i++) {
+        for (int i = 1; i < tTotalWidth; i++) {
             mWidth = i;
             nWidth = i;
             built = survivialBuildPiece(MS_LEFT_MID, stackSize, 3 + 2 * i, 4, 0, elementBudget, env, false, true);
             if (built >= 0) return built;
             built = survivialBuildPiece(MS_RIGHT_MID, stackSize, -2 - 2 * i, 4, 0, elementBudget, env, false, true);
             if (built >= 0) return built;
         }
-        if (mWidth == tTotalWidth - 2) return survivialBuildPiece(
-            MS_END,
-            stackSize,
-            (2 + tTotalWidth) * 2 - 4,
-            4,
-            0,
-            elementBudget,
-            env,
-            false,
-            true);
-        else return survivialBuildPiece(
-            MS_END,
-            stackSize,
-            (-2 - tTotalWidth) * 2 + 4,
-            4,
-            0,
-            elementBudget,
-            env,
-            false,
-            true);
+        if (mWidth == tTotalWidth - 1) {
+           built += survivialBuildPiece(
+                MS_END,
+                stackSize,
+                (3 + tTotalWidth) * 2 - 4,
+                4,
+                0,
+                elementBudget,
+                env,
+                false,
+                true);
+           built += survivialBuildPiece(
+                MS_END,
+                stackSize,
+                (-3 - tTotalWidth) * 2 + 4,
+                4,
+                0,
+                elementBudget,
+                env,
+                false,
+                true);
+        }
+        return built;
     }
 
     @Override