From c664e05035d524c2fad9055de7c38f8708199a4f Mon Sep 17 00:00:00 2001 From: Ranzu <66495944+Ranzuu@users.noreply.github.com> Date: Mon, 24 Aug 2026 18:29:58 +0200 Subject: [PATCH 1/2] Bump dep of GTNHLib --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0dca99f84c..edcf94d61d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,7 +7,7 @@ dependencies { api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.95-gtnh:dev") api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-999-GTNH:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.11.24:dev") {transitive = false} + implementation("com.github.GTNewHorizons:GTNHLib:0.11.43:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:Angelica:2.1.52:api") {transitive = false} compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.9.4-GTNH:dev") {transitive = false} From 584eb60df041d985125ef97f5202ea9479bff9e7 Mon Sep 17 00:00:00 2001 From: Ranzu <66495944+Ranzuu@users.noreply.github.com> Date: Mon, 24 Aug 2026 19:19:20 +0200 Subject: [PATCH 2/2] Add ColorUtils: - class itself + 2 colors --- src/main/java/li/cil/oc/util/ColorUtils.java | 14 ++++++++++++++ .../oc/integration/nei/CallbackDocHandler.scala | 4 +--- .../cil/oc/integration/nei/PagedUsageHandler.scala | 4 +++- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 src/main/java/li/cil/oc/util/ColorUtils.java diff --git a/src/main/java/li/cil/oc/util/ColorUtils.java b/src/main/java/li/cil/oc/util/ColorUtils.java new file mode 100644 index 0000000000..80a34433d7 --- /dev/null +++ b/src/main/java/li/cil/oc/util/ColorUtils.java @@ -0,0 +1,14 @@ +package li.cil.oc.util; + +import com.gtnewhorizon.gtnhlib.color.ColorResource; + +public class ColorUtils { + + private static final ColorResource.Factory color = new ColorResource.Factory("opencomputers"); + + public static final ColorResource + // spotless:off + neiDocTitle = color.rgb("neiDocTitle", "0x000000"), + neiDocText = color.rgb("neiDocText", "0x333333"); + // spotless:on +} \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/integration/nei/CallbackDocHandler.scala b/src/main/scala/li/cil/oc/integration/nei/CallbackDocHandler.scala index 5c9711ae95..df34b4bb07 100644 --- a/src/main/scala/li/cil/oc/integration/nei/CallbackDocHandler.scala +++ b/src/main/scala/li/cil/oc/integration/nei/CallbackDocHandler.scala @@ -8,7 +8,6 @@ import li.cil.oc.api.prefab import li.cil.oc.server.driver.Registry import li.cil.oc.server.machine.Callbacks import net.minecraft.item.ItemStack -import net.minecraft.util.EnumChatFormatting import scala.collection.convert.WrapAsScala._ @@ -66,8 +65,7 @@ class CallbackDocHandler(pages: Option[Array[String]]) extends PagedUsageHandler case VexPattern(head, tail) => (name + head, tail) case _ => (name, doc) } - wrap(signature, 160).map(EnumChatFormatting.BLACK.toString + _).mkString("\n") + - EnumChatFormatting.RESET + "\n" + + wrap(signature, 160).mkString("\n") + "\n" + wrap(documentation, 152).map(" " + _).mkString("\n") } } diff --git a/src/main/scala/li/cil/oc/integration/nei/PagedUsageHandler.scala b/src/main/scala/li/cil/oc/integration/nei/PagedUsageHandler.scala index 98fd38916e..f30727765d 100644 --- a/src/main/scala/li/cil/oc/integration/nei/PagedUsageHandler.scala +++ b/src/main/scala/li/cil/oc/integration/nei/PagedUsageHandler.scala @@ -6,6 +6,7 @@ import codechicken.lib.gui.GuiDraw import codechicken.nei.PositionedStack import codechicken.nei.recipe.GuiRecipe import codechicken.nei.recipe.IUsageHandler +import li.cil.oc.util.ColorUtils import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.inventory.Container import net.minecraft.item.ItemStack @@ -21,7 +22,8 @@ abstract class PagedUsageHandler(val pages: Option[Array[String]]) extends IUsag pages match { case Some(data) => for ((text, line) <- data(recipe).lines.zipWithIndex) { - GuiDraw.drawString(text, 4, 4 + line * 10, 0x333333, false) + val color = if (text.startsWith(" ")) ColorUtils.neiDocText.getColor() else ColorUtils.neiDocTitle.getColor() + GuiDraw.drawString(text, 4, 4 + line * 10, color, false) } case _ => }