diff --git a/fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java b/fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java index c778182d1..7f53da627 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java @@ -57,6 +57,8 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; +import java.io.PrintStream; +import java.io.PrintWriter; import java.lang.Thread.UncaughtExceptionHandler; import java.nio.IntBuffer; import java.util.Iterator; @@ -220,7 +222,12 @@ public class SplashProgress return "GL info"; } }); - CrashReport report = CrashReport.makeCrashReport(new Throwable(), "Loading screen debug info"); + CrashReport report = CrashReport.makeCrashReport(new Throwable() + { + @Override public String getMessage(){ return "This is just a prompt for computer specs to be printed. THIS IS NOT A ERROR"; } + @Override public void printStackTrace(final PrintWriter s){ s.println(getMessage()); } + @Override public void printStackTrace(final PrintStream s) { s.println(getMessage()); } + }, "Loading screen debug info"); System.out.println(report.getCompleteReport()); try @@ -316,8 +323,8 @@ public class SplashProgress // forge logo setColor(backgroundColor); - float fw = (float)forgeTexture.getWidth() / 2; - float fh = (float)forgeTexture.getHeight() / 2; + float fw = (float)forgeTexture.getWidth() / 2 / 2; + float fh = (float)forgeTexture.getHeight() / 2 / 2; if(rotate) { float sh = Math.max(fw, fh); diff --git a/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java index ea571baf4..50c8c5769 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java @@ -117,7 +117,7 @@ public class AccessTransformer implements IClassTransformer rulesResource = Resources.getResource(rulesFile); } processATFile(Resources.asCharSource(rulesResource, Charsets.UTF_8)); - FMLRelaunchLog.fine("Loaded %d rules from AccessTransformer config file %s\n", modifiers.size(), rulesFile); + FMLRelaunchLog.fine("Loaded %d rules from AccessTransformer config file %s", modifiers.size(), rulesFile); } protected void processATFile(CharSource rulesResource) throws IOException { diff --git a/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java index bc0ede023..849e73b4b 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java @@ -24,7 +24,7 @@ import com.google.common.collect.Sets; public class ModAPITransformer implements IClassTransformer { - private static final boolean logDebugInfo = Boolean.valueOf(System.getProperty("fml.debugAPITransformer", "true")); + private static final boolean logDebugInfo = Boolean.valueOf(System.getProperty("fml.debugAPITransformer", "false")); private ListMultimap optionals; @Override diff --git a/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java index 24770d13b..217495171 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java @@ -20,6 +20,7 @@ import java.io.InputStreamReader; import java.net.URL; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; @@ -41,6 +42,8 @@ import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.relauncher.Side; import com.google.common.base.Charsets; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; public class LanguageRegistry { @@ -273,13 +276,15 @@ public class LanguageRegistry private void searchZipForLanguages(File source, Side side) throws IOException { ZipFile zf = new ZipFile(source); + List added = Lists.newArrayList(); for (ZipEntry ze : Collections.list(zf.entries())) { Matcher matcher = assetENUSLang.matcher(ze.getName()); if (matcher.matches()) { String lang = matcher.group(2); - FMLLog.fine("Injecting found translation data for lang %s in zip file %s at %s into language system", lang, source.getName(), ze.getName()); + //FMLLog.fine("Injecting found translation data for lang %s in zip file %s at %s into language system", lang, source.getName(), ze.getName()); + added.add(lang); LanguageRegistry.instance().injectLanguage(lang, StringTranslate.parseLangFile(zf.getInputStream(ze))); // Ensure en_US is available to StringTranslate on the server if ("en_US".equals(lang) && side == Side.SERVER) @@ -288,6 +293,8 @@ public class LanguageRegistry } } } + if (added.size() > 0) + FMLLog.fine("Found translations in %s [%s]", source.getName(), Joiner.on(", ").join(added)); zf.close(); }