-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch to using Mixins to implement all calls to ClientHooks. getRend…
…erFluidState
- Loading branch information
Showing
12 changed files
with
208 additions
and
229 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
src/main/java/io/github/cadiboo/nocubes/mixin/Constants.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package io.github.cadiboo.nocubes.mixin; | ||
|
|
||
| public interface Constants { | ||
| /** | ||
| * To make extended fluids work, we need to redirect all getFluidState calls. | ||
| * <pre> | ||
| * var blockState = world.getBlockState(pos); | ||
| * var fluidState = blockState.getFluidState(); | ||
| * </pre> | ||
| * <pre> | ||
| * var blockState = world.getBlockState(pos); | ||
| * var fluidState = ClientHooks.getRenderFluidState(pos, blockState); | ||
| * </pre> | ||
| */ | ||
| String EXTENDED_FLUIDS_BLOCK_POS_REF_NAME = "extendedFluidsBlockPosRef"; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 57 additions & 2 deletions
59
src/main/java/io/github/cadiboo/nocubes/mixin/client/LiquidBlockRendererMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,67 @@ | ||
| package io.github.cadiboo.nocubes.mixin.client; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.ModifyReceiver; | ||
| import com.llamalad7.mixinextras.sugar.Local; | ||
| import com.llamalad7.mixinextras.sugar.Share; | ||
| import com.llamalad7.mixinextras.sugar.ref.LocalRef; | ||
| import io.github.cadiboo.nocubes.hooks.ClientHooks; | ||
| import io.github.cadiboo.nocubes.hooks.trait.INoCubesChunkSectionRenderBuilder; | ||
| import io.github.cadiboo.nocubes.mixin.Constants; | ||
| import net.minecraft.client.renderer.block.LiquidBlockRenderer; | ||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.world.level.BlockAndTintGetter; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.material.FluidState; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
|
|
||
| /** | ||
| * There is more to this mixin, see the documentation in {@link io.github.cadiboo.nocubes.hooks.MixinAsm} | ||
| * and {@link io.github.cadiboo.nocubes.hooks.MixinAsm#transformFluidRenderer}. | ||
| * Changes fluid rendering to support extended fluid rendering | ||
| * Redirects all instances of {@link BlockState#getFluidState()} to use our {@link io.github.cadiboo.nocubes.hooks.ClientHooks#getRenderFluidState} | ||
| */ | ||
| @Mixin(LiquidBlockRenderer.class) | ||
| public class LiquidBlockRendererMixin { | ||
| /** | ||
| * See documentation on {@link Constants#EXTENDED_FLUIDS_BLOCK_POS_REF_NAME} | ||
| */ | ||
| @ModifyReceiver( | ||
| method = { | ||
| "tesselate", | ||
| "getHeight(Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/material/Fluid;Lnet/minecraft/core/BlockPos;)F", | ||
| "getHeight(Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/material/Fluid;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;)F" | ||
| }, | ||
| at = @At( | ||
| value = "INVOKE", | ||
| target = "Lnet/minecraft/world/level/BlockAndTintGetter;getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;" | ||
| ) | ||
| ) | ||
| private BlockAndTintGetter storeBlockPos( | ||
| BlockAndTintGetter blockAndTintGetter, | ||
| BlockPos pos, @Share(Constants.EXTENDED_FLUIDS_BLOCK_POS_REF_NAME) LocalRef<BlockPos> posRef | ||
| ) { | ||
| posRef.set(pos); | ||
| return blockAndTintGetter; | ||
| } | ||
|
|
||
| /** | ||
| * See documentation on {@link Constants#EXTENDED_FLUIDS_BLOCK_POS_REF_NAME} | ||
| */ | ||
| @Redirect( | ||
| method = { | ||
| "tesselate", | ||
| "getHeight(Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/material/Fluid;Lnet/minecraft/core/BlockPos;)F", | ||
| "getHeight(Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/material/Fluid;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;)F" | ||
| }, | ||
| at = @At( | ||
| value = "INVOKE", | ||
| target = "Lnet/minecraft/world/level/block/state/BlockState;getFluidState()Lnet/minecraft/world/level/material/FluidState;" | ||
| ) | ||
| ) | ||
| private FluidState getRenderFluidState( | ||
| BlockState instance, | ||
| @Share(Constants.EXTENDED_FLUIDS_BLOCK_POS_REF_NAME) LocalRef<BlockPos> pos | ||
| ) { | ||
| return ClientHooks.getRenderFluidState(pos.get(), instance); | ||
| } | ||
| } |
Oops, something went wrong.