migrate to new survival autoplace api (#1382)

* migrate to new survival autoplace api

* reduce type of blocks autoplace will use

this does not prevent those blocks from not being accepted into the structures though

* implement getBlocksToPlace

* fix survivalConstruct code for assline and DT

i hate variable size multi :(

* fix AIOBE

* allow disabling machine block updates on a per-thread basis

* make a sensible guess at what texture to use on server side

* spotless

* implement hologram support for bbf

* spotless

21 files changed, 320 insertions, 164 deletions

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 41ebd254dc..68aab6ee00 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
@@ -11,8 +11,8 @@ import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
 import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
-import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -33,12 +33,14 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Multi
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.*;
 import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.IGT_HatchAdder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
 public class GT_MetaTileEntity_AssemblyLine
@@ -75,22 +77,30 @@ public class GT_MetaTileEntity_AssemblyLine
                     .addElement(
                             'g',
                             ofChain(
+                                    ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true),
                                     ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 0, true),
-                                    ofBlockUnlocalizedName(
-                                            "Thaumcraft", "blockCosmeticOpaque", 2, false), // warded glass
-                                    ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true)))
-                    .addElement('e', ofChain(Energy.newAny(16, 1), ofBlock(GregTech_API.sBlockCasings2, 0)))
+                                    // warded glass
+                                    ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false)))
                     .addElement(
-                            'd',
+                            'e',
                             ofChain(
-                                    DataHatchElement.DataAccess.newAny(42, 2),
-                                    ofBlock(GregTech_API.sBlockCasings3, 10)))
+                                    Energy.newAny(16, 1, ForgeDirection.UP, ForgeDirection.NORTH, ForgeDirection.SOUTH),
+                                    ofBlock(GregTech_API.sBlockCasings2, 0)))
+                    .addElement(
+                            'd',
+                            buildHatchAdder(GT_MetaTileEntity_AssemblyLine.class)
+                                    .atLeast(DataHatchElement.DataAccess)
+                                    .dot(2)
+                                    .casingIndex(42)
+                                    .allowOnly(ForgeDirection.NORTH)
+                                    .buildAndChain(GregTech_API.sBlockCasings3, 10))
                     .addElement(
                             'b',
                             buildHatchAdder(GT_MetaTileEntity_AssemblyLine.class)
                                     .atLeast(InputHatch, InputHatch, InputHatch, InputHatch, Maintenance)
                                     .casingIndex(16)
                                     .dot(3)
+                                    .allowOnly(ForgeDirection.DOWN)
                                     .buildAndChain(
                                             ofBlock(GregTech_API.sBlockCasings2, 0),
                                             ofHatchAdder(
@@ -99,10 +109,10 @@ public class GT_MetaTileEntity_AssemblyLine
                             'I',
                             ofChain(
                                     // all blocks nearby use solid steel casing, so let's use the texture of that
-                                    InputBus.newAny(16, 5),
+                                    InputBus.newAny(16, 5, ForgeDirection.DOWN),
                                     ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16, 4)))
-                    .addElement('i', InputBus.newAny(16, 5))
-                    .addElement('o', OutputBus.newAny(16, 4))
+                    .addElement('i', InputBus.newAny(16, 5, ForgeDirection.DOWN))
+                    .addElement('o', OutputBus.newAny(16, 4, ForgeDirection.DOWN))
                     .build();
 
     public GT_MetaTileEntity_AssemblyLine(int aID, String aName, String aNameRegional) {
@@ -479,19 +489,16 @@ public class GT_MetaTileEntity_AssemblyLine
     }
 
     @Override
-    public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) {
+    public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
         if (mMachine) return -1;
-        int build = survivialBuildPiece(
-                STRUCTURE_PIECE_FIRST, stackSize, 0, 1, 0, elementBudget, source, actor, false, true);
+        int build = survivialBuildPiece(STRUCTURE_PIECE_FIRST, stackSize, 0, 1, 0, elementBudget, env, false, true);
         if (build >= 0) return build;
         int tLength = Math.min(stackSize.stackSize + 1, 16);
         for (int i = 1; i < tLength - 1; i++) {
-            build = survivialBuildPiece(
-                    STRUCTURE_PIECE_LATER, stackSize, -i, 1, 0, elementBudget, source, actor, false, true);
+            build = survivialBuildPiece(STRUCTURE_PIECE_LATER, stackSize, -i, 1, 0, elementBudget, env, false, true);
             if (build >= 0) return build;
         }
-        return survivialBuildPiece(
-                STRUCTURE_PIECE_LAST, stackSize, 1 - tLength, 1, 0, elementBudget, source, actor, false);
+        return survivialBuildPiece(STRUCTURE_PIECE_LAST, stackSize, 1 - tLength, 1, 0, elementBudget, env, false, true);
     }
 
     private enum DataHatchElement implements IHatchElement<GT_MetaTileEntity_AssemblyLine> {
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 adf09ad6db..bec9072c80 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
@@ -11,6 +11,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import org.lwjgl.input.Keyboard;
 
 public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_PrimitiveBlastFurnace
@@ -26,6 +27,7 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri
                 .glow()
                 .build()
     };
