ID -> Id

lib/src/main/java/me/lortseam/completeconfig/CompleteConfig.java

@@ -36,7 +36,7 @@ public final class CompleteConfig {
 
     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(Objects.requireNonNull(modID)))) return;
+        if(environment != null && FabricLoader.getInstance().getEnvironmentType() != environment || Arrays.stream(mods).anyMatch(modId -> !FabricLoader.getInstance().isModLoaded(Objects.requireNonNull(modId)))) return;
         validExtensionTypes.add(extensionType);
     }
 
@@ -62,8 +62,8 @@ public final class CompleteConfig {
         }
     }
 
-    public static void registerExtension(@NonNull String modID, @NonNull Class<? extends CompleteConfigExtension> extensionType) {
-        if(!FabricLoader.getInstance().isModLoaded(modID)) return;
+    public static void registerExtension(@NonNull String modId, @NonNull Class<? extends CompleteConfigExtension> extensionType) {
+        if(!FabricLoader.getInstance().isModLoaded(modId)) return;
         registerExtension(extensionType);
     }
 

lib/src/main/java/me/lortseam/completeconfig/api/ConfigGroup.java

@@ -12,7 +12,7 @@ public interface ConfigGroup extends ConfigContainer {
      *
      * @return the ID of this group
      */
-    default String getID() {
+    default String getId() {
         return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, getClass().getSimpleName());
     }
 

lib/src/main/java/me/lortseam/completeconfig/data/CollectionSet.java

@@ -12,11 +12,11 @@ public class CollectionSet extends DataSet<Collection> {
     }
 
     void resolve(ConfigGroup group) {
-        String groupID = group.getID();
-        Collection collection = new Collection(groupID, translation.append(groupID), group.getTooltipTranslationKeys(), group.getComment());
+        String groupId = group.getId();
+        Collection collection = new Collection(groupId, translation.append(groupId), group.getTooltipTranslationKeys(), group.getComment());
         collection.resolveContainer(group);
         if (collection.isEmpty()) {
-            logger.warn("Empty group: " + groupID);
+            logger.warn("Empty group: " + groupId);
             return;
         }
         add(collection);

lib/src/main/java/me/lortseam/completeconfig/data/Config.java

@@ -31,13 +31,13 @@ public final class Config extends BaseCollection {
     /**
      * Creates a new config builder for the specified mod.
      *
-     * @param modID the ID of the mod creating the config
+     * @param modId the ID of the mod creating the config
      */
-    public static Builder builder(@NonNull String modID) {
-        if (!FabricLoader.getInstance().isModLoaded(modID)) {
-            throw new IllegalArgumentException("Mod " + modID + " is not loaded");
+    public static Builder builder(@NonNull String modId) {
+        if (!FabricLoader.getInstance().isModLoaded(modId)) {
+            throw new IllegalArgumentException("Mod " + modId + " is not loaded");
         }
-        return new Builder(modID);
+        return new Builder(modId);
     }
 
     private final ConfigSource source;
@@ -49,7 +49,7 @@ public final class Config extends BaseCollection {
     }
 
     public ModMetadata getMod() {
-        return FabricLoader.getInstance().getModContainer(source.getModID()).get().getMetadata();
+        return FabricLoader.getInstance().getModContainer(source.getModId()).get().getMetadata();
     }
 
     public TranslationKey getTranslation(boolean includeBranch) {
@@ -71,14 +71,14 @@ public final class Config extends BaseCollection {
     @Log4j2(topic = "CompleteConfig")
     public final static class Builder {
 
-        private final String modID;
+        private final String modId;
         private String[] branch = new String[0];
         private final LinkedHashSet<ConfigContainer> children = new LinkedHashSet<>();
         private boolean main;
         private boolean saveOnExit;
 
-        private Builder(String modID) {
-            this.modID = modID;
+        private Builder(String modId) {
+            this.modId = modId;
         }
 
         /**
@@ -139,14 +139,14 @@ public final class Config extends BaseCollection {
         public Config build() {
             Config config = null;
             if (!children.isEmpty()) {
-                config = new Config(new ConfigSource(modID, branch), children.toArray(new ConfigContainer[0]));
+                config = new Config(new ConfigSource(modId, branch), children.toArray(new ConfigContainer[0]));
             }
             if (config == null || config.isEmpty()) {
-                logger.warn("Empty config: " + modID + " " + Arrays.toString(branch));
+                logger.warn("Empty config: " + modId + " " + Arrays.toString(branch));
                 return null;
             }
-            if (main || branch.length == 0 && !mainConfigs.containsKey(modID)) {
-                mainConfigs.put(modID, config);
+            if (main || branch.length == 0 && !mainConfigs.containsKey(modId)) {
+                mainConfigs.put(modId, config);
             }
             if (saveOnExit) {
                 saveOnExitConfigs.add(config);

lib/src/main/java/me/lortseam/completeconfig/data/text/TranslationKey.java

@@ -17,7 +17,7 @@ public final class TranslationKey {
     private static final String DELIMITER = ".";
 
     public static TranslationKey from(ConfigSource source) {
-        return new TranslationKey("config" + DELIMITER + source.getModID());
+        return new TranslationKey("config" + DELIMITER + source.getModId());
     }
 
     private final String modKey;

lib/src/main/java/me/lortseam/completeconfig/gui/ConfigScreenBuilder.java

@@ -21,16 +21,16 @@ public abstract class ConfigScreenBuilder {
      * Sets the main screen builder for a mod. The main screen builder will be used to build the config screen if no
      * custom builder was specified.
      *
-     * @param modID the mod's ID
+     * @param modId the mod's ID
      * @param screenBuilder the screen builder
      */
-    public static void setMain(@NonNull String modID, @NonNull ConfigScreenBuilder screenBuilder) {
-        mainBuilders.put(modID, screenBuilder);
+    public static void setMain(@NonNull String modId, @NonNull ConfigScreenBuilder screenBuilder) {
+        mainBuilders.put(modId, screenBuilder);
     }
 
-    public static Optional<ConfigScreenBuilder> getMain(@NonNull String modID) {
-        if (mainBuilders.containsKey(modID)) {
-            return Optional.of(mainBuilders.get(modID));
+    public static Optional<ConfigScreenBuilder> getMain(@NonNull String modId) {
+        if (mainBuilders.containsKey(modId)) {
+            return Optional.of(mainBuilders.get(modId));
         }
         return Optional.ofNullable(fallback);
     }

lib/src/main/java/me/lortseam/completeconfig/io/ConfigSource.java

@@ -36,20 +36,20 @@ public final class ConfigSource {
 
     @EqualsAndHashCode.Include
     @Getter
-    private final String modID;
+    private final String modId;
     @EqualsAndHashCode.Include
     @Getter
     private final String[] branch;
     private final HoconConfigurationLoader loader;
 
-    public ConfigSource(String modID, String[] branch) {
-        this.modID = modID;
+    public ConfigSource(String modId, String[] branch) {
+        this.modId = modId;
         this.branch = branch;
         if (!sources.add(this)) {
             throw new IllegalArgumentException("A config of " + this + " already exists");
         }
         Path path = FabricLoader.getInstance().getConfigDir();
-        String[] subPath = ArrayUtils.add(branch, 0, modID);
+        String[] subPath = ArrayUtils.add(branch, 0, modId);
         subPath[subPath.length - 1] = subPath[subPath.length - 1] + ".conf";
         for (String child : subPath) {
             path = path.resolve(child);

lib/src/test/java/me/lortseam/completeconfig/data/ConfigTest.java

@@ -14,9 +14,9 @@ import static org.junit.jupiter.api.Assertions.*;
 public class ConfigTest {
 
     @Test
-    public void builder_throwExceptionIfModIDNull() {
+    public void builder_throwExceptionIfModIdNull() {
         NullPointerException exception = assertThrows(NullPointerException.class, () -> Config.builder(null));
-        assertEquals("modID is marked non-null but is null", exception.getMessage());
+        assertEquals("modId is marked non-null but is null", exception.getMessage());
     }
 
     @Nested