diff --git a/dependencies.gradle b/dependencies.gradle index 05da65e791..7038a44dfe 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:Baubles-Expanded:2.2.14-GTNH:dev') - api('com.github.GTNewHorizons:GTNHLib:0.9.62:dev') + api('com.github.GTNewHorizons:GTNHLib:0.11.30:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.60:api') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.10:dev') {transitive=false} diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java index c744edf5c2..0795943a99 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java @@ -26,6 +26,7 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.integration.nei.NEIHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibColorUtils; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; import codechicken.lib.gui.GuiDraw; @@ -89,7 +90,7 @@ public void drawBackground(int recipe) { EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal(recipeObj.entry.getUnlocalizedName()), 82, 30, - 0x404040, + LibColorUtils.neiHandlerBotaniaLexicaTitle.getColor(), false); KnowledgeType type = recipeObj.entry.getKnowledgeType(); @@ -97,7 +98,7 @@ public void drawBackground(int recipe) { type.color + StatCollector.translateToLocal(type.getUnlocalizedName()).replaceAll("&[0-9a-fklmnor]", ""), 82, 42, - 0x404040, + LibColorUtils.neiHandlerBotaniaLexicaKnowledge.getColor(), false); PageText.renderText( @@ -105,6 +106,8 @@ public void drawBackground(int recipe) { 42, 160, 200, + 10, + LibColorUtils.neiHandlerBotaniaLexicaTagline.getColor(), "\"" + StatCollector.translateToLocal(recipeObj.entry.getTagline()) + "\""); String key = LexiconRecipeMappings.stackToString(recipeObj.item.item); @@ -121,12 +124,12 @@ else if (quickInfo.equals(quickInfoLocal)) StatCollector.translateToLocal("botania.nei.lexicaSeparator"), 82, 80, - 0x404040, + LibColorUtils.neiHandlerBotaniaLexicaExtraInfo.getColor(), false); s = quickInfoLocal; } - PageText.renderText(5, 80, 160, 200, s); + PageText.renderText(5, 80, 160, 200, 10, LibColorUtils.neiHandlerBotaniaLexicaExtraInfoDesc.getColor(), s); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 71211f7538..3efe573923 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -47,8 +47,12 @@ public static void renderText(int x, int y, int width, int height, String unloca renderText(x, y, width, height, 10, unlocalizedText); } - @SideOnly(Side.CLIENT) public static void renderText(int x, int y, int width, int height, int paragraphSize, String unlocalizedText) { + renderText(x, y, width, height, paragraphSize, 0, unlocalizedText); + } + + @SideOnly(Side.CLIENT) + public static void renderText(int x, int y, int width, int height, int paragraphSize, int color, String unlocalizedText) { y += 10; width -= 4; @@ -132,7 +136,7 @@ public static void renderText(int x, int y, int width, int height, int paragraph String tok = words.get(idx); int tw = font.getStringWidth(tok); - font.drawString(tok, xi, y, 0); + font.drawString(tok, xi, y, color); xi += tw; if (justify && gi < gapIds.size() && idx == gapIds.get(gi)) { diff --git a/src/main/java/vazkii/botania/common/lib/LibColorUtils.java b/src/main/java/vazkii/botania/common/lib/LibColorUtils.java new file mode 100644 index 0000000000..a26543524f --- /dev/null +++ b/src/main/java/vazkii/botania/common/lib/LibColorUtils.java @@ -0,0 +1,18 @@ +package vazkii.botania.common.lib; + +import com.gtnewhorizon.gtnhlib.color.ColorResource; + + +public class LibColorUtils { + + private static final ColorResource.Factory color = new ColorResource.Factory("botania"); + + public static final ColorResource + // spotless:off + neiHandlerBotaniaLexicaTitle = color.rgb("neiHandlerBotaniaLexicaTitle", "0x404040"), + neiHandlerBotaniaLexicaKnowledge = color.rgb("neiHandlerBotaniaLexicaKnowledge", "0x404040"), + neiHandlerBotaniaLexicaTagline = color.rgb("neiHandlerBotaniaLexicaTagline", "0x404040"), + neiHandlerBotaniaLexicaExtraInfo = color.rgb("neiHandlerBotaniaLexicaExtraInfo", "0x404040"), + neiHandlerBotaniaLexicaExtraInfoDesc = color.rgb("neiHandlerBotaniaLexicaExtraInfoDesc", "0x404040"); + // spotless:on +} \ No newline at end of file