diff --git a/.gitignore b/.gitignore index a1c2a23..12f8644 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,25 @@ -# Compiled class file -*.class +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project -# Log file -*.log +# idea +out +*.ipr +*.iws +*.iml +.idea -# BlueJ files -*.ctxt +# gradle +build +.gradle -# Mobile Tools for Java (J2ME) -.mtj.tmp/ +# other +eclipse +run -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +# Files from Forge MDK +forge*changelog.txt diff --git a/README.md b/README.md index 3f8ac2e..f9b2dd2 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,18 @@ # MoreCrashInfo -Display more info in crash report. +Display more info in crash report. + +Designed for Forge 1.13.2 - 1.14.3. +Mod List and CoreMod List will be shown in crash report. +``` + Forge Mods: + | ID | Name | Version | Source | + | ---------------- | ---------------- | ----------------- | -------------------------------------------- | + | minecraft | Minecraft | 1.14.3 | Not Found | + | customskinloader | CustomSkinLoader | 14.11-SNAPSHOT-89 | CustomSkinLoader_Forge-14.11-SNAPSHOT-89.jar | + | morecrashinfo | MoreCrashInfo | 1.0 | MoreCrashInfo-1.0.jar | + | forge | Forge | 27.0.22 | forge-1.14.3-27.0.22-universal.jar | + Forge CoreMods: + | ID | Status | Source | + | ---------------- | ------ | --------------- | + | customskinloader | Loaded | transformers.js | +``` diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..24bf770 --- /dev/null +++ b/build.gradle @@ -0,0 +1,83 @@ +buildscript { + repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + jcenter() + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + } +} +apply plugin: 'net.minecraftforge.gradle' + +version = '1.0' +group = 'me.xfl03' +archivesBaseName = 'MoreCrashInfo' + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' + +minecraft { + mappings channel: 'snapshot', version: '20190621-1.14.2' + runs { + client { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + + mods { + examplemod { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + + mods { + examplemod { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/') + + mods { + examplemod { + source sourceSets.main + } + } + } + } +} + +dependencies { + minecraft 'net.minecraftforge:forge:1.14.3-27.0.50' +} + +jar { + manifest { + attributes([ + "Specification-Title": "morecrashinfo", + "Specification-Vendor": "xfl03", + "Specification-Version": "1", + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" :"xfl03", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +def reobfFile = file("$buildDir/reobfJar/output.jar") +def reobfArtifact = artifacts.add('default', reobfFile) { + type 'jar' + builtBy 'reobfJar' +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..878bf1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..949819d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/me/xfl03/morecrashinfo/MoreCrashInfo.java b/src/main/java/me/xfl03/morecrashinfo/MoreCrashInfo.java new file mode 100644 index 0000000..ed5feea --- /dev/null +++ b/src/main/java/me/xfl03/morecrashinfo/MoreCrashInfo.java @@ -0,0 +1,30 @@ +package me.xfl03.morecrashinfo; + +import me.xfl03.morecrashinfo.crash.CoreModListExtender; +import me.xfl03.morecrashinfo.crash.ModListExtender; +import net.minecraftforge.fml.CrashReportExtender; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +@Mod("morecrashinfo") +public class MoreCrashInfo +{ + private static final Logger LOGGER = LogManager.getLogger(); + + public MoreCrashInfo() { + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + } + + private void setup(final FMLCommonSetupEvent event) + { + LOGGER.debug("MoreCrashInfo: PreInit Begin."); + + CrashReportExtender.registerCrashCallable(new ModListExtender()); + CrashReportExtender.registerCrashCallable(new CoreModListExtender()); + + LOGGER.debug("MoreCrashInfo: PreInit End."); + } +} diff --git a/src/main/java/me/xfl03/morecrashinfo/crash/CoreModListExtender.java b/src/main/java/me/xfl03/morecrashinfo/crash/CoreModListExtender.java new file mode 100644 index 0000000..b545d2e --- /dev/null +++ b/src/main/java/me/xfl03/morecrashinfo/crash/CoreModListExtender.java @@ -0,0 +1,44 @@ +package me.xfl03.morecrashinfo.crash; + +import me.xfl03.morecrashinfo.util.CoreModHelper; +import me.xfl03.morecrashinfo.util.PrintHelper; +import net.minecraftforge.coremod.CoreMod; +import net.minecraftforge.fml.common.ICrashCallable; +import net.minecraftforge.forgespi.coremod.ICoreModFile; + +import java.util.ArrayList; +import java.util.List; + +public class CoreModListExtender implements ICrashCallable { + @Override + public String getLabel() { + return "Forge CoreMods"; + } + + @Override + public String call() throws Exception { + //Get coremod list + List list = CoreModHelper.getCoreModList(); + if (list == null || list.isEmpty()) { + return "Not found"; + } + + //Extend coremod list + List> datas = new ArrayList<>(); + datas.add(PrintHelper.createLine("ID", "Status", "Source")); + for (CoreMod it : list) { + ICoreModFile f = it.getFile(); + datas.add(PrintHelper.createLine( + f.getOwnerId(), + it.hasError() ? "Error" : "Loaded", + getSource(f) + )); + } + return PrintHelper.printLine("\n\t\t", datas); + } + + private String getSource(ICoreModFile file) { + if (file.getPath() == null) return "Not Found"; + return file.getPath().getFileName().toString(); + } +} diff --git a/src/main/java/me/xfl03/morecrashinfo/crash/ModListExtender.java b/src/main/java/me/xfl03/morecrashinfo/crash/ModListExtender.java new file mode 100644 index 0000000..0cfab98 --- /dev/null +++ b/src/main/java/me/xfl03/morecrashinfo/crash/ModListExtender.java @@ -0,0 +1,40 @@ +package me.xfl03.morecrashinfo.crash; + +import me.xfl03.morecrashinfo.util.PrintHelper; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.common.ICrashCallable; +import net.minecraftforge.fml.loading.FMLLoader; +import net.minecraftforge.fml.loading.moddiscovery.ModInfo; + +import java.util.ArrayList; +import java.util.List; + +public class ModListExtender implements ICrashCallable { + @Override + public String getLabel() { + return "Forge Mods"; + } + + @Override + public String call() throws Exception { + //Extend mod list text + List> datas = new ArrayList<>(); + datas.add(PrintHelper.createLine("ID", "Name", "Version", "Source")); + List mods = ModList.get().getMods(); + for (ModInfo it : mods) { + datas.add(PrintHelper.createLine( + it.getModId(), + it.getDisplayName(), + it.getVersion().toString(), + getSource(it) + )); + } + return PrintHelper.printLine("\n\t\t", datas); + } + + private String getSource(ModInfo it) { + if (it.getOwningFile() == null) return "Not Found"; + if (it.getOwningFile().getFile() == null) return "Not Found"; + return it.getOwningFile().getFile().getFileName(); + } +} diff --git a/src/main/java/me/xfl03/morecrashinfo/util/CoreModHelper.java b/src/main/java/me/xfl03/morecrashinfo/util/CoreModHelper.java new file mode 100644 index 0000000..32f213e --- /dev/null +++ b/src/main/java/me/xfl03/morecrashinfo/util/CoreModHelper.java @@ -0,0 +1,22 @@ +package me.xfl03.morecrashinfo.util; + +import net.minecraftforge.coremod.CoreMod; +import net.minecraftforge.coremod.CoreModEngine; +import net.minecraftforge.coremod.CoreModProvider; +import net.minecraftforge.fml.loading.FMLLoader; +import net.minecraftforge.forgespi.coremod.ICoreModProvider; + +import java.util.List; + +public class CoreModHelper { + public static List getCoreModList() throws Exception { + //Get and convert coremod provider + ICoreModProvider provider = FMLLoader.getCoreModProvider(); + CoreModProvider p = (CoreModProvider) provider; + + //Reflect to get coremod list + CoreModEngine engine = (CoreModEngine) ReflectionHelper.getField(p, "engine"); + List list = (List) ReflectionHelper.getField(engine, "coreMods"); + return list; + } +} diff --git a/src/main/java/me/xfl03/morecrashinfo/util/PrintHelper.java b/src/main/java/me/xfl03/morecrashinfo/util/PrintHelper.java new file mode 100644 index 0000000..c8af915 --- /dev/null +++ b/src/main/java/me/xfl03/morecrashinfo/util/PrintHelper.java @@ -0,0 +1,68 @@ +package me.xfl03.morecrashinfo.util; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class PrintHelper { + public static List createLine(String... data) { + return Arrays.asList(data); + } + + public static List printLines(List> datas) { + //Check data + if (datas == null || datas.isEmpty()) { + return new ArrayList<>(); + } + + //Calculate width + int columns = datas.get(0).size(); + int[] width = new int[columns]; + for (int i = 0; i < columns; i++) { + for (List it : datas) { + width[i] = Math.max(it.get(i).length(), width[i]); + } + } + + //Add title line + List line = new ArrayList<>(); + for (int i = 0; i < columns; i++) { + StringBuilder sb = new StringBuilder(); + for (int j = 0; j < width[i]; j++) { + sb.append('-'); + } + line.add(sb.toString()); + } + datas.add(1, line); + + //Generate text + List s = new ArrayList<>(); + for (List data : datas) { + s.add(genString(data, columns, width)); + } + return s; + } + + public static String printLine(String suffix, List> datas) { + StringBuilder sb = new StringBuilder(); + PrintHelper.printLines(datas).forEach(it -> sb.append(suffix).append(it)); + return sb.toString(); + } + + public static void appendString(StringBuilder sb, String s, int w) { + sb.append(s); + for (int i = 0; i < w - s.length(); i++) { + sb.append(' '); + } + } + + public static String genString(List data, int columns, int[] width) { + StringBuilder sb = new StringBuilder(); + sb.append("| "); + for (int i = 0; i < columns; i++) { + appendString(sb, data.get(i), width[i]); + sb.append(" | "); + } + return sb.toString(); + } +} diff --git a/src/main/java/me/xfl03/morecrashinfo/util/ReflectionHelper.java b/src/main/java/me/xfl03/morecrashinfo/util/ReflectionHelper.java new file mode 100644 index 0000000..7656914 --- /dev/null +++ b/src/main/java/me/xfl03/morecrashinfo/util/ReflectionHelper.java @@ -0,0 +1,12 @@ +package me.xfl03.morecrashinfo.util; + +import java.lang.reflect.Field; + +public class ReflectionHelper { + public static Object getField(Object o, String name) throws Exception { + Class c = o.getClass(); + Field f = c.getDeclaredField(name); + f.setAccessible(true); + return f.get(o); + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..3f7b537 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,25 @@ +modLoader="javafml" +loaderVersion="[25,)" +issueTrackerURL="http://github.com/xfl03/MoreCrashInfo/issues" +[[mods]] +modId="morecrashinfo" +version="1.0" +displayName="MoreCrashInfo" +displayURL="http://github.com/xfl03/MoreCrashInfo" #optional +credits="" +authors="xfl03" +description=''' +Display more info in crash report. +''' +[[dependencies.examplemod]] + modId="forge" + mandatory=true + versionRange="[25,)" + ordering="NONE" + side="BOTH" +[[dependencies.examplemod]] + modId="minecraft" + mandatory=true + versionRange="[1.13.2,)" + ordering="NONE" + side="BOTH" \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..46cf268 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,7 @@ +{ + "pack": { + "description": "Display more info in crash report.", + "pack_format": 4, + "_comment": "A pack_format of 4 requires json lang files. Note: we require v4 pack meta for all mods." + } +}