Clean up code

This commit is contained in:
JFronny 2020-07-10 21:24:20 +02:00
parent 769b879f2c
commit b84f507644
4 changed files with 30 additions and 34 deletions

View File

@ -6,8 +6,9 @@ import java.io.*;
import java.util.Properties; import java.util.Properties;
public abstract class CachingTransformer implements StringTransformer { public abstract class CachingTransformer implements StringTransformer {
Properties cache = null;
private static final File cacheFile = new File(FabricLoader.getInstance().getConfigDirectory(), "Translater.cache"); private static final File cacheFile = new File(FabricLoader.getInstance().getConfigDirectory(), "Translater.cache");
Properties cache = null;
@Override @Override
public String transform(String str) { public String transform(String str) {
if (cache == null) { if (cache == null) {

View File

@ -8,30 +8,31 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
public class ModInit implements ModInitializer { public class ModInit implements ModInitializer {
public static final String MOD_NAME = "translater"; public static final String MOD_NAME = "translater";
public static final String MOD_ID = "translater"; public static final String MOD_ID = "translater";
public static Cfg cfg; private static final Logger logger = LogManager.getFormatterLogger(MOD_ID);
public ModInit() { public static Cfg cfg;
AutoConfig.register(Cfg.class, JanksonConfigSerializer::new);
cfg = AutoConfig.getConfigHolder(Cfg.class).getConfig();
}
private static final Logger logger = LogManager.getFormatterLogger(MOD_ID); public ModInit() {
@Override AutoConfig.register(Cfg.class, JanksonConfigSerializer::new);
public void onInitialize() { cfg = AutoConfig.getConfigHolder(Cfg.class).getConfig();
Log("Loaded translater"); }
}
public static void Log(String msg) { public static void Log(String msg) {
logger.log(Level.INFO, "[" + MOD_NAME + "]" + msg); logger.log(Level.INFO, "[" + MOD_NAME + "]" + msg);
} }
public static void Warn(String msg) { public static void Warn(String msg) {
logger.log(Level.WARN, "[" + MOD_NAME + "]" + msg); logger.log(Level.WARN, "[" + MOD_NAME + "]" + msg);
} }
public static void LogDebug(String msg) { public static void LogDebug(String msg) {
logger.log(Level.DEBUG, "[" + MOD_NAME + "]" + msg); logger.log(Level.DEBUG, "[" + MOD_NAME + "]" + msg);
} }
@Override
public void onInitialize() {
Log("Loaded translater");
}
} }

View File

@ -2,18 +2,17 @@ package io.gitlab.jfronny.translater;
import com.github.vbauer.yta.model.Direction; import com.github.vbauer.yta.model.Direction;
import com.github.vbauer.yta.model.Language; import com.github.vbauer.yta.model.Language;
import com.github.vbauer.yta.model.Languages;
import com.github.vbauer.yta.service.YTranslateApiImpl; import com.github.vbauer.yta.service.YTranslateApiImpl;
import com.sun.org.apache.xpath.internal.operations.Mod;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.*; import java.util.Random;
import java.util.Set;
public class YnTransformer extends CachingTransformer { public class YnTransformer extends CachingTransformer {
private static final Random rnd = new Random();
private static YTranslateApiImpl api = null; private static YTranslateApiImpl api = null;
private static Set<Language> languages = null; private static Set<Language> languages = null;
private static final Random rnd = new Random();
@Override @Override
public String getTransformed(String str) { public String getTransformed(String str) {
@ -35,8 +34,7 @@ public class YnTransformer extends CachingTransformer {
f = false; f = false;
} }
return res.toString(); return res.toString();
} } else if (str.contains("$")) {
else if (str.contains("$")) {
StringBuilder res = new StringBuilder(); StringBuilder res = new StringBuilder();
boolean f = true; boolean f = true;
for (String s : str.split("\\$")) { for (String s : str.split("\\$")) {
@ -47,8 +45,7 @@ public class YnTransformer extends CachingTransformer {
f = false; f = false;
} }
return res.toString(); return res.toString();
} } else if (str.contains("§")) {
else if (str.contains("§")) {
StringBuilder res = new StringBuilder(); StringBuilder res = new StringBuilder();
boolean f = true; boolean f = true;
for (String s : str.split("§")) { for (String s : str.split("§")) {
@ -59,8 +56,7 @@ public class YnTransformer extends CachingTransformer {
f = false; f = false;
} }
return res.toString(); return res.toString();
} } else {
else {
return Break(str); return Break(str);
} }
} catch (Exception e) { } catch (Exception e) {

View File

@ -8,8 +8,6 @@ import net.fabricmc.loader.api.MappingResolver;
import net.minecraft.client.resource.language.TranslationStorage; import net.minecraft.client.resource.language.TranslationStorage;
import net.minecraft.util.Language; import net.minecraft.util.Language;
import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;