Make MetaTileEntity extend TileEntity and deprecate MetaTileEntityHolder

src/main/java/gregtech/api/block/machines/BlockMachine.java

@@ -10,7 +10,6 @@
 import gregtech.api.items.toolitem.ToolClasses;
 import gregtech.api.items.toolitem.ToolHelper;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.metatileentity.registry.MTERegistry;
@@ -266,39 +265,47 @@ public boolean recolorBlock(@NotNull World world, @NotNull BlockPos pos, @NotNul
     @Override
     public void onBlockPlacedBy(World worldIn, @NotNull BlockPos pos, @NotNull IBlockState state,
                                 @NotNull EntityLivingBase placer, ItemStack stack) {
-        IGregTechTileEntity holder = (IGregTechTileEntity) worldIn.getTileEntity(pos);
-        MTERegistry registry = GregTechAPI.mteManager.getRegistry(
-                Objects.requireNonNull(stack.getItem().getRegistryName()).getNamespace());
+        MetaTileEntity sampleMetaTileEntity = GTUtility.getMetaTileEntity(stack);
 
-        MetaTileEntity sampleMetaTileEntity = registry.getObjectById(stack.getItemDamage());
-        if (holder == null || sampleMetaTileEntity == null)
+        if (sampleMetaTileEntity == null)
             return;
 
-        // TODO Fix this
-        if (stack.hasDisplayName() && holder instanceof MetaTileEntityHolder) {
-            ((MetaTileEntityHolder) holder).setCustomName(stack.getDisplayName());
-        }
+        MetaTileEntity metaTileEntity = sampleMetaTileEntity.copy();
+
         var stackTag = stack.getTagCompound();
         NBTTagCompound mteTag = null;
         if (stackTag != null && !stackTag.isEmpty()) {
             if (stackTag.hasKey(GregtechDataCodes.BLOCK_ENTITY_TAG)) {
                 var blockTag = stackTag.getCompoundTag(GregtechDataCodes.BLOCK_ENTITY_TAG);
                 String customName = blockTag.getString(GregtechDataCodes.CUSTOM_NAME);
                 if (!customName.isEmpty())
-                    ((MetaTileEntityHolder) holder).setCustomName(customName);
+                    metaTileEntity.setCustomName(customName);
 
                 mteTag = blockTag.getCompoundTag(GregtechDataCodes.TAG_KEY_MTE);
                 List<String> removed = new ArrayList<>();
                 for (var key : mteTag.getKeySet()) {
-                    var trait = sampleMetaTileEntity.getMTETrait(key);
+                    var trait = metaTileEntity.getMTETrait(key);
                     if (trait == null) continue;
 
                     removed.add(key);
                 }
                 removed.forEach(mteTag::removeTag);
             }
         }
-        MetaTileEntity metaTileEntity = holder.setMetaTileEntity(sampleMetaTileEntity, mteTag);
+
+        if (mteTag != null) {
+            metaTileEntity.readMTETag(mteTag);
+        }
+
+        if (!GTUtility.hasTileEntity(worldIn, pos)) {
+            worldIn.setTileEntity(pos, metaTileEntity);
+        }
+
+        // TODO Fix this
+        if (stack.hasDisplayName()) {
+            metaTileEntity.setCustomName(stack.getDisplayName());
+        }
+
         if (mteTag == null) {
             if (stackTag != null && !stackTag.isEmpty())
                 metaTileEntity.initFromItemStackData(stackTag);
@@ -372,11 +379,9 @@ public void getDrops(@NotNull NonNullList<ItemStack> drops, @NotNull IBlockAcces
         if (!tagCompound.isEmpty())
             itemStack.setTagCompound(tagCompound);
         // TODO Clean this up
-        if (metaTileEntity.getHolder() instanceof MetaTileEntityHolder) {
-            MetaTileEntityHolder holder = (MetaTileEntityHolder) metaTileEntity.getHolder();
-            if (holder.hasCustomName()) {
-                itemStack.setStackDisplayName(holder.getName());
-            }
+        // clean up how exactly?
+        if (metaTileEntity.hasCustomName()) {
+            itemStack.setStackDisplayName(metaTileEntity.getName());
         }
         drops.add(itemStack);
         metaTileEntity.getDrops(drops, harvesters.get());
@@ -475,7 +480,10 @@ public void harvestBlock(@NotNull World worldIn, @NotNull EntityPlayer player, @
     @Nullable
     @Override
     public TileEntity createNewTileEntity(@Nullable World worldIn, int meta) {
-        return new MetaTileEntityHolder();
+        // i wonder if it would be a good idea to give a "proto" TE
+        // though that's really just mte holder but in a different way
+        // actually just return null, TE is handled elsewhere
+        return null;
     }
 
     @NotNull

src/main/java/gregtech/api/capability/impl/CleanroomLogic.java

@@ -178,7 +178,8 @@ public void setMinEnergyTier(int energyTier) {
 
     /**
      * writes all needed values to NBT
-     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#writeToNBT(NBTTagCompound)} method
+     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#writeMTETag(NBTTagCompound)}
+     * method
      */
     public NBTTagCompound writeToNBT(@NotNull NBTTagCompound data) {
         data.setBoolean("isActive", this.isActive);
@@ -191,7 +192,7 @@ public NBTTagCompound writeToNBT(@NotNull NBTTagCompound data) {
 
     /**
      * reads all needed values from NBT
-     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#readFromNBT(NBTTagCompound)}
+     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#readMTETag(NBTTagCompound)}
      * method
      */
     public void readFromNBT(@NotNull NBTTagCompound data) {
@@ -205,7 +206,7 @@ public void readFromNBT(@NotNull NBTTagCompound data) {
     /**
      * writes all needed values to InitialSyncData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#writeInitialSyncData(PacketBuffer)} method
+     * {@link MetaTileEntity#writeInitialSyncDataMTE(PacketBuffer)} method
      */
     public void writeInitialSyncData(@NotNull PacketBuffer buf) {
         buf.writeBoolean(this.isActive);
@@ -218,7 +219,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
     /**
      * reads all needed values from InitialSyncData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#receiveInitialSyncData(PacketBuffer)} method
+     * {@link MetaTileEntity#receiveInitialSyncDataMTE(PacketBuffer)} method
      */
     public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
         setActive(buf.readBoolean());

src/main/java/gregtech/api/capability/impl/FluidDrillLogic.java

@@ -252,7 +252,8 @@ public boolean isInventoryFull() {
 
     /**
      * writes all needed values to NBT
-     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#writeToNBT(NBTTagCompound)} method
+     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#writeMTETag(NBTTagCompound)}
+     * method
      */
     public NBTTagCompound writeToNBT(@NotNull NBTTagCompound data) {
         data.setBoolean("isActive", this.isActive);
@@ -266,7 +267,7 @@ public NBTTagCompound writeToNBT(@NotNull NBTTagCompound data) {
 
     /**
      * reads all needed values from NBT
-     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#readFromNBT(NBTTagCompound)}
+     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#readMTETag(NBTTagCompound)}
      * method
      */
     public void readFromNBT(@NotNull NBTTagCompound data) {
@@ -281,7 +282,7 @@ public void readFromNBT(@NotNull NBTTagCompound data) {
     /**
      * writes all needed values to InitialSyncData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#writeInitialSyncData(PacketBuffer)} method
+     * {@link MetaTileEntity#writeInitialSyncDataMTE(PacketBuffer)} method
      */
     public void writeInitialSyncData(@NotNull PacketBuffer buf) {
         buf.writeBoolean(this.isActive);
@@ -294,7 +295,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
     /**
      * reads all needed values from InitialSyncData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#receiveInitialSyncData(PacketBuffer)} method
+     * {@link MetaTileEntity#receiveInitialSyncDataMTE(PacketBuffer)} method
      */
     public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
         setActive(buf.readBoolean());

src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java

@@ -501,7 +501,8 @@ protected ICubeRenderer getPipeTexture() {
 
     /**
      * writes all needed values to NBT
-     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#writeToNBT(NBTTagCompound)} method
+     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#writeMTETag(NBTTagCompound)}
+     * method
      */
     public NBTTagCompound writeToNBT(@NotNull NBTTagCompound data) {
         data.setTag("xPos", new NBTTagInt(x.get()));
@@ -525,7 +526,7 @@ public NBTTagCompound writeToNBT(@NotNull NBTTagCompound data) {
 
     /**
      * reads all needed values from NBT
-     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#readFromNBT(NBTTagCompound)}
+     * This MUST be called and returned in the MetaTileEntity's {@link MetaTileEntity#readMTETag(NBTTagCompound)}
      * method
      */
     public void readFromNBT(@NotNull NBTTagCompound data) {
@@ -550,7 +551,7 @@ public void readFromNBT(@NotNull NBTTagCompound data) {
     /**
      * writes all needed values to InitialSyncData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#writeInitialSyncData(PacketBuffer)} method
+     * {@link MetaTileEntity#writeInitialSyncDataMTE(PacketBuffer)} method
      */
     public void writeInitialSyncData(@NotNull PacketBuffer buf) {
         buf.writeInt(pipeLength);
@@ -562,7 +563,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
     /**
      * reads all needed values from InitialSyncData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#receiveInitialSyncData(PacketBuffer)} method
+     * {@link MetaTileEntity#receiveInitialSyncDataMTE(PacketBuffer)} method
      */
     public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
         this.pipeLength = buf.readInt();

src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java

@@ -4,7 +4,6 @@
 import gregtech.api.items.IDyeableItem;
 import gregtech.api.items.gui.ItemUIFactory;
 import gregtech.api.items.toolitem.behavior.IToolBehavior;
-import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.unification.material.Material;
@@ -481,8 +480,7 @@ public void setSelectedTool(int slot, ItemStack stack) {
             ItemStack stack = player.getHeldItem(hand);
             ToolStackHandler handler = getHandler(stack);
             if (handler.getSelectedStack().isEmpty() &&
-                    world.getTileEntity(pos) instanceof MetaTileEntityHolder holder &&
-                    holder.getMetaTileEntity() instanceof MetaTileEntityMaintenanceHatch maintenance) {
+                    world.getTileEntity(pos) instanceof MetaTileEntityMaintenanceHatch maintenance) {
                 maintenance.fixMaintenanceProblemsWithToolbelt(player, this, stack);
                 return EnumActionResult.SUCCESS;
             }