remove access transformer to invoke EntityRenderer#getNightVisionBrightness (#1001)

This commit is contained in:
Alexdoru authored and GitHub committed 2025-08-10 16:31:30 +00:00
1 parent 49c04cf776
commit a8153fa0f7
5 files changed
+10 -24

No files matched your search

@@ -196,12 +196,6 @@ public enum Mixins implements IMixins {
)
),
IRIS_ACCESSORS(new MixinBuilder()
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableIris)
.addClientMixins("shaders.accessors.MixinEntityRenderer")
),
ANGELICA_TEXTURE(new MixinBuilder()
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableIris || AngelicaConfig.enableSodium)
@@ -4,6 +4,7 @@ import java.awt.image.BufferedImage;
import java.util.HashMap;
import java.util.Map;
import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.potion.Potion;
@@ -83,9 +84,8 @@ public final class Lightmap {
}
private float getNightVisionStrength(EntityRenderer renderer, float n) {
if (Minecraft.getMinecraft().thePlayer.isPotionActive(Potion.nightVision)) {
return renderer.getNightVisionBrightness(Minecraft.getMinecraft().thePlayer, n);
return ((EntityRendererAccessor) renderer).invokeGetNightVisionBrightness(Minecraft.getMinecraft().thePlayer, n);
}
return 0.0f;
}
@@ -16,4 +16,3 @@ public net.minecraft.potion.PotionHelper field_77925_n # field_77925_n PotionCol
public net.minecraft.client.renderer.texture.TextureAtlasSprite <init>(Ljava.lang.String;)V # constuctor
public net.minecraft.entity.projectile.EntityPotion field_70197_d # potionDamage
public net.minecraft.client.resources.SimpleResource field_110533_b # srResourceLocation
public net.minecraft.client.renderer.EntityRenderer func_82830_a(Lnet/minecraft/entity/player/EntityPlayer;F)F # getNightVisionBrightness
@@ -1,17 +1,24 @@
package com.gtnewhorizons.angelica.mixins.early.angelica;
import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
import com.gtnewhorizons.angelica.rendering.RenderingState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(EntityRenderer.class)
public abstract class MixinEntityRenderer {
public abstract class MixinEntityRenderer implements EntityRendererAccessor {
@Invoker
public abstract float invokeGetNightVisionBrightness(EntityPlayer entityPlayer, float partialTicks);
@Inject(method = "setupCameraTransform", at = @At(value = "TAIL"))
private void angelica$captureCameraMatrix(float partialTicks, int startTime, CallbackInfo ci) {
final Minecraft mc = Minecraft.getMinecraft();
@@ -1,14 +0,0 @@
package com.gtnewhorizons.angelica.mixins.early.shaders.accessors;
import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.entity.player.EntityPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(EntityRenderer.class)
public abstract class MixinEntityRenderer implements EntityRendererAccessor {
@Invoker
public abstract float invokeGetNightVisionBrightness(EntityPlayer entityPlayer, float partialTicks);
}