Browse Source

Improve config builder

Lortseam 4 years ago
parent
commit
f3798fe6d6

+ 1 - 1
src/main/java/me/lortseam/completeconfig/CompleteConfig.java

@@ -14,7 +14,7 @@ public final class CompleteConfig implements ModInitializer {
     public void onInitialize() {
         for (EntrypointContainer<ConfigOwner> entrypoint : FabricLoader.getInstance().getEntrypointContainers("completeconfig", ConfigOwner.class)) {
             ConfigOwner owner = entrypoint.getEntrypoint();
-            ConfigBuilder builder = ConfigBuilder.create(entrypoint.getProvider().getMetadata().getId(), Objects.requireNonNull(owner.getConfigBranch()), owner.getClass());
+            ConfigBuilder builder = new ConfigBuilder(entrypoint.getProvider().getMetadata().getId(), Objects.requireNonNull(owner.getConfigBranch()), owner.getClass());
             if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 owner.onInitializeClientConfig(builder);
             }

+ 10 - 6
src/main/java/me/lortseam/completeconfig/ConfigBuilder.java

@@ -12,10 +12,6 @@ import java.util.Objects;
 
 public final class ConfigBuilder {
 
-    static ConfigBuilder create(String modID, String[] branch, Class<? extends ConfigOwner> owner) {
-        return new ConfigBuilder(modID, branch, owner);
-    }
-
     private final String modID;
     private final String[] branch;
     private final Class<? extends ConfigOwner> owner;
@@ -23,7 +19,7 @@ public final class ConfigBuilder {
     private TypeSerializerCollection typeSerializers;
     private GuiBuilder guiBuilder;
 
-    private ConfigBuilder(String modID, String[] branch, Class<? extends ConfigOwner> owner) {
+    ConfigBuilder(String modID, String[] branch, Class<? extends ConfigOwner> owner) {
         this.modID = modID;
         this.branch = branch;
         this.owner = owner;
@@ -70,8 +66,16 @@ public final class ConfigBuilder {
      *
      * @return the handler associated with the created config
      */
+    public ConfigHandler build() {
+        return ConfigHandler.buildConfig(modID, branch, owner, topLevelGroups, typeSerializers, guiBuilder);
+    }
+
+    /**
+     * @deprecated Use {@link #build()}
+     */
+    @Deprecated
     public ConfigHandler finish() {
-        return ConfigHandler.registerConfig(modID, branch, owner, topLevelGroups, typeSerializers, guiBuilder);
+        return build();
     }
 
 }

+ 1 - 1
src/main/java/me/lortseam/completeconfig/ConfigHandler.java

@@ -34,7 +34,7 @@ public final class ConfigHandler {
         }));
     }
 
-    static ConfigHandler registerConfig(String modID, String[] branch, Class<? extends ConfigOwner> owner, List<ConfigGroup> topLevelGroups, TypeSerializerCollection typeSerializers, GuiBuilder guiBuilder) {
+    static ConfigHandler buildConfig(String modID, String[] branch, Class<? extends ConfigOwner> owner, List<ConfigGroup> topLevelGroups, TypeSerializerCollection typeSerializers, GuiBuilder guiBuilder) {
         if (HANDLERS.containsKey(owner)) {
             throw new IllegalArgumentException("The specified owner " + owner + " already created a config!");
         }