diff --git a/README.MD b/README.MD index 0136713..370d9c8 100644 --- a/README.MD +++ b/README.MD @@ -23,6 +23,7 @@ This mod also contains patches for the following mods: - Biome Wand - CoFH Lib - DragonAPI +- Dynamic Surroundings - Extra Utilities - GalactiCraft - Immersive Cavegen diff --git a/dependencies.gradle b/dependencies.gradle index f223d0b..609dc5e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,4 +1,15 @@ +static def curse(curseDep) { + return "curse.maven:" + curseDep +} + +def deobfCurse(curseDep) { + String curseMaven = "https://cursemaven.falsepattern.com/" //Use https://cursemaven.com/ if this is down + return deobfMaven(curseMaven, curse(curseDep)) +} + dependencies { + ////////////////Our dependencies//////////////// + compileOnly("org.projectlombok:lombok:1.18.22") { transitive = false } @@ -6,29 +17,72 @@ dependencies { compile("com.falsepattern:falsepatternlib-mc1.7.10:0.9.2:dev") - String curseMaven = "https://cursemaven.falsepattern.com/" //Use https://cursemaven.com/ if this is down - compileOnly(deobfMaven(curseMaven, "curse.maven:undergroundbiomesconstructs-72744:2304497")) // 0.8-beta49 - compileOnly(deobfMaven(curseMaven, "curse.maven:more-fun-quicksand-mod-321960:2717318")) // 1.0.8.8-fixed - compileOnly(deobfMaven(curseMaven, "curse.maven:worldedit-225608:2309699")) // 6.1.1 - compile("curse.maven:cofh-lib-220333:2388748") // 1.2.1-185-dev - compileOnly(deobfMaven(curseMaven, "curse.maven:dragonapi-235591:3574508")) // V31b + ////////////////Patched mods//////////////// - compile(deobfMaven(curseMaven, "curse.maven:antiidconflict-246288:2308279")) // 1.3.5 - compile("curse.maven:atg-228356:2231155") // 0.12.0 - compile(deobfMaven(curseMaven, "curse.maven:biomesoplenty-220318:2499612")) // 2.1.0.2308 - compile(deobfMaven(curseMaven, "curse.maven:rtg-237989:2521557")) // 1.1.1.7 - compile(deobfMaven(curseMaven, "curse.maven:naturescompass-252848:2451823")) // 1.3.1 - compile(deobfMaven(curseMaven, "curse.maven:dynamicsurrounding-238891:2642381")) // 1.0.6.4 - compile(deobfMaven(curseMaven, "curse.maven:immersivecavegen-521557:3649411")) // 1.2g - compile(deobfMaven(curseMaven, "curse.maven:twilightforest-227639:3039937")) // 2.3.8 - compile(deobfMaven(curseMaven, "curse.maven:thaumcraft-223628:2227552")) // 4.2.3.5 - compile(deobfMaven(curseMaven, "curse.maven:baubles-227083:2224857")) // 1.0.1.10, dependency of thaumcraft - compile(deobfMaven(curseMaven, "curse.maven:antiqueatlas-227795:2454232")) // 4.4.4 - compile("curse.maven:extrautilities-225561:2264384") // 1.2.12 + //Alternate Terrain Generation 0.12.0 + compile(curse("atg-228356:2231155")) + + //Antique Atlas 4.4.4 + compile(deobfCurse("antiqueatlas-227795:2454232")) + + //Anti ID Conflict 1.3.5 + compile(deobfCurse("antiidconflict-246288:2308279")) + + //ArchaicFix snapshot compile("com.github.embeddedt:ArchaicFix:be8666cb2dbf2e0a8b799e88cef3c0d12e5d4911:dev") - compile(deobf("https://spacechase0.com/wp-content/uploads/2014/10/1.7.10-Biome-Wand-1.1.9.jar")) - compile(deobf("http://spacechase0.com/files/mcmod/1.7.10-SpaceCore-0.7.14.jar")) //dependency of biome wand + //Biomes O' Plenty 2.1.0.2308 + compile(deobfCurse("biomesoplenty-220318:2499612")) + //Biome Wand 1.1.9 + compile(deobf("https://spacechase0.com/wp-content/uploads/2014/10/1.7.10-Biome-Wand-1.1.9.jar")) + + //CoFH Lib 1.2.1-185 + compile(curse("cofh-lib-220333:2388748")) + + //DragonAPI V31b + compileOnly(deobfCurse("dragonapi-235591:3574508")) + + //Dynamic Surroundings 1.0.6.4 + compile(deobfCurse("dynamicsurrounding-238891:2642381")) + + //Extra Utilities 1.2.12 + compile(curse("extrautilities-225561:2264384")) + + //Galacticraft Core 3.0.12.504 compileOnly(deobf("https://micdoodle8.com/new-builds/GC-1.7/504/GalacticraftCore-1.7-3.0.12.504.jar")) + + //Immersive Cavegen 1.2g + compile(deobfCurse("immersivecavegen-521557:3649411")) + + //More Fun Quicksands Mod 1.0.8.8-fixed + compileOnly(deobfCurse("more-fun-quicksand-mod-321960:2717318")) + + //Nature's Compass 1.3.1 + compile(deobfCurse("naturescompass-252848:2451823")) + + //Realistic Terrain Generation 1.1.1.7 + compile(deobfCurse("rtg-237989:2521557")) + + //Thaumcraft 4.2.3.5 + compile(deobfCurse("thaumcraft-223628:2227552")) + + //Twilight Forest 2.3.8 + compile(deobfCurse("twilightforest-227639:3039937")) + + //Underground Biomes Constructs 0.8-beta49 + compileOnly(deobfCurse("undergroundbiomesconstructs-72744:2304497")) + + //WorldEdit 6.1.1 + compileOnly(deobfCurse("worldedit-225608:2309699")) + + ////////////////Dependencies for patched mods//////////////// + + //SpaceCore 0.7.14 + //needed by: Biome Wand + compile(deobf("http://spacechase0.com/files/mcmod/1.7.10-SpaceCore-0.7.14.jar")) + + //Baubles 1.0.1.10 + //needed by: Thaumcraft + compile(deobfCurse("baubles-227083:2224857")) } diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index b81f966..98a133b 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -58,6 +58,16 @@ public enum Mixin implements IMixin { RenderGlobalMixin(Side.CLIENT, always(), "vanilla.RenderGlobalMixin"), //endregion Minecraft->client //endregion Minecraft + //region ATG->common + ATGBiomeConfigMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGBiomeConfigMixin"), + ATGBiomeManagerMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGBiomeManagerMixin"), + ATGChunkProviderMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGChunkProviderMixin"), + ATGWorldGenRocksMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGWorldGenRocksMixin"), + //endregion ATG->common + //region AntiqueAtlas->commond + BiomeDetectorBaseMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "antiqueatlas.BiomeDetectorBaseMixin"), + BiomeDetectorNetherMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "antiqueatlas.BiomeDetectorNetherMixin"), + //endregion AntiqueAtlas->commond //region AntiIDConflict->common AIDCAntiIdConflictBaseMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.AntiIdConflictBaseMixin"), @@ -71,16 +81,11 @@ public enum Mixin implements IMixin { AIDCEntitiesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.EntitiesManagerMixin"), AIDCPotionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.PotionsManagerMixin"), //endregion AntiIDConflict->common - //region AntiqueAtlas->commond - BiomeDetectorBaseMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "antiqueatlas.BiomeDetectorBaseMixin"), - BiomeDetectorNetherMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "antiqueatlas.BiomeDetectorNetherMixin"), - //endregion AntiqueAtlas->commond - //region ATG->common - ATGBiomeConfigMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGBiomeConfigMixin"), - ATGBiomeManagerMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGBiomeManagerMixin"), - ATGChunkProviderMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGChunkProviderMixin"), - ATGWorldGenRocksMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGWorldGenRocksMixin"), - //endregion ATG->common + //region BoP->common + BOPBiomeManagerMixin(Side.COMMON, require(TargetedMod.BOP), "bop.BOPBiomeManagerMixin"), + ChunkProviderBOPEndMixin(Side.COMMON, require(TargetedMod.BOP), "bop.ChunkProviderBOPEndMixin"), + ChunkProviderBOPHellMixin(Side.COMMON, require(TargetedMod.BOP), "bop.ChunkProviderBOPHellMixin"), + //endregion BoP->common //region Biome Wand //region Biome Wand->client BiomeWandItemClientMixin(Side.CLIENT, require(TargetedMod.BIOMEWAND), "biomewand.BiomeWandItemMixin"), @@ -89,11 +94,6 @@ public enum Mixin implements IMixin { BiomeWandItemMixin(Side.COMMON, require(TargetedMod.BIOMEWAND), "biomewand.BiomeWandItemMixin"), //endregion Biome Wand->common //endregion Biome Wand - //region BoP->common - BOPBiomeManagerMixin(Side.COMMON, require(TargetedMod.BOP), "bop.BOPBiomeManagerMixin"), - ChunkProviderBOPEndMixin(Side.COMMON, require(TargetedMod.BOP), "bop.ChunkProviderBOPEndMixin"), - ChunkProviderBOPHellMixin(Side.COMMON, require(TargetedMod.BOP), "bop.ChunkProviderBOPHellMixin"), - //endregion BoP->common //region CoFHLib->common CoFHLibCofhBlockHelperMixin(Side.COMMON, require(TargetedMod.COFHLIB), "cofhlib.BlockHelperMixin"), //endregion CoFHLib->common diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java index eb8251d..c355780 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -11,11 +11,11 @@ import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.startsWit @RequiredArgsConstructor public enum TargetedMod implements ITargetedMod { - ANTIIDCONFLICT("Anti ID Conflict", true, startsWith("antiidconflict")), - ANTIQUEATLAS("Antique Atlas", true, startsWith("antiqueatlas")), ATG("Alternate Terrain Generation", true, startsWith("atg")), - BIOMEWAND("Biome Wand", true, startsWith("1.7.10-biome-wand-").or(startsWith("biome-wand"))), + ANTIQUEATLAS("Antique Atlas", true, startsWith("antiqueatlas")), + ANTIIDCONFLICT("Anti ID Conflict", true, startsWith("antiidconflict")), BOP("Biomes O' Plenty", true, startsWith("biomesoplenty-")), + BIOMEWAND("Biome Wand", true, startsWith("1.7.10-biome-wand-").or(startsWith("biome-wand"))), COFHLIB("CoFH Lib", true, startsWith("cofhlib-")), DRAGONAPI("DragonAPI", false, startsWith("dragonapi")), EXTRAUTILITIES("Extra Utilities", true, startsWith("extrautilities-")),