From 98f3da61319dcbbe95c45d57290c6488c7d408cf Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 26 Jan 2023 00:23:38 +0100 Subject: [PATCH] stop calling EnvironmentChecks and remove dead code in EnvironmentChecks --- src/main/java/tconstruct/TConstruct.java | 3 -- .../tconstruct/util/EnvironmentChecks.java | 30 +++++-------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 3d9496aa..e5919cbd 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -51,7 +51,6 @@ import tconstruct.plugins.ubc.TinkerUBC; import tconstruct.plugins.waila.TinkerWaila; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; -import tconstruct.util.EnvironmentChecks; import tconstruct.util.IMCHandler; import tconstruct.util.config.DimensionBlacklist; import tconstruct.util.config.PHConstruct; @@ -122,8 +121,6 @@ public class TConstruct { } else { logger.info("Preparing to take over the world"); } - - EnvironmentChecks.verifyEnvironmentSanity(); } // Force the client and server to have or not have this mod diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index 7d3990aa..1c82dbbc 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -1,10 +1,8 @@ package tconstruct.util; -import cpw.mods.fml.common.*; -import cpw.mods.fml.relauncher.Side; -import java.util.*; -import mantle.crash.*; -import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.ICrashCallable; +import mantle.crash.CallableSuppConfig; public class EnvironmentChecks { @@ -15,27 +13,13 @@ public class EnvironmentChecks { * logs if so. Note: This code adds additional data to crashlogs. It does * not trigger any crashes. */ - private static List incompatibilities = new ArrayList<>(); - - private static EnvironmentChecks instance = new EnvironmentChecks(); - + //private static List incompatibilities = new ArrayList<>(); + //private static EnvironmentChecks instance = new EnvironmentChecks(); public static void verifyEnvironmentSanity() { - List modIds = new ArrayList<>(); - // Bukkit/Magic Launcher/Optifine are caught by Mantle, so we no longer // check for those. - - if (modIds.size() == 0) { - ICrashCallable callable = new CallableSuppConfig("TConstruct"); - FMLCommonHandler.instance().registerCrashCallable(callable); - } else { - ICrashCallable callable = new CallableUnsuppConfig("TConstruct", modIds); - FMLCommonHandler.instance().registerCrashCallable(callable); - } - - if (incompatibilities.size() > 0 && FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { - MinecraftForge.EVENT_BUS.register(instance); - } + ICrashCallable callable = new CallableSuppConfig("TConstruct"); + FMLCommonHandler.instance().registerCrashCallable(callable); } public static String modCompatDetails(String type, boolean consoleFormat) {