diff --git a/patches/minecraft/net/minecraft/client/gui/screens/Screen.java.patch b/patches/minecraft/net/minecraft/client/gui/screens/Screen.java.patch index 79dccfe7c6..c7679005d7 100644 --- a/patches/minecraft/net/minecraft/client/gui/screens/Screen.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/screens/Screen.java.patch @@ -103,15 +103,19 @@ int l = vector2ic.x(); int i1 = vector2ic.y(); p_263064_.m_85836_(); -@@ -307,6 +_,8 @@ +@@ -307,9 +_,10 @@ RenderSystem.m_157427_(GameRenderer::m_172811_); bufferbuilder.m_166779_(VertexFormat.Mode.QUADS, DefaultVertexFormat.f_85815_); Matrix4f matrix4f = p_263064_.m_85850_().m_252922_(); -+ // TODO 1.19.3: Tooltip rendering changed, rethink the color event. -+ // net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_263064_, k1, l1, preEvent.getFont(), p_262990_); - TooltipRenderUtil.m_262796_((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> { +- TooltipRenderUtil.m_262796_((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> { ++ net.minecraftforge.client.event.RenderTooltipEvent.Color colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, p_263064_, l, i1, preEvent.getFont(), p_262990_); ++ TooltipRenderUtil.renderTooltipBackground((p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_) -> { GuiComponent.m_93123_(p_262872_, p_262873_, p_262874_, p_262875_, p_262876_, p_262877_, p_262878_, p_262879_, p_262880_); - }, matrix4f, bufferbuilder, l, i1, i, j, 400); +- }, matrix4f, bufferbuilder, l, i1, i, j, 400); ++ }, matrix4f, bufferbuilder, l, i1, i, j, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd(), colorEvent.getBorderStart(), colorEvent.getBorderEnd()); + RenderSystem.m_69482_(); + RenderSystem.m_69478_(); + RenderSystem.m_69453_(); @@ -320,7 +_,7 @@ for(int l1 = 0; l1 < p_262990_.size(); ++l1) { diff --git a/patches/minecraft/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java.patch b/patches/minecraft/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java.patch new file mode 100644 index 0000000000..6c52084b57 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java.patch @@ -0,0 +1,49 @@ +--- a/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java ++++ b/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java +@@ -18,16 +_,21 @@ + private static final int f_262743_ = 1344798847; + + public static void m_262796_(TooltipRenderUtil.BlitPainter p_262929_, Matrix4f p_263052_, BufferBuilder p_263082_, int p_263046_, int p_263101_, int p_263024_, int p_262926_, int p_263038_) { ++ renderTooltipBackground(p_262929_, p_263052_, p_263082_, p_263046_, p_263101_, p_263024_, p_262926_, p_263038_, f_262744_, f_262744_, f_262725_, f_262743_); ++ } ++ ++ // Forge: Allow specifying colors for the inner border gradient and a gradient instead of a single color for the background and outer border ++ public static void renderTooltipBackground(TooltipRenderUtil.BlitPainter p_262929_, Matrix4f p_263052_, BufferBuilder p_263082_, int p_263046_, int p_263101_, int p_263024_, int p_262926_, int p_263038_, int backgroundTop, int backgroundBottom, int borderTop, int borderBottom) { + int i = p_263046_ - 3; + int j = p_263101_ - 3; + int k = p_263024_ + 3 + 3; + int l = p_262926_ + 3 + 3; +- m_262855_(p_262929_, p_263052_, p_263082_, i, j - 1, k, p_263038_, -267386864); +- m_262855_(p_262929_, p_263052_, p_263082_, i, j + l, k, p_263038_, -267386864); +- m_262805_(p_262929_, p_263052_, p_263082_, i, j, k, l, p_263038_, -267386864); +- m_262798_(p_262929_, p_263052_, p_263082_, i - 1, j, l, p_263038_, -267386864); +- m_262798_(p_262929_, p_263052_, p_263082_, i + k, j, l, p_263038_, -267386864); +- m_262846_(p_262929_, p_263052_, p_263082_, i, j + 1, k, l, p_263038_, 1347420415, 1344798847); ++ m_262855_(p_262929_, p_263052_, p_263082_, i, j - 1, k, p_263038_, backgroundTop); ++ m_262855_(p_262929_, p_263052_, p_263082_, i, j + l, k, p_263038_, backgroundBottom); ++ renderRectangle(p_262929_, p_263052_, p_263082_, i, j, k, l, p_263038_, backgroundTop, backgroundBottom); ++ m_262849_(p_262929_, p_263052_, p_263082_, i - 1, j, l, p_263038_, backgroundTop, backgroundBottom); ++ m_262849_(p_262929_, p_263052_, p_263082_, i + k, j, l, p_263038_, backgroundTop, backgroundBottom); ++ m_262846_(p_262929_, p_263052_, p_263082_, i, j + 1, k, l, p_263038_, borderTop, borderBottom); + } + + private static void m_262846_(TooltipRenderUtil.BlitPainter p_262974_, Matrix4f p_263030_, BufferBuilder p_263061_, int p_262982_, int p_262912_, int p_262946_, int p_263049_, int p_263118_, int p_263104_, int p_262979_) { +@@ -49,8 +_,17 @@ + p_262966_.m_262815_(p_263094_, p_262943_, p_262949_, p_263068_, p_262949_ + p_263111_, p_263068_ + 1, p_263095_, p_262918_, p_262918_); + } + ++ /** ++ * @deprecated Forge: Use gradient overload instead ++ */ ++ @Deprecated + private static void m_262805_(TooltipRenderUtil.BlitPainter p_262933_, Matrix4f p_263035_, BufferBuilder p_263084_, int p_262945_, int p_262955_, int p_263017_, int p_262978_, int p_262950_, int p_262931_) { +- p_262933_.m_262815_(p_263035_, p_263084_, p_262945_, p_262955_, p_262945_ + p_263017_, p_262955_ + p_262978_, p_262950_, p_262931_, p_262931_); ++ renderRectangle(p_262933_, p_263035_, p_263084_, p_262945_, p_262955_, p_263017_, p_262978_, p_262950_, p_262931_, p_262931_); ++ } ++ ++ // Forge: Allow specifying a gradient instead of a single color for the background ++ private static void renderRectangle(TooltipRenderUtil.BlitPainter p_262933_, Matrix4f p_263035_, BufferBuilder p_263084_, int p_262945_, int p_262955_, int p_263017_, int p_262978_, int p_262950_, int p_262931_, int colorTo) { ++ p_262933_.m_262815_(p_263035_, p_263084_, p_262945_, p_262955_, p_262945_ + p_263017_, p_262955_ + p_262978_, p_262950_, p_262931_, colorTo); + } + + @FunctionalInterface diff --git a/src/main/java/net/minecraftforge/client/event/RenderTooltipEvent.java b/src/main/java/net/minecraftforge/client/event/RenderTooltipEvent.java index 786e2f8740..8c3eb2f350 100644 --- a/src/main/java/net/minecraftforge/client/event/RenderTooltipEvent.java +++ b/src/main/java/net/minecraftforge/client/event/RenderTooltipEvent.java @@ -303,7 +303,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the gradient start color for the tooltip background} + * {@return the gradient start color for the tooltip background (top edge)} */ public int getBackgroundStart() { @@ -311,7 +311,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the gradient end color for the tooltip background} + * {@return the gradient end color for the tooltip background (bottom edge)} */ public int getBackgroundEnd() { @@ -331,7 +331,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * Sets the new start color for the gradient of the tooltip background. + * Sets the new start color for the gradient of the tooltip background (top edge). * * @param backgroundStart the new start color for the tooltip background */ @@ -341,7 +341,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * Sets the new end color for the gradient of the tooltip background. + * Sets the new end color for the gradient of the tooltip background (bottom edge). * * @param backgroundEnd the new end color for the tooltip background */ @@ -351,7 +351,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the gradient start color for the tooltip border} + * {@return the gradient start color for the tooltip border (top edge)} */ public int getBorderStart() { @@ -359,7 +359,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * Sets the new start color for the gradient of the tooltip border. + * Sets the new start color for the gradient of the tooltip border (top edge). * * @param borderStart the new start color for the tooltip border */ @@ -369,7 +369,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the gradient end color for the tooltip border} + * {@return the gradient end color for the tooltip border (bottom edge)} */ public int getBorderEnd() { @@ -377,7 +377,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * Sets the new end color for the gradient of the tooltip border. + * Sets the new end color for the gradient of the tooltip border (bottom edge). * * @param borderEnd the new end color for the tooltip border */ @@ -387,7 +387,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the original tooltip background's gradient start color} + * {@return the original tooltip background's gradient start color (top edge)} */ public int getOriginalBackgroundStart() { @@ -395,7 +395,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the original tooltip background's gradient end color} + * {@return the original tooltip background's gradient end color (bottom edge)} */ public int getOriginalBackgroundEnd() { @@ -403,7 +403,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the original tooltip border's gradient start color} + * {@return the original tooltip border's gradient start color (top edge)} */ public int getOriginalBorderStart() { @@ -411,7 +411,7 @@ public abstract class RenderTooltipEvent extends net.minecraftforge.eventbus.api } /** - * {@return the original tooltip border's gradient end color} + * {@return the original tooltip border's gradient end color (bottom edge)} */ public int getOriginalBorderEnd() { diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index b8a399bf1c..cc26321628 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -3,6 +3,8 @@ net/minecraft/advancements/Advancement$Builder.fromJson(Lcom/google/gson/JsonObj net/minecraft/client/Options.processOptionsForge(Lnet/minecraft/client/Options$FieldAccess;)V=|p_168428_ net/minecraft/client/gui/screens/MenuScreens.getScreenFactory(Lnet/minecraft/world/inventory/MenuType;Lnet/minecraft/client/Minecraft;ILnet/minecraft/network/chat/Component;)Ljava/util/Optional;=|p_96202_,p_96203_,p_96204_,p_96205_ net/minecraft/client/gui/screens/inventory/InventoryScreen.renderEntityInInventoryFollowsAngle(Lcom/mojang/blaze3d/vertex/PoseStack;IIIFFLnet/minecraft/world/entity/LivingEntity;)V=|p_275396_,p_275688_,p_275245_,p_275535_,angleXComponent,angleYComponent,p_275689_ +net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.renderRectangle(Lnet/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil$BlitPainter;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/BufferBuilder;IIIIIII)V=|p_262933_,p_263035_,p_263084_,p_262945_,p_262955_,p_263017_,p_262978_,p_262950_,p_262931_,colorTo +net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.renderTooltipBackground(Lnet/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil$BlitPainter;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/BufferBuilder;IIIIIIIII)V=|p_262929_,p_263052_,p_263082_,p_263046_,p_263101_,p_263024_,p_262926_,p_263038_,backgroundTop,backgroundBottom,borderTop,borderBottom net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.doLoadLevel(Lnet/minecraft/client/gui/screens/Screen;Ljava/lang/String;ZZZ)V=|p_233146_,p_233147_,p_233148_,p_233149_,confirmExperimentalWarning net/minecraft/client/renderer/ScreenEffectRenderer.getOverlayBlock(Lnet/minecraft/world/entity/player/Player;)Lorg/apache/commons/lang3/tuple/Pair;=|p_110717_ net/minecraft/client/renderer/ScreenEffectRenderer.renderFluid(Lnet/minecraft/client/Minecraft;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/resources/ResourceLocation;)V=|p_110726_,p_110727_,texture @@ -42,10 +44,10 @@ net/minecraft/data/tags/FluidTagsProvider.(Lnet/minecraft/data/PackOutput; net/minecraft/data/tags/GameEventTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_256060_,p_255621_,modId,existingFileHelper net/minecraft/data/tags/InstrumentTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_256418_,p_256038_,modId,existingFileHelper net/minecraft/data/tags/IntrinsicHolderTagsProvider$IntrinsicTagAppender.(Lnet/minecraft/tags/TagBuilder;Ljava/util/function/Function;Ljava/lang/String;)V=|p_256108_,p_256433_,modId -net/minecraft/data/tags/IntrinsicHolderTagsProvider.(Lnet/minecraft/data/PackOutput;Lnet/minecraft/resources/ResourceKey;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_256164_,p_256155_,p_256488_,p_256168_,modId,existingFileHelper net/minecraft/data/tags/IntrinsicHolderTagsProvider.(Lnet/minecraft/data/PackOutput;Lnet/minecraft/resources/ResourceKey;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_275304_,p_275709_,p_275227_,p_275311_,p_275566_,modId,existingFileHelper -net/minecraft/data/tags/ItemTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_275204_,p_275194_,p_275207_,p_275634_,modId,existingFileHelper +net/minecraft/data/tags/IntrinsicHolderTagsProvider.(Lnet/minecraft/data/PackOutput;Lnet/minecraft/resources/ResourceKey;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_256164_,p_256155_,p_256488_,p_256168_,modId,existingFileHelper net/minecraft/data/tags/ItemTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_275343_,p_275729_,p_275322_,modId,existingFileHelper +net/minecraft/data/tags/ItemTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_275204_,p_275194_,p_275207_,p_275634_,modId,existingFileHelper net/minecraft/data/tags/PaintingVariantTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_255750_,p_256184_,modId,existingFileHelper net/minecraft/data/tags/PoiTypeTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_256012_,p_256617_,modId,existingFileHelper net/minecraft/data/tags/StructureTagsProvider.(Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_256522_,p_256661_,modId,existingFileHelper