+    private GT_Multiblock_Tooltip_Builder tooltipBuilder;
 
     public GT_MetaTileEntity_BrickedBlastFurnace(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
@@ -54,21 +56,24 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri
     }
 
     protected GT_Multiblock_Tooltip_Builder getTooltip() {
-        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(GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond)
-                .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");
-        return tt;
+        if (tooltipBuilder == null) {
+            tooltipBuilder = new GT_Multiblock_Tooltip_Builder();
+            tooltipBuilder
+                    .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(GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond)
+                    .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");
+        }
+        return tooltipBuilder;
     }
 
     @Override
@@ -91,17 +96,22 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri
     }
 
     @Override
-    protected boolean isCorrectCasingBlock(Block block) {
-        return block == GregTech_API.sBlockCasings4;
+    protected Block getCasingBlock() {
+        return GregTech_API.sBlockCasings4;
     }
 
     @Override
-    protected boolean isCorrectCasingMetaID(int metaID) {
-        return metaID == 15;
+    protected int getCasingMetaID() {
+        return 15;
     }
 
     @Override
     public String getName() {
         return "Bricked Blast Furnace";
     }
+
+    @Override
+    public String[] getStructureDescription(ItemStack stackSize) {
+        return getTooltip().getStructureHint();
+    }
 }
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 9bccfa3376..3a50f69c5e 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
@@ -11,6 +11,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 
 public class GT_MetaTileEntity_BronzeBlastFurnace extends GT_MetaTileEntity_PrimitiveBlastFurnace {
     private static final ITexture[] FACING_SIDE = {TextureFactory.of(MACHINE_BRONZEPLATEDBRICKS)};
@@ -56,17 +57,22 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends GT_MetaTileEntity_Prim
     }
 
     @Override
-    protected boolean isCorrectCasingBlock(Block block) {
-        return block == GregTech_API.sBlockCasings1;
+    protected Block getCasingBlock() {
+        return GregTech_API.sBlockCasings1;
     }
 
     @Override
-    protected boolean isCorrectCasingMetaID(int metaID) {
-        return metaID == 10;
+    protected int getCasingMetaID() {
+        return 10;
     }
 
     @Override
     public String getName() {
         return "Bronze Blast Furnace";
     }
+
+    @Override
+    public String[] getStructureDescription(ItemStack stackSize) {
+        return new String[0];
+    }
 }
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 873c5bf769..8c146ed4f9 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
@@ -1,13 +1,17 @@
 package gregtech.common.tileentities.machines.multi;
 
+import static gregtech.api.enums.GT_HatchElement.*;
 import static gregtech.api.enums.GT_Values.VN;
 
+import com.google.common.collect.ImmutableList;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
+import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
+import java.util.List;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -62,6 +66,11 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
     }
 
     @Override
+    protected List<IHatchElement<? super GT_MetaTileEntity_DrillerBase>> getAllowedHatches() {
+        return ImmutableList.of(InputHatch, InputBus, Maintenance, Energy);
+    }
+
+    @Override
     protected void setElectricityStats() {
         this.mEfficiency = getCurrentEfficiency(null);
         this.mEfficiencyIncrease = 10000;
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 ecf31c240c..491adf1a18 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
@@ -15,8 +15,8 @@ import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
 import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
 
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
-import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -34,7 +34,6 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import java.util.ArrayList;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -384,8 +383,8 @@ public class GT_MetaTileEntity_DieselEngine
     }
 
     @Override
-    public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) {
+    public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
         if (mMachine) return -1;
-        return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 1, 1, 1, elementBudget, source, actor, false, true);
+        return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 1, 1, 1, elementBudget, env, false, true);
     }
 }
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 649939dedf..7600cac94c 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
@@ -15,8 +15,8 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
-import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -34,9 +34,9 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
 public class GT_MetaTileEntity_DistillationTower
