keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Cleanup a lot of spammy output. Everything hidden behind environment flags now. Scale anvil image down 50%

Browse source
This commit is contained in:
Lex Manos 2015-05-25 12:17:33 -07:00
parent df5e594e95
commit 89994bda39
4 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
View file

@ -57,6 +57,8 @@ import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.lang.Thread.UncaughtExceptionHandler; import java.lang.Thread.UncaughtExceptionHandler;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.Iterator; import java.util.Iterator;
@ -220,7 +222,12 @@ public class SplashProgress
return "GL info"; 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()); System.out.println(report.getCompleteReport());
try try
@ -316,8 +323,8 @@ public class SplashProgress
// forge logo // forge logo
setColor(backgroundColor); setColor(backgroundColor);
float fw = (float)forgeTexture.getWidth() / 2; float fw = (float)forgeTexture.getWidth() / 2 / 2;
float fh = (float)forgeTexture.getHeight() / 2; float fh = (float)forgeTexture.getHeight() / 2 / 2;
if(rotate) if(rotate)
{ {
float sh = Math.max(fw, fh); float sh = Math.max(fw, fh);

2
fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java
View file

@ -117,7 +117,7 @@ public class AccessTransformer implements IClassTransformer
rulesResource = Resources.getResource(rulesFile); rulesResource = Resources.getResource(rulesFile);
} }
processATFile(Resources.asCharSource(rulesResource, Charsets.UTF_8)); 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 protected void processATFile(CharSource rulesResource) throws IOException
{ {

2
fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/ModAPITransformer.java
View file

@ -24,7 +24,7 @@ import com.google.common.collect.Sets;
public class ModAPITransformer implements IClassTransformer { 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<String, ASMData> optionals; private ListMultimap<String, ASMData> optionals;
@Override @Override

9
fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java
View file

@ -20,6 +20,7 @@ import java.io.InputStreamReader;
import java.net.URL; import java.net.URL;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
@ -41,6 +42,8 @@ import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
public class LanguageRegistry public class LanguageRegistry
{ {
@ -273,13 +276,15 @@ public class LanguageRegistry
private void searchZipForLanguages(File source, Side side) throws IOException private void searchZipForLanguages(File source, Side side) throws IOException
{ {
ZipFile zf = new ZipFile(source); ZipFile zf = new ZipFile(source);
List<String> added = Lists.newArrayList();
for (ZipEntry ze : Collections.list(zf.entries())) for (ZipEntry ze : Collections.list(zf.entries()))
{ {
Matcher matcher = assetENUSLang.matcher(ze.getName()); Matcher matcher = assetENUSLang.matcher(ze.getName());
if (matcher.matches()) if (matcher.matches())
{ {
String lang = matcher.group(2); 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))); LanguageRegistry.instance().injectLanguage(lang, StringTranslate.parseLangFile(zf.getInputStream(ze)));
// Ensure en_US is available to StringTranslate on the server // Ensure en_US is available to StringTranslate on the server
if ("en_US".equals(lang) && side == Side.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(); zf.close();
} }