Cleanup hunks in net.minecraft.crash

Author: kappa-maintainer

patches/minecraft/net/minecraft/crash/CrashReport.java.patch

@@ -1,22 +1,14 @@
 --- before/net/minecraft/crash/CrashReport.java
 +++ after/net/minecraft/crash/CrashReport.java
-@@ -13,6 +13,7 @@
- import java.text.SimpleDateFormat;
- import java.util.Date;
- import java.util.List;
-+
- import net.minecraft.util.ReportedException;
- import net.minecraft.world.gen.layer.IntCache;
- import net.minecraftforge.fml.relauncher.Side;
-@@ -116,6 +117,7 @@
+@@ -116,6 +116,7 @@
                  return IntCache.getCacheSizes();
              }
          });
 +        net.minecraftforge.fml.common.FMLCommonHandler.instance().enhanceCrashReport(this, this.systemDetailsCategory);
      }
 
      public String getDescription()
-@@ -198,18 +200,19 @@
+@@ -198,13 +199,14 @@
              IOUtils.closeQuietly((Writer)printwriter);
          }
 
@@ -32,102 +24,3 @@
          stringbuilder.append("// ");
          stringbuilder.append(getWittyComment());
          stringbuilder.append("\n\n");
-         stringbuilder.append("Time: ");
--        stringbuilder.append(new SimpleDateFormat().format(new Date()));
-+        stringbuilder.append((new SimpleDateFormat()).format(new Date()));
-         stringbuilder.append("\n");
-         stringbuilder.append("Description: ");
-         stringbuilder.append(this.description);
-@@ -217,7 +220,7 @@
-         stringbuilder.append(this.getCauseStackTraceOrString());
-         stringbuilder.append("\n\nA detailed walkthrough of the error, its code path and all known details is as follows:\n");
- 
--        for (int i = 0; i < 87; i++)
-+        for (int i = 0; i < 87; ++i)
-         {
-             stringbuilder.append("-");
-         }
-@@ -247,26 +250,27 @@
-             }
- 
-             Writer writer = null;
--            boolean flag;
-+            boolean flag1;
- 
-             try
-             {
-                 writer = new OutputStreamWriter(new FileOutputStream(toFile), StandardCharsets.UTF_8);
-                 writer.write(this.getCompleteReport());
-                 this.crashReportFile = toFile;
--                return true;
-+                boolean lvt_3_1_ = true;
-+                return lvt_3_1_;
-             }
-             catch (Throwable throwable)
-             {
-                 LOGGER.error("Could not save crash report to {}", toFile, throwable);
--                flag = false;
-+                flag1 = false;
-             }
-             finally
-             {
-                 IOUtils.closeQuietly(writer);
-             }
- 
--            return flag;
-+            return flag1;
-         }
-     }
- 
-@@ -331,49 +335,13 @@
- 
-     private static String getWittyComment()
-     {
--        String[] astring = new String[]
--        {
--            "Who set us up the TNT?",
--            "Everything's going to plan. No, really, that was supposed to happen.",
--            "Uh... Did I do that?",
--            "Oops.",
--            "Why did you do that?",
--            "I feel sad now :(",
--            "My bad.",
--            "I'm sorry, Dave.",
--            "I let you down. Sorry :(",
--            "On the bright side, I bought you a teddy bear!",
--            "Daisy, daisy...",
--            "Oh - I know what I did wrong!",
--            "Hey, that tickles! Hehehe!",
--            "I blame Dinnerbone.",
--            "You should try our sister game, Minceraft!",
--            "Don't be sad. I'll do better next time, I promise!",
--            "Don't be sad, have a hug! <3",
--            "I just don't know what went wrong :(",
--            "Shall we play a game?",
--            "Quite honestly, I wouldn't worry myself about that.",
--            "I bet Cylons wouldn't have this problem.",
--            "Sorry :(",
--            "Surprise! Haha. Well, this is awkward.",
--            "Would you like a cupcake?",
--            "Hi. I'm Minecraft, and I'm a crashaholic.",
--            "Ooh. Shiny.",
--            "This doesn't make any sense!",
--            "Why is it breaking :(",
--            "Don't do that.",
--            "Ouch. That hurt :(",
--            "You're mean.",
--            "This is a token for 1 free hug. Redeem at your nearest Mojangsta: [~~HUG~~]",
--            "There are four lights!",
--            "But it works on my machine."
--        };
-+        String[] astring = new String[] {"Who set us up the TNT?", "Everything's going to plan. No, really, that was supposed to happen.", "Uh... Did I do that?", "Oops.", "Why did you do that?", "I feel sad now :(", "My bad.", "I'm sorry, Dave.", "I let you down. Sorry :(", "On the bright side, I bought you a teddy bear!", "Daisy, daisy...", "Oh - I know what I did wrong!", "Hey, that tickles! Hehehe!", "I blame Dinnerbone.", "You should try our sister game, Minceraft!", "Don't be sad. I'll do better next time, I promise!", "Don't be sad, have a hug! <3", "I just don't know what went wrong :(", "Shall we play a game?", "Quite honestly, I wouldn't worry myself about that.", "I bet Cylons wouldn't have this problem.", "Sorry :(", "Surprise! Haha. Well, this is awkward.", "Would you like a cupcake?", "Hi. I'm Minecraft, and I'm a crashaholic.", "Ooh. Shiny.", "This doesn't make any sense!", "Why is it breaking :(", "Don't do that.", "Ouch. That hurt :(", "You're mean.", "This is a token for 1 free hug. Redeem at your nearest Mojangsta: [~~HUG~~]", "There are four lights!", "But it works on my machine."};
- 
-         try
-         {
-             return astring[(int)(System.nanoTime() % (long)astring.length)];
-         }
--        catch (Throwable throwable)
-+        catch (Throwable var2)
-         {
-             return "Witty comment unavailable :(";
-         }

patches/minecraft/net/minecraft/crash/CrashReportCategory.java.patch

@@ -1,47 +1,6 @@
 --- before/net/minecraft/crash/CrashReportCategory.java
 +++ after/net/minecraft/crash/CrashReportCategory.java
-@@ -12,7 +12,7 @@
- {
-     private final CrashReport crashReport;
-     private final String name;
--    private final List<CrashReportCategory.Entry> children = Lists.newArrayList();
-+    private final List<CrashReportCategory.Entry> children = Lists.<CrashReportCategory.Entry>newArrayList();
-     private StackTraceElement[] stackTrace = new StackTraceElement[0];
- 
-     public CrashReportCategory(CrashReport report, String name)
-@@ -40,7 +40,7 @@
-         {
-             stringbuilder.append(String.format("World: (%d,%d,%d)", x, y, z));
-         }
--        catch (Throwable throwable2)
-+        catch (Throwable var16)
-         {
-             stringbuilder.append("(Error finding world loc)");
-         }
-@@ -60,7 +60,7 @@
-             int i2 = (j + 1 << 4) - 1;
-             stringbuilder.append(String.format("Chunk: (at %d,%d,%d in %d,%d; contains blocks %d,0,%d to %d,255,%d)", k, l, i1, i, j, j1, k1, l1, i2));
-         }
--        catch (Throwable throwable1)
-+        catch (Throwable var15)
-         {
-             stringbuilder.append("(Error finding chunk loc)");
-         }
-@@ -79,11 +79,9 @@
-             int j4 = l2 << 9;
-             int k4 = (k2 + 1 << 9) - 1;
-             int j2 = (l2 + 1 << 9) - 1;
--            stringbuilder.append(
--                String.format("Region: (%d,%d; contains chunks %d,%d to %d,%d, blocks %d,0,%d to %d,255,%d)", k2, l2, i3, j3, k3, l3, i4, j4, k4, j2)
--            );
-+            stringbuilder.append(String.format("Region: (%d,%d; contains chunks %d,%d to %d,%d, blocks %d,0,%d to %d,255,%d)", k2, l2, i3, j3, k3, l3, i4, j4, k4, j2));
-         }
--        catch (Throwable throwable)
-+        catch (Throwable var14)
-         {
-             stringbuilder.append("(Error finding world loc)");
-         }
-@@ -123,8 +121,11 @@
+@@ -123,8 +123,11 @@
          }
          else
          {
@@ -55,36 +14,12 @@
              return this.stackTrace.length;
          }
      }
