Skip to content

Commit

Permalink
Apply brain
Browse files Browse the repository at this point in the history
  • Loading branch information
juanmuscaria committed Jan 8, 2024
1 parent d6c1f18 commit 34392a6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
13 changes: 13 additions & 0 deletions patches/cpw/mods/fml/common/TracingPrintStream.java.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- ../src-base/minecraft/cpw/mods/fml/common/TracingPrintStream.java
+++ ../src-work/minecraft/cpw/mods/fml/common/TracingPrintStream.java
@@ -47,4 +47,10 @@
return "[" + elem.getClassName() + ":" + elem.getMethodName() + ":" + elem.getLineNumber() + "]: ";
}

+ @Override
+ public void close() {
+ // no-op
+ //println("Something tried to close the main output stream");
+ //new Throwable().printStackTrace();
+ }
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
public static final ClassPatchManager INSTANCE = new ClassPatchManager();

public static final boolean dumpPatched = Boolean.parseBoolean(System.getProperty("fml.dumpPatchedClasses", "false"));
@@ -155,10 +159,24 @@
@@ -155,10 +159,20 @@
FMLRelaunchLog.log(Level.ERROR, "The binary patch set is missing. Either you are in a development environment, or things are not going to work!");
return;
}
Expand All @@ -46,11 +46,7 @@
- Pack200.newUnpacker().unpack(binpatchesDecompressed, jos);
+
+ //Pack200.newUnpacker().unpack(binpatchesDecompressed, jos);
+ Archive archive = new Archive(binpatchesDecompressed, jos);
+ archive.setQuiet(true);
+ // Crucible note: YES, this *IS* needed, Thermos logging is so broken beyond repair that not setting a log file will break *EVERYTHING* - juanmuscaria
+ archive.setLogFile("logs/.ignoreMe");
+ archive.unpack();
+ new Pack200UnpackerAdapter().unpack(binpatchesDecompressed, jos);
+ // Crucible end
+
jis = new JarInputStream(new ByteArrayInputStream(jarBytes.toByteArray()));
Expand Down

0 comments on commit 34392a6

Please sign in to comment.