diff --git a/README.MD b/README.MD index 9899913..0264ed3 100644 --- a/README.MD +++ b/README.MD @@ -7,6 +7,7 @@ EndlessIDs is a modern rewrite of NotEnoughIDs which increases the limit even mo This mod also contains patches for the following mods: +- AntiIDConflict - UndergroundBiomesConstructs - More Fun Quicksand Mod - WorldEdit diff --git a/dependencies.gradle b/dependencies.gradle index 3bbc2bf..7aed315 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,4 +11,6 @@ dependencies { compileOnly(deobfMaven("curse.maven:worldedit-225608:2309699")) // 6.1.1 compileOnly("curse.maven:cofh-lib-220333:2388748") // 1.2.1-185-dev compileOnly(deobfMaven("curse.maven:dragonapi-235591:3574508")) // V31b + + compileOnly(deobfMaven("curse.maven:antiidconflict-246288:2308279")) // 1.3.5 } diff --git a/src/main/java/com/falsepattern/endlessids/EndlessIDs.java b/src/main/java/com/falsepattern/endlessids/EndlessIDs.java index 6fa105c..310c424 100644 --- a/src/main/java/com/falsepattern/endlessids/EndlessIDs.java +++ b/src/main/java/com/falsepattern/endlessids/EndlessIDs.java @@ -1,6 +1,10 @@ package com.falsepattern.endlessids; +import code.elix_x.coremods.antiidconflict.managers.BiomesManager; +import com.falsepattern.endlessids.constants.ExtendedConstants; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -11,4 +15,15 @@ import org.apache.logging.log4j.Logger; dependencies = "required-after:falsepatternlib@[0.8.2,);") public class EndlessIDs { public static final Logger LOG = LogManager.getLogger(Tags.MODNAME); + + @Mod.EventHandler + public static void preInit(FMLPreInitializationEvent e) { + if (Loader.isModLoaded("antiidconflict")) { + antiIdConflictLatePatch(); + } + } + + private static void antiIdConflictLatePatch() { + BiomesManager.conflicts = new BiomesManager.ConflictingBiomes[ExtendedConstants.biomeIDCount]; + } }