From c8de4a4e00aee356d8cc73fce2fedcef47dfd9f2 Mon Sep 17 00:00:00 2001 From: Brady Date: Thu, 23 Aug 2018 20:43:37 -0500 Subject: [PATCH] Fix coloring across multiple lines --- src/main/java/baritone/utils/Helper.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/baritone/utils/Helper.java b/src/main/java/baritone/utils/Helper.java index c637e48f..c973b1ca 100755 --- a/src/main/java/baritone/utils/Helper.java +++ b/src/main/java/baritone/utils/Helper.java @@ -20,16 +20,12 @@ package baritone.utils; import baritone.Baritone; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.gui.GuiNewChat; -import net.minecraft.client.gui.GuiUtilRenderComponents; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; - -import java.util.List; +import net.minecraft.util.text.TextFormatting; /** * @author Brady @@ -37,6 +33,8 @@ import java.util.List; */ public interface Helper { + ITextComponent MESSAGE_PREFIX = new TextComponentString("§5[§dBaritone§5]§7"); + Minecraft mc = Minecraft.getMinecraft(); default EntityPlayerSP player() { @@ -73,14 +71,10 @@ public interface Helper { System.out.println(message); return; } - GuiNewChat gui = mc.ingameGUI.getChatGUI(); - int normalMaxWidth = MathHelper.floor((float) gui.getChatWidth() / gui.getChatScale()); - int widthWithStyleFormat = normalMaxWidth - 2; - List list = GuiUtilRenderComponents.splitText(new TextComponentString("§5[§dBaritone§5]§7 " + message), widthWithStyleFormat, - this.mc.fontRenderer, false, true); - for (ITextComponent component : list) { - gui.printChatMessage(new TextComponentString("§7" + component.getUnformattedText())); - } + ITextComponent component = MESSAGE_PREFIX.createCopy(); + component.getStyle().setColor(TextFormatting.GRAY); + component.appendSibling(new TextComponentString(" " + message)); + mc.ingameGUI.getChatGUI().printChatMessage(component); } }