From 37a896fe1b65ecd65b060bafbdf471d37c57b88a Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 8 Jun 2019 14:38:18 -0400 Subject: [PATCH] Add params for the exception message Signed-off-by: cpw tweak logging Signed-off-by: cpw --- src/main/java/net/minecraftforge/client/ForgeHooksClient.java | 1 + src/main/java/net/minecraftforge/fml/ModLoadingException.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 362ea4400..539f1476f 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -1001,6 +1001,7 @@ public class ForgeHooksClient // This serves a workaround for no built-in method of triggering this type of refresh as brought up by LOG4J2-2178. public static void invalidateLog4jThreadCache() { + if (System.getProperty("java.version").compareTo("1.8.0_102") >= 0) return; // skip for later JDKs, because it's not CACHED see LOG4J2-2052 try { Field nameField = ThreadNameCachingStrategy.class.getDeclaredField("THREADLOCAL_NAME"); diff --git a/src/main/java/net/minecraftforge/fml/ModLoadingException.java b/src/main/java/net/minecraftforge/fml/ModLoadingException.java index f10cc647e..d40862ae2 100644 --- a/src/main/java/net/minecraftforge/fml/ModLoadingException.java +++ b/src/main/java/net/minecraftforge/fml/ModLoadingException.java @@ -25,6 +25,7 @@ import net.minecraftforge.fml.loading.EarlyLoadingException; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -52,7 +53,7 @@ public class ModLoadingException extends RuntimeException private final List context; public ModLoadingException(final IModInfo modInfo, final ModLoadingStage errorStage, final String i18nMessage, final Throwable originalException, Object... context) { - super("Mod Loading Exception : "+i18nMessage, originalException); + super("Mod Loading Exception : " + i18nMessage + " " + Arrays.toString(Streams.concat(Stream.of(modInfo, errorStage, originalException), Stream.of(context)).toArray()), originalException); this.modInfo = modInfo; this.errorStage = errorStage; this.i18nMessage = i18nMessage;