From b4ec3663bbbba0dc9f25a5d909e2f74a3637a535 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Sun, 16 Jul 2023 12:31:12 +0200 Subject: [PATCH] chore: move IC2 check to dedicated method --- src/main/java/universalelectricity/compat/CompatHandler.java | 3 +-- .../java/universalelectricity/core/UniversalElectricity.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/universalelectricity/compat/CompatHandler.java b/src/main/java/universalelectricity/compat/CompatHandler.java index 06d6c53..b1004e2 100644 --- a/src/main/java/universalelectricity/compat/CompatHandler.java +++ b/src/main/java/universalelectricity/compat/CompatHandler.java @@ -4,7 +4,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; import net.minecraft.tileentity.TileEntity; import universalelectricity.api.CompatibilityModule; import universalelectricity.compat.ic2.IC2CompatModule; @@ -17,7 +16,7 @@ public class CompatHandler { public static void initCompatHandlers() { FMLCommonHandler.instance().bus().register(new CompatTickHandler()); - if (Loader.isModLoaded("IC2") && UniversalElectricity.ic2Compat) { + if (UniversalElectricity.isIC2CompatActive()) { CompatibilityModule.register(new IC2CompatModule()); } } diff --git a/src/main/java/universalelectricity/core/UniversalElectricity.java b/src/main/java/universalelectricity/core/UniversalElectricity.java index 4b84a26..ba4c2a0 100644 --- a/src/main/java/universalelectricity/core/UniversalElectricity.java +++ b/src/main/java/universalelectricity/core/UniversalElectricity.java @@ -43,4 +43,8 @@ public class UniversalElectricity { proxy.init(); } + public static boolean isIC2CompatActive() { + return ic2Compat && Loader.isModLoaded("IC2"); + } + }