Browse Source

Add more null checks

Lortseam 4 năm trước cách đây
mục cha
commit
0013f3d256

+ 3 - 3
lib/src/main/java/me/lortseam/completeconfig/CompleteConfig.java

@@ -34,13 +34,13 @@ public final class CompleteConfig {
         }
     }
 
-    public static void registerExtensionType(Class<? extends Extension> extensionType, EnvType environment, String... mods) {
+    public static void registerExtensionType(@NonNull Class<? extends Extension> extensionType, EnvType environment, String... mods) {
         if(validExtensionTypes.contains(extensionType)) return;
-        if(environment != null && FabricLoader.getInstance().getEnvironmentType() != environment || Arrays.stream(mods).anyMatch(modID -> !FabricLoader.getInstance().isModLoaded(modID))) return;
+        if(environment != null && FabricLoader.getInstance().getEnvironmentType() != environment || Arrays.stream(mods).anyMatch(modID -> !FabricLoader.getInstance().isModLoaded(Objects.requireNonNull(modID)))) return;
         validExtensionTypes.add(extensionType);
     }
 
-    public static void registerExtensionType(Class<? extends Extension> extensionType, String... mods) {
+    public static void registerExtensionType(@NonNull Class<? extends Extension> extensionType, String... mods) {
         registerExtensionType(extensionType, null, mods);
     }
 

+ 3 - 2
lib/src/main/java/me/lortseam/completeconfig/gui/ConfigScreenBuilder.java

@@ -1,5 +1,6 @@
 package me.lortseam.completeconfig.gui;
 
+import lombok.NonNull;
 import me.lortseam.completeconfig.data.Config;
 import me.lortseam.completeconfig.gui.cloth.ClothConfigScreenBuilder;
 import net.fabricmc.api.EnvType;
@@ -23,11 +24,11 @@ public abstract class ConfigScreenBuilder {
      * @param modID the mod's ID
      * @param screenBuilder the screen builder
      */
-    public static void setMain(String modID, ConfigScreenBuilder screenBuilder) {
+    public static void setMain(@NonNull String modID, @NonNull ConfigScreenBuilder screenBuilder) {
         mainBuilders.put(modID, screenBuilder);
     }
 
-    public static Optional<ConfigScreenBuilder> getMain(String modID) {
+    public static Optional<ConfigScreenBuilder> getMain(@NonNull String modID) {
         if (mainBuilders.containsKey(modID)) {
             return Optional.of(mainBuilders.get(modID));
         }

+ 2 - 1
lib/src/main/java/me/lortseam/completeconfig/gui/cloth/ClothConfigScreenBuilder.java

@@ -1,6 +1,7 @@
 package me.lortseam.completeconfig.gui.cloth;
 
 import lombok.Getter;
+import lombok.NonNull;
 import me.lortseam.completeconfig.data.Collection;
 import me.lortseam.completeconfig.data.Config;
 import me.lortseam.completeconfig.data.Entry;
@@ -32,7 +33,7 @@ public final class ClothConfigScreenBuilder extends ConfigScreenBuilder {
     @Getter
     private final GuiRegistry registry = new GuiRegistry();
 
-    public ClothConfigScreenBuilder(Supplier<ConfigBuilder> supplier) {
+    public ClothConfigScreenBuilder(@NonNull Supplier<ConfigBuilder> supplier) {
         this.supplier = supplier;
     }