diff --git a/dependencies.gradle b/dependencies.gradle index 1edfa354..05077c75 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:ForestryMC:4.11.28:dev') - implementation('com.github.GTNewHorizons:GTNHLib:0.11.19:dev') + implementation('com.github.GTNewHorizons:GTNHLib:0.11.30:dev') devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.105-GTNH:dev') diff --git a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java index 0ac6c527..306f5f9d 100644 --- a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java @@ -11,6 +11,7 @@ import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerumArray; +import binnie.genetics.nei.helper.ColorUtils; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; @@ -60,7 +61,7 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { StatCollector.translateToLocalFormatted("genetics.nei.tip.databaseDesc"), 140); for (int i = 0; i < desc.size(); i++) { - GuiDraw.drawStringC(desc.get(i), 88, 44 + 12 * (i - 1), 0xFFFFFF); + GuiDraw.drawStringC(desc.get(i), 88, 44 + 12 * (i - 1), ColorUtils.neiDisplayText.getColor()); } } diff --git a/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java index b656fd8a..e75b6764 100644 --- a/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java @@ -13,6 +13,7 @@ import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.api.IIncubatorRecipe; import binnie.genetics.machine.incubator.Incubator; +import binnie.genetics.nei.helper.ColorUtils; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; @@ -48,8 +49,16 @@ public class IncubatorRecipeHandler extends RecipeHandlerBase { @Override public void drawExtras(int recipe) { this.drawProgressBar(75, 27, 176, 0, 24, 17, 40, 0); - GuiDraw.drawStringC(StatCollector.translateToLocal("genetics.nei.tip.loss"), 62, 5, 0xFFFFFF); - GuiDraw.drawStringC(((CachedIncubatorRecipe) arecipes.get(recipe)).lossChance, 62, 15, 0xFFFFFF); + GuiDraw.drawStringC( + StatCollector.translateToLocal("genetics.nei.tip.loss"), + 62, + 5, + ColorUtils.neiDisplayText.getColor()); + GuiDraw.drawStringC( + ((CachedIncubatorRecipe) arecipes.get(recipe)).lossChance, + 62, + 15, + ColorUtils.neiDisplayText.getColor()); } @Override diff --git a/src/main/java/binnie/genetics/nei/helper/ColorUtils.java b/src/main/java/binnie/genetics/nei/helper/ColorUtils.java new file mode 100644 index 00000000..d0b78598 --- /dev/null +++ b/src/main/java/binnie/genetics/nei/helper/ColorUtils.java @@ -0,0 +1,13 @@ +package binnie.genetics.nei.helper; + +import com.gtnewhorizon.gtnhlib.color.ColorResource; + +public class ColorUtils { + + private static final ColorResource.Factory color = new ColorResource.Factory("binniecore"); + + public static final ColorResource + // spotless:off + neiDisplayText = color.rgb("neiDisplayText", "0xFFFFFF"); + // spotless:on +}