Simplify factory-to-callback methods

Ladysnake · Jun 20, 2020 · ce9e034 · ce9e034
1 parent b07adcc
commit ce9e034
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 36 deletions.
diff --git a/...nts-chunk/src/main/java/nerdhub/cardinal/components/api/event/ChunkComponentCallback.java b/...nts-chunk/src/main/java/nerdhub/cardinal/components/api/event/ChunkComponentCallback.java
@@ -54,12 +54,7 @@ public interface ChunkComponentCallback extends ComponentCallback<Chunk, Copyabl
 
     @ApiStatus.Experimental
     static <C extends Component> void register(ComponentType<C> type, ChunkComponentFactory<? extends C> factory) {
-        EVENT.register((chunk, components) -> {
-            CopyableComponent<?> cc = factory.createForChunk(chunk);
-            if (cc != null) {
-                components.put(type, cc);
-            }
-        });
+        EVENT.register((chunk, components) -> components.put(type, factory.createForChunk(chunk)));
     }
 
     /**

diff --git a/...s-entity/src/main/java/nerdhub/cardinal/components/api/event/EntityComponentCallback.java b/...s-entity/src/main/java/nerdhub/cardinal/components/api/event/EntityComponentCallback.java
@@ -76,12 +76,7 @@ static <E extends Entity> Event<EntityComponentCallback<E>> event(Class<E> clazz
 
     @ApiStatus.Experimental
     static <C extends Component, E extends Entity> void register(ComponentType<C> type, Class<E> targetClass, EntityComponentFactory<C, E> factory) {
-        event(targetClass).register((entity, components) -> {
-            C c = factory.createForEntity(entity);
-            if (c != null) {
-                components.put(type, c);
-            }
-        });
+        event(targetClass).register((entity, components) -> components.put(type, factory.createForEntity(entity)));
     }
 
     /**

diff --git a/...nents-item/src/main/java/nerdhub/cardinal/components/api/event/ItemComponentCallback.java b/...nents-item/src/main/java/nerdhub/cardinal/components/api/event/ItemComponentCallback.java
@@ -80,12 +80,7 @@ static Event<ItemComponentCallback> event(@Nullable Item item) {
 
     @ApiStatus.Experimental
     static <C extends Component> void register(ComponentType<C> type, @Nullable Item item, ItemComponentFactory<? extends C> factory) {
-        event(item).register((stack, components) -> {
-            CopyableComponent<?> cc = factory.createForStack(stack);
-            if (cc != null) {
-                components.put(type, cc);
-            }
-        });
+        event(item).register((stack, components) -> components.put(type, factory.createForStack(stack)));
     }
 
     /**

diff --git a/...nts-item/src/main/java/nerdhub/cardinal/components/api/event/ItemComponentCallbackV2.java b/...nts-item/src/main/java/nerdhub/cardinal/components/api/event/ItemComponentCallbackV2.java
@@ -78,10 +78,7 @@ static Event<ItemComponentCallbackV2> event(@Nullable Item item) {
     @ApiStatus.Experimental
     static <C extends Component> void register(ComponentType<C> type, @Nullable Item item, ItemComponentFactoryV2<? extends C> factory) {
         event(item).register((it, stack, components) -> {
-            CopyableComponent<?> cc = factory.createForStack(it, stack);
-            if (cc != null) {
-                components.put(type, cc);
-            }
+            components.put(type, factory.createForStack(it, stack));
         });
     }
 

diff --git a/...level/src/main/java/dev/onyxstudios/cca/api/v3/component/level/LevelComponentFactory.java b/...level/src/main/java/dev/onyxstudios/cca/api/v3/component/level/LevelComponentFactory.java
@@ -26,7 +26,7 @@
 import net.minecraft.world.WorldProperties;
 import org.jetbrains.annotations.ApiStatus;
 
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * A component factory for {@linkplain WorldProperties world saves}.
@@ -45,6 +45,6 @@ public interface LevelComponentFactory<C extends Component> {
      *
      * @param properties the {@code WorldProperties} being constructed
      */
-    @Nullable
+    @Nonnull
     C createForSave(WorldProperties properties);
 }
diff --git a/...nts-level/src/main/java/nerdhub/cardinal/components/api/event/LevelComponentCallback.java b/...nts-level/src/main/java/nerdhub/cardinal/components/api/event/LevelComponentCallback.java
@@ -53,12 +53,7 @@ public interface LevelComponentCallback extends ComponentCallback<WorldPropertie
 
     @ApiStatus.Experimental
     static <C extends Component> void register(ComponentType<C> type, LevelComponentFactory<C> factory) {
-        EVENT.register((level, components) -> {
-            Component c = factory.createForSave(level);
-            if (c != null) {
-                components.put(type, c);
-            }
-        });
+        EVENT.register((level, components) -> components.put(type, factory.createForSave(level)));
     }
 
     /**

diff --git a/...nts-world/src/main/java/nerdhub/cardinal/components/api/event/WorldComponentCallback.java b/...nts-world/src/main/java/nerdhub/cardinal/components/api/event/WorldComponentCallback.java
@@ -51,12 +51,7 @@ public interface WorldComponentCallback extends ComponentCallback<World, Compone
             });
 
     static <C extends Component> void register(ComponentType<C> type, WorldComponentFactory<C> factory) {
-        EVENT.register((world, components) -> {
-            C c = factory.createForWorld(world);
-            if (c != null) {
-                components.put(type, c);
-            }
-        });
+        EVENT.register((world, components) -> components.put(type, factory.createForWorld(world)));
     }
 
     /**