trueog/BKCommonLib
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate some version-specific remappings to the chat remappings file

Browse Source 
Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
This commit is contained in:
Irmo van den Berge committed 2024-06-04 17:28:19 +02:00
1 parent e8e2d5ce8e
commit e6cc623b30
3 files changed
+20 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/templates/com/bergerkiller/templates/net/minecraft/network/chat.txt
+5 -10
View File
@@ -123,11 +123,10 @@ class IChatBaseComponent {
#endselect
public (IChatBaseComponentHandle) IChatBaseComponent setClickableURL(String url) {
#if version >= 1.18
ChatModifier modifier = instance.getStyle();
#if version >= 1.18
modifier = modifier.withClickEvent(new ChatClickable(ChatClickable$EnumClickAction.OPEN_URL, url));
#else
ChatModifier modifier = instance.getChatModifier();
modifier = modifier.setChatClickable(new ChatClickable(ChatClickable$EnumClickAction.OPEN_URL, url));
#endif
return instance#makeMutableAndSetChatModifier(modifier);
@@ -135,11 +134,10 @@ class IChatBaseComponent {
public (IChatBaseComponentHandle) IChatBaseComponent setClickableContent(String content) {
#if version >= 1.15
#if version >= 1.18
ChatModifier modifier = instance.getStyle();
#if version >= 1.18
modifier = modifier.withClickEvent(new ChatClickable(ChatClickable$EnumClickAction.COPY_TO_CLIPBOARD, content));
#else
ChatModifier modifier = instance.getChatModifier();
modifier = modifier.setChatClickable(new ChatClickable(ChatClickable$EnumClickAction.COPY_TO_CLIPBOARD, content));
#endif
return instance#makeMutableAndSetChatModifier(modifier);
@@ -150,33 +148,30 @@ class IChatBaseComponent {
}
public (IChatBaseComponentHandle) IChatBaseComponent setClickableSuggestedCommand(String command) {
#if version >= 1.18
ChatModifier modifier = instance.getStyle();
#if version >= 1.18
modifier = modifier.withClickEvent(new ChatClickable(ChatClickable$EnumClickAction.SUGGEST_COMMAND, command));
#else
ChatModifier modifier = instance.getChatModifier();
modifier = modifier.setChatClickable(new ChatClickable(ChatClickable$EnumClickAction.SUGGEST_COMMAND, command));
#endif
return instance#makeMutableAndSetChatModifier(modifier);
}
public (IChatBaseComponentHandle) IChatBaseComponent setClickableRunCommand(String command) {
#if version >= 1.18
ChatModifier modifier = instance.getStyle();
#if version >= 1.18
modifier = modifier.withClickEvent(new ChatClickable(ChatClickable$EnumClickAction.RUN_COMMAND, command));
#else
ChatModifier modifier = instance.getChatModifier();
modifier = modifier.setChatClickable(new ChatClickable(ChatClickable$EnumClickAction.RUN_COMMAND, command));
#endif
return instance#makeMutableAndSetChatModifier(modifier);
}
public (IChatBaseComponentHandle) IChatBaseComponent setHoverText((IChatBaseComponentHandle) IChatBaseComponent hoverText) {
#if version >= 1.18
ChatModifier modifier = instance.getStyle();
#if version >= 1.18
modifier = modifier.withHoverEvent(new ChatHoverable(ChatHoverable$EnumHoverAction.SHOW_TEXT, hoverText));
#else
ChatModifier modifier = instance.getChatModifier();
modifier = modifier.setChatHoverable(new ChatHoverable(ChatHoverable$EnumHoverAction.SHOW_TEXT, hoverText));
#endif
return instance#makeMutableAndSetChatModifier(modifier);
src/main/templates/com/bergerkiller/templates/net/minecraft/remapping/chat_remappings.txt
+14
View File
@@ -7,3 +7,17 @@
#endif
#remap net.minecraft.network.chat.IChatBaseComponent.ChatSerializer public static String toJson:a(net.minecraft.network.chat.IChatBaseComponent chatComponent);
#endif
#if version >= 1.18
#remap net.minecraft.network.chat.ChatModifier public boolean isObfuscated();
#remap net.minecraft.network.chat.IChatBaseComponent public net.minecraft.network.chat.ChatModifier getStyle();
#else
#remap net.minecraft.network.chat.ChatModifier public boolean isObfuscated:isRandom();
#remap net.minecraft.network.chat.IChatBaseComponent public net.minecraft.network.chat.ChatModifier getStyle:getChatModifier();
#endif
#if version >= 1.18
#remap net.minecraft.network.chat.ChatHexColor public int getValue();
#elseif version >= 1.17
#remap net.minecraft.network.chat.ChatHexColor public int getValue:a();
#endif
src/main/templates/com/bergerkiller/templates/org/bukkit/craftbukkit/util.txt
+1 -15
View File
@@ -160,22 +160,14 @@ class CraftChatMessage {
while (iter.hasNext()) {
IChatBaseComponent c = (IChatBaseComponent) iter.next();
#if version >= 1.18
net.minecraft.network.chat.ChatModifier modi = c.getStyle();
#else
net.minecraft.network.chat.ChatModifier modi = c.getChatModifier();
#endif
// Place reset character when too many style flags are active
if ((prev_was_bold && !modi.isBold()) ||
(prev_was_italic && !modi.isItalic()) ||
(prev_was_underlined && !modi.isUnderlined()) ||
(prev_was_strikeThrough && !modi.isStrikethrough()) ||
#if version >= 1.18
(prev_was_obfuscated && !modi.isObfuscated()))
#else
(prev_was_obfuscated && !modi.isRandom()))
#endif
{
prev_color_format = null;
prev_was_bold = false;
@@ -197,10 +189,8 @@ class CraftChatMessage {
}
} else {
// Get color RGB value
#if version >= 1.18
#if version >= 1.17
int rgb = modi.getColor().getValue();
#elseif version >= 1.17
int rgb = modi.getColor().a();
#else
#require net.minecraft.network.chat.ChatHexColor private final int chc_rgb:rgb;
net.minecraft.network.chat.ChatHexColor hexcolor = modi.getColor();
@@ -241,11 +231,7 @@ class CraftChatMessage {
prev_was_strikeThrough = true;
out.append(EnumChatFormat.STRIKETHROUGH);
}
#if version >= 1.18
if (modi.isObfuscated() && !prev_was_obfuscated) {
#else
if (modi.isRandom() && !prev_was_obfuscated) {
#endif
prev_was_obfuscated = true;
out.append(EnumChatFormat.OBFUSCATED);
}