diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderAbyssMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderAbyssMixin.java deleted file mode 100644 index 8d24d75..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderAbyssMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.abyssalcraft; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import com.shinoow.abyssalcraft.common.world.ChunkProviderAbyss; -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 = ChunkProviderAbyss.class, - remap = false) -public abstract class ChunkProviderAbyssMixin { - @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/abyssalcraft/ChunkProviderDarkRealmMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderDarkRealmMixin.java deleted file mode 100644 index 2c9a467..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderDarkRealmMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.abyssalcraft; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import com.shinoow.abyssalcraft.common.world.ChunkProviderDarkRealm; -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 = ChunkProviderDarkRealm.class, - remap = false) -public abstract class ChunkProviderDarkRealmMixin { - @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/abyssalcraft/ChunkProviderDreadlandsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderDreadlandsMixin.java deleted file mode 100644 index 9b50c47..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderDreadlandsMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.abyssalcraft; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import com.shinoow.abyssalcraft.common.world.ChunkProviderDreadlands; -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 = ChunkProviderDreadlands.class, - remap = false) -public abstract class ChunkProviderDreadlandsMixin { - @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/abyssalcraft/ChunkProviderOmotholMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderOmotholMixin.java deleted file mode 100644 index 74f90b4..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/ChunkProviderOmotholMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.abyssalcraft; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import com.shinoow.abyssalcraft.common.world.ChunkProviderOmothol; -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 = ChunkProviderOmothol.class, - remap = false) -public abstract class ChunkProviderOmotholMixin { - @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/atg/ATGChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGChunkProviderMixin.java deleted file mode 100644 index 04b1eac..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGChunkProviderMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.atg; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -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 ttftcuts.atg.ATGChunkProvider; - -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; - -@Mixin(value = ATGChunkProvider.class, - remap = false) -public abstract class ATGChunkProviderMixin { - @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/atum/AtumChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atum/AtumChunkProviderMixin.java deleted file mode 100644 index 0529601..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atum/AtumChunkProviderMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.atum; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import com.teammetallurgy.atum.world.AtumChunkProvider; -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 = AtumChunkProvider.class, - remap = false) -public abstract class AtumChunkProviderMixin { - @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/bop/ChunkProviderBOPEndMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/ChunkProviderBOPEndMixin.java deleted file mode 100644 index 143fa45..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/ChunkProviderBOPEndMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.bop; - -import biomesoplenty.common.world.ChunkProviderBOPEnd; -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -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 = ChunkProviderBOPEnd.class, - remap = false) -public abstract class ChunkProviderBOPEndMixin { - @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/bop/ChunkProviderBOPHellMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/ChunkProviderBOPHellMixin.java deleted file mode 100644 index 2e23e15..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/ChunkProviderBOPHellMixin.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.bop; - -import biomesoplenty.common.world.ChunkProviderBOPHell; -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import net.minecraft.block.Block; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; - -@Mixin(value = ChunkProviderBOPHell.class, - remap = false) -public abstract class ChunkProviderBOPHellMixin { - private BiomeGenBase[] bgb; - - @Inject(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - shift = At.Shift.BEFORE, - remap = true), - locals = LocalCapture.CAPTURE_FAILHARD, - remap = true, - require = 1) - private void setBiomesTweaked1(int par1, int par2, CallbackInfoReturnable cir, byte[] abyte, Block[] blocks, Chunk chunk, BiomeGenBase[] abiomegenbase) { - bgb = abiomegenbase; - - } - - @Redirect(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - remap = true), - remap = true, - require = 1) - private byte[] setBiomesTweaked2(Chunk chunk) { - try { - return BiomePatchHelper.getBiomeArrayTweaked(chunk, bgb); - } finally { - bgb = null; - } - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ChunkProviderDarkWorldAlphaMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ChunkProviderDarkWorldAlphaMixin.java deleted file mode 100644 index 0f70172..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ChunkProviderDarkWorldAlphaMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.darkworld; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import matthbo.mods.darkworld.world.ChunkProviderDarkWorldAlpha; -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 = ChunkProviderDarkWorldAlpha.class, - remap = false) -public abstract class ChunkProviderDarkWorldAlphaMixin { - @Shadow - private BiomeGenBase[] biomesForGen; - - @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, biomesForGen); - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ChunkProviderDarkWorldBetaMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ChunkProviderDarkWorldBetaMixin.java deleted file mode 100644 index bdeb528..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ChunkProviderDarkWorldBetaMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.darkworld; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import matthbo.mods.darkworld.world.ChunkProviderDarkWorldBeta; -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 = ChunkProviderDarkWorldBeta.class, - remap = false) -public abstract class ChunkProviderDarkWorldBetaMixin { - @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/ChunkProviderErebusMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ChunkProviderErebusMixin.java deleted file mode 100644 index ea88752..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ChunkProviderErebusMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -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/extrautilities/ChunkProviderUnderdarkMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extrautilities/ChunkProviderUnderdarkMixin.java deleted file mode 100644 index d0d524b..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extrautilities/ChunkProviderUnderdarkMixin.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.extrautilities; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import com.rwtema.extrautils.worldgen.Underdark.ChunkProviderUnderdark; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import net.minecraft.block.Block; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; - -@Mixin(value = ChunkProviderUnderdark.class, - remap = false) -public abstract class ChunkProviderUnderdarkMixin { - private BiomeGenBase[] bgb; - - @SuppressWarnings("InvalidInjectorMethodSignature") - @Inject(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - shift = At.Shift.BEFORE, - remap = true), - locals = LocalCapture.CAPTURE_FAILHARD, - remap = true, - require = 1) - private void setBiomesTweaked1(int par1, int par2, CallbackInfoReturnable cir, Chunk chunk, Block[] arr, int spire_x, int spire_z, Block stone_type, BiomeGenBase[] abiomegenbase) { - bgb = abiomegenbase; - - } - - @Redirect(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - remap = true), - remap = true, - require = 1) - private byte[] setBiomesTweaked2(Chunk chunk) { - try { - return BiomePatchHelper.getBiomeArrayTweaked(chunk, bgb); - } finally { - bgb = null; - } - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/futurepack/ChunkProviderSpaceMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/futurepack/ChunkProviderSpaceMixin.java deleted file mode 100644 index 7725683..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/futurepack/ChunkProviderSpaceMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.futurepack; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import futurepack.common.dim.ChunkProviderSpace; -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 = ChunkProviderSpace.class, - remap = false) -public abstract class ChunkProviderSpaceMixin { - @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/galacticraft/ChunkProviderSpaceMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ChunkProviderSpaceMixin.java deleted file mode 100644 index 7b45e07..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ChunkProviderSpaceMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.galacticraft; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.ChunkProviderSpace; -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 = ChunkProviderSpace.class, - remap = false) -public abstract class ChunkProviderSpaceMixin { - @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/netherlicious/NetherChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/netherlicious/NetherChunkProviderMixin.java deleted file mode 100644 index fc847c8..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/netherlicious/NetherChunkProviderMixin.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.netherlicious; - -import DelirusCrux.Netherlicious.Dimension.NetherChunkProvider; -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import net.minecraft.block.Block; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; - -@Mixin(value = NetherChunkProvider.class, - remap = false) -public abstract class NetherChunkProviderMixin { - private BiomeGenBase[] bgb; - - @Inject(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - shift = At.Shift.BEFORE, - remap = true), - remap = true, - locals = LocalCapture.CAPTURE_FAILHARD, - require = 1) - private void setBiomesTweaked1(int par1, int par2, CallbackInfoReturnable cir, byte[] abyte, Block[] blocks, Chunk chunk, BiomeGenBase[] abiomegenbase) { - bgb = abiomegenbase; - - } - - @Redirect(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - remap = true), - remap = true, - require = 1) - private byte[] setBiomesTweaked2(Chunk chunk) { - try { - return BiomePatchHelper.getBiomeArrayTweaked(chunk, bgb); - } finally { - bgb = null; - } - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/tropicraft/ChunkProviderTropicraftMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/tropicraft/ChunkProviderTropicraftMixin.java deleted file mode 100644 index 63fab1e..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/tropicraft/ChunkProviderTropicraftMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.tropicraft; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import net.tropicraft.world.chunk.ChunkProviderTropicraft; -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 = ChunkProviderTropicraft.class, - remap = false) -public abstract class ChunkProviderTropicraftMixin { - @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/twilightforest/ChunkProviderTwilightForestMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/twilightforest/ChunkProviderTwilightForestMixin.java deleted file mode 100644 index 0338731..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/twilightforest/ChunkProviderTwilightForestMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.twilightforest; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -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 twilightforest.world.ChunkProviderTwilightForest; - -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; - -@Mixin(value = ChunkProviderTwilightForest.class, - remap = false) -public abstract class ChunkProviderTwilightForestMixin { - @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/vanilla/worldgen/ChunkProviderEndMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderEndMixin.java deleted file mode 100644 index 823f081..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderEndMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -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; -import net.minecraft.world.gen.ChunkProviderEnd; - -@Mixin(ChunkProviderEnd.class) -public abstract class ChunkProviderEndMixin { - @Shadow - private BiomeGenBase[] biomesForGeneration; - - @Redirect(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B"), - require = 1) - private byte[] setBiomesTweaked(Chunk chunk) { - return BiomePatchHelper.getBiomeArrayTweaked(chunk, biomesForGeneration); - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderFlatMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderFlatMixin.java deleted file mode 100644 index 266ce2f..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderFlatMixin.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderFlat; - -@Mixin(ChunkProviderFlat.class) -public abstract class ChunkProviderFlatMixin implements IChunkProvider { - private BiomeGenBase[] bgb; - - @Inject(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - shift = At.Shift.BEFORE), - locals = LocalCapture.CAPTURE_FAILHARD, - require = 1) - private void setBiomesTweaked1(int p_73154_1_, int p_73154_2_, CallbackInfoReturnable cir, Chunk chunk, BiomeGenBase[] abiomegenbase) { - bgb = abiomegenbase; - - } - - @Redirect(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B"), - require = 1) - private byte[] setBiomesTweaked2(Chunk chunk) { - try { - return BiomePatchHelper.getBiomeArrayTweaked(chunk, bgb); - } finally { - bgb = null; - } - } - -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderGenerateMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderGenerateMixin.java deleted file mode 100644 index f33d8f9..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderGenerateMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -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; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderGenerate; - -@Mixin(ChunkProviderGenerate.class) -public abstract class ChunkProviderGenerateMixin implements IChunkProvider { - @Shadow - private BiomeGenBase[] biomesForGeneration; - - @Redirect(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B"), - require = 1) - private byte[] setBiomesTweaked(Chunk chunk) { - return BiomePatchHelper.getBiomeArrayTweaked(chunk, biomesForGeneration); - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderHellMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderHellMixin.java deleted file mode 100644 index cdf0bfa..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/ChunkProviderHellMixin.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen; - -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import net.minecraft.block.Block; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderHell; - -@Mixin(ChunkProviderHell.class) -public abstract class ChunkProviderHellMixin implements IChunkProvider { - private BiomeGenBase[] bgb; - - @Inject(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B", - shift = At.Shift.BEFORE), - locals = LocalCapture.CAPTURE_FAILHARD, - require = 1) - private void setBiomesTweaked1(int p_73154_1_, int p_73154_2_, CallbackInfoReturnable cir, Block[] ablock, byte[] meta, BiomeGenBase[] abiomegenbase, Chunk chunk) { - bgb = abiomegenbase; - - } - - @Redirect(method = "provideChunk", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B"), - require = 1) - private byte[] setBiomesTweaked2(Chunk chunk) { - try { - return BiomePatchHelper.getBiomeArrayTweaked(chunk, bgb); - } finally { - bgb = 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 3ad3c0e..0610876 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -43,10 +43,6 @@ public enum Mixin implements IMixin { WorldMixin(Side.COMMON, always(), "vanilla.misc.WorldMixin"), //endregion Minecraft->common->misc //region Minecraft->common->worldgen -// ChunkProviderEndMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderEndMixin"), -// ChunkProviderFlatMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderFlatMixin"), -// ChunkProviderGenerateMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderGenerateMixin"), -// ChunkProviderHellMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderHellMixin"), GenLayerRiverMixMixin(Side.COMMON, avoid(TargetedMod.DRAGONAPI), "vanilla.worldgen.GenLayerRiverMixMixin"), GenLayerVoronoiZoomMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerVoronoiZoomMixin"), //endregion Minecraft->common->worldgen @@ -60,17 +56,10 @@ public enum Mixin implements IMixin { //endregion Minecraft //region AbyssalCraft->common AbyssalCraftMixin(Side.COMMON, require(TargetedMod.ABYSSALCRAFT), "abyssalcraft.AbyssalCraftMixin"), -// ChunkProviderAbyssMixin(Side.COMMON, require(TargetedMod.ABYSSALCRAFT), "abyssalcraft.ChunkProviderAbyssMixin"), -// ChunkProviderDarkRealmMixin(Side.COMMON, require(TargetedMod.ABYSSALCRAFT), -// "abyssalcraft.ChunkProviderDarkRealmMixin"), -// ChunkProviderDreadlandsMixin(Side.COMMON, require(TargetedMod.ABYSSALCRAFT), -// "abyssalcraft.ChunkProviderDreadlandsMixin"), -// ChunkProviderOmotholMixin(Side.COMMON, require(TargetedMod.ABYSSALCRAFT), "abyssalcraft.ChunkProviderOmotholMixin"), //endregion AbyssalCraft->common //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 @@ -90,13 +79,8 @@ 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 Atum->common -// AtumChunkProviderMixin(Side.COMMON, require(TargetedMod.ATUM), "atum.AtumChunkProviderMixin"), - //endregion Atum->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 BiomeTweaker->common BiomeEventHandlerMixin(Side.COMMON, require(TargetedMod.BIOMETWEAKER), "biometweaker.BiomeEventHandlerMixin"), @@ -113,10 +97,6 @@ public enum Mixin implements IMixin { CoFHLibCofhBlockHelperMixin(Side.COMMON, require(TargetedMod.COFHLIB), "cofhlib.BlockHelperMixin"), //endregion CoFHLib->common //region DarkWorld->common -// ChunkProviderDarkWorldAlphaMixin(Side.COMMON, require(TargetedMod.DARKWORLD), -// "darkworld.ChunkProviderDarkWorldAlphaMixin"), -// ChunkProviderDarkWorldBetaMixin(Side.COMMON, require(TargetedMod.DARKWORLD), -// "darkworld.ChunkProviderDarkWorldBetaMixin"), DarkWorldModBiomesMixin(Side.COMMON, require(TargetedMod.DARKWORLD), "darkworld.ModBiomesMixin"), //endregion DarkWorld->common //region DragonAPI->common @@ -129,22 +109,17 @@ public enum Mixin implements IMixin { 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"), //endregion ExtraUtilities->common //region Futurepack->common -// FuturepackChunkProviderSpaceMixin(Side.COMMON, require(TargetedMod.FUTUREPACK), "futurepack.ChunkProviderSpaceMixin"), FuturepackBiomeGenSpaceMixin(Side.COMMON, require(TargetedMod.FUTUREPACK), "futurepack.BiomeGenSpaceMixin"), //endregion Futurepack->common //region GalactiCraftCore->common GalactiCraftChunkProviderOrbitMixin(Side.COMMON, require(TargetedMod.GALACTICRAFTCORE), "galacticraft.ChunkProviderOrbitMixin"), -// GalactiCraftChunkProviderSpaceMixin(Side.COMMON, require(TargetedMod.GALACTICRAFTCORE), -// "galacticraft.ChunkProviderSpaceMixin"), GalactiCraftConfigManagerCoreMixin(Side.COMMON, require(TargetedMod.GALACTICRAFTCORE), "galacticraft.ConfigManagerCoreMixin"), //endregion GalactiCraftCore->common @@ -162,8 +137,6 @@ public enum Mixin implements IMixin { //region Netherlicious->common NetherliciousBiomeConfigurationMixin(Side.COMMON, require(TargetedMod.NETHERLICIOUS), "netherlicious.BiomeConfigurationMixin"), -// NetherliciousNetherChunkProviderMixin(Side.COMMON, require(TargetedMod.NETHERLICIOUS), -// "netherlicious.NetherChunkProviderMixin"), //endregion Netherlicious->common //region RTG->common RTGChunkProviderRTGMixin(Side.COMMON, require(TargetedMod.RTG), "rtg.ChunkProviderRTGMixin"), @@ -174,14 +147,10 @@ public enum Mixin implements IMixin { ThaumcraftUtilsMixin(Side.COMMON, require(TargetedMod.THAUMCRAFT), "thaumcraft.UtilsMixin"), //endregion Thaumcraft->common //region Tropicraft->common -// ChunkProviderTropicraftMixin(Side.COMMON, require(TargetedMod.TROPICRAFT), -// "tropicraft.ChunkProviderTropicraftMixin"), GenLayerTropiVoronoiZoomMixin(Side.COMMON, require(TargetedMod.TROPICRAFT), "tropicraft.GenLayerTropiVoronoiZoomMixin"), //endregion Tropicraft->common //region TwilightForest->common -// ChunkProviderTwilightForestMixin(Side.COMMON, require(TargetedMod.TWILIGHTFOREST), -// "twilightforest.ChunkProviderTwilightForestMixin"), TFBiomeBaseMixin(Side.COMMON, require(TargetedMod.TWILIGHTFOREST), "twilightforest.TFBiomeBaseMixin"), //endregion TwilightForest->common //region UBC->common