From aeb0f81a18c574d6aed01ae2ce72634a1406c22e Mon Sep 17 00:00:00 2001 From: makamys Date: Sun, 21 Jan 2024 16:58:34 +0100 Subject: [PATCH] Add Campfire Backport compatibility to animation speedup Fixes Angelica's equivalent of https://github.com/GTNewHorizons/Hodgepodge/issues/204 Fixes embers and NEI mixed flames not animating --- .../gtnewhorizons/angelica/mixins/Mixins.java | 5 +++ .../angelica/mixins/TargetedMod.java | 1 + .../MixinRenderBlockCampfire.java | 35 +++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 src/main/java/com/gtnewhorizons/angelica/mixins/late/client/campfirebackport/MixinRenderBlockCampfire.java diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 277cd39df..d286db148 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -194,6 +194,11 @@ public enum Mixins { "angelica.animation.MixinRenderBlockFluid", "angelica.animation.MixinWorldRenderer", "angelica.animation.MixinRenderItem")), + + SPEEDUP_CAMPFIRE_BACKPORT_ANIMATIONS(new Builder("Add animation speedup support to Campfire Backport").setPhase(Phase.LATE) + .addTargetedMod(TargetedMod.CAMPFIRE_BACKPORT).setSide(Side.CLIENT) + .setApplyIf(() -> AngelicaConfig.speedupAnimations) + .addMixinClasses("client.campfirebackport.MixinRenderBlockCampfire")), IC2_FLUID_RENDER_FIX(new Builder("IC2 Fluid Render Fix").setPhase(Phase.EARLY).setSide(Side.CLIENT) .addTargetedMod(TargetedMod.IC2).setApplyIf(() -> AngelicaConfig.speedupAnimations) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java index f2ada1110..bd307979e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java @@ -8,6 +8,7 @@ public enum TargetedMod { , FASTCRAFT("FastCraft", "fastcraft.Tweaker") , OPTIFINE("Optifine", "optifine.OptiFineForgeTweaker", "Optifine") , BOTANIA("Botania", null, "Botania") + , CAMPFIRE_BACKPORT("CampfireBackport", null, "campfirebackport") , CHICKENCHUNKS("ChickenChunks", null, "ChickenChunks") , COFHCORE("CoFHCore", "cofh.asm.LoadingPlugin", "CoFHCore") , DYNAMIC_SURROUNDINGS_MIST("Dynamic Surroundings", "org.blockartistry.mod.DynSurround.mixinplugin.DynamicSurroundingsEarlyMixins", "dsurround") 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 new file mode 100644 index 000000000..552f4abb7 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/campfirebackport/MixinRenderBlockCampfire.java @@ -0,0 +1,35 @@ +package com.gtnewhorizons.angelica.mixins.late.client.campfirebackport; + +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.ModifyArgs; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.invoke.arg.Args; + +import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache; +import com.gtnewhorizons.angelica.utils.AnimationsRenderUtils; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; + +@Mixin(targets = "connor135246.campfirebackport.client.rendering.RenderBlockCampfire") +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); + } +}