From add938780f46451d081744022c8a03bcdfe4544f Mon Sep 17 00:00:00 2001 From: alexbegt Date: Wed, 7 Apr 2021 18:54:49 -0400 Subject: [PATCH] Add support for non default colors to the text rendering for the book. --- .../mantle/client/book/data/element/TextData.java | 2 ++ .../mantle/client/screen/book/TextDataRenderer.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java b/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java index 4617d8c..29c08b9 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java @@ -11,6 +11,8 @@ public class TextData { public String text; public String color = "black"; + public int rgbColor = 0; + public boolean useOldColor = true; public boolean bold = false; public boolean italic = false; public boolean underlined = false; diff --git a/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java b/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java index bad1e03..03e24f2 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java @@ -73,7 +73,9 @@ public class TextDataRenderer { String modifiers = ""; - modifiers += TextFormatting.getValueByName(item.color); + if(item.useOldColor) { + modifiers += TextFormatting.getValueByName(item.color); + } if (item.bold) { modifiers += TextFormatting.BOLD; @@ -107,7 +109,7 @@ public class TextDataRenderer { } String s = split[i]; - drawScaledString(matrixStack, fr, modifiers + s, atX, atY, 0, item.dropshadow, item.scale); + drawScaledString(matrixStack, fr, modifiers + s, atX, atY, item.rgbColor, item.dropshadow, item.scale); if (i < split.length - 1) { atY += fr.FONT_HEIGHT;