diff --git a/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java b/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java
index 98c1f549..f285b50b 100644
--- a/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java
+++ b/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java
@@ -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);
+    }
 }
diff --git a/src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java b/src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java
index d985e9e6..19674aa8 100644
--- a/src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java
+++ b/src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java
@@ -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);
     }
 }