Remove some unnecessary forge capabilities, and move cleanroom behaviour to a machine trait

src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java

@@ -351,8 +351,8 @@ public ResourceTexture getPipeTexture(boolean isBlock) {
     }
 
     @Override
-    public Pair<GTToolType, InteractionResult> onToolClick(Set<GTToolType> toolTypes, ItemStack itemStack,
-                                                           UseOnContext context) {
+    public Pair<@Nullable GTToolType, InteractionResult> onToolClick(Set<GTToolType> toolTypes, ItemStack itemStack,
+                                                                     UseOnContext context) {
         // the side hit from the machine grid
         var playerIn = context.getPlayer();
         if (playerIn == null) return Pair.of(null, InteractionResult.PASS);

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

@@ -2,7 +2,6 @@
 
 import com.gregtechceu.gtceu.api.capability.forge.GTCapability;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
-import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -70,11 +69,6 @@ public static IControllable getControllable(Level level, BlockPos pos, @Nullable
         return getBlockEntityCapability(GTCapability.CAPABILITY_CONTROLLABLE, level, pos, side);
     }
 
-    @Nullable
-    public static RecipeLogic getRecipeLogic(Level level, BlockPos pos, @Nullable Direction side) {
-        return getBlockEntityCapability(GTCapability.CAPABILITY_RECIPE_LOGIC, level, pos, side);
-    }
-
     @Nullable
     public static IEnergyStorage getForgeEnergy(Level level, BlockPos pos, @Nullable Direction side) {
         if (level.getBlockState(pos).hasBlockEntity()) {
@@ -86,11 +80,6 @@ public static IEnergyStorage getForgeEnergy(Level level, BlockPos pos, @Nullable
         return null;
     }
 
-    @Nullable
-    public static ICleanroomReceiver getCleanroomReceiver(Level level, BlockPos pos, @Nullable Direction side) {
-        return getBlockEntityCapability(GTCapability.CAPABILITY_CLEANROOM_RECEIVER, level, pos, side);
-    }
-
     @Nullable
     public static IMaintenanceMachine getMaintenanceMachine(Level level, BlockPos pos, @Nullable Direction side) {
         return getBlockEntityCapability(GTCapability.CAPABILITY_MAINTENANCE_MACHINE, level, pos, side);

src/main/java/com/gregtechceu/gtceu/api/capability/forge/GTCapability.java

@@ -2,7 +2,6 @@
 
 import com.gregtechceu.gtceu.api.capability.*;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
-import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityManager;
@@ -20,16 +19,10 @@ public class GTCapability {
     public static final Capability<IWorkable> CAPABILITY_WORKABLE = CapabilityManager.get(new CapabilityToken<>() {});
     public static final Capability<IControllable> CAPABILITY_CONTROLLABLE = CapabilityManager
             .get(new CapabilityToken<>() {});
-    public static final Capability<RecipeLogic> CAPABILITY_RECIPE_LOGIC = CapabilityManager
-            .get(new CapabilityToken<>() {});
     public static final Capability<IElectricItem> CAPABILITY_ELECTRIC_ITEM = CapabilityManager
             .get(new CapabilityToken<>() {});
-    public static final Capability<ICleanroomReceiver> CAPABILITY_CLEANROOM_RECEIVER = CapabilityManager
-            .get(new CapabilityToken<>() {});
     public static final Capability<IMaintenanceMachine> CAPABILITY_MAINTENANCE_MACHINE = CapabilityManager
             .get(new CapabilityToken<>() {});
-    public static final Capability<ITurbineMachine> CAPABILITY_TURBINE_MACHINE = CapabilityManager
-            .get(new CapabilityToken<>() {});
     public static final Capability<ILaserContainer> CAPABILITY_LASER = CapabilityManager
             .get(new CapabilityToken<>() {});
     public static final Capability<IOpticalComputationProvider> CAPABILITY_COMPUTATION_PROVIDER = CapabilityManager
@@ -40,8 +33,6 @@ public class GTCapability {
             .get(new CapabilityToken<>() {});
     public static final Capability<IMonitorComponent> CAPABILITY_MONITOR_COMPONENT = CapabilityManager
             .get(new CapabilityToken<>() {});
-    public static final Capability<ICentralMonitor> CAPABILITY_CENTRAL_MONITOR = CapabilityManager
-            .get(new CapabilityToken<>() {});
 
     public static final Capability<IMedicalConditionTracker> CAPABILITY_MEDICAL_CONDITION_TRACKER = CapabilityManager
             .get(new CapabilityToken<>() {});
@@ -53,17 +44,13 @@ public static void register(RegisterCapabilitiesEvent event) {
         event.register(IToolable.class);
         event.register(IWorkable.class);
         event.register(IControllable.class);
-        event.register(RecipeLogic.class);
         event.register(IElectricItem.class);
-        event.register(ICleanroomReceiver.class);
         event.register(IMaintenanceMachine.class);
-        event.register(ITurbineMachine.class);
         event.register(ILaserContainer.class);
         event.register(IOpticalComputationProvider.class);
         event.register(IDataAccessHatch.class);
         event.register(IMedicalConditionTracker.class);
         event.register(IHazardParticleContainer.class);
         event.register(IMonitorComponent.class);
-        event.register(ICentralMonitor.class);
     }
 }

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

@@ -23,7 +23,6 @@
 import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.machine.trait.MachineTrait;
 import com.gregtechceu.gtceu.api.machine.trait.MachineTraitHolder;
-import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 import com.gregtechceu.gtceu.api.machine.trait.feature.IFrontFacingTrait;
 import com.gregtechceu.gtceu.api.machine.trait.feature.IInteractionTrait;
 import com.gregtechceu.gtceu.api.machine.trait.feature.IRenderingTrait;
@@ -290,8 +289,9 @@ private void executeTick() {
      *         animations will be played
      */
     @Override
-    public final Pair<GTToolType, InteractionResult> onToolClick(Set<GTToolType> toolType, ItemStack itemStack,
-                                                                 UseOnContext context) {
+    public final Pair<@Nullable GTToolType, InteractionResult> onToolClick(Set<GTToolType> toolType,
+                                                                           ItemStack itemStack,
+                                                                           UseOnContext context) {
         // the side hit from the machine grid
         var playerIn = context.getPlayer();
         if (playerIn == null) return Pair.of(null, InteractionResult.PASS);
@@ -303,7 +303,7 @@ public final Pair<GTToolType, InteractionResult> onToolClick(Set<GTToolType> too
         CoverBehavior coverBehavior = gridSide == null ? null : coverContainer.getCoverAtSide(gridSide);
         if (gridSide == null) gridSide = hitResult.getDirection();
 
-        Pair<GTToolType, InteractionResult> result = null;
+        Pair<@Nullable GTToolType, InteractionResult> result = null;
 
         // Prioritize covers where they apply (Screwdriver, Soft Mallet)
         if (toolType.isEmpty() && playerIn.isShiftKeyDown()) {
@@ -970,12 +970,6 @@ private static <T> List<T> getCapabilitiesFromTraits(List<MachineTrait> traits,
                     return GTCapability.CAPABILITY_CONTROLLABLE.orEmpty(cap, LazyOptional.of(() -> controllable));
                 }
             }
-        } else if (cap == GTCapability.CAPABILITY_RECIPE_LOGIC) {
-            for (MachineTrait trait : machine.traitHolder.getAllTraits()) {
-                if (trait instanceof RecipeLogic recipeLogic) {
-                    return GTCapability.CAPABILITY_RECIPE_LOGIC.orEmpty(cap, LazyOptional.of(() -> recipeLogic));
-                }
-            }
         } else if (cap == GTCapability.CAPABILITY_ENERGY_CONTAINER) {
             if (machine instanceof IEnergyContainer energyContainer) {
                 return GTCapability.CAPABILITY_ENERGY_CONTAINER.orEmpty(cap, LazyOptional.of(() -> energyContainer));
@@ -995,21 +989,11 @@ private static <T> List<T> getCapabilitiesFromTraits(List<MachineTrait> traits,
                 return GTCapability.CAPABILITY_ENERGY_INFO_PROVIDER.orEmpty(cap,
                         LazyOptional.of(() -> list.size() == 1 ? list.get(0) : new EnergyInfoProviderList(list)));
             }
-        } else if (cap == GTCapability.CAPABILITY_CLEANROOM_RECEIVER) {
-            if (machine instanceof ICleanroomReceiver cleanroomReceiver) {
-                return GTCapability.CAPABILITY_CLEANROOM_RECEIVER.orEmpty(cap,
-                        LazyOptional.of(() -> cleanroomReceiver));
-            }
         } else if (cap == GTCapability.CAPABILITY_MAINTENANCE_MACHINE) {
             if (machine instanceof IMaintenanceMachine maintenanceMachine) {
                 return GTCapability.CAPABILITY_MAINTENANCE_MACHINE.orEmpty(cap,
                         LazyOptional.of(() -> maintenanceMachine));
             }
-        } else if (cap == GTCapability.CAPABILITY_TURBINE_MACHINE) {
-            if (machine instanceof ITurbineMachine turbineMachine) {
-                return GTCapability.CAPABILITY_TURBINE_MACHINE.orEmpty(cap,
-                        LazyOptional.of(() -> turbineMachine));
-            }
         } else if (cap == ForgeCapabilities.ITEM_HANDLER) {
             var handler = machine.getItemHandlerCap(side, true);
             if (handler != null) {
@@ -1064,14 +1048,6 @@ private static <T> List<T> getCapabilitiesFromTraits(List<MachineTrait> traits,
             if (!list.isEmpty()) {
                 return GTCapability.CAPABILITY_MONITOR_COMPONENT.orEmpty(cap, LazyOptional.of(() -> list.get(0)));
             }
-        } else if (cap == GTCapability.CAPABILITY_CENTRAL_MONITOR) {
-            if (machine instanceof ICentralMonitor centralMonitor) {
-                return GTCapability.CAPABILITY_CENTRAL_MONITOR.orEmpty(cap, LazyOptional.of(() -> centralMonitor));
-            }
-            var list = getCapabilitiesFromTraits(machine.traitHolder.getAllTraits(), side, ICentralMonitor.class);
-            if (!list.isEmpty()) {
-                return GTCapability.CAPABILITY_CENTRAL_MONITOR.orEmpty(cap, LazyOptional.of(() -> list.get(0)));
-            }
         }
         if (GTCEu.Mods.isAE2Loaded()) {
             LazyOptional<?> opt = AE2CallWrapper.getGridNodeHostCapability(cap, machine, side);

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

@@ -17,7 +17,6 @@
 import lombok.Setter;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
 
 import java.util.*;
@@ -40,10 +39,8 @@ public abstract class WorkableTieredMachine extends TieredEnergyMachine implemen
     @Setter
     @SaveField
     public int activeRecipeType;
-    @Nullable
     @Getter
-    @Setter
-    private ICleanroomProvider cleanroom;
+    protected final CleanroomReceiverTrait cleanroomReceiver;
     @SaveField
     public final NotifiableItemStackHandler importItems, exportItems;
     @SaveField
@@ -75,6 +72,7 @@ public WorkableTieredMachine(BlockEntityCreationInfo info, int tier,
         this.capabilitiesProxy = new EnumMap<>(IO.class);
         this.capabilitiesFlat = new EnumMap<>(IO.class);
         this.traitSubscriptions = new ArrayList<>();
+        this.cleanroomReceiver = new CleanroomReceiverTrait(this);
         this.recipeLogic = recipeLogicSupplier.apply(this);
         this.importItems = new NotifiableItemStackHandler(this, importSlots, IO.IN, IO.BOTH);
         this.exportItems = new NotifiableItemStackHandler(this, exportSlots, IO.OUT);
@@ -94,6 +92,7 @@ public WorkableTieredMachine(BlockEntityCreationInfo info, int tier, Int2IntFunc
         this.capabilitiesProxy = new EnumMap<>(IO.class);
         this.capabilitiesFlat = new EnumMap<>(IO.class);
         this.traitSubscriptions = new ArrayList<>();
+        this.cleanroomReceiver = new CleanroomReceiverTrait(this);
         this.recipeLogic = new RecipeLogic(this);
         this.importItems = new NotifiableItemStackHandler(this, getRecipeType().getMaxInputs(ItemRecipeCapability.CAP),
                 IO.IN);

src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java

@@ -1,6 +1,5 @@
 package com.gregtechceu.gtceu.api.machine.feature;
 
-import com.gregtechceu.gtceu.api.capability.ICleanroomReceiver;
 import com.gregtechceu.gtceu.api.capability.IWorkable;
 import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder;
 import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
@@ -16,8 +15,7 @@
 /**
  * A machine can handle recipes.
  */
-public interface IRecipeLogicMachine extends IRecipeCapabilityHolder, IMachineFeature, IWorkable, ICleanroomReceiver,
-                                     IVoidable {
+public interface IRecipeLogicMachine extends IRecipeCapabilityHolder, IMachineFeature, IWorkable, IVoidable {
 
     /**
      * RecipeType held