Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/li/cil/oc/util/ColorUtils.java
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down Expand Up @@ -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")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Comment thread
Guvante marked this conversation as resolved.
GuiDraw.drawString(text, 4, 4 + line * 10, color, false)
}
case _ =>
}
Expand Down