Merge branch 'refs/heads/master' into config-subcategory

# Conflicts: # src/main/java/com/gtnewhorizon/gtnhlib/config/ConfigurationManager.java
GTNewHorizons · Sep 1, 2024 · e7e429c · e7e429c
2 parents eef6f82 + 0b01adb
commit e7e429c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 151 deletions.
diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/config/ConfigurationManager.java b/src/main/java/com/gtnewhorizon/gtnhlib/config/ConfigurationManager.java
@@ -76,7 +76,7 @@ public static void registerConfig(Class<?> configClass) throws ConfigException {
         val modid = cfg.modid();
         val filename = Optional.of(cfg.filename().trim()).filter(s -> !s.isEmpty()).orElse(modid);
 
-        Configuration rawConfig = configs.computeIfAbsent(modid + "|" + filename, (ignored) -> {
+        Configuration rawConfig = configs.computeIfAbsent(getConfigKey(cfg), (ignored) -> {
             Path newConfigDir = configDir;
             if (!cfg.configSubDirectory().trim().isEmpty()) {
                 newConfigDir = newConfigDir.resolve(cfg.configSubDirectory().trim());
@@ -312,9 +312,7 @@ public static List<IConfigElement> getConfigElements(Class<?> configClass) throw
         init();
         val cfg = Optional.ofNullable(configClass.getAnnotation(Config.class)).orElseThrow(
                 () -> new ConfigException("Class " + configClass.getName() + " does not have a @Config annotation!"));
-        val modid = cfg.modid();
-        val filename = Optional.of(cfg.filename().trim()).filter(s -> !s.isEmpty()).orElse(modid);
-        val rawConfig = Optional.ofNullable(configs.get(modid + "|" + filename)).map(
+        val rawConfig = Optional.ofNullable(configs.get(getConfigKey(cfg))).map(
                 (conf) -> Optional.ofNullable(configToCategoryClassMap.get(conf))
                         .map((map) -> map.get(cfg.category().trim()).contains(configClass)).orElse(false) ? conf : null)
                 .orElseThrow(
@@ -344,9 +342,7 @@ public static List<IConfigElement> getConfigElements(Class<?> configClass) throw
     public static List<IConfigElement> getCategorizedElements(Class<?> configClass) throws ConfigException {
         val cfg = Optional.ofNullable(configClass.getAnnotation(Config.class)).orElseThrow(
                 () -> new ConfigException("Class " + configClass.getName() + " does not have a @Config annotation!"));;
-        val modid = cfg.modid();
-        val filename = Optional.of(cfg.filename().trim()).filter(s -> !s.isEmpty()).orElse(modid);
-        val rawConfig = Optional.ofNullable(configs.get(modid + "|" + filename)).map(
+        val rawConfig = Optional.ofNullable(configs.get(getConfigKey(cfg))).map(
                 (conf) -> Optional.ofNullable(configToCategoryClassMap.get(conf))
                         .map((map) -> map.get(cfg.category().trim()).contains(configClass)).orElse(false) ? conf : null)
                 .orElseThrow(
@@ -442,6 +438,10 @@ private static boolean isFieldSubCategory(Field field) {
                 && fieldClass.getSuperclass().equals(Object.class);
     }
 
+    private static String getConfigKey(Config cfg) {
+        return cfg.modid() + "|" + cfg.configSubDirectory() + "|" + cfg.filename();
+    }
+
     private static File minecraftHome() {
         return Launch.minecraftHome != null ? Launch.minecraftHome : new File(".");
     }

diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/core/transformer/ClassConstantPoolParser.java b/src/main/java/com/gtnewhorizon/gtnhlib/core/transformer/ClassConstantPoolParser.java
diff --git a/...main/java/com/gtnewhorizon/gtnhlib/core/transformer/TessellatorRedirectorTransformer.java b/...main/java/com/gtnewhorizon/gtnhlib/core/transformer/TessellatorRedirectorTransformer.java
@@ -23,8 +23,7 @@ public class TessellatorRedirectorTransformer implements IClassTransformer {
 
     private static final String TessellatorClass = "net/minecraft/client/renderer/Tessellator";
 
-    private static final com.gtnewhorizon.gtnhlib.asm.ClassConstantPoolParser cstPoolParser = new ClassConstantPoolParser(
-            TessellatorClass);
+    private static final ClassConstantPoolParser cstPoolParser = new ClassConstantPoolParser(TessellatorClass);
 
     private static final List<String> TransformerExclusions = Arrays.asList(
             "org.lwjgl",