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

1 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
index 85f9f2497a..eeadfe7602 100644
--- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
@@ -47,7 +47,7 @@ import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.metatileentity.GregTechTileClientEvents;
-import gregtech.api.multitileentity.MultiTileEntityBlockRegistryInternal;
+import gregtech.api.multitileentity.MultiTileEntityBlock;
 import gregtech.api.multitileentity.MultiTileEntityClassContainer;
 import gregtech.api.multitileentity.MultiTileEntityRegistry;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
@@ -171,12 +171,11 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     @Override
     public void copyTextures() {
         // Loading an instance
-        final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry
-            .getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID());
-        if (!(tCanonicalTileEntity instanceof MultiTileEntity)) {
+        final TileEntity referenceTileEntity = MultiTileEntityRegistry
+            .getReferenceTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID());
+        if (!(referenceTileEntity instanceof MultiTileEntity canonicalEntity)) {
             return;
         }
-        final MultiTileEntity canonicalEntity = (MultiTileEntity) tCanonicalTileEntity;
         baseTexture = canonicalEntity.baseTexture;
         topOverlayTexture = canonicalEntity.topOverlayTexture;
         bottomOverlayTexture = canonicalEntity.bottomOverlayTexture;
@@ -225,7 +224,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                 if (tClass != null) {
                     // Add the Default Parameters. Useful for things that differ between different tiers/types of the
                     // same machine
-                    nbt = GT_Util.fuseNBT(nbt, tClass.parameters);
+                    nbt = GT_Util.fuseNBT(nbt, tClass.getParameters());
                 }
             }
         }
@@ -996,8 +995,8 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     }
 
     @Override
-    public boolean getSubItems(MultiTileEntityBlockRegistryInternal block, Item item, CreativeTabs tab,
-        List<ItemStack> list, short aID) {
+    public boolean getSubItems(MultiTileEntityBlock block, Item item, CreativeTabs tab, List<ItemStack> list,
+        short aID) {
         return true;
     }
 
@@ -1378,4 +1377,9 @@ public abstract class MultiTileEntity extends CoverableTileEntity
         getTimedPacketData(timedPacket);
         GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, timedPacket, getXCoord(), getZCoord());
     }
+
+    @Override
+    public void onChunkUnload() {
+        super.onChunkUnload();
+    }
 }