update crowdin lang files, some minor code tweaks

sakura-ryoko · Nov 22, 2024 · db70937 · db70937
1 parent b4049c7
commit db70937
Show file tree

Hide file tree

Showing 52 changed files with 19,963 additions and 2,429 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,11 +9,11 @@ author = masa
 mod_file_name = tweakeroo-fabric
 
 # Current mod version
-mod_version = 0.21.53-sakura.2
+mod_version = 0.21.53
 
 # Required malilib version
-malilib_version = 0.21.2-sakura.2
-malilib_id = 21481c3732
+malilib_version = 0.21.2
+malilib_id = 51dd186f89
 
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 1.21

diff --git a/src/main/java/fi/dy/masa/tweakeroo/config/ConfigBooleanClient.java b/src/main/java/fi/dy/masa/tweakeroo/config/ConfigBooleanClient.java
@@ -8,14 +8,19 @@
 
 public class ConfigBooleanClient extends ConfigBooleanHotkeyed
 {
+    public ConfigBooleanClient(String name, boolean defaultValue, String defaultHotkey)
+    {
+        this(name, defaultValue, defaultHotkey, name+" Comment!", StringUtils.splitCamelCase(name), name);
+    }
+
     public ConfigBooleanClient(String name, boolean defaultValue, String defaultHotkey, String comment)
     {
-        this(name, defaultValue, defaultHotkey, comment, name);
+        this(name, defaultValue, defaultHotkey, comment, StringUtils.splitCamelCase(name), name);
     }
 
-    public ConfigBooleanClient(String name, boolean defaultValue, String defaultHotkey, String comment, String prettyName)
+    public ConfigBooleanClient(String name, boolean defaultValue, String defaultHotkey, String comment, String prettyName, String translatedName)
     {
-        super(name, defaultValue, defaultHotkey, comment, prettyName);
+        super(name, defaultValue, defaultHotkey, comment, prettyName, translatedName);
     }
 
     @Override

diff --git a/src/main/java/fi/dy/masa/tweakeroo/config/Configs.java b/src/main/java/fi/dy/masa/tweakeroo/config/Configs.java
diff --git a/src/main/java/fi/dy/masa/tweakeroo/config/FeatureToggle.java b/src/main/java/fi/dy/masa/tweakeroo/config/FeatureToggle.java
@@ -107,6 +107,8 @@ public enum FeatureToggle implements IHotkeyTogglable, IConfigNotifiable<IConfig
 
     public static final ImmutableList<FeatureToggle> VALUES = ImmutableList.copyOf(values());
 
+    private final static String FEATURE_KEY = Reference.MOD_ID+ ".config.feature_toggle";
+
     private final String name;
     private final String comment;
     private final String prettyName;
@@ -120,25 +122,25 @@ public enum FeatureToggle implements IHotkeyTogglable, IConfigNotifiable<IConfig
     FeatureToggle(String name, boolean defaultValue, String defaultHotkey)
     {
         this(name, defaultValue, false, defaultHotkey, KeybindSettings.DEFAULT,
-                Reference.MOD_ID+".config.feature_toggle.comment."+name,
-                Reference.MOD_ID+".config.feature_toggle.prettyName."+name,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             buildTranslateName(name, "comment"),
+             buildTranslateName(name, "prettyName"),
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, String defaultHotkey, KeybindSettings settings)
     {
         this(name, defaultValue, false, defaultHotkey, settings,
-                Reference.MOD_ID+".config.feature_toggle.comment."+name,
-                Reference.MOD_ID+".config.feature_toggle.prettyName."+name,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             buildTranslateName(name, "comment"),
+             buildTranslateName(name, "prettyName"),
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, boolean singlePlayer, String defaultHotkey)
     {
         this(name, defaultValue, singlePlayer, defaultHotkey, KeybindSettings.DEFAULT,
-                Reference.MOD_ID+".config.feature_toggle.comment."+name,
-                Reference.MOD_ID+".config.feature_toggle.prettyName."+name,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             buildTranslateName(name, "comment"),
+             buildTranslateName(name, "prettyName"),
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, String defaultHotkey, String comment, String prettyName, String translatedName)
@@ -161,57 +163,57 @@ public enum FeatureToggle implements IHotkeyTogglable, IConfigNotifiable<IConfig
     FeatureToggle(String name, boolean defaultValue, String defaultHotkey, String comment)
     {
         this(name, defaultValue, false, defaultHotkey, KeybindSettings.DEFAULT,
-                comment,
-                Reference.MOD_ID+".config.feature_toggle.prettyName."+name,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             comment,
+             buildTranslateName(name, "prettyName"),
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, boolean singlePlayer, String defaultHotkey, String comment)
     {
         this(name, defaultValue, singlePlayer, defaultHotkey, KeybindSettings.DEFAULT,
-                comment,
-                Reference.MOD_ID+".config.feature_toggle.prettyName."+name,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             comment,
+             buildTranslateName(name, "prettyName"),
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, String defaultHotkey, KeybindSettings settings, String comment)
     {
         this(name, defaultValue, false, defaultHotkey, settings,
-                comment,
-                Reference.MOD_ID+".config.feature_toggle.prettyName."+name,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             comment,
+             buildTranslateName(name, "prettyName"),
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, boolean singlePlayer, String defaultHotkey, KeybindSettings settings, String comment)
     {
         this(name, defaultValue, singlePlayer, defaultHotkey, settings,
-                comment,
-                Reference.MOD_ID+".config.feature_toggle.prettyName."+name,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             comment,
+             buildTranslateName(name, "prettyName"),
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, String defaultHotkey, String comment, String prettyName)
     {
         this(name, defaultValue, false, defaultHotkey,
-                comment,
-                prettyName,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             comment,
+             prettyName,
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, boolean singlePlayer, String defaultHotkey, String comment, String prettyName)
     {
         this(name, defaultValue, singlePlayer, defaultHotkey, KeybindSettings.DEFAULT,
-                comment,
-                prettyName,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             comment,
+             prettyName,
+             buildTranslateName(name, "name"));
     }
 
     FeatureToggle(String name, boolean defaultValue, boolean singlePlayer, String defaultHotkey, KeybindSettings settings, String comment, String prettyName)
     {
         this(name, defaultValue, singlePlayer, defaultHotkey, settings,
-                comment,
-                prettyName,
-                Reference.MOD_ID+".config.feature_toggle.name."+name);
+             comment,
+             prettyName,
+             buildTranslateName(name, "name"));
     }
     // Backwards Compatible constructors - END
 
@@ -317,6 +319,11 @@ public String getTranslatedName()
         return this.translatedName;
     }
 
+    private static String buildTranslateName(String name, String type)
+    {
+        return FEATURE_KEY + "." + type + "." + name;
+    }
+
     @Override
     public IKeybind getKeybind()
     {