refactor: rename variable names

sakurawald · Jul 11, 2024 · e2617d2 · e2617d2
1 parent d525e17
commit e2617d2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/src/main/java/io/github/sakurawald/Fuji.java b/src/main/java/io/github/sakurawald/Fuji.java
@@ -44,9 +44,6 @@
 
 // TODO: condense
 
-// TODO: force enable -> force disable
-// TODO: stop loading if configuration structure is in-compatible
-
 public class Fuji implements ModInitializer {
     public static final String MOD_ID = "fuji";
     public static final Logger LOGGER = LogUtil.createLogger(StringUtils.capitalize(MOD_ID));

diff --git a/src/main/java/io/github/sakurawald/config/handler/ConfigHandler.java b/src/main/java/io/github/sakurawald/config/handler/ConfigHandler.java
@@ -76,7 +76,7 @@ public void backupFromDisk() {
         try {
             Files.copy(file.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
-            LOGGER.error("Backup file failed: " + e.getMessage());
+            LOGGER.error("Backup file failed: {}", e.getMessage());
         }
     }
 
@@ -98,18 +98,18 @@ public void mergeJson(JsonElement oldJson, JsonElement newJson) {
         mergeFields(oldJson.getAsJsonObject(), newJson.getAsJsonObject());
     }
 
-    private void mergeFields(JsonObject oldJson, JsonObject newJson) {
-        Set<Map.Entry<String, JsonElement>> entrySet = newJson.entrySet();
+    private void mergeFields(JsonObject currentJson, JsonObject defaultJson) {
+        Set<Map.Entry<String, JsonElement>> entrySet = defaultJson.entrySet();
         for (Map.Entry<String, JsonElement> entry : entrySet) {
             String key = entry.getKey();
             JsonElement value = entry.getValue();
 
-            if (oldJson.has(key) && oldJson.get(key).isJsonObject() && value.isJsonObject()) {
-                mergeFields(oldJson.getAsJsonObject(key), value.getAsJsonObject());
+            if (currentJson.has(key) && currentJson.get(key).isJsonObject() && value.isJsonObject()) {
+                mergeFields(currentJson.getAsJsonObject(key), value.getAsJsonObject());
             } else {
                 // note: for JsonArray, we will not directly set array elements, but we will add new properties for every array element (language default empty-value). e.g. For List<ExamplePojo>, we will never change the size of this list, but we will add missing properties for every ExamplePojo with the language default empty-value.
-                if (!oldJson.has(key)) {
-                    oldJson.add(key, value);
+                if (!currentJson.has(key)) {
+                    currentJson.add(key, value);
                     LOGGER.warn("Add missing json property: file = {}, key = {}, value = {}", this.file.getName(), key, value);
                 }
             }

diff --git a/src/main/java/io/github/sakurawald/config/handler/ObjectConfigHandler.java b/src/main/java/io/github/sakurawald/config/handler/ObjectConfigHandler.java
@@ -32,18 +32,18 @@ public void loadFromDisk() {
             } else {
                 // read older json from disk
                 @Cleanup Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(this.file)));
-                JsonElement olderJsonElement = JsonParser.parseReader(reader);
+                JsonElement currentJsonElement = JsonParser.parseReader(reader);
 
                 // merge older json with newer json
                 if (!this.merged) {
                     this.merged = true;
-                    T newerJsonInstance = configClass.getDeclaredConstructor().newInstance();
-                    JsonElement newerJsonElement = gson.toJsonTree(newerJsonInstance, configClass);
-                    mergeJson(olderJsonElement, newerJsonElement);
+                    T defaultJsonInstance = configClass.getDeclaredConstructor().newInstance();
+                    JsonElement defaultJsonElement = gson.toJsonTree(defaultJsonInstance, configClass);
+                    mergeJson(currentJsonElement, defaultJsonElement);
                 }
 
                 // read merged json
-                model = gson.fromJson(olderJsonElement, configClass);
+                model = gson.fromJson(currentJsonElement, configClass);
 
                 this.saveToDisk();
             }

diff --git a/src/main/java/io/github/sakurawald/module/ModuleManager.java b/src/main/java/io/github/sakurawald/module/ModuleManager.java
@@ -83,8 +83,8 @@ public static boolean shouldEnableModule(JsonElement config, String basePackageN
         try {
             enable = config.getAsJsonObject().get("modules").getAsJsonObject().get(basePackageName).getAsJsonObject().get("enable").getAsBoolean();
         } catch (Exception e) {
-            LOGGER.error("The enable-supplier key '{}' is missing -> force enable this module", "modules.%s.enable".formatted(basePackageName));
-            enable = true;
+            LOGGER.error("The enable-supplier key '{}' is missing, will disable this module", "modules.%s.enable".formatted(basePackageName));
+            enable = false;
         }
 
         module2enable.put(basePackageName, enable);

diff --git a/src/main/java/io/github/sakurawald/util/LuckPermsUtil.java b/src/main/java/io/github/sakurawald/util/LuckPermsUtil.java
@@ -4,6 +4,7 @@
 import lombok.experimental.UtilityClass;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.LuckPermsProvider;
+import net.luckperms.api.model.user.UserManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 import java.util.Optional;
@@ -31,4 +32,5 @@ public static LuckPerms getAPI() {
     }
 
 
+
 }