Revert "Revert "update configuration (#3579)" (#3611)"

gradle/forge.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 ldlib = "1.0.40.b"
 registrate = "MC1.20-1.3.11"
-configuration = "2.2.0"
+configuration = "3.1.0-forge"
 mixinExtras = "0.5.0-rc.3"
 
 jei = "15.20.0.115"
@@ -52,11 +52,10 @@ ftbteams-cm = "5267190"
 ftbquests-cm = "6167056"
 ftbchunks-cm = "5956390"
 
-
 [libraries]
 ldlib               = { module = "com.lowdragmc.ldlib:ldlib-forge-1.20.1", version.ref = "ldlib" }
 registrate          = { module = "com.tterrag.registrate:Registrate", version.ref = "registrate" }
-configuration       = { module = "dev.toma.configuration:configuration-forge-1.20.1", version.ref = "configuration" }
+configuration       = { module = "dev.toma.configuration:configuration-1.20.1", version.ref = "configuration" }
 mixinExtras-common  = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtras" }
 mixinExtras-forge   = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixinExtras" }
 

gradle/scripts/repositories.gradle

@@ -27,6 +27,7 @@ repositories {
         url = "https://maven.firstdark.dev/snapshots"
     }
 
+
     exclusiveContent { // Create, Ponder, Flywheel
         forRepository { maven { url = "https://maven.createmod.net" } }
         filter {
@@ -35,6 +36,13 @@ repositories {
             includeGroup("dev.engine-room.flywheel")
         }
     }
+    exclusiveContent { // Configuration
+        forRepositories(
+                maven { url = "https://repo.repsy.io/mvn/toma/public/" },
+                maven { url = "https://api.repsy.io/mvn/toma/public" },
+        )
+        filter { includeGroup("dev.toma.configuration")}
+    }
     exclusiveContent { // KubeJS and Rhino
         forRepository { maven { url = "https://maven.latvian.dev/releases" } }
         filter { includeGroup("dev.latvian.mods")}

gradle/scripts/resources.gradle

@@ -39,7 +39,7 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
             minecraft_version   : libs.versions.minecraft.get(),
             loader_version      : forgeVers,
             forge_version       : forgeVers, // only specify major version of forge
-            configuration_version: forge.versions.configuration.get(),
+            configuration_version: forge.versions.configuration.get().split("-")[0],
             kjs_version         : forge.versions.kubejs.get().split("\\.")[0], // only specify major version of kjs
             ldlib_version       : forge.versions.ldlib.get(),
             jei_version         : forge.versions.jei.get(),

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -1956,6 +1956,7 @@
   "config.jade.plugin_gtceu.steam_boiler_info": "oɟuI ɹǝןıoᗺ ɯɐǝʇS ]nƎƆ⟘⅁[",
   "config.jade.plugin_gtceu.transformer": "oɟuI ɹǝɯɹoɟsuɐɹ⟘ ]nƎƆ⟘⅁[",
   "config.jade.plugin_gtceu.workable_provider": "ǝןqɐʞɹoM ]nƎƆ⟘⅁[",
+  "config.screen.gtceu": "uoıʇɐɹnbıɟuoƆ nƎƆɥɔǝ⟘bǝɹ⅁",
   "cover.advanced_detector.latch.disabled.0": "snonuıʇuoƆ :ɹoıʌɐɥǝᗺ",
   "cover.advanced_detector.latch.disabled.1": "",
   "cover.advanced_detector.latch.disabled.2": "˙ɹǝʌoƆ sıɥʇ ɟo ɹoıʌɐɥǝq ǝuoʇspǝɹ ǝɥʇ ǝbuɐɥƆ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -1956,6 +1956,7 @@
   "config.jade.plugin_gtceu.steam_boiler_info": "[GTCEu] Steam Boiler Info",
   "config.jade.plugin_gtceu.transformer": "[GTCEu] Transformer Info",
   "config.jade.plugin_gtceu.workable_provider": "[GTCEu] Workable",
+  "config.screen.gtceu": "GregTechCEu Configuration",
   "cover.advanced_detector.latch.disabled.0": "Behavior: Continuous",
   "cover.advanced_detector.latch.disabled.1": "",
   "cover.advanced_detector.latch.disabled.2": "Change the redstone behavior of this Cover.",

src/main/java/com/gregtechceu/gtceu/data/lang/ConfigurationLang.java

@@ -4,30 +4,33 @@
 import com.gregtechceu.gtceu.config.ConfigHolder;
 
 import com.tterrag.registrate.providers.RegistrateLangProvider;
-import dev.toma.configuration.Configuration;
-import dev.toma.configuration.config.format.ConfigFormats;
-import dev.toma.configuration.config.value.ConfigValue;
-import dev.toma.configuration.config.value.ObjectValue;
+import dev.toma.configuration.config.value.IConfigValue;
+import dev.toma.configuration.config.value.IHierarchical;
 
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 public class ConfigurationLang {
 
-    public static void init(RegistrateLangProvider provider) {
-        dfs(provider, new HashSet<>(),
-                Configuration.registerConfig(ConfigHolder.class, ConfigFormats.yaml()).getValueMap());
+    public static void init(final RegistrateLangProvider provider) {
+        provider.add("config.screen.gtceu", GTCEu.NAME + " Configuration");
+
+        final Set<String> added = new HashSet<>();
+        ConfigHolder.INTERNAL_INSTANCE.values()
+                .forEach((value) -> addTranslation(provider, added, value));
     }
 
-    private static void dfs(RegistrateLangProvider provider, Set<String> added, Map<String, ConfigValue<?>> map) {
-        for (var entry : map.entrySet()) {
-            var id = entry.getValue().getId();
-            if (added.add(id)) {
-                provider.add(String.format("config.%s.option.%s", GTCEu.MOD_ID, id), id);
-            }
-            if (entry.getValue() instanceof ObjectValue objectValue) {
-                dfs(provider, added, objectValue.get());
+    private static void addTranslation(RegistrateLangProvider provider, Set<String> added, IConfigValue<?> value) {
+        var id = value.getId();
+        if (added.add(id)) {
+            provider.add("config.gtceu.option." + id, id);
+        }
+        if (value instanceof IHierarchical hierarchical) {
+            for (String childKey : value.getChildrenKeys()) {
+                IConfigValue<?> child = hierarchical.getChildById(childKey);
+                if (child != null) {
+                    addTranslation(provider, added, child);
+                }
             }
         }
     }

src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/feature/IGridConnectedMachine.java

@@ -14,8 +14,6 @@
  */
 public interface IGridConnectedMachine extends IMachineFeature, IGridConnectedBlockEntity {
 
-    int ME_UPDATE_INTERVAL = ConfigHolder.INSTANCE.compat.ae2.updateIntervals;
-
     /**
      * @return return {@code true} if current machine connected to a valid ME network, {@code false} otherwise.
      */
@@ -27,7 +25,7 @@ public interface IGridConnectedMachine extends IMachineFeature, IGridConnectedBl
      * @return {@code true} if current machine should interact with ME network, {@code false} otherwise.
      */
     default boolean shouldSyncME() {
-        return self().getOffsetTimer() % ME_UPDATE_INTERVAL == 0;
+        return self().getOffsetTimer() % ConfigHolder.INSTANCE.compat.ae2.updateIntervals == 0;
     }
 
     default AECableType getCableConnectionType(Direction dir) {