From f684bc0a1bfce48a7276d9f7b81f95fb098ff692 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 13 May 2024 18:04:58 +0100 Subject: [PATCH] Fix RenderBlockFluid reading the block type from the world access multiple times (#482) * Fix RenderBlockFluid reading the block type from the world access multiple times * Fix compiler warnings --- .../angelica/config/AngelicaConfig.java | 5 ++++ .../gtnewhorizons/angelica/mixins/Mixins.java | 6 +++++ .../early/angelica/MixinFMLClientHandler.java | 2 +- .../bugfixes/MixinRenderBlockFluid.java | 24 +++++++++++++++++++ .../fontrenderer/MixinFontRenderer.java | 2 +- .../angelica/mixins/hooks/FluidHooks.java | 19 +++++++++++++++ .../MixinRenderBlockCampfire.java | 6 ++--- 7 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlockFluid.java create mode 100644 src/main/java/com/gtnewhorizons/angelica/mixins/hooks/FluidHooks.java diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index fde69e6f1..a6170b167 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -110,6 +110,11 @@ public class AngelicaConfig { @Config.RequiresMcRestart public static boolean fixExtraUtilsSodiumCompat; + @Config.Comment("Fix RenderBlockFluid reading the block type from the world access multiple times") + @Config.DefaultBoolean(true) + @Config.RequiresMcRestart + public static boolean fixFluidRendererCheckingBlockAgain; + @Config.Comment("Enable Debug Logging") @Config.DefaultBoolean(false) @Config.RequiresMcRestart diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 861d58a34..91c1e1371 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -63,6 +63,12 @@ public enum Mixins { ) ), + ANGELICA_FIX_FLUID_RENDERER_CHECKING_BLOCK_AGAIN( + new Builder("Fix RenderBlockFluid reading the block type from the world access multiple times") + .setPhase(Phase.EARLY).addMixinClasses("angelica.bugfixes.MixinRenderBlockFluid").setSide(Side.BOTH) + .setApplyIf(() -> AngelicaConfig.fixFluidRendererCheckingBlockAgain) + .addTargetedMod(TargetedMod.VANILLA)), + // Not compatible with the lwjgl debug callbacks, so disable if that's enabled ARCHAIC_SPLASH(new Builder("ArchaicFix Splash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.showSplashMemoryBar && !AngelicaMod.lwjglDebug).addMixinClasses( diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinFMLClientHandler.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinFMLClientHandler.java index beb16895b..97c6fac21 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinFMLClientHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinFMLClientHandler.java @@ -11,7 +11,7 @@ public class MixinFMLClientHandler { * @reason Remove more traces of Optifine */ @Overwrite - public void detectOptifine() { + private void detectOptifine() { // Do nothing } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlockFluid.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlockFluid.java new file mode 100644 index 000000000..28bf5a591 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlockFluid.java @@ -0,0 +1,24 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.bugfixes; + +import com.gtnewhorizons.angelica.mixins.hooks.FluidHooks; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fluids.BlockFluidBase; +import net.minecraftforge.fluids.RenderBlockFluid; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import com.llamalad7.mixinextras.sugar.Local; + +@Mixin(value = RenderBlockFluid.class, remap = false) +public class MixinRenderBlockFluid { + + @Redirect( + method = "renderWorldBlock", at = @At( + value = "INVOKE", + target = "Lnet/minecraftforge/fluids/BlockFluidBase;getFlowDirection(Lnet/minecraft/world/IBlockAccess;III)D")) + double hodgepodge$directFlowDirectionCheck(IBlockAccess world, int x, int y, int z, @Local BlockFluidBase block) { + return FluidHooks.getFlowDirection(world, x, y, z, block); + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java index 54a71d5b0..29b0364fa 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java @@ -103,7 +103,7 @@ public abstract class MixinFontRenderer implements FontRendererAccessor { @Shadow protected abstract String bidiReorder(String p_147647_1_); - @Shadow + @Shadow(remap = false) protected abstract void bindTexture(ResourceLocation location); @Unique diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/hooks/FluidHooks.java b/src/main/java/com/gtnewhorizons/angelica/mixins/hooks/FluidHooks.java new file mode 100644 index 000000000..d044b5374 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/hooks/FluidHooks.java @@ -0,0 +1,19 @@ +package com.gtnewhorizons.angelica.mixins.hooks; + +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fluids.BlockFluidBase; + +public class FluidHooks { + + /** + * {@link BlockFluidBase#getFluid()} that uses the given Block instead of fetching it from the world again + */ + public static double getFlowDirection(IBlockAccess world, int x, int y, int z, BlockFluidBase block) { + if (!block.getMaterial().isLiquid()) { + return -1000.0; + } + Vec3 vec = block.getFlowVector(world, x, y, z); + return vec.xCoord == 0.0D && vec.zCoord == 0.0D ? -1000.0D : Math.atan2(vec.zCoord, vec.xCoord) - Math.PI / 2D; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/campfirebackport/MixinRenderBlockCampfire.java b/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/campfirebackport/MixinRenderBlockCampfire.java index 7d02bba08..885fb723c 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/campfirebackport/MixinRenderBlockCampfire.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/campfirebackport/MixinRenderBlockCampfire.java @@ -14,20 +14,20 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; -@Mixin(targets = "connor135246.campfirebackport.client.rendering.RenderBlockCampfire", remap = false) +@Mixin(value = connor135246.campfirebackport.client.rendering.RenderBlockCampfire.class, remap = false) public class MixinRenderBlockCampfire { @Inject(method = "renderFace", at = @At("HEAD")) private static void angelica$beforeRenderFace(double x, double y, double z, Block block, RenderBlocks renderer, IIcon icon, int side, CallbackInfo ci) { AnimationsRenderUtils.markBlockTextureForUpdate(icon, renderer.blockAccess); ((ITexturesCache)renderer).getRenderedTextures().add(icon); } - + @ModifyArgs(method = "renderFire", at = @At(value = "INVOKE", target = "Lconnor135246/campfirebackport/client/rendering/RenderBlockCampfire;drawCrossedSquaresTwoIcons(Lnet/minecraft/util/IIcon;Lnet/minecraft/util/IIcon;DDDF)V")) private static void angelica$onDrawCrossedSquaresTwoIcons(Args args, double x, double y, double z, Block block, RenderBlocks renderer, boolean mix) { IIcon icon1 = (IIcon)args.get(0); AnimationsRenderUtils.markBlockTextureForUpdate(icon1, renderer.blockAccess); ((ITexturesCache)renderer).getRenderedTextures().add(icon1); - + IIcon icon2 = (IIcon)args.get(1); AnimationsRenderUtils.markBlockTextureForUpdate(icon2, renderer.blockAccess); ((ITexturesCache)renderer).getRenderedTextures().add(icon2);