Use new Cyclops capability registry

Author: rubensworks

build.properties

@@ -2,5 +2,5 @@ mod_version=0.1.5
 minecraft_version=1.9.4
 forge_version=12.17.0.1909-1.9.4
 mcp_mappings_version=snapshot_20160519
-cyclopscore_version=0.6.1-332
+cyclopscore_version=0.6.3-359
 release_type=release

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.3-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.13-all.zip

src/main/java/org/cyclops/structuredcrafting/StructuredCrafting.java

@@ -1,17 +1,14 @@
 package org.cyclops.structuredcrafting;
 
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.*;
 import org.apache.logging.log4j.Level;
-import org.cyclops.commoncapabilities.api.capability.work.IWorker;
 import org.cyclops.cyclopscore.config.ConfigHandler;
 import org.cyclops.cyclopscore.config.extendedconfig.BlockItemConfigReference;
 import org.cyclops.cyclopscore.init.ItemCreativeTab;
 import org.cyclops.cyclopscore.init.ModBaseVersionable;
 import org.cyclops.cyclopscore.init.RecipeHandler;
-import org.cyclops.cyclopscore.modcompat.ICapabilityCompat;
 import org.cyclops.cyclopscore.modcompat.ModCompatLoader;
 import org.cyclops.cyclopscore.proxy.ICommonProxy;
 import org.cyclops.structuredcrafting.block.BlockStructuredCrafterConfig;
@@ -56,13 +53,7 @@ protected void loadModCompats(ModCompatLoader modCompatLoader) {
         super.loadModCompats(modCompatLoader);
 
         // Capabilities
-        ICapabilityCompat.ICapabilityReference<IWorker> workerReference = new ICapabilityCompat.ICapabilityReference<IWorker>() {
-            @Override
-            public Capability<IWorker> getCapability() {
-                return Capabilities.WORKER;
-            }
-        };
-        modCompatLoader.addCapabilityCompat(TileStructuredCrafter.class, workerReference, new WorkerStructuredCrafterTileCompat());
+        getCapabilityConstructorRegistry().registerTile(TileStructuredCrafter.class, new WorkerStructuredCrafterTileCompat());
     }
 
     @Mod.EventHandler

src/main/java/org/cyclops/structuredcrafting/modcompat/capabilities/WorkerStructuredCrafterTileCompat.java

@@ -1,19 +1,30 @@
 package org.cyclops.structuredcrafting.modcompat.capabilities;
 
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import org.cyclops.commoncapabilities.api.capability.work.IWorker;
-import org.cyclops.cyclopscore.modcompat.ICapabilityCompat;
+import org.cyclops.cyclopscore.modcompat.capabilities.DefaultCapabilityProvider;
+import org.cyclops.cyclopscore.modcompat.capabilities.SimpleCapabilityConstructor;
 import org.cyclops.structuredcrafting.Capabilities;
 import org.cyclops.structuredcrafting.tileentity.TileStructuredCrafter;
 
+import javax.annotation.Nullable;
+
 /**
  * Compatibility for structured crafter worker capability.
  * @author rubensworks
  */
-public class WorkerStructuredCrafterTileCompat implements ICapabilityCompat<TileStructuredCrafter> {
+public class WorkerStructuredCrafterTileCompat extends SimpleCapabilityConstructor<IWorker, TileStructuredCrafter> {
+
+    @Nullable
+    @Override
+    public ICapabilityProvider createProvider(TileStructuredCrafter host) {
+        return new DefaultCapabilityProvider<>(Capabilities.WORKER, new Worker(host));
+    }
 
     @Override
-    public void attach(final TileStructuredCrafter provider) {
-        provider.addCapabilityInternal(Capabilities.WORKER, new Worker(provider));
+    public Capability<IWorker> getCapability() {
+        return Capabilities.WORKER;
     }
 
     public static class Worker implements IWorker {