icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new 1.16 formatting fixes #253

Browse Source
This commit is contained in:
gnembon committed 2020-04-25 17:31:35 -03:00
1 parent b3b94bdd68
commit bdbeea6dfa
2 files changed
+66 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=20w17a minecraft_version=20w17a
yarn_mappings=20w17a+build.2 yarn_mappings=20w17a+build.4
loader_version=0.8.2+build.194 loader_version=0.8.2+build.194
# Mod Properties # Mod Properties
src/main/java/carpet/utils/Messenger.java
+65 -49
View File
@@ -1,5 +1,6 @@
package carpet.utils; package carpet.utils;
import net.minecraft.class_5251;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.entity.EntityCategory; import net.minecraft.entity.EntityCategory;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
@@ -7,6 +8,7 @@ import net.minecraft.text.BaseText;
import net.minecraft.text.ClickEvent; import net.minecraft.text.ClickEvent;
import net.minecraft.text.HoverEvent; import net.minecraft.text.HoverEvent;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
import net.minecraft.text.Style;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
@@ -18,65 +20,79 @@ import org.apache.logging.log4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Messenger public class Messenger
{ {
public static final Logger LOG = LogManager.getLogger(); public static final Logger LOG = LogManager.getLogger();
/* private static final Pattern colorExtract = Pattern.compile("#([0-9a-fA-F]{6})");
messsage: "desc me ssa ge" public enum CarpetFormatting
desc contains: {
i = italic ITALIC ('i', (s, f) -> s.setItalic(true)),
s = strikethrough STRIKE ('s', (s, f) -> s.method_27705(Formatting.STRIKETHROUGH)),
u = underline UNDERLINE ('u', (s, f) -> s.method_27705(Formatting.UNDERLINE)),
b = bold BOLD ('b', (s, f) -> s.setBold(true)),
o = obfuscated OBFUSCATE ('o', (s, f) -> s.method_27705(Formatting.OBFUSCATED)),
w = white WHITE ('w', (s, f) -> s.setColor(Formatting.WHITE)),
y = yellow YELLOW ('y', (s, f) -> s.setColor(Formatting.YELLOW)),
m = magenta (light purple) LIGHT_PURPLE('m', (s, f) -> s.setColor(Formatting.LIGHT_PURPLE)), // magenta
r = red RED ('r', (s, f) -> s.setColor(Formatting.RED)),
c = cyan (aqua) AQUA ('c', (s, f) -> s.setColor(Formatting.AQUA)), // cyan
l = lime (green) GREEN ('l', (s, f) -> s.setColor(Formatting.GREEN)), // lime
t = light blue (blue) BLUE ('t', (s, f) -> s.setColor(Formatting.BLUE)), // light blue, teal
f = dark gray DARK_GRAY ('f', (s, f) -> s.setColor(Formatting.DARK_GRAY)),
g = gray GRAY ('g', (s, f) -> s.setColor(Formatting.GRAY)),
d = gold GOLD ('d', (s, f) -> s.setColor(Formatting.GOLD)),
p = dark purple (purple) DARK_PURPLE ('p', (s, f) -> s.setColor(Formatting.DARK_PURPLE)), // purple
n = dark red (brown) DARK_RED ('n', (s, f) -> s.setColor(Formatting.DARK_RED)), // brown
q = dark aqua DARK_AQUA ('q', (s, f) -> s.setColor(Formatting.DARK_AQUA)),
e = dark green DARK_GREEN ('e', (s, f) -> s.setColor(Formatting.DARK_GREEN)),
v = dark blue (navy) DARK_BLUE ('v', (s, f) -> s.setColor(Formatting.DARK_BLUE)), // navy
k = black BLACK ('k', (s, f) -> s.setColor(Formatting.BLACK)),
/ = action added to the previous component COLOR ('#', (s, f) -> {
*/ class_5251 color = class_5251.method_27719("#"+f);
return color == null ? s : s.method_27703(color);
}, s -> {
Matcher m = colorExtract.matcher(s);
return m.find() ? m.group(1) : null;
}),
;
public char code;
public BiFunction<Style, String, Style> applier;
public Function<String, String> container;
CarpetFormatting(char code, BiFunction<Style, String, Style> applier)
{
this(code, applier, s -> s.indexOf(code)>=0?Character.toString(code):null);
}
CarpetFormatting(char code, BiFunction<Style, String, Style> applier, Function<String, String> container)
{
this.code = code;
this.applier = applier;
this.container = container;
}
public Style apply(String format, Style previous)
{
String fmt;
if ((fmt = container.apply(format))!= null) return applier.apply(previous, fmt);
return previous;
}
};
private static BaseText _applyStyleToTextComponent(BaseText comp, String style) private static BaseText _applyStyleToTextComponent(BaseText comp, String style)
{ {
//could be rewritten to be more efficient Style myStyle= Style.field_24360.setColor(Formatting.WHITE);
comp.getStyle().setItalic(style.indexOf('i')>=0); for (CarpetFormatting cf: CarpetFormatting.values())
if (style.indexOf('s')>=0) comp.setStyle(comp.getStyle().method_27705(Formatting.STRIKETHROUGH)); {
if (style.indexOf('u')>=0) comp.setStyle(comp.getStyle().method_27705(Formatting.UNDERLINE)); myStyle = cf.apply(style, myStyle);
comp.getStyle().setBold(style.indexOf('b')>=0); }
if (style.indexOf('o')>=0) comp.setStyle(comp.getStyle().method_27705(Formatting.OBFUSCATED)); comp.setStyle(myStyle);
comp.getStyle().setColor(Formatting.WHITE);
if (style.indexOf('w')>=0) comp.getStyle().setColor(Formatting.WHITE); // not needed
if (style.indexOf('y')>=0) comp.getStyle().setColor(Formatting.YELLOW);
if (style.indexOf('m')>=0) comp.getStyle().setColor(Formatting.LIGHT_PURPLE);
if (style.indexOf('r')>=0) comp.getStyle().setColor(Formatting.RED);
if (style.indexOf('c')>=0) comp.getStyle().setColor(Formatting.AQUA);
if (style.indexOf('l')>=0) comp.getStyle().setColor(Formatting.GREEN);
if (style.indexOf('t')>=0) comp.getStyle().setColor(Formatting.BLUE);
if (style.indexOf('f')>=0) comp.getStyle().setColor(Formatting.DARK_GRAY);
if (style.indexOf('g')>=0) comp.getStyle().setColor(Formatting.GRAY);
if (style.indexOf('d')>=0) comp.getStyle().setColor(Formatting.GOLD);
if (style.indexOf('p')>=0) comp.getStyle().setColor(Formatting.DARK_PURPLE);
if (style.indexOf('n')>=0) comp.getStyle().setColor(Formatting.DARK_RED);
if (style.indexOf('q')>=0) comp.getStyle().setColor(Formatting.DARK_AQUA);
if (style.indexOf('e')>=0) comp.getStyle().setColor(Formatting.DARK_GREEN);
if (style.indexOf('v')>=0) comp.getStyle().setColor(Formatting.DARK_BLUE);
if (style.indexOf('k')>=0) comp.getStyle().setColor(Formatting.BLACK);
return comp; return comp;
} }
public static String heatmap_color(double actual, double reference) public static String heatmap_color(double actual, double reference)