@@ -57,9 +57,15 @@ public class GT_MetaTileEntity_DistillationTower
                 .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] {
                     {"b~b", "bbb", "bbb"},
                 }))
-                .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] {{"lll", "lcl", "lll"}}))
-                .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] {{"lll", "l-l", "lll"}}))
-                .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] {{"lll", "lll", "lll"}}))
+                .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] {
+                    {"lll", "lcl", "lll"},
+                }))
+                .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] {
+                    {"lll", "l-l", "lll"},
+                }))
+                .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] {
+                    {"LLL", "LLL", "LLL"},
+                }))
                 .addElement(
                         'b',
                         ofChain(
@@ -78,6 +84,7 @@ public class GT_MetaTileEntity_DistillationTower
                                         .atLeast(layeredOutputHatch)
                                         .casingIndex(CASING_INDEX)
                                         .dot(2)
+                                        .disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
                                         .build(),
                                 ofHatchAdder(
                                         GT_MetaTileEntity_DistillationTower::addEnergyInputToMachineList,
@@ -91,6 +98,15 @@ public class GT_MetaTileEntity_DistillationTower
                                 onElementPass(
                                         GT_MetaTileEntity_DistillationTower::onCasingFound,
                                         ofBlock(GregTech_API.sBlockCasings4, 1))))
+                // hint element only used in top layer
+                .addElement(
+                        'L',
+                        buildHatchAdder(GT_MetaTileEntity_DistillationTower.class)
+                                .atLeast(layeredOutputHatch)
+                                .casingIndex(CASING_INDEX)
+                                .dot(2)
+                                .disallowOnly(ForgeDirection.UP)
+                                .buildAndChain(GregTech_API.sBlockCasings4, 1))
                 .addElement(
                         'c',
                         ofChain(
@@ -283,7 +299,7 @@ public class GT_MetaTileEntity_DistillationTower
     }
 
     protected int getCurrentLayerOutputHatchCount() {
-        return mOutputHatchesByLayer.size() < mHeight
+        return mOutputHatchesByLayer.size() < mHeight || mHeight <= 0
                 ? 0
                 : mOutputHatchesByLayer.get(mHeight - 1).size();
     }
@@ -377,21 +393,20 @@ public class GT_MetaTileEntity_DistillationTower
     }
 
     @Override
-    public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) {
+    public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
         if (mMachine) return -1;
         mHeight = 0;
-        int built = survivialBuildPiece(
-                STRUCTURE_PIECE_BASE, stackSize, 1, 0, 0, elementBudget, source, actor, false, true);
+        int built = survivialBuildPiece(STRUCTURE_PIECE_BASE, stackSize, 1, 0, 0, elementBudget, env, false, true);
         if (built >= 0) return built;
         int tTotalHeight = Math.min(12, stackSize.stackSize + 2); // min 2 output layer, so at least 1 + 2 height
         for (int i = 1; i < tTotalHeight - 1; i++) {
             mHeight = i;
             built = survivialBuildPiece(
-                    STRUCTURE_PIECE_LAYER_HINT, stackSize, 1, i, 0, elementBudget, source, actor, false, true);
+                    STRUCTURE_PIECE_LAYER_HINT, stackSize, 1, i, 0, elementBudget, env, false, true);
             if (built >= 0) return built;
         }
