diff --git a/.gitignore b/.gitignore index 5b704fa..d91dfbe 100644 --- a/.gitignore +++ b/.gitignore @@ -145,4 +145,5 @@ gradle-app.setting # End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,forgegradle,java -srgmap.cfg \ No newline at end of file +srgmap.cfg +!lib/*.jar \ No newline at end of file diff --git a/README.MD b/README.MD index 0264ed3..b6e6144 100644 --- a/README.MD +++ b/README.MD @@ -8,6 +8,7 @@ EndlessIDs is a modern rewrite of NotEnoughIDs which increases the limit even mo This mod also contains patches for the following mods: - AntiIDConflict +- GalactiCraft - UndergroundBiomesConstructs - More Fun Quicksand Mod - WorldEdit diff --git a/dependencies.gradle b/dependencies.gradle index 7aed315..2481e78 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -13,4 +13,5 @@ dependencies { compileOnly(deobfMaven("curse.maven:dragonapi-235591:3574508")) // V31b compileOnly(deobfMaven("curse.maven:antiidconflict-246288:2308279")) // 1.3.5 + compileOnly(files("lib/GalacticraftCore-1.7-3.0.12.504-deobf.jar")) } diff --git a/lib/GalacticraftCore-1.7-3.0.12.504-deobf.jar b/lib/GalacticraftCore-1.7-3.0.12.504-deobf.jar new file mode 100644 index 0000000..d67b769 Binary files /dev/null and b/lib/GalacticraftCore-1.7-3.0.12.504-deobf.jar differ diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ConfigManagerCoreMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ConfigManagerCoreMixin.java new file mode 100644 index 0000000..b203a1e --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ConfigManagerCoreMixin.java @@ -0,0 +1,26 @@ +package com.falsepattern.endlessids.mixin.mixins.common.galacticraft; + +import com.falsepattern.endlessids.constants.ExtendedConstants; +import com.falsepattern.endlessids.constants.VanillaConstants; +import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(value = ConfigManagerCore.class, + remap = false) +public abstract class ConfigManagerCoreMixin { + @ModifyConstant(method = "syncConfig", + constant = @Constant(stringValue = "Biome ID for Moon (Mars will be this + 1, Asteroids + 2 etc). Allowed range 40-250."), + require = 1) + private static String modifyHint(String constant) { + return "Biome ID for Moon (Mars will be this + 1, Asteroids + 2 etc). Allowed range 40-" + (ExtendedConstants.biomeIDCount - 6); + } + + @ModifyConstant(method = "syncConfig", + constant = @Constant(intValue = VanillaConstants.biomeIDCount - 6), + require = 1) + private static int modifyLimit(int constant) { + return ExtendedConstants.biomeIDCount - 6; + } +} 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 4317b3a..7564fdd 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -54,6 +54,9 @@ public enum Mixin implements IMixin { RenderGlobalMixin(Side.CLIENT, always(), "vanilla.RenderGlobalMixin"), //endregion client //endregion Minecraft + //region GalactiCraftCore->common + ConfigManagerCoreMixin(Side.COMMON, require(TargetedMod.GALACTICRAFTCORE), "galacticraft.ConfigManagerCoreMixin"), + //endregion GalactiCraftCore->common //region UBC->common OreUBifierMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.OreUBifierMixin"), BiomeUndergroundDecoratorMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.BiomeUndergroundDecoratorMixin"), 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 50ce6c2..73961f9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -11,6 +11,7 @@ import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.*; @RequiredArgsConstructor public enum TargetedMod implements ITargetedMod { + GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")), UBC("Underground Biomes Constructs", false, startsWith("undergroundbiomesconstructs-")), COFHLIB("CoFH Lib", false, startsWith("cofhlib-")), DRAGONAPI("DragonAPI", false, startsWith("dragonapi")),