JfMods/Translater
JfMods
/
Translater
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up the code a bit and remove some outdated namecache entries

This commit is contained in:
Johannes Frohnmeyer 2021-12-19 18:19:15 +01:00
parent d92aabe8f1
commit feaa462c0c
Signed by: Johannes
GPG Key ID: E76429612C2929F4
19 changed files with 1166 additions and 1929 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -4,10 +4,11 @@ dependencies {
include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}")
include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}")
modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
modImplementation "com.terraformersmc:modmenu:3.0.0"
modImplementation "com.terraformersmc:modmenu:3.0.1"
testImplementation('org.junit.jupiter:junit-jupiter:5.8.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.8.2')
}
test {

8
gradle.properties
View File

@ -2,9 +2,9 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.18
yarn_mappings=build.1
loader_version=0.12.6
minecraft_version=1.18.1
yarn_mappings=build.6
loader_version=0.12.12
# Mod Properties
maven_group=io.gitlab.jfronny
archives_base_name=translater
@ -12,6 +12,6 @@ archives_base_name=translater
jfapi_version=2.2.0
modrinth_id=YnU8kpyc
modrinth_optional_dependencies=JPP6w2U1
modrinth_optional_dependencies=eueI9czw
curseforge_id=394823
curseforge_optional_dependencies=modmenu

5
src/main/java/io/gitlab/jfronny/translater/IMinecraftClient.java
View File

@ -1,5 +0,0 @@
package io.gitlab.jfronny.translater;
public interface IMinecraftClient {
void forceRender();
}

44
src/main/java/io/gitlab/jfronny/translater/Translater.java
View File

@ -4,54 +4,42 @@ import io.gitlab.jfronny.translater.transformer.CachingTransformer;
import io.gitlab.jfronny.translater.transformer.TransformingMap;
import io.gitlab.jfronny.translater.transformer.TranslatingTransformer;
import io.gitlab.jfronny.translater.translation.WurstGoogleBackend;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import java.util.Map;
@Environment(EnvType.CLIENT)
public class Translater implements ClientModInitializer {
public class Translater {
public static final String MOD_ID = "translater";
public static final Logger LOGGER = LogManager.getFormatterLogger(MOD_ID);
private static TransformingMap map;
@Override
public void onInitializeClient() {
}
public static boolean Gui() {
public static boolean progressUIEnabled() {
return Cfg.renderProgress == Cfg.ProgressMode.Full;
}
public static boolean Cli() {
public static boolean progressLogsEnabled() {
return Cfg.renderProgress == Cfg.ProgressMode.Full || Cfg.renderProgress == Cfg.ProgressMode.Console;
}
public static TransformingMap getMap(Map<String, String> base) {
public static @Nullable TransformingMap getMap(@Nullable Map<String, String> base) {
if (map == null) {
map = new TransformingMap(base, new CachingTransformer(new TranslatingTransformer<>(new WurstGoogleBackend())));
//map = new TransformingMap(base, new CachingTransformer(new TranslatingTransformer<>(new EmptyBackend())));
if (base == null) {
LOGGER.error("Tried to mutate translations before they were accessed. This should NEVER happen!");
return null;
}
map = new TransformingMap(base,
new CachingTransformer(
new TranslatingTransformer<>(
new WurstGoogleBackend()
)
)
);
map.init();
}
return map;
}
public static TransformingMap getMap() {
return map;
}
public static boolean stringInvalid(String str) {
if (str.length() < 2)
return true;
for (char c : str.toCharArray()) {
String tmp = "" + c;
if (StringUtils.isAlphanumeric(tmp))
return false;
}
return true;
}
}

11
src/main/java/io/gitlab/jfronny/translater/mixin/MinecraftClientAccessor.java Normal file
View File

@ -0,0 +1,11 @@
package io.gitlab.jfronny.translater.mixin;
import net.minecraft.client.MinecraftClient;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(MinecraftClient.class)
public interface MinecraftClientAccessor {
@Invoker
void render(boolean tick);
}

19
src/main/java/io/gitlab/jfronny/translater/mixin/MinecraftClientMixin.java
View File

@ -1,19 +0,0 @@
package io.gitlab.jfronny.translater.mixin;
import io.gitlab.jfronny.translater.IMinecraftClient;
import net.minecraft.client.MinecraftClient;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
//This exposes the render method to other code, used for updating the loading screen
@Mixin(MinecraftClient.class)
public class MinecraftClientMixin implements IMinecraftClient {
@Shadow
private void render(boolean tick) {
}
@Override
public void forceRender() {
render(false);
}
}

6
src/main/java/io/gitlab/jfronny/translater/mixin/Plugin.java
View File

@ -26,10 +26,10 @@ public class Plugin implements IMixinConfigPlugin {
if (Objects.equals(mixinClassName, LanguageMixin.class.getName())
|| Objects.equals(mixinClassName, TranslationStorageAccessor.class.getName()))
return true;
else if (Objects.equals(mixinClassName, MinecraftClientMixin.class.getName()))
return Translater.Gui();
else if (Objects.equals(mixinClassName, MinecraftClientAccessor.class.getName()))
return Translater.progressUIEnabled();
else if (Objects.equals(mixinClassName, SplashScreenMixin.class.getName()))
return Translater.Gui();
return Translater.progressUIEnabled();
else
throw new IllegalStateException("Unrecognized mixin! This should never happen");
}

52
src/main/java/io/gitlab/jfronny/translater/mixin/SplashScreenMixin.java
View File

@ -27,8 +27,8 @@ public abstract class SplashScreenMixin extends Overlay {
private MinecraftClient client;
@Inject(at = @At("RETURN"), method = "renderProgressBar")
private void RenderTrnslProgress(MatrixStack matrixStack, int i, int j, int k, int l, float f, CallbackInfo ci) {
TransformingMap map = Translater.getMap();
private void renderTranslationProgress(MatrixStack matrixStack, int i, int j, int k, int l, float f, CallbackInfo ci) {
TransformingMap map = Translater.getMap(null);
if (map != null && map.initializing) {
renderer.draw(matrixStack, "Transforming " + map.initI + "/" + map.initMax, 10, 10, 0);
}
@ -36,30 +36,30 @@ public abstract class SplashScreenMixin extends Overlay {
private TextRenderer renderer;
private static final String FONT_JSON = //Taken from loadingspice (https://github.com/therealfarfetchd/loadingspice)
"{\n" +
" \"type\": \"bitmap\",\n" +
" \"file\": \"minecraft:font/ascii.png\",\n" +
" \"ascent\": 7,\n" +
" \"chars\": [\n" +
" \"\\u00c0\\u00c1\\u00c2\\u00c8\\u00ca\\u00cb\\u00cd\\u00d3\\u00d4\\u00d5\\u00da\\u00df\\u00e3\\u00f5\\u011f\\u0130\",\n" +
" \"\\u0131\\u0152\\u0153\\u015e\\u015f\\u0174\\u0175\\u017e\\u0207\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\",\n" +
" \"\\u0020\\u0021\\\"\\u0023\\u0024\\u0025\\u0026\\u0027\\u0028\\u0029\\u002a\\u002b\\u002c\\u002d\\u002e\\u002f\",\n" +
" \"\\u0030\\u0031\\u0032\\u0033\\u0034\\u0035\\u0036\\u0037\\u0038\\u0039\\u003a\\u003b\\u003c\\u003d\\u003e\\u003f\",\n" +
" \"\\u0040\\u0041\\u0042\\u0043\\u0044\\u0045\\u0046\\u0047\\u0048\\u0049\\u004a\\u004b\\u004c\\u004d\\u004e\\u004f\",\n" +
" \"\\u0050\\u0051\\u0052\\u0053\\u0054\\u0055\\u0056\\u0057\\u0058\\u0059\\u005a\\u005b\\\\\\u005d\\u005e\\u005f\",\n" +
" \"\\u0060\\u0061\\u0062\\u0063\\u0064\\u0065\\u0066\\u0067\\u0068\\u0069\\u006a\\u006b\\u006c\\u006d\\u006e\\u006f\",\n" +
" \"\\u0070\\u0071\\u0072\\u0073\\u0074\\u0075\\u0076\\u0077\\u0078\\u0079\\u007a\\u007b\\u007c\\u007d\\u007e\\u0000\",\n" +
" \"\\u00c7\\u00fc\\u00e9\\u00e2\\u00e4\\u00e0\\u00e5\\u00e7\\u00ea\\u00eb\\u00e8\\u00ef\\u00ee\\u00ec\\u00c4\\u00c5\",\n" +
" \"\\u00c9\\u00e6\\u00c6\\u00f4\\u00f6\\u00f2\\u00fb\\u00f9\\u00ff\\u00d6\\u00dc\\u00f8\\u00a3\\u00d8\\u00d7\\u0192\",\n" +
" \"\\u00e1\\u00ed\\u00f3\\u00fa\\u00f1\\u00d1\\u00aa\\u00ba\\u00bf\\u00ae\\u00ac\\u00bd\\u00bc\\u00a1\\u00ab\\u00bb\",\n" +
" \"\\u2591\\u2592\\u2593\\u2502\\u2524\\u2561\\u2562\\u2556\\u2555\\u2563\\u2551\\u2557\\u255d\\u255c\\u255b\\u2510\",\n" +
" \"\\u2514\\u2534\\u252c\\u251c\\u2500\\u253c\\u255e\\u255f\\u255a\\u2554\\u2569\\u2566\\u2560\\u2550\\u256c\\u2567\",\n" +
" \"\\u2568\\u2564\\u2565\\u2559\\u2558\\u2552\\u2553\\u256b\\u256a\\u2518\\u250c\\u2588\\u2584\\u258c\\u2590\\u2580\",\n" +
" \"\\u03b1\\u03b2\\u0393\\u03c0\\u03a3\\u03c3\\u03bc\\u03c4\\u03a6\\u0398\\u03a9\\u03b4\\u221e\\u2205\\u2208\\u2229\",\n" +
" \"\\u2261\\u00b1\\u2265\\u2264\\u2320\\u2321\\u00f7\\u2248\\u00b0\\u2219\\u00b7\\u221a\\u207f\\u00b2\\u25a0\\u0000\"\n" +
" ]\n" +
"}";
private static final String FONT_JSON = """
{
"type": "bitmap",
"file": "minecraft:font/ascii.png",
"ascent": 7,
"chars": [
"\\u00c0\\u00c1\\u00c2\\u00c8\\u00ca\\u00cb\\u00cd\\u00d3\\u00d4\\u00d5\\u00da\\u00df\\u00e3\\u00f5\\u011f\\u0130",
"\\u0131\\u0152\\u0153\\u015e\\u015f\\u0174\\u0175\\u017e\\u0207\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000",
"\\u0020\\u0021\\"\\u0023\\u0024\\u0025\\u0026\\u0027\\u0028\\u0029\\u002a\\u002b\\u002c\\u002d\\u002e\\u002f",
"\\u0030\\u0031\\u0032\\u0033\\u0034\\u0035\\u0036\\u0037\\u0038\\u0039\\u003a\\u003b\\u003c\\u003d\\u003e\\u003f",
"\\u0040\\u0041\\u0042\\u0043\\u0044\\u0045\\u0046\\u0047\\u0048\\u0049\\u004a\\u004b\\u004c\\u004d\\u004e\\u004f",
"\\u0050\\u0051\\u0052\\u0053\\u0054\\u0055\\u0056\\u0057\\u0058\\u0059\\u005a\\u005b\\\\\\u005d\\u005e\\u005f",
"\\u0060\\u0061\\u0062\\u0063\\u0064\\u0065\\u0066\\u0067\\u0068\\u0069\\u006a\\u006b\\u006c\\u006d\\u006e\\u006f",
"\\u0070\\u0071\\u0072\\u0073\\u0074\\u0075\\u0076\\u0077\\u0078\\u0079\\u007a\\u007b\\u007c\\u007d\\u007e\\u0000",
"\\u00c7\\u00fc\\u00e9\\u00e2\\u00e4\\u00e0\\u00e5\\u00e7\\u00ea\\u00eb\\u00e8\\u00ef\\u00ee\\u00ec\\u00c4\\u00c5",
"\\u00c9\\u00e6\\u00c6\\u00f4\\u00f6\\u00f2\\u00fb\\u00f9\\u00ff\\u00d6\\u00dc\\u00f8\\u00a3\\u00d8\\u00d7\\u0192",
"\\u00e1\\u00ed\\u00f3\\u00fa\\u00f1\\u00d1\\u00aa\\u00ba\\u00bf\\u00ae\\u00ac\\u00bd\\u00bc\\u00a1\\u00ab\\u00bb",
"\\u2591\\u2592\\u2593\\u2502\\u2524\\u2561\\u2562\\u2556\\u2555\\u2563\\u2551\\u2557\\u255d\\u255c\\u255b\\u2510",
"\\u2514\\u2534\\u252c\\u251c\\u2500\\u253c\\u255e\\u255f\\u255a\\u2554\\u2569\\u2566\\u2560\\u2550\\u256c\\u2567",
"\\u2568\\u2564\\u2565\\u2559\\u2558\\u2552\\u2553\\u256b\\u256a\\u2518\\u250c\\u2588\\u2584\\u258c\\u2590\\u2580",
"\\u03b1\\u03b2\\u0393\\u03c0\\u03a3\\u03c3\\u03bc\\u03c4\\u03a6\\u0398\\u03a9\\u03b4\\u221e\\u2205\\u2208\\u2229",
"\\u2261\\u00b1\\u2265\\u2264\\u2320\\u2321\\u00f7\\u2248\\u00b0\\u2219\\u00b7\\u221a\\u207f\\u00b2\\u25a0\\u0000"
]
}""";
@Inject(method = "<init>", at = @At("RETURN"))
public void setup(CallbackInfo ci) {

31
src/main/java/io/gitlab/jfronny/translater/transformer/CachingTransformer.java
View File

@ -10,10 +10,10 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Properties;
public class CachingTransformer implements ITransformer {
private static final Path cacheFile = FabricLoader.getInstance().getConfigDir().resolve(Translater.MOD_ID + ".cache");
Properties cache;
private final ITransformer transformer;
public class CachingTransformer implements Transformer {
private static final Path CACHE_FILE = FabricLoader.getInstance().getConfigDir().resolve(Translater.MOD_ID + ".cache");
private final Properties cache = new Properties();
private final Transformer transformer;
@Override
public String transform(String str) {
@ -27,26 +27,25 @@ public class CachingTransformer implements ITransformer {
return null;
}
cache.put(str, transformed);
Save();
save();
}
//Return cached result
return (String) cache.get(str);
}
public CachingTransformer(ITransformer baseTransformer) {
public CachingTransformer(Transformer baseTransformer) {
transformer = baseTransformer;
cache = new Properties();
if (Cfg.forceRegenerate) {
Cfg.forceRegenerate = false;
ConfigHolder.getInstance().getRegistered().get(Translater.MOD_ID).write();
} else {
//Load cache
if (Files.exists(cacheFile) && Files.isRegularFile(cacheFile)) {
if (Files.exists(CACHE_FILE) && Files.isRegularFile(CACHE_FILE)) {
Translater.LOGGER.info("Loading cache");
try (InputStream inS = Files.newInputStream(cacheFile)) {
try (InputStream inS = Files.newInputStream(CACHE_FILE)) {
cache.load(inS);
} catch (IOException e) {
e.printStackTrace();
Translater.LOGGER.error("Could not load translater cache", e);
}
} else {
//Save default cache if parameters are default
@ -58,22 +57,22 @@ public class CachingTransformer implements ITransformer {
try {
cache.load(inS);
inS.close();
Save();
save();
} catch (IOException e) {
e.printStackTrace();
Translater.LOGGER.error("Could not initialize default translater cache");
}
}
}
}
}
Save();
save();
}
private void Save() {
try (OutputStream outS = Files.newOutputStream(cacheFile)) {
private void save() {
try (OutputStream outS = Files.newOutputStream(CACHE_FILE)) {
cache.store(outS, "---Lang---");
} catch (IOException e) {
e.printStackTrace();
Translater.LOGGER.error("Could not save translater cache");
}
}
}

2
src/main/java/io/gitlab/jfronny/translater/transformer/ITransformer.java → src/main/java/io/gitlab/jfronny/translater/transformer/Transformer.java
View File

@ -1,5 +1,5 @@
package io.gitlab.jfronny.translater.transformer;
public interface ITransformer {
public interface Transformer {
String transform(String str);
}

12
src/main/java/io/gitlab/jfronny/translater/transformer/TransformingMap.java
View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.translater.transformer;
import io.gitlab.jfronny.translater.IMinecraftClient;
import io.gitlab.jfronny.translater.Translater;
import io.gitlab.jfronny.translater.mixin.MinecraftClientAccessor;
import net.minecraft.client.MinecraftClient;
import java.util.Collection;
@ -10,12 +10,12 @@ import java.util.Set;
public class TransformingMap implements Map<String, String> {
private final Map<String, String> backer;
private final ITransformer transformer;
private final Transformer transformer;
public boolean initializing;
public int initI;
public int initMax;
public TransformingMap(Map<String, String> m, ITransformer t) {
public TransformingMap(Map<String, String> m, Transformer t) {
backer = m;
transformer = t;
}
@ -26,12 +26,12 @@ public class TransformingMap implements Map<String, String> {
initMax = strings.size();
initializing = true;
for (String value : strings) {
if (Translater.Cli()) {
if (Translater.progressLogsEnabled()) {
initI++;
Translater.LOGGER.info("Transforming " + initI + "/" + initMax);
}
if (Translater.Gui() && initI % 10 == 0)
((IMinecraftClient) MinecraftClient.getInstance()).forceRender();
if (Translater.progressUIEnabled() && initI % 10 == 0)
((MinecraftClientAccessor) MinecraftClient.getInstance()).render(false);
transformer.transform(value);
}
initializing = false;

40
src/main/java/io/gitlab/jfronny/translater/transformer/TranslatingTransformer.java
View File

@ -5,12 +5,15 @@ import io.gitlab.jfronny.translater.Translater;
import io.gitlab.jfronny.translater.translation.ITranslationBackend;
import org.apache.commons.lang3.StringUtils;
import java.util.Collection;
import java.util.List;
import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class TranslatingTransformer<T> implements ITransformer {
public class TranslatingTransformer<T> implements Transformer {
private static final Pattern SURROUNDING_SPACE_PATTERN = Pattern.compile("^(\\s*)(.*[^\\s]+)(\\s*)$");
private final Random rnd;
private final Collection<T> languages;
private final List<T> languages;
private final ITranslationBackend<T> backend;
@Override
public String transform(String str) {
@ -51,7 +54,7 @@ public class TranslatingTransformer<T> implements ITransformer {
}
return res.toString();
} else {
return Break(str);
return translateMultiple(str);
}
}
catch (Exception e) {
@ -61,32 +64,35 @@ public class TranslatingTransformer<T> implements ITransformer {
}
}
private String Break(String str) {
private String translateMultiple(String str) {
Matcher m = SURROUNDING_SPACE_PATTERN.matcher(str);
if (!m.find()) {
Translater.LOGGER.info("Skipping translation of \"" + str + "\"");
return str;
}
try {
if (Translater.stringInvalid(str))
return str;
T startLang = StringUtils.isAlpha(Cfg.targetLanguage) && Cfg.targetLanguage.length() == 2
? backend.parseLang(Cfg.targetLanguage)
: backend.detect(str);
String currentState = str;
: backend.detect(m.group(2)); // Identify target language
String currentState = m.group(2);
T currentLang = startLang;
for (int i = 0; i < Cfg.rounds; i++) {
T newLang = selectRandom();
currentState = backend.translate(currentState, newLang, Cfg.breakFully ? selectRandom() : currentLang);
for (int i = 0; i < Cfg.rounds; i++) { // Translate around
T newLang = randomLanguage();
currentState = backend.translate(currentState, newLang, Cfg.breakFully ? randomLanguage() : currentLang);
currentLang = newLang;
}
currentState = backend.translate(currentState, startLang, currentLang);
currentState = backend.translate(currentState, startLang, currentLang); // Translate to starting language
currentState = m.group(1) + currentState + m.group(3); // Add back surrounding white space
Translater.LOGGER.info("Transformed: \"" + str + "\" to: \"" + currentState + "\"");
return currentState;
} catch (Exception e) {
Translater.LOGGER.warn("Failed to break: \"" + str + "\" (" + str.length() + " characters). Is your API key valid?");
Translater.LOGGER.warn("Failed to break: \"" + m.group(2) + "\" (" + m.group(2).length() + " characters). Is your API key valid?");
throw e;
}
}
private T selectRandom() {
return languages.stream().skip(rnd.nextInt(languages.size())).findFirst().get();
private T randomLanguage() {
return languages.get(rnd.nextInt(languages.size()));
}
public TranslatingTransformer(ITranslationBackend<T> translationBackend) {

9
src/main/java/io/gitlab/jfronny/translater/translation/EmptyBackend.java
View File

@ -1,7 +1,6 @@
package io.gitlab.jfronny.translater.translation;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
//Since Yandex removed the API this will allow the mod to keep running
public class EmptyBackend implements ITranslationBackend<Object> {
@ -21,9 +20,7 @@ public class EmptyBackend implements ITranslationBackend<Object> {
}
@Override
public Collection<Object> getLanguages() {
HashSet<Object> set = new HashSet<>();
set.add("null");
return set;
public List<Object> getLanguages() {
return List.of("null");
}
}

46
src/main/java/io/gitlab/jfronny/translater/translation/GoogleService.java
View File

@ -1,22 +1,23 @@
package io.gitlab.jfronny.translater.translation;
import org.apache.commons.io.FileUtils;
import io.gitlab.jfronny.translater.Translater;
import org.apache.commons.lang3.StringEscapeUtils;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class GoogleService {
private static final Pattern TRANSLATION_RESULT = Pattern.compile("class=\"result-container\">([^<]*)</div>", Pattern.MULTILINE);
public enum Language {
AUTO_DETECT("AUTO_DETECT", "auto"), ARABIC("ARABIC", "ar"), CHINESE_SIMPLIFIED("CHINESE_SIMPLIFIED", "zh-CN"),
CHINESE_TRADITIONAL("CHINESE_TRADITIONAL", "zh-TW"), ENGLISH("ENGLISH", "en"), FILIPINO("FILIPINO", "tl"),
FRENCH("FRENCH", "fr"), GERMAN("GERMAN", "de"), GREEK("GREEK", "el"), INDONESIAN("INDONESIAN", "id"),
@ -28,7 +29,7 @@ public class GoogleService {
public final String name;
public final String value;
private Language(String name, String value) {
Language(String name, String value) {
this.name = name;
this.value = value;
}
@ -45,23 +46,23 @@ public class GoogleService {
String pageSource = "";
try {
pageSource = getPageSource(textToTranslate, translateFrom, translateTo);
final String regex = "class=\"result-container\">([^<]*)<\\/div>";
final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
final Matcher matcher = pattern.matcher(pageSource);
matcher.find();
String match = matcher.group(1);
if (match != null && !match.isEmpty()) {
return match;
} else {
return null;
Matcher matcher = TRANSLATION_RESULT.matcher(pageSource);
if (matcher.find()) {
String match = matcher.group(1);
if (match != null && !match.isEmpty()) {
return StringEscapeUtils.unescapeHtml4(match);
}
}
Translater.LOGGER.error("Could not translate \"" + textToTranslate + "\": result page couldn't be parsed");
return null;
} catch (Exception e) {
try {
FileUtils.writeStringToFile(new File("cum"), pageSource, StandardCharsets.UTF_8);
} catch (IOException ioException) {
ioException.printStackTrace();
Path p = Files.createTempFile("translater-pagedump-", ".html").toAbsolutePath();
Files.writeString(p, pageSource);
Translater.LOGGER.error("Could not translate string, see dumped page at " + p, e);
} catch (IOException ioe) {
Translater.LOGGER.error("Could not translate string and the page could not be dumped", ioe);
}
e.printStackTrace();
return null;
}
}
@ -81,21 +82,20 @@ public class GoogleService {
connection.setConnectTimeout(5000);
connection.setRequestProperty("User-Agent",
"Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11");
bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
String line;
while ((line = bufferedReader.readLine()) != null) {
pageSource.append(line + System.lineSeparator());
pageSource.append(line).append('\n');
}
String clean = pageSource.toString();
return clean;
return pageSource.toString();
} catch (Exception e) {
e.printStackTrace();
Translater.LOGGER.error("Could not load translation from google", e);
return null;
} finally {
if (connection != null)
connection.disconnect();
if (bufferedReader != null)
bufferedReader.close();
}
return null;
}
}

4
src/main/java/io/gitlab/jfronny/translater/translation/ITranslationBackend.java
View File

@ -1,10 +1,10 @@
package io.gitlab.jfronny.translater.translation;
import java.util.Collection;
import java.util.List;
public interface ITranslationBackend<T> {
String translate(String text, T target, T current);
T detect(String text);
T parseLang(String lang);
Collection<T> getLanguages();
List<T> getLanguages();
}

11
src/main/java/io/gitlab/jfronny/translater/translation/WurstGoogleBackend.java
View File

@ -2,21 +2,20 @@ package io.gitlab.jfronny.translater.translation;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
public class WurstGoogleBackend implements ITranslationBackend<GoogleService.Language> {
@java.lang.Override
@Override
public String translate(String text, GoogleService.Language target, GoogleService.Language current) {
return GoogleService.translate(text, current.value, target.value);
}
@java.lang.Override
@Override
public GoogleService.Language detect(String text) {
return GoogleService.Language.AUTO_DETECT;
}
@java.lang.Override
@Override
public GoogleService.Language parseLang(String lang) {
for (GoogleService.Language value : GoogleService.Language.values()) {
if (value.value.equals(lang))
@ -25,8 +24,8 @@ public class WurstGoogleBackend implements ITranslationBackend<GoogleService.Lan
return null;
}
@java.lang.Override
public Collection<GoogleService.Language> getLanguages() {
@Override
public List<GoogleService.Language> getLanguages() {
List<GoogleService.Language> langs = new ArrayList<>(Arrays.asList(GoogleService.Language.values()));
langs.remove(GoogleService.Language.AUTO_DETECT);
return langs;

6
src/main/resources/fabric.mod.json
View File

@ -13,7 +13,7 @@
},
"license": "MIT",
"icon": "assets/translater/icon.png",
"environment": "client",
"environment": "*",
"entrypoints": {
"libjf:config": ["io.gitlab.jfronny.translater.Cfg"]
},
@ -21,9 +21,9 @@
"translater.mixins.json"
],
"depends": {
"fabricloader": ">=0.12.0",
"fabricloader": ">=0.12.12",
"minecraft": "*",
"libjf-config-v0": ">=2.0"
"libjf-config-v0": ">=2.2.0"
},
"custom": {
"modupdater": {

2782
src/main/resources/namecache.ini
View File

File diff suppressed because it is too large Load Diff

2
src/main/resources/translater.mixins.json
View File

@ -6,7 +6,7 @@
"plugin": "io.gitlab.jfronny.translater.mixin.Plugin",
"client": [
"LanguageMixin",
"MinecraftClientMixin",
"MinecraftClientAccessor",
"SplashScreenMixin",
"TranslationStorageAccessor"
],