-        mHeight = tTotalHeight;
+        mHeight = tTotalHeight - 1;
         return survivialBuildPiece(
-                STRUCTURE_PIECE_TOP_HINT, stackSize, 1, tTotalHeight - 1, 0, elementBudget, source, actor, false, true);
+                STRUCTURE_PIECE_TOP_HINT, stackSize, 1, tTotalHeight - 1, 0, elementBudget, env, false, true);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
index 0ec74e3a78..ba5c28b3a4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
@@ -4,8 +4,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
 import static gregtech.api.enums.GT_Values.W;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL_ACTIVE;
@@ -18,8 +16,8 @@ import static gregtech.api.util.GT_StructureUtility.ofFrame;
 import com.google.common.collect.ImmutableList;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
-import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ItemList;
@@ -40,7 +38,6 @@ import java.util.Collections;
 import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -79,6 +76,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
                                             t.getCasingBlockItem().get(0).getItemDamage())))
                             .addElement('b', lazy(t -> buildHatchAdder(GT_MetaTileEntity_DrillerBase.class)
                                     .atLeastList(t.getAllowedHatches())
+                                    .adder(GT_MetaTileEntity_DrillerBase::addToMachineList)
                                     .casingIndex(t.casingTextureIndex)
                                     .dot(1)
                                     .buildAndChain(
@@ -568,6 +566,12 @@ public abstract class GT_MetaTileEntity_DrillerBase
         return rList;
     }
 
+    @Override
+    public boolean addToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+        return super.addToMachineList(aTileEntity, aBaseCasingIndex)
+                || addDataAccessToMachineList(aTileEntity, aBaseCasingIndex);
+    }
+
     public boolean addDataAccessToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
@@ -590,9 +594,9 @@ public abstract class GT_MetaTileEntity_DrillerBase
     }
 
     @Override
-    public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) {
+    public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
         if (mMachine) return -1;
-        return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 1, 6, 0, elementBudget, source, actor, false, true);
+        return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 1, 6, 0, elementBudget, env, false, true);
     }
 
     protected List<IHatchElement<? super GT_MetaTileEntity_DrillerBase>> getAllowedHatches() {
@@ -607,7 +611,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
                 DataHatchElement.DataAccess);
     }
 
-    private enum DataHatchElement implements IHatchElement<GT_MetaTileEntity_DrillerBase> {
+    protected enum DataHatchElement implements IHatchElement<GT_MetaTileEntity_DrillerBase> {
         DataAccess;
 
         @Override
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 a2d1dee4a1..6f6cf9c6da 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
@@ -9,8 +9,8 @@ import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
 import static gregtech.api.util.GT_StructureUtility.ofCoil;
 
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
-import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -27,7 +27,6 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import java.util.ArrayList;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -53,12 +52,8 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
             StructureDefinition.<GT_MetaTileEntity_ElectricBlastFurnace>builder()
                     .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][] {
                         {"ttt", "tmt", "ttt"},
-                        {
-                            "CCC", "C-C", "CCC",
-                        },
-                        {
-                            "CCC", "C-C", "CCC",
-                        },
+                        {"CCC", "C-C", "CCC"},
+                        {"CCC", "C-C", "CCC"},
                         {"b~b", "bbb", "bbb"}
                     }))
                     .addElement(
@@ -408,9 +403,9 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
     }
 
     @Override
-    public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) {
+    public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
         if (mMachine) return -1;
-        return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 1, 3, 0, elementBudget, source, actor, false, true);
+        return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 1, 3, 0, elementBudget, env, false, true);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
index 4e708065bd..87271bf9a7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
@@ -14,8 +14,8 @@ import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
 
 import com.google.common.collect.ImmutableMap;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
-import com.gtnewhorizon.structurelib.structure.IItemSource;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.GT_Mod;
 import gregtech.api.enums.GT_Values;
@@ -34,7 +34,6 @@ import gregtech.api.util.GT_Utility;
 import gregtech.common.gui.GT_GUIContainer_FusionReactor;
 import java.util.ArrayList;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -556,9 +555,8 @@ public abstract class GT_MetaTileEntity_FusionComputer
     }
 
     @Override
-    public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) {
+    public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {