Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed alarm messages formatting

Browse source
This commit is contained in:
LemADEC 2017-04-24 10:01:10 +02:00
parent 43ce2c9d43
commit 5893b5d996
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/cr0s/warpdrive/Commons.java
View file

@ -13,7 +13,6 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.lang.Thread.State;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
@ -32,12 +31,23 @@ import java.util.Set;
*/
public class Commons {
private static final String CHAR_FORMATTING = "" + (char)167;
public static String updateEscapeCodes(final String message) {
return message
.replace("§", CHAR_FORMATTING)
.replace("\\n", "\n")
.replace("|", "\n")
.replace(CHAR_FORMATTING + "r", CHAR_FORMATTING + "7")
.replaceAll("\u00A0", " "); // u00A0 is 'NO-BREAK SPACE'
}
public static void addChatMessage(final ICommandSender sender, final String message) {
if (sender == null) {
WarpDrive.logger.error("Unable to send message to NULL sender: " + message);
return;
}
String[] lines = message.replace("§", "" + (char)167).replace("\\n", "\n").replaceAll("\u00A0", " ").split("\n");
String[] lines = updateEscapeCodes(message).split("\n");
for (String line : lines) {
sender.addChatMessage(new ChatComponentText(line));
}
@ -48,9 +58,7 @@ public class Commons {
// add tooltip information with text formatting and line splitting
// will ensure it fits on minimum screen width
public static void addTooltip(List<String> list, String tooltip) {
final String charFormatting = "" + (char)167;
tooltip = tooltip.replace("§", charFormatting).replace("\\n", "\n").replace("|", "\n");
tooltip = tooltip.replace(charFormatting + "r", charFormatting + "7");
tooltip = updateEscapeCodes(tooltip);
String[] split = tooltip.split("\n");
for (String line : split) {

4
src/main/java/cr0s/warpdrive/render/RenderCommons.java
View file

@ -52,7 +52,7 @@ public class RenderCommons {
int y = scaledHeight / 10;
// bold title, single line, centered, with shadows
final String textTitle = "§l" + StatCollector.translateToLocal(title);
final String textTitle = Commons.updateEscapeCodes("§l" + StatCollector.translateToLocal(title));
minecraft.fontRenderer.drawString(textTitle,
scaledWidth / 4 - minecraft.fontRenderer.getStringWidth(textTitle) / 2,
y - minecraft.fontRenderer.FONT_HEIGHT,
@ -60,7 +60,7 @@ public class RenderCommons {
true);
// normal message, multi-lines, centered, without shadows
final String textMessage = StatCollector.translateToLocal(message).replace("\\n", "\n");
final String textMessage = Commons.updateEscapeCodes(StatCollector.translateToLocal(message));
final int alpha = 160 + (int) (85.0D * Math.sin(cycle * 2 * Math.PI));
@SuppressWarnings("unchecked")