diff --git a/dependencies.gradle b/dependencies.gradle index 4952acc6c..6c9a1eb46 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -115,6 +115,7 @@ dependencies { compileOnly(rfg.deobf("curse.maven:campfirebackport-387444:4611675")) compileOnly(rfg.deobf("curse.maven:xaeros-minimap-263420:5060684")) compileOnly(rfg.deobf("curse.maven:security-craft-64760:2818228")) + compileOnly(rfg.deobf("curse.maven:et-futurum-requiem-441392:5873837")) // runtimeOnlyNonPublishable("com.github.GTNewHorizons:CoreTweaks:0.3.3.6-GTNH") // For testing alternative splash screens, can be sourced from https://github.com/MalTeeez/ModernSplash/releases diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 36443972b..61c13f7f1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -196,7 +196,8 @@ public enum Mixins implements IMixins { .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableIris) .addClientMixins( - "shaders.MixinEntityPickupFX" + "shaders.MixinDroppedItemGlintEdges" + , "shaders.MixinEntityPickupFX" , "shaders.MixinEntityRenderer" , "shaders.MixinGuiIngameForge" , "shaders.MixinFramebuffer" @@ -204,6 +205,7 @@ public enum Mixins implements IMixins { , "shaders.MixinLocale" , "shaders.MixinRender" , "shaders.MixinRenderBiped" + , "shaders.MixinRenderDragon" , "shaders.MixinRenderEntityFlame" , "shaders.MixinRendererLivingEntity" , "shaders.MixinRenderGlobal" @@ -451,6 +453,12 @@ public enum Mixins implements IMixins { "MixinBlockTFMagicLeaves" )) ), + ET_FUTURUM_ELYTRA_CAPE(new MixinBuilder("Set custom item ID for elytra with cape texture") + .setPhase(Phase.LATE) + .addRequiredMod(TargetedMod.ET_FUTURUM_REQUIEM) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addClientMixins("client.etfuturum.MixinLayerBetterElytra") + ), MCPATCHER_FORGE(new MixinBuilder() .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java index 94652417d..5542c71c4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java @@ -14,6 +14,7 @@ public enum TargetedMod implements ITargetMod { DYNAMIC_SURROUNDINGS_MIST("org.blockartistry.mod.DynSurround.mixinplugin.DynamicSurroundingsEarlyMixins", "dsurround"), DYNAMIC_SURROUNDINGS_ORIGINAL("org.blockartistry.mod.DynSurround.asm.TransformLoader", "dsurround"), DRAGON_API("Reika.DragonAPI.Auxiliary.DragonAPIASMHandler", "DragonAPI"), + ET_FUTURUM_REQUIEM(null, "etfuturum"), EXTRAUTILS(null, "ExtraUtilities"), FALSETWEAKS("com.falsepattern.falsetweaks.asm.CoreLoadingPlugin", "falsetweaks"), MINEFACTORY_RELOADED(null, "MineFactoryReloaded"), diff --git a/src/main/java/net/coderbot/iris/uniforms/EntityIdHelper.java b/src/main/java/net/coderbot/iris/uniforms/EntityIdHelper.java new file mode 100644 index 000000000..d003e3cb2 --- /dev/null +++ b/src/main/java/net/coderbot/iris/uniforms/EntityIdHelper.java @@ -0,0 +1,137 @@ +package net.coderbot.iris.uniforms; + +import it.unimi.dsi.fastutil.objects.Object2IntFunction; +import it.unimi.dsi.fastutil.objects.Object2IntMap; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import net.coderbot.iris.block_rendering.BlockRenderingSettings; +import net.coderbot.iris.shaderpack.materialmap.NamespacedId; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.player.EntityPlayer; + +/** + * Shared utility for resolving entity IDs with support for special entities and caching. + */ +public final class EntityIdHelper { + private static final NamespacedId CONVERTING_VILLAGER = new NamespacedId("minecraft", "zombie_villager_converting"); + private static final NamespacedId CURRENT_PLAYER = new NamespacedId("minecraft", "current_player"); + private static final NamespacedId LIGHTNING_BOLT_ID = new NamespacedId("minecraft", "lightning_bolt"); + + private static final Object2IntMap> entityIdCache = new Object2IntOpenHashMap<>(); + private static Object2IntFunction cachedEntityIdMap; + + static { + entityIdCache.defaultReturnValue(Integer.MIN_VALUE); + } + + private EntityIdHelper() { + } + + /** + * Get the entity ID for the given entity. + * + * @param entity The entity to get the ID for + * @return The entity ID, or -1 if no mapping exists + */ + public static int getEntityId(Entity entity) { + Object2IntFunction entityIdMap = BlockRenderingSettings.INSTANCE.getEntityIds(); + if (entityIdMap == null) { + return -1; + } + + // Invalidate cache if the map changed (shader reload) + if (entityIdMap != cachedEntityIdMap) { + entityIdCache.clear(); + cachedEntityIdMap = entityIdMap; + } + + // Normal entity type lookup + int normalId = getNormalEntityId(entity, entityIdMap); + + // Check for special entity type overrides + int specialId = getSpecialEntityId(entity, entityIdMap); + if (specialId != -1) { + return specialId; + } + + return normalId; + } + + /** + * Check if the entity should use a special hardcoded entity ID. + */ + private static int getSpecialEntityId(Entity entity, Object2IntFunction entityIdMap) { + // Check if this is the current player (3rd person only) + Entity cameraEntity = Minecraft.getMinecraft().renderViewEntity; + if (entity == cameraEntity && entity instanceof EntityPlayer) { + int currentPlayerId = entityIdMap.applyAsInt(CURRENT_PLAYER); + if (currentPlayerId != -1) { + return currentPlayerId; + } + } + + // Check if this is a converting zombie villager + if (entity instanceof EntityZombie zombie) { + if (zombie.isConverting()) { + return entityIdMap.applyAsInt(CONVERTING_VILLAGER); + } + } + + return -1; + } + + /** + * Get the normal entity ID based on entity type, with caching. + * Uses Class as cache key for fast reference-equality lookups. + */ + private static int getNormalEntityId(Entity entity, Object2IntFunction entityIdMap) { + // Use entity class as cache key + Class entityClass = entity.getClass(); + + // Check cache first + int cached = entityIdCache.getInt(entityClass); + if (cached != Integer.MIN_VALUE) { + return cached; + } + + // Cache miss, store for next lookup + int resolvedId = resolveEntityId(entity, entityClass, entityIdMap); + entityIdCache.put(entityClass, resolvedId); + + return resolvedId; + } + + /** + * Resolve entity ID for a cache miss. Try in order: + * 1. Registered entity name (e.g., "Zombie") + * 2. Simple class name (e.g., "EntityLightningBolt") + * 3. Fully qualified class name (e.g., "net.minecraft.entity.effect.EntityLightningBolt") + * 4. Special hardcoded cases (e.g., "minecraft:lightning_bolt") + */ + private static int resolveEntityId(Entity entity, Class entityClass, Object2IntFunction entityIdMap) { + // Try registered entity name first (most common) + String entityType = EntityList.getEntityString(entity); + if (entityType != null) { + return entityIdMap.applyAsInt(new NamespacedId(entityType)); + } + + String simpleClassName = entityClass.getSimpleName(); + int id = entityIdMap.applyAsInt(new NamespacedId(simpleClassName)); + + if (id == -1) { + String className = entityClass.getName(); + id = entityIdMap.applyAsInt(new NamespacedId(className)); + } + + if (id == -1 && entity instanceof EntityLightningBolt) { + // Shaderpacks use "minecraft:lightning_bolt" so we should continue to provide it here + // Even if we can just use EntityLightningBolt + id = entityIdMap.applyAsInt(LIGHTNING_BOLT_ID); + } + + return id; + } +} diff --git a/src/main/java/net/coderbot/iris/uniforms/ItemIdManager.java b/src/main/java/net/coderbot/iris/uniforms/ItemIdManager.java new file mode 100644 index 000000000..cada13426 --- /dev/null +++ b/src/main/java/net/coderbot/iris/uniforms/ItemIdManager.java @@ -0,0 +1,33 @@ +package net.coderbot.iris.uniforms; + +import net.minecraft.item.ItemStack; + +/** + * Helper class to manage the currentRenderedItem ID uniform. + */ +public class ItemIdManager { + /** + * Set the item ID for an armor piece or held item. + * If the ItemStack is null/empty, resets to 0. + * Otherwise, looks up the material ID and sets it. + * + * @param itemStack The armor or item being rendered + */ + public static void setItemId(ItemStack itemStack) { + if (itemStack == null || itemStack.getItem() == null) { + CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); + return; + } + + int id = ItemMaterialHelper.getMaterialId(itemStack); + CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); + } + + /** + * Reset the item ID to 0. + * Used when entering/exiting render sections or before glint rendering. + */ + public static void resetItemId() { + CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinDroppedItemGlintEdges.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinDroppedItemGlintEdges.java new file mode 100644 index 000000000..ca18f5c65 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinDroppedItemGlintEdges.java @@ -0,0 +1,41 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.util.IIcon; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArgs; +import org.spongepowered.asm.mixin.injection.invoke.arg.Args; + +@Mixin(RenderItem.class) +public class MixinDroppedItemGlintEdges { + + /** + * Fix enchantment glint not rendering on item edges by using the actual icon dimensions + * instead of hardcoded 255x255. This ensures the edge geometry calculation matches the + * main item render, allowing GL_EQUAL depth test to pass on all edges. + + * First glint pass (ordinal 1) + */ + @ModifyArgs( + method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemIn2D(Lnet/minecraft/client/renderer/Tessellator;FFFFIIF)V", ordinal = 1) + ) + private void iris$fixFirstGlintDimensions(Args args, EntityItem entity, IIcon icon, int count, float partialTicks, float r, float g, float b, int pass) { + args.set(5, icon.getIconWidth()); + args.set(6, icon.getIconHeight()); + } + + /** + * Second glint pass (ordinal 2) + */ + @ModifyArgs( + method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemIn2D(Lnet/minecraft/client/renderer/Tessellator;FFFFIIF)V", ordinal = 2) + ) + private void iris$fixSecondGlintDimensions(Args args, EntityItem entity, IIcon icon, int count, float partialTicks, float r, float g, float b, int pass) { + args.set(5, icon.getIconWidth()); + args.set(6, icon.getIconHeight()); + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityPickupFX.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityPickupFX.java index 7ee6f63fc..ec6bde197 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityPickupFX.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityPickupFX.java @@ -20,7 +20,7 @@ public class MixinEntityPickupFX { @WrapOperation( method = "renderParticle", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderManager;func_147940_a(Lnet/minecraft/entity/Entity;DDDFF)Z") + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderManager;renderEntityWithPosYaw(Lnet/minecraft/entity/Entity;DDDFF)Z") ) private boolean iris$wrapPickupRender(RenderManager renderManager, Entity entity, double x, double y, double z, float yaw, float partialTicks, Operation original) { GbufferPrograms.beginEntities(); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java index aa7377e41..28189f47c 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java @@ -4,8 +4,7 @@ import com.gtnewhorizons.angelica.compat.mojang.InteractionHand; import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; import net.coderbot.iris.layer.GbufferPrograms; import net.coderbot.iris.pipeline.HandRenderer; -import net.coderbot.iris.uniforms.CapturedRenderingState; -import net.coderbot.iris.uniforms.ItemMaterialHelper; +import net.coderbot.iris.uniforms.ItemIdManager; import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; @@ -16,12 +15,15 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** - * Mixin to handle hand rendering and item ID tracking. + * Mixin to handle item rendering in first-person. */ @Mixin(ItemRenderer.class) public class MixinItemRenderer { + /** + * Render held item in first person. + */ @Inject(method = "renderItemInFirstPerson", at = @At("HEAD"), cancellable = true) - private void iris$handleFirstPersonRender(float partialTicks, CallbackInfo ci) { + private void iris$setFirstPersonItemId(float partialTicks, CallbackInfo ci) { if (IrisApi.getInstance().isShaderPackInUse()) { boolean isHandTranslucent = HandRenderer.INSTANCE.isHandTranslucent(InteractionHand.MAIN_HAND); boolean isRenderingSolid = HandRenderer.INSTANCE.isRenderingSolid(); @@ -39,40 +41,8 @@ public class MixinItemRenderer { ItemStack itemStack = mc.thePlayer.getCurrentEquippedItem(); - if (itemStack == null || itemStack.getItem() == null) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); - return; - } - - // Get material ID from item.properties or block.properties - int id = ItemMaterialHelper.getMaterialId(itemStack); - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); - } - - /** - * Activate GLINT shader before rendering enchantment glint on held items. - * Injects at the first glDepthFunc inside the if(hasEffect) block. - */ - @Inject( - method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", - at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0), - remap = false - ) - private void iris$activateGlintShaderHeldItem(net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, net.minecraftforge.client.IItemRenderer.ItemRenderType type, CallbackInfo ci) { - GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT); - } - - /** - * Deactivate GLINT shader after rendering enchantment glint on held items. - * Injects at the last glDepthFunc inside the if(hasEffect) block. - */ - @Inject( - method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", - at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER), - remap = false - ) - private void iris$deactivateGlintShaderHeldItem(net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, net.minecraftforge.client.IItemRenderer.ItemRenderType type, CallbackInfo ci) { - GbufferPrograms.teardownSpecialRenderCondition(); + // Set item ID for first-person hand/item + ItemIdManager.setItemId(itemStack); } /** @@ -82,7 +52,32 @@ public class MixinItemRenderer { method = "renderItemInFirstPerson", at = @At("RETURN") ) - private void iris$resetHeldItemId(float partialTicks, CallbackInfo ci) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); + private void iris$resetFirstPersonItemId(float partialTicks, CallbackInfo ci) { + ItemIdManager.resetItemId(); + } + + /** + * Activate GLINT shader before rendering enchantment glint on held items (third person). + */ + @Inject( + method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0), + remap = false + ) + private void iris$glintStart(CallbackInfo ci) { + ItemIdManager.resetItemId(); + GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT); + } + + /** + * Deactivate GLINT shader after rendering enchantment glint on held items (third person). + */ + @Inject( + method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER), + remap = false + ) + private void iris$glintEnd(CallbackInfo ci) { + GbufferPrograms.teardownSpecialRenderCondition(); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java index 67acc8546..d19399040 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java @@ -2,94 +2,54 @@ package com.gtnewhorizons.angelica.mixins.early.shaders; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import net.coderbot.iris.uniforms.CapturedRenderingState; -import net.coderbot.iris.uniforms.ItemMaterialHelper; +import net.coderbot.iris.uniforms.ItemIdManager; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; /** - * Mixin to set the currentRenderedItem ID when rendering armor on entities. - * This allows shaders to identify and apply different materials to armor pieces. + * Mixin to set currentRenderedItem ID when rendering armor and equipment on biped entities. + * RENDER ORDER: + * 1. doRender() starts (parent resets item ID to 0) + * 2. Main entity body + * 3. Armor loop (4 slots) - we set ID per armor piece + * 4. renderEquippedItems(): - Handled via ItemRenderer + * - Held item */ @Mixin(RenderBiped.class) public class MixinRenderBiped { /** - * Set the item ID when rendering armor. - * Wraps the setRenderPassModel call to inject our ID setting logic. + * Set item ID when rendering armor on biped entities. + * Wraps setRenderPassModel() which is called inside shouldRenderPass(). */ @WrapOperation( method = "shouldRenderPass(Lnet/minecraft/entity/EntityLiving;IF)I", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderBiped;setRenderPassModel(Lnet/minecraft/client/model/ModelBase;)V") ) private void iris$setArmorItemId(RenderBiped instance, ModelBase model, Operation original, EntityLiving entity, int armorSlot, float partialTicks) { - // Get the armor item stack for this slot + // Get the armor item stack for this slot (slot 0=boots, 1=legs, 2=chest, 3=helmet) ItemStack itemStack = entity.func_130225_q(3 - armorSlot); + ItemIdManager.setItemId(itemStack); - if (itemStack == null || itemStack.getItem() == null) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); - original.call(instance, model); - return; - } - - // Get material ID from item.properties or block.properties - int id = ItemMaterialHelper.getMaterialId(itemStack); - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); - - // Call original method original.call(instance, model); } /** - * Reset the item ID at the start of rendering each entity. - * This ensures a clean slate and prevents ID bleed between entities. - */ - @Inject( - method = "doRender(Lnet/minecraft/entity/EntityLiving;DDDFF)V", - at = @At("HEAD") - ) - private void iris$resetAtStart(EntityLiving entity, double x, double y, double z, float entityYaw, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); - } - - /** - * Reset the item ID at the start of renderEquippedItems. - * This prevents armor IDs from bleeding into held item rendering. - */ - @Inject( - method = "renderEquippedItems(Lnet/minecraft/entity/EntityLiving;F)V", - at = @At("HEAD") - ) - private void iris$resetInEquippedItems(EntityLiving entity, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); - } - - /** - * Set the item ID when rendering held items in third person. - * Wraps renderItem calls to set the ID based on the held item. + * Set item ID when rendering held items on entities (third person). */ @WrapOperation( method = "renderEquippedItems(Lnet/minecraft/entity/EntityLiving;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;I)V") ) - private void iris$setHeldItemId(net.minecraft.client.renderer.ItemRenderer itemRenderer, net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation original) { - if (itemStack == null || itemStack.getItem() == null) { - original.call(itemRenderer, entity, itemStack, renderPass); - return; - } - - // Get material ID from item.properties or block.properties - int id = ItemMaterialHelper.getMaterialId(itemStack); - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); + private void iris$setHeldItemId(ItemRenderer itemRenderer, EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation original) { + ItemIdManager.setItemId(itemStack); original.call(itemRenderer, entity, itemStack, renderPass); - - // Reset after rendering the held item - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderDragon.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderDragon.java new file mode 100644 index 000000000..7902ca400 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderDragon.java @@ -0,0 +1,55 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import it.unimi.dsi.fastutil.objects.Object2IntFunction; +import net.coderbot.iris.block_rendering.BlockRenderingSettings; +import net.coderbot.iris.shaderpack.materialmap.NamespacedId; +import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.minecraft.client.renderer.entity.RenderDragon; +import net.minecraft.entity.boss.EntityDragon; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * Mixin to set the entity ID to "end_crystal_beam" when rendering ender dragon healing beams. + * This allows shaders to apply special effects to the healing beams separately from the dragon itself. + */ +@Mixin(RenderDragon.class) +public class MixinRenderDragon { + @Unique + private static final NamespacedId END_CRYSTAL_BEAM = new NamespacedId("minecraft", "end_crystal_beam"); + + @Unique + private int angelica$previousEntityId = -1; + + @Inject( + method = "doRender(Lnet/minecraft/entity/boss/EntityDragon;DDDFF)V", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glPushMatrix()V", ordinal = 0, shift = At.Shift.AFTER, remap = false) + ) + private void iris$setBeamEntityId(EntityDragon dragon, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + // Only set the ID if the dragon is being healed by a crystal + if (dragon.healingEnderCrystal != null) { + Object2IntFunction entityIdMap = BlockRenderingSettings.INSTANCE.getEntityIds(); + if (entityIdMap != null) { + // Save the current entity ID + angelica$previousEntityId = CapturedRenderingState.INSTANCE.getCurrentRenderedEntity(); + + int beamId = entityIdMap.applyAsInt(END_CRYSTAL_BEAM); + CapturedRenderingState.INSTANCE.setCurrentEntity(beamId); + } + } + } + + @Inject( + method = "doRender(Lnet/minecraft/entity/boss/EntityDragon;DDDFF)V", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glPopMatrix()V", ordinal = 0, shift = At.Shift.BEFORE, remap = false) + ) + private void iris$restoreEntityId(EntityDragon dragon, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + if (angelica$previousEntityId != -1) { + CapturedRenderingState.INSTANCE.setCurrentEntity(angelica$previousEntityId); + angelica$previousEntityId = -1; + } + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderGlobal.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderGlobal.java index c76485ad9..a80821744 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderGlobal.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderGlobal.java @@ -4,27 +4,19 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Share; import com.llamalad7.mixinextras.sugar.ref.LocalRef; -import it.unimi.dsi.fastutil.objects.Object2IntFunction; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.coderbot.iris.Iris; -import net.coderbot.iris.block_rendering.BlockRenderingSettings; import net.coderbot.iris.layer.GbufferPrograms; import net.coderbot.iris.pipeline.WorldRenderingPhase; import net.coderbot.iris.pipeline.WorldRenderingPipeline; -import net.coderbot.iris.shaderpack.materialmap.NamespacedId; import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.coderbot.iris.uniforms.EntityIdHelper; import net.minecraft.client.renderer.RenderGlobal; -import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MovingObjectPosition; import org.lwjgl.opengl.GL11; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Slice; @@ -32,13 +24,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(RenderGlobal.class) public class MixinRenderGlobal { - @Unique private static final NamespacedId LIGHTNING_BOLT_ID = new NamespacedId("minecraft", "lightning_bolt"); - @Unique private static final Object2IntOpenHashMap angelica$entityIdCache = new Object2IntOpenHashMap<>(); - @Unique private static Object2IntFunction angelica$cachedEntityIdMap; - - static { - angelica$entityIdCache.defaultReturnValue(Integer.MIN_VALUE); - } @Inject(method = "renderSky", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/Tessellator;instance:Lnet/minecraft/client/renderer/Tessellator;")) private void iris$renderSky$beginNormalSky(float partialTicks, CallbackInfo ci, @Share("pipeline") LocalRef pipeline) { @@ -89,55 +74,7 @@ public class MixinRenderGlobal { @WrapOperation(method="renderEntities", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/entity/RenderManager;renderEntitySimple(Lnet/minecraft/entity/Entity;F)Z")) private boolean angelica$renderEntitySimple(RenderManager instance, Entity entity, float partialTicks, Operation original) { - int entityId = entity.getEntityId(); - - Object2IntFunction entityIdMap = BlockRenderingSettings.INSTANCE.getEntityIds(); - if (entityIdMap != null) { - // Invalidate cache if the map changed (shader reload) - if (entityIdMap != angelica$cachedEntityIdMap) { - angelica$entityIdCache.clear(); - angelica$cachedEntityIdMap = entityIdMap; - } - - String entityType = EntityList.getEntityString(entity); - String cacheKey; - - if (entityType != null) { - // Use registered entity name - cacheKey = entityType; - int cached = angelica$entityIdCache.getInt(cacheKey); - if (cached == Integer.MIN_VALUE) { - cached = entityIdMap.applyAsInt(new NamespacedId(entityType)); - angelica$entityIdCache.put(cacheKey, cached); - } - entityId = cached; - } else { - // Unregistered entity check - Class entityClass = entity.getClass(); - String className = entityClass.getName(); - cacheKey = className; - - int cached = angelica$entityIdCache.getInt(cacheKey); - if (cached == Integer.MIN_VALUE) { - // Try simple class name first (e.g., "EntityLightningBolt") - String simpleClassName = entityClass.getSimpleName(); - cached = entityIdMap.applyAsInt(new NamespacedId(simpleClassName)); - - // If not found, try FQN (e.g., "net.minecraft.entity.effect.EntityLightningBolt") - if (cached == -1) { - cached = entityIdMap.applyAsInt(new NamespacedId(className)); - } - - // Special case: Shaderpacks have "minecraft:lightning_bolt" so we should continue to provide this - if (cached == -1 && entity instanceof EntityLightningBolt) { - cached = entityIdMap.applyAsInt(LIGHTNING_BOLT_ID); - } - - angelica$entityIdCache.put(cacheKey, cached); - } - entityId = cached; - } - } + int entityId = EntityIdHelper.getEntityId(entity); CapturedRenderingState.INSTANCE.setCurrentEntity(entityId); GbufferPrograms.beginEntities(); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderHorse.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderHorse.java index 091dfe129..6c64e7263 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderHorse.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderHorse.java @@ -3,6 +3,7 @@ package com.gtnewhorizons.angelica.mixins.early.shaders; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.coderbot.iris.uniforms.ItemIdManager; import net.coderbot.iris.uniforms.ItemMaterialHelper; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderHorse; @@ -65,7 +66,6 @@ public abstract class MixinRenderHorse { } if (armorItem != null) { - // Get material ID from item.properties int id = ItemMaterialHelper.getMaterialId(armorItem, 0); CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); hasArmor = true; @@ -78,7 +78,7 @@ public abstract class MixinRenderHorse { // Reset only if we set it if (hasArmor) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); + ItemIdManager.resetItemId(); } } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderItem.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderItem.java index 9f483a881..23499d969 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderItem.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderItem.java @@ -1,10 +1,10 @@ - package com.gtnewhorizons.angelica.mixins.early.shaders; +package com.gtnewhorizons.angelica.mixins.early.shaders; import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; import net.coderbot.iris.layer.GbufferPrograms; -import net.coderbot.iris.uniforms.CapturedRenderingState; -import net.coderbot.iris.uniforms.ItemMaterialHelper; +import net.coderbot.iris.uniforms.ItemIdManager; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -12,8 +12,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** - * Mixin to set the currentRenderedItem ID when rendering dropped items (EntityItem). - * This allows shaders to identify and apply different materials to items on the ground. + * Mixin to set the currentRenderedItem ID when rendering dropped items. */ @Mixin(RenderItem.class) public class MixinRenderItem { @@ -26,38 +25,9 @@ public class MixinRenderItem { method = "doRender(Lnet/minecraft/entity/item/EntityItem;DDDFF)V", at = @At("HEAD") ) - private void iris$setItemIdBeforeRender(net.minecraft.entity.item.EntityItem entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + private void iris$setItemIdBeforeRender(EntityItem entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { ItemStack itemStack = entity.getEntityItem(); - - // Get material ID from item.properties or block.properties - int id = ItemMaterialHelper.getMaterialId(itemStack); - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); - } - - /** - * Activate GLINT shader before rendering enchantment glint. - * Injects at the first glDepthFunc inside the if(hasEffect) block. - */ - @Inject( - method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V", - at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0), - remap = false - ) - private void iris$activateGlintShader(net.minecraft.entity.item.EntityItem entity, net.minecraft.util.IIcon icon, int count, float partialTicks, float r, float g, float b, int pass, CallbackInfo ci) { - GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT); - } - - /** - * Deactivate GLINT shader after rendering enchantment glint. - * Injects at the last glDepthFunc inside the if(hasEffect) block. - */ - @Inject( - method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V", - at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER), - remap = false - ) - private void iris$deactivateGlintShader(net.minecraft.entity.item.EntityItem entity, net.minecraft.util.IIcon icon, int count, float partialTicks, float r, float g, float b, int pass, CallbackInfo ci) { - GbufferPrograms.teardownSpecialRenderCondition(); + ItemIdManager.setItemId(itemStack); } /** @@ -67,7 +37,32 @@ public class MixinRenderItem { method = "doRender(Lnet/minecraft/entity/item/EntityItem;DDDFF)V", at = @At("RETURN") ) - private void iris$resetItemIdAfterRender(net.minecraft.entity.item.EntityItem entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); + private void iris$resetItemIdAfterRender(EntityItem entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + ItemIdManager.resetItemId(); + } + + /** + * Activate GLINT shader before rendering enchantment glint on dropped items. + */ + @Inject( + method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0), + remap = false + ) + private void iris$glintStart(CallbackInfo ci) { + ItemIdManager.resetItemId(); + GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT); + } + + /** + * Deactivate GLINT shader after rendering enchantment glint on dropped items. + */ + @Inject( + method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER), + remap = false + ) + private void iris$glintEnd(CallbackInfo ci) { + GbufferPrograms.teardownSpecialRenderCondition(); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java index 03eaee0c2..8c2ce3f06 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java @@ -2,113 +2,29 @@ package com.gtnewhorizons.angelica.mixins.early.shaders; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import it.unimi.dsi.fastutil.objects.Object2IntFunction; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import net.coderbot.iris.block_rendering.BlockRenderingSettings; -import net.coderbot.iris.shaderpack.materialmap.NamespacedId; import net.coderbot.iris.uniforms.CapturedRenderingState; -import net.coderbot.iris.uniforms.ItemMaterialHelper; +import net.coderbot.iris.uniforms.EntityIdHelper; +import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; /** - * Mixin to handle material ID setting for entities rendered through renderEntityWithPosYaw. - * This is needed for EntityPickupFX which renders entities during pickup animation - * Entity ID mapping is handled by MixinRenderGlobal for the normal rendering path. + * Mixin to handle entity ID setting for entities rendered through renderEntityWithPosYaw and renderEntityStatic. + * Sets the entity ID for all entities. Item IDs for EntityItem are handled by their specific renderer mixins. */ - -// TODO: Find a way to de-duplicate this code. @Mixin(RenderManager.class) public class MixinRenderManager { - @Unique private static final Object2IntOpenHashMap angelica$entityIdCache = new Object2IntOpenHashMap<>(); - @Unique private static Object2IntFunction angelica$cachedEntityIdMap; - - static { - angelica$entityIdCache.defaultReturnValue(Integer.MIN_VALUE); - } @WrapOperation( method = "func_147939_a", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V") ) - private void iris$wrapDoRender(net.minecraft.client.renderer.entity.Render render, Entity entity, double x, double y, double z, float entityYaw, float partialTicks, Operation original) { - // Set appropriate material ID when entities are rendered through renderEntityWithPosYaw - // (used by EntityPickupFX during pickup animation) - // Note: Entity ID mapping is handled by MixinRenderGlobal for the normal path - boolean setItemId = false; - boolean setEntityId = false; - - if (entity instanceof EntityItem) { - EntityItem entityItem = (EntityItem) entity; - ItemStack itemStack = entityItem.getEntityItem(); - int itemId = ItemMaterialHelper.getMaterialId(itemStack); - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(itemId); - setItemId = true; - } else { - Object2IntFunction entityIdMap = BlockRenderingSettings.INSTANCE.getEntityIds(); - if (entityIdMap != null) { - // Invalidate cache if the map changed (shader reload) - if (entityIdMap != angelica$cachedEntityIdMap) { - angelica$entityIdCache.clear(); - angelica$cachedEntityIdMap = entityIdMap; - } - - int entityId = entity.getEntityId(); - - String entityType = EntityList.getEntityString(entity); - String cacheKey; - - if (entityType != null) { - // Use registered entity name - cacheKey = entityType; - int cached = angelica$entityIdCache.getInt(cacheKey); - if (cached == Integer.MIN_VALUE) { - cached = entityIdMap.applyAsInt(new NamespacedId(entityType)); - angelica$entityIdCache.put(cacheKey, cached); - } - entityId = cached; - } else { - // Unregistered entity - try class names - Class entityClass = entity.getClass(); - String className = entityClass.getName(); - cacheKey = className; - - int cached = angelica$entityIdCache.getInt(cacheKey); - if (cached == Integer.MIN_VALUE) { - // Try simple class name first (e.g., "EntityLightningBolt") - String simpleClassName = entityClass.getSimpleName(); - cached = entityIdMap.applyAsInt(new NamespacedId(simpleClassName)); - - // If not found, try FQN (e.g., "net.minecraft.entity.effect.EntityLightningBolt") - if (cached == -1) { - cached = entityIdMap.applyAsInt(new NamespacedId(className)); - } - - angelica$entityIdCache.put(cacheKey, cached); - } - entityId = cached; - } - - CapturedRenderingState.INSTANCE.setCurrentEntity(entityId); - setEntityId = true; - } - } - - try { - original.call(render, entity, x, y, z, entityYaw, partialTicks); - } finally { - if (setItemId) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); - } - if (setEntityId) { - CapturedRenderingState.INSTANCE.setCurrentEntity(-1); - } - } + private void iris$wrapDoRender(Render render, Entity entity, double x, double y, double z, float entityYaw, float partialTicks, Operation original) { + int entityId = EntityIdHelper.getEntityId(entity); + CapturedRenderingState.INSTANCE.setCurrentEntity(entityId); + original.call(render, entity, x, y, z, entityYaw, partialTicks); + CapturedRenderingState.INSTANCE.setCurrentEntity(-1); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java index d507e7aa9..fd8ae15e5 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java @@ -2,94 +2,82 @@ package com.gtnewhorizons.angelica.mixins.early.shaders; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.coderbot.iris.block_rendering.BlockRenderingSettings; +import net.coderbot.iris.shaderpack.materialmap.NamespacedId; import net.coderbot.iris.uniforms.CapturedRenderingState; -import net.coderbot.iris.uniforms.ItemMaterialHelper; +import net.coderbot.iris.uniforms.ItemIdManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderPlayer; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; + +import java.util.Objects; /** - * Mixin to set the currentRenderedItem ID when rendering armor on the player. - * This allows shaders to identify and apply different materials to player armor pieces. + * Mixin to set currentRenderedItem ID when rendering armor and equipment on players. + * RENDER ORDER (same as parent RendererLivingEntity): + * 1. doRender() starts (parent resets item ID to 0) + * 2. Main player body + * 3. Armor loop (4 slots) - we set ID per armor piece + * 4. renderEquippedItems(): - Handled via ItemRenderer + * - Helmet (Pumpkin head or other items) + * - Deadmau5 ears + * - Cape - sets "minecraft:player_cape" ID here + * - Held item */ @Mixin(RenderPlayer.class) public class MixinRenderPlayerArmor { + @Unique + private static final NamespacedId PLAYER_CAPE = new NamespacedId("minecraft", "player_cape"); /** - * Set the item ID when rendering player armor. - * Wraps the setRenderPassModel call to inject our ID setting logic. + * Set item ID when rendering player armor. */ @WrapOperation( method = "shouldRenderPass(Lnet/minecraft/client/entity/AbstractClientPlayer;IF)I", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderPlayer;setRenderPassModel(Lnet/minecraft/client/model/ModelBase;)V") ) private void iris$setArmorItemId(RenderPlayer instance, ModelBase model, Operation original, AbstractClientPlayer player, int armorSlot, float partialTicks) { - // Get the armor item stack for this slot ItemStack itemStack = player.getCurrentArmor(3 - armorSlot); + ItemIdManager.setItemId(itemStack); - if (itemStack == null || itemStack.getItem() == null) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); - original.call(instance, model); - return; - } - - // Get material ID from item.properties or block.properties - int id = ItemMaterialHelper.getMaterialId(itemStack); - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); - - // Call original method original.call(instance, model); } /** - * Reset the item ID at the start of rendering each player. - * This ensures a clean slate and prevents ID bleed between entities. + * Set "minecraft:player_cape" when rendering the player's cape. */ - @Inject( - method = "doRender(Lnet/minecraft/client/entity/AbstractClientPlayer;DDDFF)V", - at = @At("HEAD") - ) - private void iris$resetAtStart(AbstractClientPlayer player, double x, double y, double z, float entityYaw, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); - } - - /** - * Reset the item ID at the start of renderEquippedItems. - * This prevents armor IDs from bleeding into cape/held items rendering. - */ - @Inject( + @WrapOperation( method = "renderEquippedItems(Lnet/minecraft/client/entity/AbstractClientPlayer;F)V", - at = @At("HEAD") + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/ModelBiped;renderCloak(F)V") ) - private void iris$resetInEquippedItems(AbstractClientPlayer player, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); + private void iris$setCapeItemId(ModelBiped modelBiped, float scale, Operation original) { + if (BlockRenderingSettings.INSTANCE.getItemIds() != null) { + assert BlockRenderingSettings.INSTANCE.getItemIds() != null; + int capeId = Objects.requireNonNull(BlockRenderingSettings.INSTANCE.getItemIds()).applyAsInt(PLAYER_CAPE); + CapturedRenderingState.INSTANCE.setCurrentRenderedItem(capeId); + } + + original.call(modelBiped, scale); + ItemIdManager.resetItemId(); } /** - * Set the item ID when rendering held items in third person. - * Wraps renderItem calls to set the ID based on the held item. + * Set item ID when rendering held items in third person. */ @WrapOperation( method = "renderEquippedItems(Lnet/minecraft/client/entity/AbstractClientPlayer;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;I)V") ) - private void iris$setHeldItemId(net.minecraft.client.renderer.ItemRenderer itemRenderer, net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation original) { - if (itemStack == null || itemStack.getItem() == null) { - original.call(itemRenderer, entity, itemStack, renderPass); - return; - } - - // Get material ID from item.properties or block.properties - int id = ItemMaterialHelper.getMaterialId(itemStack); - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); + private void iris$setHeldItemId(ItemRenderer itemRenderer, EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation original) { + ItemIdManager.setItemId(itemStack); original.call(itemRenderer, entity, itemStack, renderPass); - - // Reset after rendering the held item - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java index c76c41606..b93c340d5 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java @@ -5,6 +5,7 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; import net.coderbot.iris.layer.GbufferPrograms; import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.coderbot.iris.uniforms.ItemIdManager; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderDragon; import net.minecraft.client.renderer.entity.RenderEnderman; @@ -21,19 +22,22 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(RendererLivingEntity.class) public class MixinRendererLivingEntity { /** - * Reset currentRenderedItemId at the start of rendering each living entity, otherwise entity materials don't apply. + * Reset currentRenderedItemId at the start of rendering each living entity. */ @Inject( method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", at = @At("HEAD") ) private void iris$resetItemIdAtStart(EntityLivingBase entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { - CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); + ItemIdManager.resetItemId(); } + /** + * Capture entity color for shader access. + */ @WrapOperation( - method="doRender", - at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/entity/RendererLivingEntity;getColorMultiplier(Lnet/minecraft/entity/EntityLivingBase;FF)I") + method = "doRender", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RendererLivingEntity;getColorMultiplier(Lnet/minecraft/entity/EntityLivingBase;FF)I") ) private int iris$setEntityColor(RendererLivingEntity instance, EntityLivingBase elb, float f0, float f1, Operation original) { final int j = original.call(instance, elb, f0, f1); @@ -45,6 +49,9 @@ public class MixinRendererLivingEntity { return j; } + /** + * Handle special render conditions for entity eyes (spiders, endermen, ender dragon). + */ @WrapOperation( method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/ModelBase;render(Lnet/minecraft/entity/Entity;FFFFFF)V", ordinal = 0), @@ -64,28 +71,28 @@ public class MixinRendererLivingEntity { } /** - * Activate GLINT shader before rendering armor enchantment glint. - * Injects at the first glDepthFunc inside the armor glint rendering block. + * Activate GLINT shader before rendering enchantment glint on armor. */ @Inject( method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0), remap = false ) - private void iris$activateArmorGlintShader(EntityLivingBase entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + private void iris$glintStart(CallbackInfo ci) { + ItemIdManager.resetItemId(); GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT); } /** - * Deactivate GLINT shader after rendering armor enchantment glint. - * Injects at the last glDepthFunc inside the armor glint rendering block. + * Deactivate GLINT shader after rendering enchantment glint on armor. */ @Inject( method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER), remap = false ) - private void iris$deactivateArmorGlintShader(EntityLivingBase entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + private void iris$glintEnd(CallbackInfo ci) { GbufferPrograms.teardownSpecialRenderCondition(); } + } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/late/client/etfuturum/MixinLayerBetterElytra.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/late/client/etfuturum/MixinLayerBetterElytra.java new file mode 100644 index 000000000..25fd07707 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/late/client/etfuturum/MixinLayerBetterElytra.java @@ -0,0 +1,72 @@ +package com.gtnewhorizons.angelica.mixins.late.client.etfuturum; + +import ganymedes01.etfuturum.client.renderer.entity.elytra.LayerBetterElytra; +import net.coderbot.iris.block_rendering.BlockRenderingSettings; +import net.coderbot.iris.shaderpack.materialmap.NamespacedId; +import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.coderbot.iris.uniforms.ItemIdManager; +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.entity.EntityLivingBase; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.Objects; + +/** + * Sets a custom material ID for elytra when rendered with a cape texture. + * This allows shader developers to target elytra with capes using "minecraft:elytra_with_cape" + * in their item.properties files. + */ +@Mixin(value = LayerBetterElytra.class, remap = false) +public class MixinLayerBetterElytra { + + @Unique + private static final NamespacedId ELYTRA_WITH_CAPE = new NamespacedId("minecraft", "elytra_with_cape"); + @Unique + private static final NamespacedId ELYTRA = new NamespacedId("etfuturum", "elytra"); + @Unique + private static boolean iris$didSetId = false; + + /** + * Before rendering the elytra model, set the appropriate material ID based on whether + * the player has a cape or not. This allows shader developers to target both cases. + */ + @Inject( + method = "doRenderLayer", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glPushMatrix()V", ordinal = 0, shift = At.Shift.BEFORE), + remap = false + ) + private static void iris$setElytraId(EntityLivingBase entityIn, float limbSwing, float limbSwingAmount, + float partialTicks, float ageInTicks, float scale, CallbackInfo ci) { + iris$didSetId = false; + + if (entityIn instanceof AbstractClientPlayer player) { + if (BlockRenderingSettings.INSTANCE.getItemIds() != null) { + // Check if the player has a cape and set appropriate ID + NamespacedId elytraId = player.func_152122_n() ? ELYTRA_WITH_CAPE : ELYTRA; + int materialId = Objects.requireNonNull(BlockRenderingSettings.INSTANCE.getItemIds()).applyAsInt(elytraId); + CapturedRenderingState.INSTANCE.setCurrentRenderedItem(materialId); + iris$didSetId = true; + } + } + } + + /** + * After rendering the elytra, reset the material ID only if we set it. + */ + @Inject( + method = "doRenderLayer", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glPopAttrib()V", ordinal = 0, shift = At.Shift.AFTER), + remap = false + ) + private static void iris$resetElytraId(EntityLivingBase entityIn, float limbSwing, float limbSwingAmount, + float partialTicks, float ageInTicks, float scale, CallbackInfo ci) { + // Reset only if we set it + if (iris$didSetId) { + ItemIdManager.resetItemId(); + } + } +}