diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeGenBasePlaceholderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeGenBasePlaceholderMixin.java deleted file mode 100644 index 592593a..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeGenBasePlaceholderMixin.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.biome; - -import com.falsepattern.endlessids.PlaceholderBiome; -import org.spongepowered.asm.lib.Opcodes; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; -import org.spongepowered.asm.mixin.injection.Redirect; - -import net.minecraft.world.biome.BiomeGenBase; - -@Mixin(BiomeGenBase.class) -public abstract class BiomeGenBasePlaceholderMixin { - @Shadow - @Final - private static BiomeGenBase[] biomeList; - - @Mutable - @Shadow - @Final - public int biomeID; - - private static ThreadLocal wantsRegister; - - @Redirect(method = "(IZ)V", - at = @At(value = "FIELD", - opcode = Opcodes.PUTFIELD, - target = "Lnet/minecraft/world/biome/BiomeGenBase;biomeID:I"), - require = 1) - private void removePlaceholders(BiomeGenBase instance, int id) { - if (wantsRegister.get()) { - if (biomeList[id] instanceof PlaceholderBiome) { - biomeList[id] = null; - } - } - biomeID = id; - } - - @ModifyVariable(method = "(IZ)V", - at = @At(value = "HEAD"), - index = 2, - require = 1, - argsOnly = true) - private static boolean modifyArg(boolean register) { - if (wantsRegister == null) wantsRegister = new ThreadLocal<>(); - wantsRegister.set(register); - return register; - } -} 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 c7b4593..371de05 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -34,8 +34,6 @@ public enum Mixin implements IMixin { //region Minecraft->common->biome BiomeDictionaryMixin(Side.COMMON, always(), "vanilla.biome.BiomeDictionaryMixin"), BiomeGenBaseMixin(Side.COMMON, always(), "vanilla.biome.BiomeGenBaseMixin"), - BiomesGenBasePlaceholderMixin(Side.COMMON, avoid(TargetedMod.ANTIIDCONFLICT), - "vanilla.biome.BiomeGenBasePlaceholderMixin"), //endregion Minecraft->common->biome //region Minecraft->common->misc BlockFireMixin(Side.COMMON, always(), "vanilla.misc.BlockFireMixin"),