icons + more complete namecache

build.gradle

@@ -27,6 +27,11 @@ dependencies {
 
 	modCompile "com.github.vbauer:yandex-translate-api:1.4.2"
 
+	modCompile "me.sargunvohra.mcmods:autoconfig1u:3.2.0-unstable"
+	include "me.sargunvohra.mcmods:autoconfig1u:3.2.0-unstable"
+	modApi "me.shedaniel.cloth:config-2:4.5.6"
+	include "me.shedaniel.cloth:config-2:4.5.6"
+
 	modCompile("io.github.prospector:modmenu:1.12.2+build.17")
 }
 

src/main/java/io/gitlab/jfronny/translater/CachingTransformer.java

@@ -3,8 +3,6 @@ package io.gitlab.jfronny.translater;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Properties;
 
 public abstract class CachingTransformer implements StringTransformer {
@@ -14,16 +12,30 @@ public abstract class CachingTransformer implements StringTransformer {
     public String transform(String str) {
         if (cache == null) {
             cache = new Properties();
-            if (cacheFile.exists()) {
-                try {
-                    FileInputStream inS = new FileInputStream(cacheFile);
-                    cache.load(inS);
-                    inS.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
+            if (!ModInit.cfg.forceRegenerate) {
+                ModInit.cfg.forceRegenerate = false;
+                if (cacheFile.exists()) {
+                    try {
+                        FileInputStream inS = new FileInputStream(cacheFile);
+                        cache.load(inS);
+                        inS.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    if (!ModInit.cfg.breakFully && ModInit.cfg.rounds == 10) {
+                        try {
+                            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+                            InputStream inS = classLoader.getResourceAsStream("namecache.ini");
+                            if (inS != null) {
+                                cache.load(inS);
+                                inS.close();
+                            }
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
                 }
-            } else {
-
             }
         }
         if (!cache.containsKey(str)) {

src/main/java/io/gitlab/jfronny/translater/Cfg.java

@@ -0,0 +1,17 @@
+package io.gitlab.jfronny.translater;
+
+import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
+import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
+import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
+
+@Config(name = "TanslaterCF")
+public class Cfg implements ConfigData {
+    @Comment("NOTE: remove the cache after you change the config!\nRegenerating the cache can take up to 3 hours for vanilla (5000 strings)\nWatch the log when in doubt\n\nThe amount of times to translate each element")
+    public int rounds = 10;
+    @Comment("Whether to fully break the texts content by translating from the wrong language (enable for complete breaking)")
+    public boolean breakFully = false;
+    @Comment("The API key for Yandex Translate (this is REQUIRED for updating the cache, since Yandex doesn't give them out for free anymore you might want to google \"trnsl.1.1.\" to find keys on the web)")
+    public String key = "trnsl.1.1.20130811T164454Z.2facd8a3323b8111.e9f682063308aff12357de3c8a3260d6d6b71be7";
+    @Comment("Use this if something is broken. This initiate the regeneration of the cache")
+    public boolean forceRegenerate = false;
+}

src/main/java/io/gitlab/jfronny/translater/ModInit.java

@@ -1,5 +1,7 @@
 package io.gitlab.jfronny.translater;
 
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer;
 import net.fabricmc.api.ModInitializer;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
@@ -8,6 +10,11 @@ import org.apache.logging.log4j.Logger;
 public class ModInit implements ModInitializer {
 	public static final String MOD_NAME = "translater";
 	public static final String MOD_ID = "translater";
+	public static Cfg cfg;
+	public ModInit() {
+		AutoConfig.register(Cfg.class, JanksonConfigSerializer::new);
+		cfg = AutoConfig.getConfigHolder(Cfg.class).getConfig();
+	}
 
 	private static final Logger logger = LogManager.getFormatterLogger(MOD_ID);
 	@Override

src/main/java/io/gitlab/jfronny/translater/ModMenu.java

@@ -0,0 +1,15 @@
+package io.gitlab.jfronny.translater;
+
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
+import io.github.prospector.modmenu.api.ModMenuApi;
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+
+@Environment(EnvType.CLIENT)
+public class ModMenu implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return screen -> AutoConfig.getConfigScreen(Cfg.class, screen).get();
+    }
+}

src/main/java/io/gitlab/jfronny/translater/YnTransformer.java

@@ -4,46 +4,87 @@ import com.github.vbauer.yta.model.Direction;
 import com.github.vbauer.yta.model.Language;
 import com.github.vbauer.yta.model.Languages;
 import com.github.vbauer.yta.service.YTranslateApiImpl;
+import com.sun.org.apache.xpath.internal.operations.Mod;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 
 public class YnTransformer extends CachingTransformer {
-    private static final int rounds = 10;
-    private static final boolean breakFully = true;
-    private static final String key = "trnsl.1.1.20200118T180605Z.654f2ec649458c36.107c6ad38dc02937f25e660aa1f8f4097d6561a8";
 
-    private static final YTranslateApiImpl api = new YTranslateApiImpl(key);
-    private static final Set<Language> languages = api.languageApi().all().languages();
+    private static YTranslateApiImpl api = null;
+    private static Set<Language> languages = null;
     private static final Random rnd = new Random();
 
     @Override
     public String getTransformed(String str) {
-        if (str.contains("%")) {
-            StringBuilder res = new StringBuilder();
-            boolean f = true;
-            for (String s : str.split("%")) {
-                if (!f) {
-                    res.append(s.charAt(0)).append(Break(s.substring(1)).replace("%", ""));
-                } else
-                    res.append(Break(s));
-                f = false;
+        try {
+            if (api == null)
+                api = new YTranslateApiImpl(ModInit.cfg.key);
+            if (languages == null)
+                languages = api.languageApi().all().languages();
+            if (str.contains("%")) {
+                StringBuilder res = new StringBuilder();
+                boolean f = true;
+                for (String s : str.split("%")) {
+                    if (!f) {
+                        res.append("%");
+                        if (s.length() > 0)
+                            res.append(s.charAt(0)).append(getTransformed(s.substring(1)).replace("%", ""));
+                    } else
+                        res.append(getTransformed(s));
+                    f = false;
+                }
+                return res.toString();
             }
-            return res.toString();
-        } else {
-            return Break(str);
+            else if (str.contains("$")) {
+                StringBuilder res = new StringBuilder();
+                boolean f = true;
+                for (String s : str.split("\\$")) {
+                    if (!f) {
+                        res.append("$").append(s.charAt(0)).append(getTransformed(s.substring(1)).replace("$", ""));
+                    } else
+                        res.append(getTransformed(s));
+                    f = false;
+                }
+                return res.toString();
+            }
+            else if (str.contains("§")) {
+                StringBuilder res = new StringBuilder();
+                boolean f = true;
+                for (String s : str.split("§")) {
+                    if (!f) {
+                        res.append("§").append(s.charAt(0)).append(getTransformed(s.substring(1)).replace("§", ""));
+                    } else
+                        res.append(getTransformed(s));
+                    f = false;
+                }
+                return res.toString();
+            }
+            else {
+                return Break(str);
+            }
+        } catch (Exception e) {
+            ModInit.Warn("Failed to transform: " + str + " (" + str.length() + " characters)");
+            ModInit.Warn("Please report this bug with the mod containing the lang file");
+            throw e;
         }
     }
 
     private String Break(String str) {
         try {
-            if (str.replace(" ", "").replace("[", "").replace("]", "").length() < 2)
+            if (!valid(str))
                 return str;
-            Language startLang = api.detectionApi().detect(str).get();
+            Language startLang = api.detectionApi().detect(str).orElse(Language.EN);
+            if (!valid(startLang.code())) {
+                ModInit.Warn("Could not detect language for: " + str);
+                ModInit.Warn("Defaulting to EN");
+                startLang = Language.EN;
+            }
             String currentState = str;
             Language currentLang = startLang;
-            for (int i = 0; i < rounds; i++) {
+            for (int i = 0; i < ModInit.cfg.rounds; i++) {
                 Language newLang = selectRandom();
-                currentState = api.translationApi().translate(currentState, Direction.of(breakFully ? selectRandom() : currentLang, newLang)).text();
+                currentState = api.translationApi().translate(currentState, Direction.of(ModInit.cfg.breakFully ? selectRandom() : currentLang, newLang)).text();
                 currentLang = newLang;
             }
             currentState = api.translationApi().translate(currentState, startLang).text();
@@ -56,6 +97,17 @@ public class YnTransformer extends CachingTransformer {
         }
     }
 
+    private boolean valid(String str) {
+        if (str.length() < 2)
+            return false;
+        for (char c : str.toCharArray()) {
+            String tmp = "" + c;
+            if (StringUtils.isAlphanumeric(tmp))
+                return true;
+        }
+        return false;
+    }
+
     private Language selectRandom() {
         return languages.stream().skip(rnd.nextInt(languages.size())).findFirst().get();
     }

src/main/resources/fabric.mod.json

@@ -19,7 +19,11 @@
   "entrypoints": {
     "main": [
       "io.gitlab.jfronny.translater.ModInit"
+    ],
+    "modmenu": [
+      "io.gitlab.jfronny.translater.ModMenu"
     ]
+
   },
   "mixins": [
     "translater.mixins.json"