Include plugins in Crash Reports

CyberdyneCC · Feb 6, 2016 · 5d034d1 · 5d034d1
1 parent 66e6e56
commit 5d034d1
Showing 1 changed file with 35 additions and 10 deletions.
diff --git a/patches/net/minecraft/crash/CrashReport.java.patch b/patches/net/minecraft/crash/CrashReport.java.patch
@@ -1,14 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/crash/CrashReport.java
 +++ ../src-work/minecraft/net/minecraft/crash/CrashReport.java
-@@ -3,6 +3,7 @@
- import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+
- import java.io.File;
- import java.io.FileWriter;
- import java.io.PrintWriter;
-@@ -15,8 +16,11 @@
+@@ -15,12 +16,18 @@
  import java.util.Iterator;
  import java.util.List;
  import java.util.concurrent.Callable;
@@ -20,7 +12,14 @@
  import org.apache.commons.io.IOUtils;
  import org.apache.commons.lang3.ArrayUtils;
  import org.apache.logging.log4j.LogManager;
-@@ -51,6 +55,12 @@
+ import org.apache.logging.log4j.Logger;
++import org.bukkit.Bukkit;
++import org.bukkit.ChatColor;
++import org.bukkit.plugin.Plugin;
+
+ public class CrashReport
+ {
+@@ -51,6 +58,38 @@
                  return "1.7.10";
              }
          });
@@ -29,6 +28,32 @@
 +            public String call() throws Exception {
 +                return String.format("%s:%s:%s", Thermos.getGroup(), Thermos.getChannel(), Thermos.getCurrentVersion());
 +            }
++        });
++        this.theReportCategory.addCrashSectionCallable("Plugins", new Callable<String>() {
++            @Override
++            public String call() throws Exception {
++                StringBuilder pluginList = new StringBuilder();
++                Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
++                for (Plugin plugin : plugins) {
++                    if (pluginList.length() > 0)
++                        pluginList.append(", ");
++                    if (plugin.isEnabled()) pluginList.append(plugin.getDescription().getName());
++                }
++                return pluginList.toString();
++            }
++        });
++        this.theReportCategory.addCrashSectionCallable("Disabled Plugins", new Callable<String>() {
++            @Override
++            public String call() throws Exception {
++                StringBuilder pluginList = new StringBuilder();
++                Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
++                for (Plugin plugin : plugins) {
++                    if (pluginList.length() > 0)
++                        pluginList.append(", ");
++                    if (!plugin.isEnabled()) pluginList.append(plugin.getDescription().getName());
++                }
++                return pluginList.toString();
++            }
 +        });
          this.theReportCategory.addCrashSectionCallable("Operating System", new Callable()
          {