diff --git a/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java b/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java index cf9ebc326d..75fc5085ea 100644 --- a/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java +++ b/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java @@ -49,7 +49,11 @@ public enum CapabilityManager * @param type The Interface to be registered * @param storage A default implementation of the storage handler. * @param implementation A default implementation of the interface. + * @deprecated Use the overload that takes a factory instead of a class. + * You can easily do this by passing a constructor reference + * (MyImpl::new instead of MyImpl.class). TODO remove in 1.13. */ + @Deprecated public void register(Class type, Capability.IStorage storage, final Class implementation) { Preconditions.checkArgument(implementation != null, "Attempted to register a capability with no default implementation"); @@ -173,4 +177,4 @@ public enum CapabilityManager } } } -} \ No newline at end of file +} diff --git a/src/test/java/net/minecraftforge/debug/ChunkCapabilityPollutionTest.java b/src/test/java/net/minecraftforge/debug/ChunkCapabilityPollutionTest.java index d4cd18217c..cd3f3dfe1d 100644 --- a/src/test/java/net/minecraftforge/debug/ChunkCapabilityPollutionTest.java +++ b/src/test/java/net/minecraftforge/debug/ChunkCapabilityPollutionTest.java @@ -169,7 +169,7 @@ public class ChunkCapabilityPollutionTest { { if (ENABLE) { - CapabilityManager.INSTANCE.register(IPollution.class, new PollutionStorage(), DefaultPollution.class); + CapabilityManager.INSTANCE.register(IPollution.class, new PollutionStorage(), DefaultPollution::new); MinecraftForge.EVENT_BUS.register(new EventBusHandler()); } } diff --git a/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java b/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java index 06231b1883..626f343735 100644 --- a/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java +++ b/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java @@ -66,7 +66,7 @@ public class NoBedSleepingTest @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - CapabilityManager.INSTANCE.register(IExtraSleeping.class, new Storage(), DefaultImpl.class); + CapabilityManager.INSTANCE.register(IExtraSleeping.class, new Storage(), DefaultImpl::new); MinecraftForge.EVENT_BUS.register(new EventHandler()); } diff --git a/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java b/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java index 2c8263fe68..7c551d7519 100644 --- a/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java +++ b/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java @@ -52,7 +52,7 @@ public class TestCapabilityMod // If you are a API, provide register your capability ASAP. // You MUST supply a default save handler and a default implementation // If you are a CONSUMER of the capability DO NOT register it. Only APIs should. - CapabilityManager.INSTANCE.register(IExampleCapability.class, new Storage(), DefaultImpl.class); + CapabilityManager.INSTANCE.register(IExampleCapability.class, new Storage(), DefaultImpl::new); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java b/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java index bce974abe3..1f6d5ce12b 100644 --- a/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java +++ b/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java @@ -36,7 +36,7 @@ public class WorldCapabilityRainTimerTest @EventHandler public void init(FMLInitializationEvent event) { - CapabilityManager.INSTANCE.register(IRainTimer.class, new TimerStorage(), DefaultTimer.class); + CapabilityManager.INSTANCE.register(IRainTimer.class, new TimerStorage(), DefaultTimer::new); MinecraftForge.EVENT_BUS.register(new NormalEventHandler()); }