From 35bd58a9d0d0859c21eaef83b67e9ea3013065da Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Fri, 7 Jun 2024 19:13:30 +0200 Subject: [PATCH] fix mixin warnings --- .../common/biome/lotr/LOTRChunkProviderMixin.java | 12 ++++++------ .../biome/lotr/LOTRChunkProviderUtumnoMixin.java | 12 ++++++------ .../LOTRPacketBiomeVariantsWatchHandlerMixin.java | 3 ++- .../biome/lotr/LOTRWorldChunkManagerMixin.java | 12 ++++++------ .../common/biome/lotr/LOTRWorldProviderMixin.java | 2 +- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderMixin.java index 6e98c71..20dc19e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderMixin.java @@ -10,17 +10,17 @@ import org.spongepowered.asm.mixin.injection.Redirect; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.IChunkProvider; -@Mixin(value = LOTRChunkProvider.class, - remap = false) -public abstract class LOTRChunkProviderMixin { - @Shadow +@Mixin(value = LOTRChunkProvider.class) +public abstract class LOTRChunkProviderMixin implements IChunkProvider { + @Shadow(remap = false) private LOTRBiomeVariant[] variantsForGeneration; @Redirect(method = "provideChunk", at = @At(value = "INVOKE", - target = "Llotr/common/world/biome/variant/LOTRBiomeVariantStorage;setChunkBiomeVariants(Lnet/minecraft/world/World;Lnet/minecraft/world/chunk/Chunk;[B)V"), - remap = true, + target = "Llotr/common/world/biome/variant/LOTRBiomeVariantStorage;setChunkBiomeVariants(Lnet/minecraft/world/World;Lnet/minecraft/world/chunk/Chunk;[B)V", + remap = false), require = 1) private void storeShorts(World world, Chunk chunk, byte[] variantsB) { short[] variants = new short[256]; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderUtumnoMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderUtumnoMixin.java index 52d473d..ff2e42e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderUtumnoMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderUtumnoMixin.java @@ -10,17 +10,17 @@ import org.spongepowered.asm.mixin.injection.Redirect; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.IChunkProvider; -@Mixin(value = LOTRChunkProviderUtumno.class, - remap = false) -public abstract class LOTRChunkProviderUtumnoMixin { - @Shadow +@Mixin(value = LOTRChunkProviderUtumno.class) +public abstract class LOTRChunkProviderUtumnoMixin implements IChunkProvider { + @Shadow(remap = false) private LOTRBiomeVariant[] variantsForGeneration; @Redirect(method = "provideChunk", at = @At(value = "INVOKE", - target = "Llotr/common/world/biome/variant/LOTRBiomeVariantStorage;setChunkBiomeVariants(Lnet/minecraft/world/World;Lnet/minecraft/world/chunk/Chunk;[B)V"), - remap = true, + target = "Llotr/common/world/biome/variant/LOTRBiomeVariantStorage;setChunkBiomeVariants(Lnet/minecraft/world/World;Lnet/minecraft/world/chunk/Chunk;[B)V", + remap = false), require = 1) private void storeShorts(World world, Chunk chunk, byte[] variantsB) { short[] variants = new short[256]; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRPacketBiomeVariantsWatchHandlerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRPacketBiomeVariantsWatchHandlerMixin.java index d8eda96..87a0019 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRPacketBiomeVariantsWatchHandlerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRPacketBiomeVariantsWatchHandlerMixin.java @@ -12,11 +12,12 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @Mixin(value = LOTRPacketBiomeVariantsWatch.Handler.class, remap = false) -public abstract class LOTRPacketBiomeVariantsWatchHandlerMixin { +public abstract class LOTRPacketBiomeVariantsWatchHandlerMixin implements IMessageHandler { /** * @author FalsePattern diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldChunkManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldChunkManagerMixin.java index 08d2887..03eec30 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldChunkManagerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldChunkManagerMixin.java @@ -8,23 +8,23 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import net.minecraft.world.World; +import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.Chunk; import cpw.mods.fml.common.FMLLog; -@Mixin(value = LOTRWorldChunkManager.class, - remap = false) -public abstract class LOTRWorldChunkManagerMixin { - @Shadow +@Mixin(value = LOTRWorldChunkManager.class) +public abstract class LOTRWorldChunkManagerMixin extends WorldChunkManager { + @Shadow(remap = false) private World worldObj; - @Shadow + @Shadow(remap = false) public abstract LOTRBiomeVariant[] getBiomeVariants(LOTRBiomeVariant[] variants, int i, int k, int xSize, int zSize); /** * @author FalsePattern * @reason fix stuff */ - @Overwrite + @Overwrite(remap = false) public LOTRBiomeVariant getBiomeVariantAt(int i, int k) { short[] variants; Chunk chunk = this.worldObj.getChunkFromBlockCoords(i, k); diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldProviderMixin.java index 0b36cfc..4bdc7f9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldProviderMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldProviderMixin.java @@ -17,7 +17,7 @@ import static com.falsepattern.endlessids.constants.ExtendedConstants.biomeIDMas @Mixin(LOTRWorldProvider.class) public abstract class LOTRWorldProviderMixin extends WorldProvider { - @Shadow public abstract LOTRDimension getLOTRDimension(); + @Shadow(remap = false) public abstract LOTRDimension getLOTRDimension(); /** * @author FalsePattern