diff --git a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java index 70735f49f..f86faa5ac 100644 --- a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java @@ -1,9 +1,9 @@ package com.gtnewhorizons.angelica; +import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.proxy.CommonProxy; import com.gtnewhorizons.angelica.utils.AnimationMode; import com.gtnewhorizons.angelica.utils.ManagedEnum; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -20,28 +20,14 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; public class AngelicaMod { @SidedProxy(clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy") public static CommonProxy proxy; - /** Mixin Version */ - public static boolean isNEIDLoaded; - /** ASM Version */ - public static boolean isOldNEIDLoaded; - public static boolean isLotrLoaded; - - public static boolean isChunkAPILoaded; - - public static boolean isEIDBiomeLoaded; - - public static final boolean lwjglDebug = Boolean.parseBoolean(System.getProperty("org.lwjgl.util.Debug", "false")); + public static final boolean lwjglDebug = Boolean.parseBoolean(System.getProperty("org.lwjgl.util.Debug", "false")); public static final ManagedEnum animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY); @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - isNEIDLoaded = Loader.isModLoaded("neid"); - isOldNEIDLoaded = Loader.isModLoaded("notenoughIDs"); - isLotrLoaded = Loader.isModLoaded("lotr"); - isChunkAPILoaded = Loader.isModLoaded("chunkapi"); - isEIDBiomeLoaded = Loader.isModLoaded("endlessids_biome"); + ModStatus.preInit(); proxy.preInit(event); } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/ExtendedBlockStorageExt.java b/src/main/java/com/gtnewhorizons/angelica/compat/ExtendedBlockStorageExt.java index 28ac40dc8..e8ec65fb7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/ExtendedBlockStorageExt.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ExtendedBlockStorageExt.java @@ -1,7 +1,6 @@ package com.gtnewhorizons.angelica.compat; import com.falsepattern.chunk.api.DataRegistry; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.mixins.early.sodium.MixinExtendedBlockStorage; import com.gtnewhorizons.angelica.mixins.interfaces.ExtendedNibbleArray; import com.gtnewhorizons.neid.mixins.interfaces.IExtendedBlockStorageMixin; @@ -22,14 +21,14 @@ public class ExtendedBlockStorageExt extends ExtendedBlockStorage { public ExtendedBlockStorageExt(Chunk chunk, ExtendedBlockStorage storage) { super(((MixinExtendedBlockStorage) storage).getYBase(), storage.getSkylightArray() != null); - if (AngelicaMod.isChunkAPILoaded) { + if (ModStatus.isChunkAPILoaded) { if (storage.getSkylightArray() != null) { hasSky = true; } DataRegistry.cloneSubChunk(chunk, storage, this); } else { int arrayLen; - if (AngelicaMod.isNEIDLoaded){ + if (ModStatus.isNEIDLoaded){ final short[] block16BArray = ((IExtendedBlockStorageMixin)(Object)this).getBlock16BArray(); System.arraycopy(((IExtendedBlockStorageMixin)(Object)storage).getBlock16BArray(), 0, block16BArray, 0, block16BArray.length); if(storage.getBlockMSBArray() != null) { @@ -38,7 +37,7 @@ public class ExtendedBlockStorageExt extends ExtendedBlockStorage { } arrayLen = block16BArray.length; } - else if (AngelicaMod.isOldNEIDLoaded){ + else if (ModStatus.isOldNEIDLoaded){ final short[] blockLSBArray = Hooks.get(this); System.arraycopy(Hooks.get(storage), 0, blockLSBArray, 0, blockLSBArray.length); // getBlockMSBArray is nuked in asm version diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java new file mode 100644 index 000000000..36f91484b --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java @@ -0,0 +1,25 @@ +package com.gtnewhorizons.angelica.compat; + +import cpw.mods.fml.common.Loader; + +public class ModStatus { + /** + * Mixin Version + */ + public static boolean isNEIDLoaded; + /** + * ASM Version + */ + public static boolean isOldNEIDLoaded; + public static boolean isLotrLoaded; + public static boolean isChunkAPILoaded; + public static boolean isEIDBiomeLoaded; + + public static void preInit(){ + isNEIDLoaded = Loader.isModLoaded("neid"); + isOldNEIDLoaded = Loader.isModLoaded("notenoughIDs"); + isLotrLoaded = Loader.isModLoaded("lotr"); + isChunkAPILoaded = Loader.isModLoaded("chunkapi"); + isEIDBiomeLoaded = Loader.isModLoaded("endlessids_biome"); + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java index fb89ed253..b462e5229 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -11,7 +11,6 @@ import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import mist475.mcpatcherforge.asm.AsmTransformers; import mist475.mcpatcherforge.asm.mappings.Namer; -import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index 6bc4956af..3244be5ec 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.proxy; import com.google.common.base.Objects; -import com.gtnewhorizons.angelica.AngelicaMod; +import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.hudcaching.HUDCaching; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; @@ -65,7 +65,7 @@ public class ClientProxy extends CommonProxy { @Override public void postInit(FMLPostInitializationEvent event) { - if (AngelicaMod.isLotrLoaded && AngelicaConfig.enableSodium && AngelicaConfig.fixLotrSodiumCompat) { + if (ModStatus.isLotrLoaded && AngelicaConfig.enableSodium && AngelicaConfig.fixLotrSodiumCompat) { try { Class lotrRendering = Class.forName("lotr.common.coremod.LOTRReplacedMethods$BlockRendering"); ReflectionHelper.setPrivateValue(lotrRendering,null,new ConcurrentHashMap<>(),"naturalBlockClassTable"); diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java index 3ad3052ad..b9efb942d 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java @@ -1,8 +1,8 @@ package me.jellysquid.mods.sodium.client.world.cloned; import com.falsepattern.endlessids.mixin.helpers.ChunkBiomeHook; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.compat.ExtendedBlockStorageExt; +import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.compat.mojang.BlockPos; import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; import it.unimi.dsi.fastutil.shorts.Short2ObjectMap; @@ -61,7 +61,7 @@ public class ClonedChunkSection { this.data = new ExtendedBlockStorageExt(chunk, section); int bArrLength; - if (AngelicaMod.isEIDBiomeLoaded) { + if (ModStatus.isEIDBiomeLoaded) { bArrLength = ((ChunkBiomeHook)chunk).getBiomeShortArray().length; } else { bArrLength = chunk.getBiomeArray().length;