diff --git a/README.MD b/README.MD index 3bb7687..610c1ac 100644 --- a/README.MD +++ b/README.MD @@ -25,6 +25,7 @@ This mod also contains patches for the following mods: - CoFH Lib - DragonAPI - Dynamic Surroundings +- Erebus - Extra Utilities - GalactiCraft - Immersive Cavegen diff --git a/dependencies.gradle b/dependencies.gradle index 0803443..d37eb88 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,6 +49,9 @@ dependencies { //Dynamic Surroundings 1.0.6.4 compile(deobfCurse("dynamicsurrounding-238891:2642381")) + //Erebus 0.4.7 + compile(deobfCurse("theerebus-220698:2305035")) + //Extra Utilities 1.2.12 compile(curse("extrautilities-225561:2264384")) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ChunkProviderErebusMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ChunkProviderErebusMixin.java new file mode 100644 index 0000000..ea88752 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ChunkProviderErebusMixin.java @@ -0,0 +1,28 @@ +package com.falsepattern.endlessids.mixin.mixins.common.erebus; + +import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; +import erebus.world.ChunkProviderErebus; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.Chunk; + +@Mixin(value = ChunkProviderErebus.class, + remap = false) +public abstract class ChunkProviderErebusMixin { + @Shadow + private BiomeGenBase[] biomesForGeneration; + + @Redirect(method = "provideChunk", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", + remap = true), + remap = true, + require = 1) + private byte[] setBiomesTweaked(Chunk chunk) { + return BiomePatchHelper.getBiomeArrayTweaked(chunk, biomesForGeneration); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ModBiomesMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ModBiomesMixin.java new file mode 100644 index 0000000..44c979f --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ModBiomesMixin.java @@ -0,0 +1,83 @@ +package com.falsepattern.endlessids.mixin.mixins.common.erebus; + +import com.falsepattern.endlessids.PlaceholderBiome; +import com.falsepattern.endlessids.constants.ExtendedConstants; +import erebus.ModBiomes; +import lombok.val; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyConstant; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.world.biome.BiomeGenBase; + +@Mixin(value = ModBiomes.class, + remap = false) +public abstract class ModBiomesMixin { + @Shadow + public static int undergroundJungleID; + @Shadow + public static int volcanicDesertID; + @Shadow + public static int subterraneanSavannahID; + @Shadow + public static int elysianFieldsID; + @Shadow + public static int ulteriorOutbackID; + @Shadow + public static int fungalForestID; + @Shadow + public static int submergedSwampID; + @Shadow + public static int fieldsSubForestID; + @Shadow + public static int jungleSubLakeID; + @Shadow + public static int jungleSubAsperGroveID; + @Shadow + public static int desertSubCharredForestID; + @Shadow + public static int savannahSubRockyWastelandID; + @Shadow + public static int savannahSubAsperGroveID; + @Shadow + public static int savannahSubSteppeID; + + @ModifyConstant(method = "init", + constant = @Constant(intValue = 128), + require = 1) + private static int extendIDs(int constant) { + return ExtendedConstants.biomeIDCount - 129; + } + + @ModifyConstant(method = "init", + constant = @Constant(stringValue = "Erebus biome IDs cannot be higher than 127 or smaller than 0!"), + require = 1) + private static String modifyWarning(String str) { + return "Erebus biome IDs cannot be higher than " + (ExtendedConstants.biomeIDCount - 129) + " or smaller than 0!"; + } + + @Inject(method = "init", + at = @At("HEAD"), + require = 1) + private static void cleanupBiomeArrayForAssignment(CallbackInfo ci) { + val bga = BiomeGenBase.getBiomeGenArray(); + + int[] biomes = new int[]{undergroundJungleID, volcanicDesertID, subterraneanSavannahID, elysianFieldsID, + ulteriorOutbackID, fungalForestID, submergedSwampID, fieldsSubForestID, + jungleSubLakeID, jungleSubAsperGroveID, desertSubCharredForestID, + savannahSubRockyWastelandID, savannahSubAsperGroveID, savannahSubSteppeID}; + for (val biome: biomes) { + if (biome <= 0 || biome >= ExtendedConstants.biomeIDCount - 129) { + continue; + } + if (bga[biome] instanceof PlaceholderBiome) { + bga[biome] = null; + } + } + } +} 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 8500b2e..eebb4bb 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -109,6 +109,10 @@ 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 Erebus->common + ChunkProviderErebusMixin(Side.COMMON, require(TargetedMod.EREBUS), "erebus.ChunkProviderErebusMixin"), + ErebusModBiomesMixin(Side.COMMON, require(TargetedMod.EREBUS), "erebus.ModBiomesMixin"), + //endregion Erebus->common //region ExtraUtilities->common ChunkProviderEndOfTimeMixin(Side.COMMON, require(TargetedMod.EXTRAUTILITIES), "extrautilities.ChunkProviderEndOfTimeMixin"), ChunkProviderUnderdarkMixin(Side.COMMON, require(TargetedMod.EXTRAUTILITIES), "extrautilities.ChunkProviderUnderdarkMixin"), 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 61f82ba..2896e7c 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -19,6 +19,7 @@ public enum TargetedMod implements ITargetedMod { 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")), + EREBUS("The Erebus", true, startsWith("theerebus")), EXTRAUTILITIES("Extra Utilities", true, startsWith("extrautilities-")), GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")), ICG("Immersive Cavegen", true, startsWith("immersivecavegen")),