fix detectors

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java

@@ -1,35 +1,23 @@
 package de.srendi.advancedperipherals;
 
-import dan200.computercraft.api.media.MediaCapability;
-import dan200.computercraft.api.peripheral.PeripheralCapability;
-import dan200.computercraft.shared.media.MountMedia;
 import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.addons.ae2.AEApi;
 import de.srendi.advancedperipherals.common.addons.ae2.AE2Registries;
 import de.srendi.advancedperipherals.common.addons.computercraft.integrations.IntegrationPeripheralProvider;
 import de.srendi.advancedperipherals.common.addons.refinedstorage.RSApi;
-import de.srendi.advancedperipherals.common.blocks.base.ICapabilityProvider;
-import de.srendi.advancedperipherals.common.blocks.blockentities.GasDetectorEntity;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
-import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
-import de.srendi.advancedperipherals.common.setup.APItems;
 import de.srendi.advancedperipherals.common.setup.APRegistration;
 import de.srendi.advancedperipherals.common.util.ChunkManager;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.ItemLike;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
-import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
-import top.theillusivec4.curios.api.CuriosCapability;
-import top.theillusivec4.curios.api.type.capability.ICurio;
-
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Random;
@@ -110,62 +98,6 @@ public void onLoadComplete(FMLLoadCompleteEvent event) {
     }
 
     public void registerCapabilities(RegisterCapabilitiesEvent event) {
-        APRegistration.BLOCK_ENTITIES.getEntries().forEach((entry) -> {
-            event.registerBlockEntity(
-                PeripheralCapability.get(),
-                entry.get(),
-                (blockEntity, side) -> blockEntity instanceof ICapabilityProvider provider
-                    ? provider.createPeripheralCap(side)
-                    : null
-            );
-            event.registerBlockEntity(
-                Capabilities.ItemHandler.BLOCK,
-                entry.get(),
-                (blockEntity, side) -> blockEntity instanceof ICapabilityProvider provider
-                    ? provider.createItemHandlerCap(side)
-                    : null
-            );
-            event.registerBlockEntity(
-                Capabilities.FluidHandler.BLOCK,
-                entry.get(),
-                (blockEntity, side) -> blockEntity instanceof ICapabilityProvider provider
-                    ? provider.createFluidHandlerCap(side)
-                    : null
-            );
-            event.registerBlockEntity(
-                Capabilities.EnergyStorage.BLOCK,
-                entry.get(),
-                (blockEntity, side) -> blockEntity instanceof ICapabilityProvider provider
-                    ? provider.createEnergyStorageCap(side)
-                    : null
-            );
-            event.registerBlockEntity(
-                    mekanism.common.capabilities.Capabilities.CHEMICAL.block(),
-                    entry.get(),
-                    (blockEntity, side) -> blockEntity instanceof GasDetectorEntity provider
-                            ? provider.createProxy()
-                            : null
-            );
-        });
-
-        ItemLike[] smartGlasses = new ItemLike[]{
-            APItems.SMART_GLASSES.get(),
-            APItems.SMART_GLASSES_NETHERITE.get(),
-        };
-        event.registerItem(MediaCapability.get(), (stack, ignored) -> MountMedia.COMPUTER, smartGlasses);
-        event.registerItem(
-            Capabilities.ItemHandler.ITEM,
-            (stack, ignored) -> ((SmartGlassesItem) stack.getItem()).createItemHandlerCap(stack),
-            smartGlasses
-        );
-        if (APAddon.CURIOS.isLoaded()) {
-            event.registerItem(
-                CuriosCapability.ITEM,
-                (stack, ignored) -> (ICurio) ((SmartGlassesItem) stack.getItem()).createCurioCap(stack),
-                smartGlasses
-            );
-        }
-
         if (APAddon.AE2.isLoaded()) {
             AEApi.registerCapabilities(event);
         }

src/main/java/de/srendi/advancedperipherals/common/blocks/base/BaseDetectorEntity.java

@@ -11,7 +11,6 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.capabilities.BlockCapability;
-import net.neoforged.neoforge.capabilities.ICapabilityProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -20,7 +19,7 @@
  * @param <S> The storage proxy type, must implements/extends both {@code <T>} and {@link IStorageProxy}
  * @param <P> The peripheral type, must extends {@link BasePeripheral}
  */
-public abstract class BaseDetectorEntity<T, S extends IStorageProxy, P extends BasePeripheral<?>> extends PeripheralBlockEntity<P> implements ICapabilityProvider<BlockEntity, Direction, Object> {
+public abstract class BaseDetectorEntity<T, S extends IStorageProxy, P extends BasePeripheral<?>> extends PeripheralBlockEntity<P> {
 
     private static final String RATE_LIMIT_TAG = "RateLimit";
 
@@ -103,19 +102,19 @@ public Direction getOutputDirection() {
         return this.getBlockState().getValue(BaseBlock.ORIENTATION).front().getOpposite();
     }
 
-    @Override
-    public @Nullable Object getCapability(BlockEntity self, Direction context) {
+    @Nullable
+    public T getCapability(Direction context) {
         Direction inputDirection = this.getInputDirection();
         Direction outputDirection = this.getOutputDirection();
         if (context == inputDirection) {
-            return this.getStorageProxy();
-        } else if (context == outputDirection) {
+            return (T) this.getStorageProxy();
+        }
+        if (context == outputDirection) {
             if (this.zeroStorageCap == null) {
                 this.zeroStorageCap = this.getZeroStorage();
             }
             return this.zeroStorageCap;
         }
-
         return null;
     }
 

src/main/java/de/srendi/advancedperipherals/common/blocks/base/BlockCapabilityProviders.java

@@ -0,0 +1,35 @@
+package de.srendi.advancedperipherals.common.blocks.base;
+
+import dan200.computercraft.api.peripheral.IPeripheral;
+import net.minecraft.core.Direction;
+import net.neoforged.neoforge.energy.IEnergyStorage;
+import net.neoforged.neoforge.fluids.capability.IFluidHandler;
+import net.neoforged.neoforge.items.IItemHandler;
+import org.jetbrains.annotations.Nullable;
+
+public final class BlockCapabilityProviders {
+    public interface EnergyStorage {
+        @Nullable
+        IEnergyStorage createEnergyStorageCap(@Nullable Direction side);
+    }
+
+    public interface FluidHandler {
+        @Nullable
+        IFluidHandler createFluidHandlerCap(@Nullable Direction side);
+    }
+
+    public interface ItemHandler {
+        @Nullable
+        IItemHandler createItemHandlerCap(@Nullable Direction side);
+    }
+
+    public interface Peripheral {
+        @Nullable
+        IPeripheral createPeripheralCap(@Nullable Direction side);
+    }
+
+    public interface ChemicalHandler {
+        @Nullable
+        Object /*IChemicalHandler*/ createChemicalHandlerCap(@Nullable Direction side);
+    }
+}

src/main/java/de/srendi/advancedperipherals/common/blocks/base/ICapabilityProvider.java

@@ -21,19 +21,16 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.neoforged.neoforge.fluids.capability.IFluidHandler;
-import net.neoforged.neoforge.fluids.capability.templates.FluidTank;
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.wrapper.SidedInvWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class PeripheralBlockEntity<T extends BasePeripheral<?>> extends BaseContainerBlockEntity implements WorldlyContainer, IPeripheralBlockEntity, ICapabilityProvider, VarNameable {
+public abstract class PeripheralBlockEntity<T extends BasePeripheral<?>> extends BaseContainerBlockEntity implements WorldlyContainer, IPeripheralBlockEntity, BlockCapabilityProviders.ItemHandler, BlockCapabilityProviders.Peripheral, VarNameable {
     private static final String PERIPHERAL_SETTINGS_KEY = "peripheralSettings";
     protected CompoundTag peripheralSettings = new CompoundTag();
     protected NonNullList<ItemStack> items;
     private IItemHandler itemHandler = null;
-    private IFluidHandler fluidHandler = null;
     private IPeripheral peripheral = null;
 
     protected PeripheralBlockEntity(BlockEntityType<?> tileEntityTypeIn, BlockPos pos, BlockState state) {
@@ -59,15 +56,6 @@ public IItemHandler createItemHandlerCap(@Nullable Direction side) {
         return this.itemHandler;
     }
 
-    @Override
-    @NotNull
-    public IFluidHandler createFluidHandlerCap(@Nullable Direction side) {
-        if (this.fluidHandler == null) {
-            this.fluidHandler = new FluidTank(0);
-        }
-        return this.fluidHandler;
-    }
-
     @Override
     @NotNull
     public IPeripheral createPeripheralCap(@Nullable Direction side) {

src/main/java/de/srendi/advancedperipherals/common/blocks/base/PeripheralBlockEntity.java

@@ -13,7 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class PoweredPeripheralBlockEntity<T extends BasePeripheral<?>> extends PeripheralBlockEntity<T> {
+public abstract class PoweredPeripheralBlockEntity<T extends BasePeripheral<?>> extends PeripheralBlockEntity<T> implements BlockCapabilityProviders.EnergyStorage {
 
     private final IEnergyStorage energyStorage;
 

src/main/java/de/srendi/advancedperipherals/common/blocks/base/PoweredPeripheralBlockEntity.java

@@ -2,17 +2,20 @@
 
 import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.EnergyDetectorPeripheral;
 import de.srendi.advancedperipherals.common.blocks.base.BaseDetectorEntity;
+import de.srendi.advancedperipherals.common.blocks.base.BlockCapabilityProviders;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
 import de.srendi.advancedperipherals.common.util.proxy.EnergyStorageProxy;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.energy.EnergyStorage;
 import net.neoforged.neoforge.energy.IEnergyStorage;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class EnergyDetectorEntity extends BaseDetectorEntity<IEnergyStorage, EnergyStorageProxy, EnergyDetectorPeripheral> {
+public class EnergyDetectorEntity extends BaseDetectorEntity<IEnergyStorage, EnergyStorageProxy, EnergyDetectorPeripheral> implements BlockCapabilityProviders.EnergyStorage {
 
     private static final EnergyStorage ZERO_STORAGE = new EnergyStorage(0, 0, 0);
 
@@ -37,4 +40,10 @@ protected EnergyStorageProxy createProxy() {
     protected IEnergyStorage getZeroStorage() {
         return ZERO_STORAGE;
     }
+
+    @Override
+    @Nullable
+    public IEnergyStorage createEnergyStorageCap(@Nullable Direction side) {
+        return this.getCapability(side);
+    }
 }

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/EnergyDetectorEntity.java

@@ -2,17 +2,20 @@
 
 import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.FluidDetectorPeripheral;
 import de.srendi.advancedperipherals.common.blocks.base.BaseDetectorEntity;
+import de.srendi.advancedperipherals.common.blocks.base.BlockCapabilityProviders;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
 import de.srendi.advancedperipherals.common.util.proxy.FluidStorageProxy;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 import net.neoforged.neoforge.fluids.capability.templates.FluidTank;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class FluidDetectorEntity extends BaseDetectorEntity<IFluidHandler, FluidStorageProxy, FluidDetectorPeripheral> {
+public class FluidDetectorEntity extends BaseDetectorEntity<IFluidHandler, FluidStorageProxy, FluidDetectorPeripheral> implements BlockCapabilityProviders.FluidHandler {
 
     private static final FluidTank ZERO_STORAGE = new FluidTank(0);
 
@@ -37,4 +40,10 @@ protected FluidStorageProxy createProxy() {
     protected IFluidHandler getZeroStorage() {
         return ZERO_STORAGE;
     }
+
+    @Override
+    @Nullable
+    public IFluidHandler createFluidHandlerCap(@Nullable Direction side) {
+        return this.getCapability(side);
+    }
 }

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/FluidDetectorEntity.java

@@ -2,23 +2,24 @@
 
 import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.GasDetectorPeripheral;
 import de.srendi.advancedperipherals.common.blocks.base.BaseDetectorEntity;
+import de.srendi.advancedperipherals.common.blocks.base.BlockCapabilityProviders;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
 import de.srendi.advancedperipherals.common.util.proxy.GasStorageProxy;
 import de.srendi.advancedperipherals.common.util.proxy.ZeroGasTank;
 import mekanism.api.chemical.IChemicalHandler;
 import mekanism.common.capabilities.Capabilities;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class GasDetectorEntity extends BaseDetectorEntity<IChemicalHandler, GasStorageProxy, GasDetectorPeripheral> {
+public class GasDetectorEntity extends BaseDetectorEntity<IChemicalHandler, GasStorageProxy, GasDetectorPeripheral> implements BlockCapabilityProviders.ChemicalHandler {
 
-    // a zero size, zero transfer gas storage to ensure that cables connect
     private static final IChemicalHandler ZERO_STORAGE = new ZeroGasTank();
 
     public GasDetectorEntity(BlockPos pos, BlockState state) {
-        //TODO: Does still not work, transfers chemicals but without a rate limit and without monitoring the transfer rate
         super(APBlockEntityTypes.GAS_DETECTOR.get(), pos, state, Capabilities.CHEMICAL.block());
     }
 
@@ -39,4 +40,10 @@ public GasStorageProxy createProxy() {
     protected IChemicalHandler getZeroStorage() {
         return ZERO_STORAGE;
     }
+
+    @Override
+    @Nullable
+    public Object createChemicalHandlerCap(@Nullable Direction side) {
+        return this.getCapability(side);
+    }
 }