-@@ -135,10 +136,7 @@
-         {
-             StackTraceElement stacktraceelement = this.stackTrace[0];
- 
--            if (stacktraceelement.isNativeMethod() == s1.isNativeMethod()
--                    && stacktraceelement.getClassName().equals(s1.getClassName())
--                    && stacktraceelement.getFileName().equals(s1.getFileName())
--                    && stacktraceelement.getMethodName().equals(s1.getMethodName()))
-+            if (stacktraceelement.isNativeMethod() == s1.isNativeMethod() && stacktraceelement.getClassName().equals(s1.getClassName()) && stacktraceelement.getFileName().equals(s1.getFileName()) && stacktraceelement.getMethodName().equals(s1.getMethodName()))
-             {
-                 if (s2 != null != this.stackTrace.length > 1)
-                 {
-@@ -192,7 +190,7 @@
-             for (StackTraceElement stacktraceelement : this.stackTrace)
-             {
-                 builder.append("\n\tat ");
--                builder.append(stacktraceelement);
-+                builder.append((Object)stacktraceelement);
-             }
-         }
-     }
-@@ -211,9 +209,9 @@
+@@ -211,7 +214,7 @@
              {
                  try
                  {
 -                    return String.format("ID #%d (%s // %s)", i, blockIn.getTranslationKey(), blockIn.getClass().getCanonicalName());
 +                    return String.format("ID #%d (%s // %s // %s)", i, blockIn.getTranslationKey(), blockIn.getClass().getName(), blockIn.getRegistryName());
                  }
--                catch (Throwable throwable)
-+                catch (Throwable var2)
+                 catch (Throwable throwable)
                  {
-                     return "ID #" + i;
-                 }