mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-10-25 20:22:33 +00:00
Implement ColorUtils class to NEI handler (#143)
This commit is contained in:
1 parent
9d1709dd74
commit
0e88bd8a9c
4 files changed
+32
-7
No files matched your search
+1
-1
@@ -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}
|
||||
|
||||
+7
-4
@@ -26,6 +26,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
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 class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {
|
||||
EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal(recipeObj.entry.getUnlocalizedName()),
|
||||
82,
|
||||
30,
|
||||
0x404040,
|
||||
LibColorUtils.neiHandlerBotaniaLexicaTitle.getColor(),
|
||||
false);
|
||||
|
||||
KnowledgeType type = recipeObj.entry.getKnowledgeType();
|
||||
@@ -97,7 +98,7 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {
|
||||
type.color + StatCollector.translateToLocal(type.getUnlocalizedName()).replaceAll("&[0-9a-fklmnor]", ""),
|
||||
82,
|
||||
42,
|
||||
0x404040,
|
||||
LibColorUtils.neiHandlerBotaniaLexicaKnowledge.getColor(),
|
||||
false);
|
||||
|
||||
PageText.renderText(
|
||||
@@ -105,6 +106,8 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {
|
||||
42,
|
||||
160,
|
||||
200,
|
||||
10,
|
||||
LibColorUtils.neiHandlerBotaniaLexicaTagline.getColor(),
|
||||
"\"" + StatCollector.translateToLocal(recipeObj.entry.getTagline()) + "\"");
|
||||
|
||||
String key = LexiconRecipeMappings.stackToString(recipeObj.item.item);
|
||||
@@ -121,12 +124,12 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {
|
||||
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
|
||||
|
||||
@@ -47,8 +47,12 @@ public class PageText extends LexiconPage {
|
||||
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 class PageText extends LexiconPage {
|
||||
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)) {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
Reference in new issue
Block a user