Adjust text colors to be more consistent with other tooltips

Swedz · Swedz · commit 6cda56001fc2 · 2024-11-27T10:44:48.000-05:00
diff --git a/src/client/java/aztech/modern_industrialization/items/client/ClientStructureMemberBlockTooltip.java b/src/client/java/aztech/modern_industrialization/items/client/ClientStructureMemberBlockTooltip.java
@@ -44,6 +44,7 @@
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.util.FormattedCharSequence;
@@ -67,20 +68,22 @@ public ClientStructureMemberBlockTooltip(StructureMultiblockMemberBlockItem.Tool
 
         StructureMemberMode mode = data.mode();
 
-        lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipMode.text(mode.text())));
+        lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipMode.text(mode.text().withStyle(MITooltips.HIGHLIGHT_STYLE))
+                .withStyle(MITooltips.DEFAULT_STYLE)));
 
         if (mode == StructureMemberMode.VARIABLE) {
             String name = data.name();
             if (name != null && !name.isEmpty()) {
-                lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipVariableName.text(name)));
+                lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipVariableName
+                        .text(Component.literal(name).withStyle(MITooltips.HIGHLIGHT_STYLE)).withStyle(MITooltips.DEFAULT_STYLE)));
             }
         }
 
         if (mode == StructureMemberMode.SIMPLE || mode == StructureMemberMode.HATCH) {
             BlockState preview = data.preview();
             if (preview != null && !preview.isAir()) {
                 ItemStack previewStack = preview.getBlock().asItem().getDefaultInstance();
-                lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipPreview.text().append(" "),
+                lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipPreview.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),
                         List.of(new IconsLine.StackEntry(previewStack)), 6));
             }
 
@@ -105,14 +108,16 @@ public ClientStructureMemberBlockTooltip(StructureMultiblockMemberBlockItem.Tool
                 }
             }
             if (!members.isEmpty()) {
-                lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipMembers.text().append(" "), members, 6));
+                lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipMembers.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),
+                        members, 6));
             }
         }
 
         if (mode == StructureMemberMode.HATCH) {
             MachineCasing casing = data.casing();
             if (casing != null) {
-                lines.add(new MachineCasingLine(MIText.StructureMultiblockMemberTooltipCasing.text().append(" "), casing));
+                lines.add(new MachineCasingLine(MIText.StructureMultiblockMemberTooltipCasing.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),
+                        casing));
             }
 
             HatchFlags hatchFlags = data.hatchFlags();
@@ -123,7 +128,8 @@ public ClientStructureMemberBlockTooltip(StructureMultiblockMemberBlockItem.Tool
                         hatches.add(new IconsLine.HatchEntry(hatchType));
                     }
                 }
-                lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipHatches.text().append(" "), hatches, 9));
+                lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipHatches.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),
+                        hatches, 9));
             }
         }
     }
@@ -180,16 +186,16 @@ default void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSou
         }
     }
 
