Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

Fix compatibility with CompatLayer 0.3.1 #148

Open
josephcsible wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compatibility with CompatLayer 0.3.1 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/rwtema/denseores/DenseOresMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/rwtema/denseores/compat/Compat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down