Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made capability access test-friendly.

Browse Source
This commit is contained in:
Florian Nücke
2022-02-13 15:58:17 +01:00
parent 07429bf39c
commit 4688106a6d
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/li/cil/oc2/common/capabilities/Capabilities.java
View File

@@ -13,6 +13,8 @@ import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandler;
import java.util.function.Consumer;
public final class Capabilities {
public static Capability<IEnergyStorage> energyStorage() {
return CapabilityRegistry.ENERGY_STORAGE;
@@ -49,4 +51,13 @@ public final class Capabilities {
public static Capability<Robot> robot() {
return CapabilityRegistry.ROBOT;
}
public static void registerCapabilities(final Consumer<Class<?>> registry) {
registry.accept(DeviceBusElement.class);
registry.accept(Device.class);
registry.accept(RedstoneEmitter.class);
registry.accept(NetworkInterface.class);
registry.accept(TerminalUserProvider.class);
registry.accept(Robot.class);
}
}

7
src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java
View File

@@ -33,11 +33,6 @@ public final class CapabilityRegistry {
@SubscribeEvent
public static void initialize(final RegisterCapabilitiesEvent event) {
event.register(DeviceBusElement.class);
event.register(Device.class);
event.register(RedstoneEmitter.class);
event.register(NetworkInterface.class);
event.register(TerminalUserProvider.class);
event.register(Robot.class);
Capabilities.registerCapabilities(event::register);
}
}