-    private record ComponentLine(@Nullable Component label, Component text) implements Line {
-        public ComponentLine(Component text) {
+    private record ComponentLine(@Nullable MutableComponent label, MutableComponent text) implements Line {
+        public ComponentLine(MutableComponent text) {
             this(null, text);
         }
 
         // 200 is the max width used by most tooltips
         private static final int MAX_WIDTH = 200;
 
         private Component fullText() {
-            return label == null ? text : label.copy().append(text);
+            return label == null ? text : label.append(text);
         }
 
         private int labelWidth(Font font) {
@@ -221,7 +227,7 @@ public void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSour
         }
     }
 
-    private record IconsLine(Component label, List<Entry> entries, int maxToDisplay) implements Line {
+    private record IconsLine(MutableComponent label, List<Entry> entries, int maxToDisplay) implements Line {
 
         @Override
         public int height(Font font) {
@@ -250,7 +256,7 @@ public void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSour
             font.drawInBatch(label, x, y + 5, -1, true, matrix, buffer, Font.DisplayMode.NORMAL, 0, 0xF000F0);
 
             if (entries.size() > maxToDisplay) {
-                font.drawInBatch(Component.literal("+ ...").withStyle(MITooltips.DEFAULT_STYLE), x + (18 * maxToDisplay) + 2 + font.width(label),
+                font.drawInBatch(Component.literal("+ ...").withStyle(MITooltips.HIGHLIGHT_STYLE), x + (18 * maxToDisplay) + 2 + font.width(label),
                         y + 5, -1,
                         true, matrix, buffer,
                         Font.DisplayMode.NORMAL, 0, 0xF000F0);
@@ -283,7 +289,7 @@ public void renderImage(Font font, int x, int y, GuiGraphics graphics) {
 
                 graphics.pose().pushPose();
                 graphics.pose().translate(0, 0, 200);
-                graphics.drawString(font, Component.literal("#").withStyle(MITooltips.DEFAULT_STYLE), x, y, 0xFFFFFF, true);
+                graphics.drawString(font, Component.literal("#").withStyle(MITooltips.HIGHLIGHT_STYLE), x, y, 0xFFFFFF, true);
                 graphics.pose().popPose();
             }
         }
@@ -317,8 +323,8 @@ public void renderImage(Font font, int x, int y, GuiGraphics graphics) {
         public void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSource.BufferSource buffer) {
             font.drawInBatch(label, x, y + 5, -1, true, matrix, buffer, Font.DisplayMode.NORMAL, 0, 0xF000F0);
 
-            font.drawInBatch(casing.getDisplayName().copy().withStyle(MITooltips.DEFAULT_STYLE), x + font.width(label) + 20, y + 5, -1, true, matrix, buffer, Font.DisplayMode.NORMAL, 0,
-                    0xF000F0);
+            font.drawInBatch(casing.getDisplayName().withStyle(MITooltips.HIGHLIGHT_STYLE), x + font.width(label) + 20, y + 5, -1, true, matrix,
+                    buffer, Font.DisplayMode.NORMAL, 0, 0xF000F0);
         }
     }
 }
diff --git a/src/main/java/aztech/modern_industrialization/blocks/structure/member/StructureMemberMode.java b/src/main/java/aztech/modern_industrialization/blocks/structure/member/StructureMemberMode.java
@@ -25,7 +25,7 @@
 
 import aztech.modern_industrialization.MIText;
 import java.util.Locale;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.util.StringRepresentable;
 
 public enum StructureMemberMode implements StringRepresentable {
@@ -40,11 +40,11 @@ public enum StructureMemberMode implements StringRepresentable {
         this.text = text;
     }
 
-    public Component textInfo() {
+    public MutableComponent textInfo() {
         return textInfo.text();
     }
 
-    public Component text() {
+    public MutableComponent text() {
         return text.text();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`import net.minecraft.client.renderer.MultiBufferSource;`
`45`	`45`	`import net.minecraft.core.registries.BuiltInRegistries;`
`46`	`46`	`import net.minecraft.network.chat.Component;`
	`47`	`+import net.minecraft.network.chat.MutableComponent;`
`47`	`48`	`import net.minecraft.resources.ResourceLocation;`
`48`	`49`	`import net.minecraft.tags.TagKey;`
`49`	`50`	`import net.minecraft.util.FormattedCharSequence;`
`@@ -67,20 +68,22 @@ public ClientStructureMemberBlockTooltip(StructureMultiblockMemberBlockItem.Tool`
`67`	`68`
`68`	`69`	`StructureMemberMode mode = data.mode();`
`69`	`70`
`70`		`- lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipMode.text(mode.text())));`
	`71`	`+ lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipMode.text(mode.text().withStyle(MITooltips.HIGHLIGHT_STYLE))`
	`72`	`+ .withStyle(MITooltips.DEFAULT_STYLE)));`
`71`	`73`
`72`	`74`	`if (mode == StructureMemberMode.VARIABLE) {`
`73`	`75`	`String name = data.name();`
`74`	`76`	`if (name != null && !name.isEmpty()) {`
`75`		`- lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipVariableName.text(name)));`
	`77`	`+ lines.add(new ComponentLine(MIText.StructureMultiblockMemberTooltipVariableName`
	`78`	`+ .text(Component.literal(name).withStyle(MITooltips.HIGHLIGHT_STYLE)).withStyle(MITooltips.DEFAULT_STYLE)));`
`76`	`79`	`}`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`if (mode == StructureMemberMode.SIMPLE \|\| mode == StructureMemberMode.HATCH) {`
`80`	`83`	`BlockState preview = data.preview();`
`81`	`84`	`if (preview != null && !preview.isAir()) {`
`82`	`85`	`ItemStack previewStack = preview.getBlock().asItem().getDefaultInstance();`
`83`		`- lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipPreview.text().append(" "),`
	`86`	`+ lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipPreview.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),`
`84`	`87`	`List.of(new IconsLine.StackEntry(previewStack)), 6));`
`85`	`88`	`}`
`86`	`89`
`@@ -105,14 +108,16 @@ public ClientStructureMemberBlockTooltip(StructureMultiblockMemberBlockItem.Tool`
`105`	`108`	`}`
`106`	`109`	`}`
`107`	`110`	`if (!members.isEmpty()) {`
`108`		`- lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipMembers.text().append(" "), members, 6));`
	`111`	`+ lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipMembers.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),`
	`112`	`+ members, 6));`
`109`	`113`	`}`
`110`	`114`	`}`
`111`	`115`
`112`	`116`	`if (mode == StructureMemberMode.HATCH) {`
`113`	`117`	`MachineCasing casing = data.casing();`
`114`	`118`	`if (casing != null) {`
`115`		`- lines.add(new MachineCasingLine(MIText.StructureMultiblockMemberTooltipCasing.text().append(" "), casing));`
	`119`	`+ lines.add(new MachineCasingLine(MIText.StructureMultiblockMemberTooltipCasing.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),`
	`120`	`+ casing));`
`116`	`121`	`}`
`117`	`122`
`118`	`123`	`HatchFlags hatchFlags = data.hatchFlags();`
`@@ -123,7 +128,8 @@ public ClientStructureMemberBlockTooltip(StructureMultiblockMemberBlockItem.Tool`
`123`	`128`	`hatches.add(new IconsLine.HatchEntry(hatchType));`
`124`	`129`	`}`
`125`	`130`	`}`
`126`		`- lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipHatches.text().append(" "), hatches, 9));`
	`131`	`+ lines.add(new IconsLine(MIText.StructureMultiblockMemberTooltipHatches.text().append(" ").withStyle(MITooltips.DEFAULT_STYLE),`
	`132`	`+ hatches, 9));`
`127`	`133`	`}`
`128`	`134`	`}`
`129`	`135`	`}`
`@@ -180,16 +186,16 @@ default void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSou`
`180`	`186`	`}`
`181`	`187`	`}`
`182`	`188`
`183`		`- private record ComponentLine(@Nullable Component label, Component text) implements Line {`
`184`		`- public ComponentLine(Component text) {`
	`189`	`+ private record ComponentLine(@Nullable MutableComponent label, MutableComponent text) implements Line {`
	`190`	`+ public ComponentLine(MutableComponent text) {`
`185`	`191`	`this(null, text);`
`186`	`192`	`}`
`187`	`193`
`188`	`194`	`// 200 is the max width used by most tooltips`
`189`	`195`	`private static final int MAX_WIDTH = 200;`
`190`	`196`
`191`	`197`	`private Component fullText() {`
`192`		`- return label == null ? text : label.copy().append(text);`
	`198`	`+ return label == null ? text : label.append(text);`
`193`	`199`	`}`
`194`	`200`
`195`	`201`	`private int labelWidth(Font font) {`
`@@ -221,7 +227,7 @@ public void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSour`
`221`	`227`	`}`
`222`	`228`	`}`
`223`	`229`
`224`		`- private record IconsLine(Component label, List<Entry> entries, int maxToDisplay) implements Line {`
	`230`	`+ private record IconsLine(MutableComponent label, List<Entry> entries, int maxToDisplay) implements Line {`
`225`	`231`
`226`	`232`	`@Override`
`227`	`233`	`public int height(Font font) {`
`@@ -250,7 +256,7 @@ public void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSour`
`250`	`256`	`font.drawInBatch(label, x, y + 5, -1, true, matrix, buffer, Font.DisplayMode.NORMAL, 0, 0xF000F0);`
`251`	`257`
`252`	`258`	`if (entries.size() > maxToDisplay) {`
`253`		`- font.drawInBatch(Component.literal("+ ...").withStyle(MITooltips.DEFAULT_STYLE), x + (18 * maxToDisplay) + 2 + font.width(label),`
	`259`	`+ font.drawInBatch(Component.literal("+ ...").withStyle(MITooltips.HIGHLIGHT_STYLE), x + (18 * maxToDisplay) + 2 + font.width(label),`
`254`	`260`	`y + 5, -1,`
`255`	`261`	`true, matrix, buffer,`
`256`	`262`	`Font.DisplayMode.NORMAL, 0, 0xF000F0);`
`@@ -283,7 +289,7 @@ public void renderImage(Font font, int x, int y, GuiGraphics graphics) {`
`283`	`289`
`284`	`290`	`graphics.pose().pushPose();`
`285`	`291`	`graphics.pose().translate(0, 0, 200);`
`286`		`- graphics.drawString(font, Component.literal("#").withStyle(MITooltips.DEFAULT_STYLE), x, y, 0xFFFFFF, true);`
	`292`	`+ graphics.drawString(font, Component.literal("#").withStyle(MITooltips.HIGHLIGHT_STYLE), x, y, 0xFFFFFF, true);`
`287`	`293`	`graphics.pose().popPose();`
`288`	`294`	`}`
`289`	`295`	`}`
`@@ -317,8 +323,8 @@ public void renderImage(Font font, int x, int y, GuiGraphics graphics) {`
`317`	`323`	`public void renderText(Font font, int x, int y, Matrix4f matrix, MultiBufferSource.BufferSource buffer) {`
`318`	`324`	`font.drawInBatch(label, x, y + 5, -1, true, matrix, buffer, Font.DisplayMode.NORMAL, 0, 0xF000F0);`
`319`	`325`
`320`		`- font.drawInBatch(casing.getDisplayName().copy().withStyle(MITooltips.DEFAULT_STYLE), x + font.width(label) + 20, y + 5, -1, true, matrix, buffer, Font.DisplayMode.NORMAL, 0,`
`321`		`- 0xF000F0);`
	`326`	`+ font.drawInBatch(casing.getDisplayName().withStyle(MITooltips.HIGHLIGHT_STYLE), x + font.width(label) + 20, y + 5, -1, true, matrix,`
	`327`	`+ buffer, Font.DisplayMode.NORMAL, 0, 0xF000F0);`
`322`	`328`	`}`
`323`	`329`	`}`
`324`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`import aztech.modern_industrialization.MIText;`
`27`	`27`	`import java.util.Locale;`
`28`		`-import net.minecraft.network.chat.Component;`
	`28`	`+import net.minecraft.network.chat.MutableComponent;`
`29`	`29`	`import net.minecraft.util.StringRepresentable;`
`30`	`30`
`31`	`31`	`public enum StructureMemberMode implements StringRepresentable {`
`@@ -40,11 +40,11 @@ public enum StructureMemberMode implements StringRepresentable {`
`40`	`40`	`this.text = text;`
`41`	`41`	`}`
`42`	`42`
`43`		`- public Component textInfo() {`
	`43`	`+ public MutableComponent textInfo() {`
`44`	`44`	`return textInfo.text();`
`45`	`45`	`}`
`46`	`46`
`47`		`- public Component text() {`
	`47`	`+ public MutableComponent text() {`
`48`	`48`	`return text.text();`
`49`	`49`	`}`
`50`	`50`