stop calling EnvironmentChecks and remove dead code in EnvironmentChecks

This commit is contained in:
Alexdoru authored and Jason Mitchell committed 2023-01-28 18:02:41 -08:00
1 parent dba65e38dd
commit 98f3da6131
2 files changed
+7 -26

No files matched your search

-3
View File
@@ -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
@@ -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<String> incompatibilities = new ArrayList<>();
private static EnvironmentChecks instance = new EnvironmentChecks();
//private static List<String> incompatibilities = new ArrayList<>();
//private static EnvironmentChecks instance = new EnvironmentChecks();
public static void verifyEnvironmentSanity() {
List<String> 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) {