diff --git a/.gitignore b/.gitignore index 382cb21..186c283 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,4 @@ gradle-app.setting .classpath # End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,forgegradle,java +!lib/*.jar \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index f68fcfa..9a6ea83 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -59,6 +59,9 @@ dependencies { //Dynamic Surroundings 1.0.6.4 compile(deobfCurse("dynamicsurrounding-238891:2642381")) + //Enhanced Biomes 2.5 + compile(deobf("file://${project.rootDir}/lib/Enhanced Biomes 2.5 for MC 1.7.10.jar")) + //Erebus 0.4.7 compile(deobfCurse("theerebus-220698:2305035")) diff --git a/lib/Enhanced Biomes 2.5 for MC 1.7.10.jar b/lib/Enhanced Biomes 2.5 for MC 1.7.10.jar new file mode 100644 index 0000000..d5ddd63 Binary files /dev/null and b/lib/Enhanced Biomes 2.5 for MC 1.7.10.jar differ diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/BiomeIDsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/BiomeIDsMixin.java new file mode 100644 index 0000000..1dec6a7 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/BiomeIDsMixin.java @@ -0,0 +1,16 @@ +package com.falsepattern.endlessids.mixin.mixins.common.eb; + +import enhancedbiomes.world.biomestats.BiomeIDs; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(BiomeIDs.class) +public abstract class BiomeIDsMixin { + @ModifyConstant(method = "", + constant = @Constant(intValue = 39), + require = 1) + private static int extendIDs(int id) { + return id + 15000; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerArchipelagoEdgeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerArchipelagoEdgeMixin.java new file mode 100644 index 0000000..4f36e2a --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerArchipelagoEdgeMixin.java @@ -0,0 +1,20 @@ +package com.falsepattern.endlessids.mixin.mixins.common.eb; + +import com.falsepattern.endlessids.constants.ExtendedConstants; +import com.falsepattern.endlessids.constants.VanillaConstants; +import enhancedbiomes.world.gen.layer.GenLayerArchipelagoEdge; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(value = GenLayerArchipelagoEdge.class, + remap = false) +public abstract class GenLayerArchipelagoEdgeMixin { + @ModifyConstant(method = "getInts", + constant = @Constant(intValue = VanillaConstants.biomeIDCount), + remap = true, + require = 5) + private int extendIDs(int constant) { + return ExtendedConstants.biomeIDCount; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBHillsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBHillsMixin.java new file mode 100644 index 0000000..b5badf1 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBHillsMixin.java @@ -0,0 +1,40 @@ +package com.falsepattern.endlessids.mixin.mixins.common.eb; + +import com.falsepattern.endlessids.constants.ExtendedConstants; +import com.falsepattern.endlessids.constants.VanillaConstants; +import enhancedbiomes.world.gen.layer.GenLayerEBHills; +import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(value = GenLayerEBHills.class, + remap = false) +public abstract class GenLayerEBHillsMixin { + @ModifyConstant(method = "getInts", + constant = @Constant(intValue = VanillaConstants.biomeIDCount), + remap = true, + require = 8) + private int extendIDs1(int constant) { + return ExtendedConstants.biomeIDCount; + } + + @ModifyConstant(method = "getInts", + constant = @Constant(intValue = 128), + remap = true, + require = 1) + private int extendIDs2(int constant) { + return ExtendedConstants.biomeIDCount; + } + + @Redirect(method = "getInts", + at = @At(value = "INVOKE", + target = "Lorg/apache/logging/log4j/Logger;debug(Ljava/lang/String;)V"), + remap = true, + require = 1) + private void noLog(Logger instance, String s) { + + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBRiverMixMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBRiverMixMixin.java new file mode 100644 index 0000000..b6c1545 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBRiverMixMixin.java @@ -0,0 +1,28 @@ +package com.falsepattern.endlessids.mixin.mixins.common.eb; + +import com.falsepattern.endlessids.constants.ExtendedConstants; +import com.falsepattern.endlessids.constants.VanillaConstants; +import enhancedbiomes.world.gen.layer.GenLayerEBRiverMix; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(value = GenLayerEBRiverMix.class, + remap = false) +public abstract class GenLayerEBRiverMixMixin { + @ModifyConstant(method = "getInts", + constant = @Constant(intValue = VanillaConstants.biomeIDCount), + remap = true, + require = 1) + private int extendIDs1(int constant) { + return ExtendedConstants.biomeIDCount; + } + + @ModifyConstant(method = "getInts", + constant = @Constant(intValue = VanillaConstants.biomeIDMask), + remap = true, + require = 1) + private int extendIDs2(int constant) { + return ExtendedConstants.biomeIDMask; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBVoronoiZoomMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBVoronoiZoomMixin.java new file mode 100644 index 0000000..bbf7103 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBVoronoiZoomMixin.java @@ -0,0 +1,20 @@ +package com.falsepattern.endlessids.mixin.mixins.common.eb; + +import com.falsepattern.endlessids.constants.ExtendedConstants; +import com.falsepattern.endlessids.constants.VanillaConstants; +import enhancedbiomes.world.gen.layer.GenLayerEBVoronoiZoom; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(value = GenLayerEBVoronoiZoom.class, + remap = false) +public abstract class GenLayerEBVoronoiZoomMixin { + @ModifyConstant(method = "getInts", + constant = @Constant(intValue = VanillaConstants.biomeIDMask), + remap = true, + require = 2) + private int extendIDs(int constant) { + return ExtendedConstants.biomeIDMask; + } +} 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 0c12da4..b2d7f1d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -108,6 +108,13 @@ public enum Mixin implements IMixin { DragonAPIBlockPropertiesMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.BlockPropertiesMixin"), DragonAPIIDTypeMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.IDTypeMixin"), //endregion DragonAPI->common + //region EnhancedBiomes + EBBiomeIDsMixin(Side.COMMON, require(TargetedMod.EB), "eb.BiomeIDsMixin"), + EBGenLayerArchipelagoEdgeMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerArchipelagoEdgeMixin"), + EBGenLayerEBHillsMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerEBHillsMixin"), + EBGenLayerEBRiverMixMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerEBRiverMixMixin"), + EBGenLayerEBVoronoiZoomMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerEBVoronoiZoomMixin"), + //endregion EnhancedBiomes //region Erebus->common ErebusModBiomesMixin(Side.COMMON, require(TargetedMod.EREBUS), "erebus.ModBiomesMixin"), //endregion Erebus->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 b227ad4..9719d67 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -21,6 +21,7 @@ public enum TargetedMod implements ITargetedMod { COFHLIB("CoFH Lib", true, startsWith("cofhlib-")), DARKWORLD("Dark World", true, startsWith("darkworld-")), DRAGONAPI("DragonAPI", false, startsWith("dragonapi")), + EB("Enhanced Biomes", true, startsWith("Enhanced Biomes").or(startsWith("enhancedbiomes"))), EREBUS("The Erebus", true, startsWith("theerebus")), EXTRAUTILITIES("Extra Utilities", true, startsWith("extrautilities-")), FUTUREPACK("Futurepack", true, startsWith("[1.7.10]futurepack").or(startsWith("futurepack-"))),