feat: 26.3

fabric/src/main/java/com/teamresourceful/resourcefullib/fabric/ResourcefulLibFabricClient.java

@@ -1,13 +1,15 @@
 package com.teamresourceful.resourcefullib.fabric;
 
 import com.teamresourceful.resourcefullib.ResourcefulLib;
+import com.teamresourceful.resourcefullib.client.fluid.data.ClientFluidProperties;
 import com.teamresourceful.resourcefullib.client.highlights.HighlightHandler;
 import com.teamresourceful.resourcefullib.client.sysinfo.SystemInfo;
 import com.teamresourceful.resourcefullib.common.ApiProxy;
 import com.teamresourceful.resourcefullib.common.utils.files.GlobalStorage;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommands;
+import net.fabricmc.fabric.api.client.rendering.v1.RenderStateDataKey;
 import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
@@ -20,6 +22,8 @@
 
 public class ResourcefulLibFabricClient implements ClientModInitializer {
 
+    public static RenderStateDataKey<ClientFluidProperties> FLUID_DATA_KEY = RenderStateDataKey.create(() -> "Resourceful Lib Client Fluid Properties");
+
     @Override
     public void onInitializeClient() {
         ApiProxy.setInstance(FabricClientProxy.INSTANCE);

fabric/src/main/java/com/teamresourceful/resourcefullib/mixins/fabric/LevelExtractorMixin.java

@@ -4,17 +4,28 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.teamresourceful.resourcefullib.client.fabric.BlockOutlineRenderStateExtension;
+import com.teamresourceful.resourcefullib.client.fluid.fabric.EntityFluidEyesHook;
+import com.teamresourceful.resourcefullib.client.fluid.registry.ResourcefulClientFluidRegistry;
 import com.teamresourceful.resourcefullib.client.highlights.HighlightHandler;
+import com.teamresourceful.resourcefullib.common.fluid.ResourcefulFlowingFluid;
+import com.teamresourceful.resourcefullib.fabric.ResourcefulLibFabricClient;
+import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.extract.LevelExtractor;
 import net.minecraft.client.renderer.state.level.BlockOutlineRenderState;
+import net.minecraft.client.renderer.state.level.PlayerRenderState;
 import net.minecraft.core.BlockPos;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jspecify.annotations.Nullable;
 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.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LevelExtractor.class)
 public class LevelExtractorMixin {
@@ -44,4 +55,18 @@ public class LevelExtractorMixin {
         return renderState;
     }
 
+    @Inject(method = "extractPlayerState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isUnderWater()Z"))
+    private void extractStuff(
+            Camera camera,
+            DeltaTracker deltaTracker,
+            float worldPartialTicks,
+            PlayerRenderState state,
+            CallbackInfo ci,
+            @Local LocalPlayer player
+    ) {
+        if (player instanceof EntityFluidEyesHook hook && hook.rlib$getEyesFluid() != null && hook.rlib$getEyesFluid().getType() instanceof ResourcefulFlowingFluid fluid) {
+            Identifier id = fluid.getData().id();
+            state.setData(ResourcefulLibFabricClient.FLUID_DATA_KEY, ResourcefulClientFluidRegistry.get(id));
+        }
+    }
 }

fabric/src/main/java/com/teamresourceful/resourcefullib/mixins/fabric/ScreenEffectRendererMixin.java

@@ -3,14 +3,14 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.teamresourceful.resourcefullib.client.fluid.data.ClientFluidProperties;
-import com.teamresourceful.resourcefullib.client.fluid.fabric.EntityFluidEyesHook;
-import com.teamresourceful.resourcefullib.client.fluid.registry.ResourcefulClientFluidRegistry;
-import com.teamresourceful.resourcefullib.common.fluid.ResourcefulFlowingFluid;
+import com.teamresourceful.resourcefullib.fabric.ResourcefulLibFabricClient;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.ScreenEffectRenderer;
 import net.minecraft.client.renderer.SubmitNodeCollector;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.client.renderer.state.level.CameraRenderState;
+import net.minecraft.client.renderer.state.level.PlayerRenderState;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -21,17 +21,25 @@
 @Mixin(ScreenEffectRenderer.class)
 public class ScreenEffectRendererMixin {
 
-    @Shadow @Final private Minecraft minecraft;
+    @Shadow
+    @Final
+    private GameRenderer gameRenderer;
 
-    @Inject(method = "submit", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z", shift = At.Shift.BEFORE))
-    private void rlib_renderScreenEffect(boolean isFirstPerson, boolean isSleeping, float partialTicks, SubmitNodeCollector submitNodeCollector, boolean hideGui, CallbackInfo ci, @Local PoseStack stack) {
-        Player player = this.minecraft.player;
-        if (player instanceof EntityFluidEyesHook hook && hook.rlib$getEyesFluid() != null && hook.rlib$getEyesFluid().getType() instanceof ResourcefulFlowingFluid fluid) {
-            Identifier id = fluid.getData().id();
-            ClientFluidProperties properties = ResourcefulClientFluidRegistry.get(id);
-            if (properties != null) {
-                properties.renderOverlay(this.minecraft, stack, submitNodeCollector);
-            }
+    @Inject(method = "submit", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/state/level/PlayerRenderState;waterOverlay:Lnet/minecraft/client/renderer/state/level/PlayerRenderState$WaterOverlay;", opcode = Opcodes.GETFIELD))
+    private void rlib_renderScreenEffect(
+            float partialTicks,
+            SubmitNodeCollector submitNodeCollector,
+            PlayerRenderState playerRenderState,
+            CameraRenderState cameraRenderState,
+            boolean hideGui,
+            CallbackInfo ci,
+            @Local PoseStack poseStack
+    ) {
+        ClientFluidProperties properties = playerRenderState.getData(ResourcefulLibFabricClient.FLUID_DATA_KEY);
+        if (properties == null) {
+            return;
         }
+
+        properties.renderOverlay(Minecraft.getInstance(), poseStack, submitNodeCollector);
     }
 }

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
 
 # Minecraft
-minecraft = "26.2"
-neoform = "26.2-1"
-fabric-api = "0.152.1+26.2"
+minecraft = "26.3-rc-2"
+neoform = "26.3-rc-2-1"
+fabric-api = "0.160.4+26.3"
 neoforge = "26.2.0.0-beta"
 
 # Libraries