From 39e6b70922da889feeaa175ebb52cda370391bc0 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Thu, 25 Aug 2022 21:32:18 +0200 Subject: [PATCH] buildcraft compat (#40) --- dependencies.gradle | 3 +++ .../buildcraft/BuildcraftEnergyMixin.java | 19 +++++++++++++++++++ .../endlessids/mixin/plugin/Mixin.java | 3 +++ .../endlessids/mixin/plugin/TargetedMod.java | 5 +---- 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/buildcraft/BuildcraftEnergyMixin.java diff --git a/dependencies.gradle b/dependencies.gradle index 9da0166..d87e02b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -47,6 +47,9 @@ dependencies { //Mirrored at: https://maven.falsepattern.com/mirror/mirror/1.7.10-Biome-Wand-1.1.9.jar compile(deobf("https://spacechase0.com/wp-content/uploads/2014/10/1.7.10-Biome-Wand-1.1.9.jar")) + //Buildcraft 7.1.24 + compile(deobfCurse("buildcraft-61811:3538651")) + //CoFH Lib 1.2.1-185 compile(deobfCurse("cofh-lib-220333:2388748")) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/buildcraft/BuildcraftEnergyMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/buildcraft/BuildcraftEnergyMixin.java new file mode 100644 index 0000000..5104c8f --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/buildcraft/BuildcraftEnergyMixin.java @@ -0,0 +1,19 @@ +package com.falsepattern.endlessids.mixin.mixins.common.buildcraft; + +import buildcraft.BuildCraftEnergy; +import com.falsepattern.endlessids.constants.ExtendedConstants; +import com.falsepattern.endlessids.constants.VanillaConstants; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(value = BuildCraftEnergy.class, + remap = false) +public abstract class BuildcraftEnergyMixin { + @ModifyConstant(method = "findUnusedBiomeID", + constant = @Constant(intValue = VanillaConstants.biomeIDCount), + require = 1) + private int extendIDs(int constant) { + return ExtendedConstants.biomeIDCount; + } +} 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 66c538d..a26d8a2 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -93,6 +93,9 @@ public enum Mixin implements IMixin { BiomeWandItemMixin(Side.COMMON, require(TargetedMod.BIOMEWAND), "biomewand.BiomeWandItemMixin"), //endregion Biome Wand->common //endregion Biome Wand + //region Buildcraft + BuildcraftEnergyMixin(Side.COMMON, require(TargetedMod.BUILDCRAFT), "buildcraft.BuildcraftEnergyMixin"), + //endregion Buildcraft //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 112a3aa..6ad75c7 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -1,9 +1,5 @@ package com.falsepattern.endlessids.mixin.plugin; -import com.falsepattern.endlessids.config.DarkWorldIDConfig; -import com.falsepattern.endlessids.config.FuturepackIDConfig; -import com.falsepattern.lib.config.ConfigException; -import com.falsepattern.lib.config.ConfigurationManager; import com.falsepattern.lib.mixin.ITargetedMod; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -22,6 +18,7 @@ public enum TargetedMod implements ITargetedMod { BOP("Biomes O' Plenty", true, startsWith("biomesoplenty-")), BIOMETWEAKER("Biome Tweaker", true, startsWith("biometweaker-")), BIOMEWAND("Biome Wand", true, startsWith("1.7.10-biome-wand-").or(startsWith("biome-wand"))), + BUILDCRAFT("BuildCraft", true, startsWith("buildcraft-")), COFHLIB("CoFH Lib", true, startsWith("cofhlib-")), DARKWORLD("Dark World", true, startsWith("darkworld-")), DRAGONAPI("DragonAPI", false, startsWith("dragonapi")),