Replace ChatFormatting with TextFormatting, like it should be.

ChatFormatting only exists on the client side.
Fixes #2792.
Fixes #2850.
This commit is contained in:
Vexatos 2018-09-10 17:56:41 +02:00
parent 3374cf45e8
commit 225e907c49
8 changed files with 19 additions and 19 deletions

View File

@ -1,10 +1,10 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class BoldSegment(parent: Segment, text: String) extends TextSegment(parent, text) {
override protected def format = ChatFormatting.BOLD.toString
override protected def format = TextFormatting.BOLD.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"**$text**"

View File

@ -1,14 +1,14 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class HeaderSegment(parent: Segment, text: String, val level: Int) extends TextSegment(parent, text) {
private val fontScale = math.max(2, 5 - level) / 2f
override protected def scale = Some(fontScale)
override protected def format = ChatFormatting.UNDERLINE.toString
override protected def format = TextFormatting.UNDERLINE.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"${"#" * level} $text"

View File

@ -1,10 +1,10 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class ItalicSegment(parent: Segment, text: String) extends TextSegment(parent, text) {
override protected def format = ChatFormatting.ITALIC.toString
override protected def format = TextFormatting.ITALIC.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"*$text*"

View File

@ -1,10 +1,10 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class StrikethroughSegment(parent: Segment, text: String) extends TextSegment(parent, text) {
override protected def format = ChatFormatting.STRIKETHROUGH.toString
override protected def format = TextFormatting.STRIKETHROUGH.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"~~$text~~"

View File

@ -1,7 +1,6 @@
package li.cil.oc.client.renderer.tileentity
import com.google.common.base.Strings
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.OpenComputers
import li.cil.oc.Settings
import li.cil.oc.api.driver.item.UpgradeRenderer
@ -24,6 +23,7 @@ import net.minecraft.item.ItemBlock
import net.minecraft.item.ItemStack
import net.minecraft.util.EnumFacing
import net.minecraft.util.math.Vec3d
import net.minecraft.util.text.TextFormatting
import net.minecraftforge.client.MinecraftForgeClient
import net.minecraftforge.common.MinecraftForge
import org.lwjgl.opengl.GL11
@ -487,7 +487,7 @@ object RobotRenderer extends TileEntitySpecialRenderer[tileentity.RobotProxy] {
t.draw()
GlStateManager.enableTexture2D() // For the font.
f.drawString((if (EventHandler.isItTime) ChatFormatting.OBFUSCATED.toString else "") + name, -halfWidth, 0, 0xFFFFFFFF)
f.drawString((if (EventHandler.isItTime) TextFormatting.OBFUSCATED.toString else "") + name, -halfWidth, 0, 0xFFFFFFFF)
GlStateManager.depthMask(true)
GlStateManager.enableLighting()

View File

@ -2,7 +2,6 @@ package li.cil.oc.common.item
import java.util
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.OpenComputers
import li.cil.oc.api
import li.cil.oc.util.BlockPosition
@ -11,6 +10,7 @@ import net.minecraft.item.ItemStack
import net.minecraft.util.ActionResult
import net.minecraft.util.EnumActionResult
import net.minecraft.util.EnumFacing
import net.minecraft.util.text.TextFormatting
import net.minecraft.world.World
import net.minecraftforge.fml.relauncher.Side
import net.minecraftforge.fml.relauncher.SideOnly
@ -18,7 +18,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
class Manual(val parent: Delegator) extends traits.Delegate {
@SideOnly(Side.CLIENT)
override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean): Unit = {
tooltip.add(ChatFormatting.DARK_GRAY.toString + "v" + OpenComputers.Version)
tooltip.add(TextFormatting.DARK_GRAY.toString + "v" + OpenComputers.Version)
super.tooltipLines(stack, player, tooltip, advanced)
}

View File

@ -1,6 +1,5 @@
package li.cil.oc.common.nanomachines
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.OpenComputers
import li.cil.oc.Settings
import li.cil.oc.api
@ -13,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.entity.player.EntityPlayerMP
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.text.TextComponentString
import net.minecraft.util.text.TextFormatting
import net.minecraftforge.common.util.Constants.NBT
import scala.collection.convert.WrapAsScala._
@ -126,10 +126,10 @@ class NeuralNetwork(controller: ControllerImpl) extends Persistable {
def print(player: EntityPlayer): Unit = {
val sb = StringBuilder.newBuilder
def colored(value: Any, enabled: Boolean) = {
if (enabled) sb.append(ChatFormatting.GREEN)
else sb.append(ChatFormatting.RED)
if (enabled) sb.append(TextFormatting.GREEN)
else sb.append(TextFormatting.RED)
sb.append(value)
sb.append(ChatFormatting.RESET)
sb.append(TextFormatting.RESET)
}
for (behavior <- behaviors) {
val name = Option(behavior.behavior.getNameHint).getOrElse(behavior.behavior.getClass.getSimpleName)

View File

@ -4,7 +4,6 @@ import java.util
import javax.annotation.Nonnull
import com.google.common.base.Strings
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.Settings
import li.cil.oc.api
import li.cil.oc.api.driver.EnvironmentAware
@ -22,6 +21,7 @@ import mezz.jei.api.recipe.IRecipeHandler
import net.minecraft.client.Minecraft
import net.minecraft.item.ItemStack
import net.minecraft.util.ResourceLocation
import net.minecraft.util.text.TextFormatting
import scala.collection.convert.WrapAsJava._
import scala.collection.convert.WrapAsScala._
@ -84,8 +84,8 @@ object CallbackDocHandler {
case VexPattern(head, tail) => (name + head, tail)
case _ => (name, doc)
}
wrap(signature, 160).map(ChatFormatting.BLACK.toString + _).mkString("\n") +
ChatFormatting.RESET + "\n" +
wrap(signature, 160).map(TextFormatting.BLACK.toString + _).mkString("\n") +
TextFormatting.RESET + "\n" +
wrap(documentation, 152).map(" " + _).mkString("\n")
}
}