From 9d605ba250f89830e288ba591a03faf6ed795098 Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sat, 17 Feb 2018 15:01:15 -0500 Subject: [PATCH] Fix compatibility with CompatLayer 0.3.1 Fixes McJty/compatlayer#26. --- src/main/java/com/rwtema/denseores/DenseOresMod.java | 2 +- src/main/java/com/rwtema/denseores/compat/Compat.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rwtema/denseores/DenseOresMod.java b/src/main/java/com/rwtema/denseores/DenseOresMod.java index 7fb4936..6dab02f 100644 --- a/src/main/java/com/rwtema/denseores/DenseOresMod.java +++ b/src/main/java/com/rwtema/denseores/DenseOresMod.java @@ -37,7 +37,7 @@ public class DenseOresMod { public void preInit(FMLPreInitializationEvent event) { String version = Loader.instance().getMinecraftModContainer().getVersion(); if (ImmutableSet.of("1.9", "1.9.1", "1.9.2", "1.9.3", "1.9.4", "1.10", "1.10.1", "1.10.2").contains(version)) { - if (!ModAPIManager.INSTANCE.hasAPI("compatlayer")) { + if (!Loader.isModLoaded("compatlayer") && !ModAPIManager.INSTANCE.hasAPI("compatlayer")) { throw proxy.wrap(new EnhancedRuntimeException(String.format("Dense Ores requires CompatLayer to run in Minecraft %s", version)) { @Override protected void printStackTrace(WrappedPrintStream stream) { diff --git a/src/main/java/com/rwtema/denseores/compat/Compat.java b/src/main/java/com/rwtema/denseores/compat/Compat.java index d653ee0..d3f0655 100644 --- a/src/main/java/com/rwtema/denseores/compat/Compat.java +++ b/src/main/java/com/rwtema/denseores/compat/Compat.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModAPIManager; import javax.annotation.Nonnull; @@ -16,7 +17,7 @@ public abstract class Compat { static { Compat instance; - if (ModAPIManager.INSTANCE.hasAPI("compatlayer")) { + if (Loader.isModLoaded("compatlayer") || ModAPIManager.INSTANCE.hasAPI("compatlayer")) { try { instance = (Compat) Class.forName("com.rwtema.denseores.compat.CompatLayer").newInstance(); } catch (Throwable e) {