remove IMachineLife interface

src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java

@@ -248,7 +248,7 @@ public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState
             if (!pState.is(pNewState.getBlock())) { // new block
                 MetaMachine machine = MetaMachine.getMachine(pLevel, pPos);
                 if (machine != null) {
-                    machine.onRemoved();
+                    machine.onMachineDestroyed();
                 }
 
                 pLevel.updateNeighbourForOutputSignal(pPos, this);

src/main/java/com/gregtechceu/gtceu/api/capability/IMiner.java

@@ -1,18 +1,8 @@
 package com.gregtechceu.gtceu.api.capability;
 
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine;
-import com.gregtechceu.gtceu.common.machine.trait.miner.MinerLogic;
 
-public interface IMiner extends IRecipeLogicMachine, IMachineLife {
-
-    @Override
-    MinerLogic getRecipeLogic();
-
-    @Override
-    default void onMachineRemoved() {
-        getRecipeLogic().onRemove();
-    }
+public interface IMiner extends IRecipeLogicMachine {
 
     boolean drainInput(boolean simulate);
 

src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java

@@ -157,26 +157,6 @@ public MetaMachine(BlockEntityCreationInfo info) {
     // ***** Machine Lifecycle ******//
     //////////////////////////////////////
 
-    public void onMachinePlaced(@Nullable LivingEntity player, ItemStack stack) {
-        if (player instanceof ServerPlayer sPlayer) {
-            ownerUUID = sPlayer.getUUID();
-        }
-
-        if (this instanceof IDropSaveMachine dropSaveMachine) {
-            CompoundTag tag = stack.getTag();
-            if (tag != null) {
-                dropSaveMachine.loadFromItem(tag);
-            }
-        }
-    }
-
-    public void onRemoved() {
-        for (Direction direction : GTUtil.DIRECTIONS) {
-            getCoverContainer().removeCover(direction, null);
-        }
-        if (this instanceof IMachineLife l) l.onMachineRemoved();
-    }
-
     @Override
     public void load(CompoundTag tag) {
         TagCompatibilityFixer.fixMachineAutoOutputTag(tag);
@@ -196,14 +176,6 @@ public void onLoad() {
         }
     }
 
-    public void setRenderState(MachineRenderState renderState) {
-        this.renderState = renderState;
-        if (level != null && !level.isClientSide) {
-            syncDataHolder.markClientSyncFieldDirty("renderState");
-        }
-        scheduleRenderUpdate();
-    }
-
     @Override
     public final void setRemoved() {
         super.setRemoved();
@@ -220,6 +192,25 @@ public void onUnload() {
         serverTicks.clear();
     }
 
+    public void onMachinePlaced(@Nullable LivingEntity player, ItemStack stack) {
+        if (player instanceof ServerPlayer sPlayer) {
+            ownerUUID = sPlayer.getUUID();
+        }
+
+        if (this instanceof IDropSaveMachine dropSaveMachine) {
+            CompoundTag tag = stack.getTag();
+            if (tag != null) {
+                dropSaveMachine.loadFromItem(tag);
+            }
+        }
+    }
+
+    public void onMachineDestroyed() {
+        for (Direction direction : GTUtil.DIRECTIONS) {
+            getCoverContainer().removeCover(direction, null);
+        }
+    }
+
     //////////////////////////////////////
     // ***** Tickable Manager ****//
     //////////////////////////////////////
@@ -440,6 +431,14 @@ public boolean triggerEvent(int id, int para) {
         return false;
     }
 
+    public void setRenderState(MachineRenderState renderState) {
+        this.renderState = renderState;
+        if (level != null && !level.isClientSide) {
+            syncDataHolder.markClientSyncFieldDirty("renderState");
+        }
+        scheduleRenderUpdate();
+    }
+
     public void setPaintingColor(int color) {
         if (color == this.paintingColor) return;
 

src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java

@@ -133,8 +133,8 @@ protected void chargeBattery() {
     // ********** MISC ***********//
     //////////////////////////////////////
     @Override
-    public void onMachineRemoved() {
-        super.onMachineRemoved();
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(chargerInventory);
         if (!ConfigHolder.INSTANCE.machines.ghostCircuit) {
             clearInventory(circuitInventory.storage);

src/main/java/com/gregtechceu/gtceu/api/machine/WorkableTieredMachine.java

@@ -27,7 +27,7 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public abstract class WorkableTieredMachine extends TieredEnergyMachine implements IRecipeLogicMachine,
-                                            IMachineLife, IMufflableMachine, IOverclockMachine {
+                                            IMufflableMachine, IOverclockMachine {
 
     @Getter
     @SaveField
@@ -144,7 +144,8 @@ public void onUnload() {
     //////////////////////////////////////
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(importItems.storage);
         clearInventory(exportItems.storage);
     }

src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java

@@ -86,7 +86,8 @@ public void onLoad() {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(importItems.storage);
         clearInventory(exportItems.storage);
     }

src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java

@@ -6,7 +6,6 @@
 import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
 import com.gregtechceu.gtceu.api.gui.GuiTextures;
 import com.gregtechceu.gtceu.api.item.tool.GTToolType;
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.feature.IMufflableMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine;
 import com.gregtechceu.gtceu.api.machine.trait.*;
@@ -42,7 +41,7 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public abstract class SteamWorkableMachine extends SteamMachine
-                                           implements IRecipeLogicMachine, IMufflableMachine, IMachineLife {
+                                           implements IRecipeLogicMachine, IMufflableMachine {
 
     @Getter
     protected final CleanroomReceiverTrait cleanroomReceiver;

src/main/java/com/gregtechceu/gtceu/common/machine/electric/BatteryBufferMachine.java

@@ -11,7 +11,6 @@
 import com.gregtechceu.gtceu.api.gui.widget.SlotWidget;
 import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer;
 import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
 import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler;
@@ -40,7 +39,7 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class BatteryBufferMachine extends TieredEnergyMachine
-                                  implements IControllable, IFancyUIMachine, IMachineLife, IMonitorComponent {
+                                  implements IControllable, IFancyUIMachine, IMonitorComponent {
 
     public static final long AMPS_PER_BATTERY = 2L;
 
@@ -191,7 +190,8 @@ private List<Object> getAllBatteries() {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(batteryInventory);
     }
 

src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java

@@ -13,7 +13,6 @@
 import com.gregtechceu.gtceu.api.machine.TickableSubscription;
 import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.trait.AutoOutputTrait;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler;
 import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
@@ -49,7 +48,7 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class BlockBreakerMachine extends TieredEnergyMachine
-                                 implements IFancyUIMachine, IMachineLife, IControllable {
+                                 implements IFancyUIMachine, IControllable {
 
     @SaveField
     protected final NotifiableItemStackHandler cache;
@@ -138,7 +137,8 @@ public void onUnload() {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(chargerInventory);
         clearInventory(cache.storage);
     }

src/main/java/com/gregtechceu/gtceu/common/machine/electric/ChargerMachine.java

@@ -8,7 +8,6 @@
 import com.gregtechceu.gtceu.api.gui.widget.SlotWidget;
 import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer;
 import com.gregtechceu.gtceu.api.sync_system.annotations.RerenderOnChanged;
@@ -40,7 +39,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-public class ChargerMachine extends TieredEnergyMachine implements IControllable, IFancyUIMachine, IMachineLife {
+public class ChargerMachine extends TieredEnergyMachine implements IControllable, IFancyUIMachine {
 
     public static final long AMPS_PER_ITEM = 4L;
 
@@ -111,7 +110,8 @@ public int tintColor(int index) {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(chargerInventory);
     }
 

src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java

@@ -14,7 +14,6 @@
 import com.gregtechceu.gtceu.api.machine.TickableSubscription;
 import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.trait.AutoOutputTrait;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler;
 import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
@@ -58,7 +57,7 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class FisherMachine extends TieredEnergyMachine
-                           implements IFancyUIMachine, IMachineLife, IWorkable {
+                           implements IFancyUIMachine, IWorkable {
 
     @SaveField
     protected final NotifiableItemStackHandler cache;
@@ -167,7 +166,8 @@ public boolean shouldWeatherOrTerrainExplosion() {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(chargerInventory);
         clearInventory(baitHandler.storage);
         clearInventory(cache.storage);

src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java

@@ -15,7 +15,6 @@
 import com.gregtechceu.gtceu.api.machine.TickableSubscription;
 import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.machine.trait.AutoOutputTrait;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler;
@@ -56,7 +55,7 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class ItemCollectorMachine extends TieredEnergyMachine
-                                  implements IFancyUIMachine, IMachineLife, IWorkable {
+                                  implements IFancyUIMachine, IWorkable {
 
     @Getter
     private static final int[] INVENTORY_SIZES = { 4, 9, 16, 25, 25 };
@@ -173,7 +172,8 @@ public boolean shouldWeatherOrTerrainExplosion() {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         clearInventory(chargerInventory);
         clearInventory(output.storage);
     }

src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java

@@ -57,7 +57,7 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class MinerMachine extends WorkableTieredMachine
-                          implements IMiner, IControllable, IFancyUIMachine, IDataInfoProvider {
+                          implements IControllable, IFancyUIMachine, IDataInfoProvider, IMiner {
 
     @Getter
     @SaveField
@@ -95,7 +95,7 @@ protected CustomItemStackHandler createChargerItemHandler() {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
         // Remove the miner pipes below this miner
         getRecipeLogic().onRemove();
         clearInventory(exportItems.storage);

src/main/java/com/gregtechceu/gtceu/common/machine/electric/PumpMachine.java

@@ -8,7 +8,6 @@
 import com.gregtechceu.gtceu.api.gui.widget.TankWidget;
 import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget;
 import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine;
-import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
 import com.gregtechceu.gtceu.api.machine.feature.IUIMachine;
 import com.gregtechceu.gtceu.api.machine.trait.AutoOutputTrait;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank;
@@ -54,7 +53,7 @@
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-public class PumpMachine extends TieredEnergyMachine implements IUIMachine, IMachineLife {
+public class PumpMachine extends TieredEnergyMachine implements IUIMachine {
 
     public static final int BASE_PUMP_RADIUS = 16;
     public static final int EXTRA_PUMP_RADIUS = 4;
@@ -378,7 +377,8 @@ private boolean canAdvancePumpHead() {
     }
 
     @Override
-    public void onMachineRemoved() {
+    public void onMachineDestroyed() {
+        super.onMachineDestroyed();
         if (getLevel() instanceof ServerLevel serverLevel) {
             var pos = getBlockPos().relative(Direction.DOWN);
             while (serverLevel.getBlockState(pos).is(GTBlocks.MINER_PIPE.get())) {