diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 2f8de55741..ef8224afb8 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -67,7 +67,7 @@
this.f_91064_ = new DebugRenderer(this);
this.f_238717_ = new RealmsDataFetcher(RealmsClient.m_239151_(this));
RenderSystem.m_69900_(this::m_91113_);
-@@ -541,6 +_,20 @@
+@@ -541,6 +_,21 @@
TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
}
@@ -84,6 +84,7 @@
+ net.minecraftforge.client.DimensionSpecialEffectsManager.init();
+ net.minecraftforge.client.NamedRenderTypeManager.init();
+ net.minecraftforge.client.ColorResolverManager.init();
++ net.minecraftforge.client.ItemDecoratorHandler.init();
+
this.f_90990_.m_85409_(this.f_91066_.m_231817_().m_231551_());
this.f_90990_.m_85424_(this.f_91066_.m_232123_().m_231551_());
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch
index 24693e7c54..ad44e9fc08 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch
@@ -60,6 +60,14 @@
crashreportcategory.m_128165_("Item Damage", () -> {
return String.valueOf(p_174237_.m_41773_());
});
+@@ -362,6 +_,7 @@
+ RenderSystem.m_69482_();
+ }
+
++ net.minecraftforge.client.ItemDecoratorHandler.of(p_115176_).render(p_115175_, p_115176_, p_115177_, p_115178_, f_115093_);
+ }
+ }
+
@@ -377,5 +_,9 @@
public void m_6213_(ResourceManager p_115105_) {
diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
old mode 100755
new mode 100644
diff --git a/src/main/java/net/minecraftforge/client/IItemDecorator.java b/src/main/java/net/minecraftforge/client/IItemDecorator.java
new file mode 100644
index 0000000000..2f789bd9f3
--- /dev/null
+++ b/src/main/java/net/minecraftforge/client/IItemDecorator.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.client;
+
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
+import net.minecraftforge.client.event.RegisterItemDecorationsEvent;
+
+/**
+ * An ItemDecorator that is used to render something on specific items, when the DurabilityBar and StackCount is rendered.
+ * Add it to an item using {@linkplain RegisterItemDecorationsEvent#register(ItemLike, IItemDecorator)}.
+ */
+public interface IItemDecorator
+{
+
+ /**
+ * Is called after {@linkplain ItemRenderer#renderGuiItemDecorations(Font, ItemStack, int, int, String)} is done rendering.
+ * The StackCount is rendered at blitOffset+200 so use the blitOffset with caution.
+ *
+ * The RenderState during this call will be: enableTexture, enableDepthTest, enableBlend and defaultBlendFunc
+ * @return true if you have modified the RenderState and it has to be reset for other ItemDecorators
+ */
+ boolean render(Font font, ItemStack stack, int xOffset, int yOffset, float blitOffset);
+}
diff --git a/src/main/java/net/minecraftforge/client/ItemDecoratorHandler.java b/src/main/java/net/minecraftforge/client/ItemDecoratorHandler.java
new file mode 100644
index 0000000000..4c1410ae60
--- /dev/null
+++ b/src/main/java/net/minecraftforge/client/ItemDecoratorHandler.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.client;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.mojang.blaze3d.systems.RenderSystem;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.minecraft.client.gui.Font;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.client.event.RegisterItemDecorationsEvent;
+import net.minecraftforge.fml.ModLoader;
+import net.minecraftforge.fml.ModLoadingContext;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@ApiStatus.Internal
+public final class ItemDecoratorHandler
+{
+ private final List itemDecorators;
+
+ private static Map- DECORATOR_LOOKUP = ImmutableMap.of();
+
+ private static final ItemDecoratorHandler EMPTY = new ItemDecoratorHandler();
+ private ItemDecoratorHandler()
+ {
+ this.itemDecorators = ImmutableList.of();
+ }
+ private ItemDecoratorHandler(List itemDecorators)
+ {
+ this.itemDecorators = ImmutableList.copyOf(itemDecorators);
+ }
+
+ public static void init()
+ {
+ var decorators = new HashMap
- >();
+ var event = new RegisterItemDecorationsEvent(decorators);
+ ModLoader.get().postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
+ var builder = new ImmutableMap.Builder
- ();
+ decorators.forEach((item, itemDecorators) -> builder.put(item, new ItemDecoratorHandler(itemDecorators)));
+ DECORATOR_LOOKUP = builder.build();
+ }
+
+ public static ItemDecoratorHandler of(ItemStack stack)
+ {
+ return DECORATOR_LOOKUP.getOrDefault(stack.getItem(), EMPTY);
+ }
+
+ public void render(Font font, ItemStack stack, int xOffset, int yOffset, float blitOffset)
+ {
+ resetRenderState();
+ for (IItemDecorator itemDecorator : itemDecorators)
+ {
+ if (itemDecorator.render(font, stack, xOffset, yOffset, blitOffset))
+ resetRenderState();
+ }
+ }
+
+ private void resetRenderState()
+ {
+ RenderSystem.enableTexture();
+ RenderSystem.enableDepthTest();
+ RenderSystem.enableBlend();
+ RenderSystem.defaultBlendFunc();
+ }
+}
diff --git a/src/main/java/net/minecraftforge/client/event/RegisterItemDecorationsEvent.java b/src/main/java/net/minecraftforge/client/event/RegisterItemDecorationsEvent.java
new file mode 100644
index 0000000000..3c652191a0
--- /dev/null
+++ b/src/main/java/net/minecraftforge/client/event/RegisterItemDecorationsEvent.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+package net.minecraftforge.client.event;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.ItemLike;
+import net.minecraftforge.client.IItemDecorator;
+
+import net.minecraftforge.eventbus.api.Cancelable;
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.LogicalSide;
+import net.minecraftforge.fml.event.IModBusEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Allows users to register custom {@linkplain IItemDecorator IItemDecorator} to Items.
+ *
+ *
This event is not {@linkplain Cancelable cancelable}, and does not {@linkplain HasResult have a result}.
+ *
+ *
This event is fired on the {@linkplain FMLJavaModLoadingContext#getModEventBus() mod-specific event bus},
+ * only on the {@linkplain LogicalSide#CLIENT logical client}.
+ */
+public class RegisterItemDecorationsEvent extends Event implements IModBusEvent
+{
+
+ private final Map- > decorators;
+
+ @ApiStatus.Internal
+ public RegisterItemDecorationsEvent(Map
- > decorators)
+ {
+ this.decorators = decorators;
+ }
+
+ /**
+ * Register an ItemDecorator to an Item
+ */
+ public void register(ItemLike itemLike, IItemDecorator decorator)
+ {
+ List itemDecoratorList = decorators.computeIfAbsent(itemLike.asItem(), item -> new ArrayList<>());
+ itemDecoratorList.add(decorator);
+ }
+}
diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/CustomItemDecorationsTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/CustomItemDecorationsTest.java
new file mode 100644
index 0000000000..b4d9a6b1a7
--- /dev/null
+++ b/src/test/java/net/minecraftforge/debug/client/rendering/CustomItemDecorationsTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.debug.client.rendering;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.BufferUploader;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.util.Mth;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.IItemDecorator;
+import net.minecraftforge.client.ItemDecoratorHandler;
+import net.minecraftforge.client.event.RegisterItemDecorationsEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.registries.ForgeRegistries;
+
+@Mod(CustomItemDecorationsTest.MOD_ID)
+public class CustomItemDecorationsTest
+{
+ public static final String MOD_ID = "custom_item_decorations_test";
+ private static final boolean ENABLED = true;
+
+ public CustomItemDecorationsTest() { }
+
+ @Mod.EventBusSubscriber(modid = CustomItemDecorationsTest.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+ public static class ClientEvents
+ {
+ @SubscribeEvent
+ public static void onRegisterItemDecorations(final RegisterItemDecorationsEvent event)
+ {
+ if (ENABLED)
+ event.register(Items.EGG, new StackSizeDurabilityBar());
+ }
+ }
+
+ private static class StackSizeDurabilityBar implements IItemDecorator
+ {
+
+ @Override
+ public boolean render(Font font, ItemStack stack, int xOffset, int yOffset, float blitOffset)
+ {
+ RenderSystem.disableTexture();
+ RenderSystem.disableBlend();
+ Tesselator tesselator = Tesselator.getInstance();
+ BufferBuilder bufferbuilder = tesselator.getBuilder();
+ float f = Math.max(0.0F, (stack.getMaxStackSize() - (float)stack.getCount()) / stack.getMaxStackSize());
+ int i = Math.round(13.0F - (float)stack.getCount() * 13.0F / stack.getMaxStackSize());
+ int j = Mth.hsvToRgb(f / 3.0F,1f,1f);
+ fillRect(bufferbuilder, xOffset + 2, yOffset, blitOffset + 189, 13, 2, 0, 0, 0);
+ fillRect(bufferbuilder, xOffset + 2, yOffset, blitOffset + 190, i, 1, j >> 16 & 255, j >> 8 & 255, j & 255);
+ RenderSystem.enableBlend();
+ RenderSystem.enableTexture();
+ return true;
+ }
+
+ private static void fillRect(BufferBuilder pRenderer, int pX, int pY, float pZ, int pWidth, int pHeight, int pRed, int pGreen, int pBlue)
+ {
+ RenderSystem.setShader(GameRenderer::getPositionColorShader);
+ pRenderer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+ pRenderer.vertex(pX, pY, pZ).color(pRed, pGreen, pBlue, 255).endVertex();
+ pRenderer.vertex(pX, pY + pHeight, pZ).color(pRed, pGreen, pBlue, 255).endVertex();
+ pRenderer.vertex(pX + pWidth, pY + pHeight, pZ).color(pRed, pGreen, pBlue, 255).endVertex();
+ pRenderer.vertex(pX + pWidth, pY, pZ).color(pRed, pGreen, pBlue, 255).endVertex();
+ BufferUploader.drawWithShader(pRenderer.end());
+ }
+ }
+}