diff --git a/gradle.properties b/gradle.properties index 08ea55e..6ae59b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.daemon=false group = com.github.octarine-noise jarName = BetterFoliage-Forge -version = 2.6.1 +version = 2.6.2 mcVersion = 1.16.5 forgeVersion = 36.1.17 diff --git a/src/main/java/mods/betterfoliage/mixin/MixinClientWorld.java b/src/main/java/mods/betterfoliage/mixin/MixinClientWorld.java index e3238d6..6ece763 100644 --- a/src/main/java/mods/betterfoliage/mixin/MixinClientWorld.java +++ b/src/main/java/mods/betterfoliage/mixin/MixinClientWorld.java @@ -1,16 +1,16 @@ package mods.betterfoliage.mixin; import mods.betterfoliage.Hooks; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.world.ClientWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; 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.CallbackInfo; import java.util.Random; @@ -26,10 +26,9 @@ public class MixinClientWorld { /** * Inject a callback to call for every random display tick. Used for adding custom particle effects to blocks. */ - @Redirect(method = worldAnimateTick, at = @At(value = "INVOKE", target = blockAnimateTick)) - void onAnimateTick(Block block, BlockState state, World world, BlockPos pos, Random random) { - Hooks.onRandomDisplayTick(block, state, (ClientWorld) world, pos, random); - block.animateTick(state, world, pos, random); + @Inject(method = worldAnimateTick, at = @At(value = "INVOKE", target = blockAnimateTick)) + void onAnimateTick(int x, int y, int z, int range, Random random, boolean doBarrier, BlockPos.Mutable pos, CallbackInfo ci) { + Hooks.onRandomDisplayTick((ClientWorld) (Object) this, pos, random); } /** diff --git a/src/main/kotlin/mods/betterfoliage/Hooks.kt b/src/main/kotlin/mods/betterfoliage/Hooks.kt index 995288a..38b46bf 100644 --- a/src/main/kotlin/mods/betterfoliage/Hooks.kt +++ b/src/main/kotlin/mods/betterfoliage/Hooks.kt @@ -35,7 +35,8 @@ fun onClientBlockChanged(worldClient: ClientWorld, pos: BlockPos, oldState: Bloc ChunkOverlayManager.onBlockChange(worldClient, pos) } -fun onRandomDisplayTick(block: Block, state: BlockState, world: ClientWorld, pos: BlockPos, random: Random) { +fun onRandomDisplayTick(world: ClientWorld, pos: BlockPos, random: Random) { + val state = world.getBlockState(pos) if (Config.enabled && Config.risingSoul.enabled && state.block == Blocks.SOUL_SAND &&