MultiTileEntityBlock work

* Merge MultiTileEntityBlockRegistryInternal into MultiTileEntityBlock
* Add a hard dep on NEID for meta extension
* Use in world block meta for MuTE ID
* Use one block per MuTE Registry
* Add WeakTargetRef
* Migrate `controller` reference for parts over to a non non cachable WeakTargetRef
* Migrate controller WeakReference usage to WeakTargetRef

2 files changed, 10 insertions, 11 deletions

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
index 28cfc4e5a8..d446009ac7 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
@@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.PacketBuffer;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.Constants;
@@ -34,7 +35,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SpecialFilter;
-import gregtech.api.multitileentity.MultiTileEntityContainer;
 import gregtech.api.multitileentity.MultiTileEntityItem;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
@@ -90,10 +90,8 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
     }
 
     private static RecipeMap<?> getMuTeRecipeMap(@NotNull ItemStack stack) {
-        MultiTileEntityContainer muTeEntityContainer = GT_Loader_MultiTileEntities.MACHINE_REGISTRY
-            .getNewTileEntityContainer(stack);
-        if (muTeEntityContainer != null
-            && muTeEntityContainer.tileEntity instanceof RecipeMapWorkable recipeMapWorkable) {
+        final TileEntity tileEntity = GT_Loader_MultiTileEntities.MACHINE_REGISTRY.getReferenceTileEntity(stack);
+        if (tileEntity instanceof RecipeMapWorkable recipeMapWorkable) {
             return recipeMapWorkable.getRecipeMap();
         }
         return null;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java
index a34246e045..9e76883a8b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java
@@ -7,6 +7,8 @@ import static gregtech.api.util.GT_StructureUtilityMuTE.ofMuTECasings;
 
 import javax.annotation.Nonnull;
 
+import net.minecraft.util.StatCollector;
+
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import com.gtnewhorizon.structurelib.util.Vec3Impl;
@@ -20,7 +22,6 @@ import gregtech.api.multitileentity.multiblock.base.StackableController;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_StructureUtility;
 import gregtech.common.tileentities.machines.multiblock.logic.DistillationTowerProcessingLogic;
-import net.minecraft.util.StatCollector;
 
 public class DistillationTower extends StackableController<DistillationTower, DistillationTowerProcessingLogic> {
 
@@ -162,11 +163,11 @@ public class DistillationTower extends StackableController<DistillationTower, Di
         return StatCollector.translateToLocal(getTileEntityName());
     }
 
-//    @Override
-//    public String getLocalName() {
-//        return "Distillation Tower";
-//    }
-//
+    // @Override
+    // public String getLocalName() {
+    // return "Distillation Tower";
+    // }
+    //
     @Override
     protected String getStackableMiddle(int stackIndex) {
         return stackIndex % 2 == 0 ? STACKABLE_MIDDLE_1 : STACKABLE_MIDDLE_2;