From 05de3c20c76f16855d612e1c9b67fc2185fa6fb4 Mon Sep 17 00:00:00 2001 From: OBro1961 Date: Fri, 22 Dec 2023 17:56:00 -0600 Subject: [PATCH] Util index rename --- .../chatpatches/mixin/chat/MessageHandlerMixin.java | 4 +--- .../java/obro1961/chatpatches/mixin/gui/ChatHudMixin.java | 4 ++-- .../obro1961/chatpatches/mixin/gui/ChatScreenMixin.java | 6 +++--- src/main/java/obro1961/chatpatches/util/ChatUtils.java | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/obro1961/chatpatches/mixin/chat/MessageHandlerMixin.java b/src/main/java/obro1961/chatpatches/mixin/chat/MessageHandlerMixin.java index 5083e86..d70d65f 100644 --- a/src/main/java/obro1961/chatpatches/mixin/chat/MessageHandlerMixin.java +++ b/src/main/java/obro1961/chatpatches/mixin/chat/MessageHandlerMixin.java @@ -4,9 +4,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.MessageIndicator; import net.minecraft.client.network.message.MessageHandler; -import net.minecraft.network.message.MessageSignatureData; import net.minecraft.network.message.MessageType; import net.minecraft.network.message.SignedMessage; import net.minecraft.text.Text; @@ -29,7 +27,7 @@ /** * A mixin used to cache the metadata of the most recent message * received by the client. This is used in - * {@link ChatHudMixin#modifyMessage(Text, Text, MessageSignatureData, int, MessageIndicator, boolean)} + * {@link ChatHudMixin#modifyMessage(Text, boolean)} * to provide more accurate timestamp data, the correct player * name, and the player's UUID. */ diff --git a/src/main/java/obro1961/chatpatches/mixin/gui/ChatHudMixin.java b/src/main/java/obro1961/chatpatches/mixin/gui/ChatHudMixin.java index 58527ba..6fc9566 100644 --- a/src/main/java/obro1961/chatpatches/mixin/gui/ChatHudMixin.java +++ b/src/main/java/obro1961/chatpatches/mixin/gui/ChatHudMixin.java @@ -35,7 +35,7 @@ import java.util.List; import static obro1961.chatpatches.ChatPatches.config; -import static obro1961.chatpatches.util.ChatUtils.OG_MSG_INDEX; +import static obro1961.chatpatches.util.ChatUtils.MSG_INDEX; import static obro1961.chatpatches.util.SharedVariables.lastMsg; /** @@ -300,7 +300,7 @@ private Text addCounter(Text incoming, boolean refreshing) { // exclude the first message, already checked above messages.subList(1, attemptDistance) .stream() - .filter( hudLine -> hudLine.content().getSiblings().get(OG_MSG_INDEX).getString().equalsIgnoreCase( incoming.getSiblings().get(OG_MSG_INDEX).getString() ) ) + .filter( hudLine -> hudLine.content().getSiblings().get(MSG_INDEX).getString().equalsIgnoreCase( incoming.getSiblings().get(MSG_INDEX).getString() ) ) .findFirst() .ifPresent( hudLine -> ChatUtils.getCondensedMessage(incoming, messages.indexOf(hudLine)) ); } diff --git a/src/main/java/obro1961/chatpatches/mixin/gui/ChatScreenMixin.java b/src/main/java/obro1961/chatpatches/mixin/gui/ChatScreenMixin.java index f779406..feca2c9 100644 --- a/src/main/java/obro1961/chatpatches/mixin/gui/ChatScreenMixin.java +++ b/src/main/java/obro1961/chatpatches/mixin/gui/ChatScreenMixin.java @@ -188,13 +188,13 @@ protected void initSearchStuff(CallbackInfo ci) { return ""; })); hoverButtons.put(COPY_NAME, of(1, COPY_NAME, () -> { - Text message = selectedLine.content().getSiblings().get(ChatUtils.OG_MSG_INDEX); + Text message = selectedLine.content().getSiblings().get(ChatUtils.MSG_INDEX); Text text = message.getSiblings().size() > ChatUtils.MSG_NAME_INDEX ? message.getSiblings().get(ChatUtils.MSG_NAME_INDEX) : Text.empty(); HoverEvent.EntityContent player = text.getStyle().getHoverEvent() != null ? text.getStyle().getHoverEvent().getValue(SHOW_ENTITY) : null; return player != null ? player.name.getString() : text.getString(); })); hoverButtons.put(COPY_UUID, of(1, COPY_UUID, () -> { - Text message = selectedLine.content().getSiblings().get(ChatUtils.OG_MSG_INDEX); + Text message = selectedLine.content().getSiblings().get(ChatUtils.MSG_INDEX); Text text = message.getSiblings().size() > ChatUtils.MSG_NAME_INDEX ? message.getSiblings().get(ChatUtils.MSG_NAME_INDEX) : Text.empty(); HoverEvent.EntityContent player = text.getStyle().getHoverEvent() != null ? text.getStyle().getHoverEvent().getValue(SHOW_ENTITY) : null; return player != null ? player.uuid.toString() : text.getString(); @@ -620,7 +620,7 @@ so i switched it to a startsWith() bc the first one never has extra spaces. /!\ mainButtons.get(COPY_UNIX).readyToRender(true); // add player data and reply buttons - Text originalMessage = selectedLine.content().getSiblings().size() > ChatUtils.OG_MSG_INDEX ? selectedLine.content().getSiblings().get(ChatUtils.OG_MSG_INDEX) : Text.empty(); + Text originalMessage = selectedLine.content().getSiblings().size() > ChatUtils.MSG_INDEX ? selectedLine.content().getSiblings().get(ChatUtils.MSG_INDEX) : Text.empty(); Style style = originalMessage.getSiblings().size() > 0 ? originalMessage.getSiblings().get(ChatUtils.MSG_NAME_INDEX).getStyle() : Style.EMPTY; if( !style.equals(Style.EMPTY) && style.getHoverEvent() != null && style.getHoverEvent().getAction() == HoverEvent.Action.SHOW_ENTITY ) { PlayerListEntry player = client.getNetworkHandler().getPlayerListEntry( UUID.fromString(hoverButtons.get(COPY_UUID).copySupplier.get()) ); diff --git a/src/main/java/obro1961/chatpatches/util/ChatUtils.java b/src/main/java/obro1961/chatpatches/util/ChatUtils.java index 78b7ec4..59ff1a7 100644 --- a/src/main/java/obro1961/chatpatches/util/ChatUtils.java +++ b/src/main/java/obro1961/chatpatches/util/ChatUtils.java @@ -26,8 +26,8 @@ public class ChatUtils { public static final UUID NIL_UUID = new UUID(0, 0); public static final MessageData NIL_MSG_DATA = new MessageData(new GameProfile(ChatUtils.NIL_UUID, ""), Date.from(Instant.EPOCH), false); - public static final int TIMESTAMP_INDEX = 0, OG_MSG_INDEX = 1, DUPE_COUNTER_INDEX = 2; // indices of all main (modified message) components - public static final int MSG_NAME_INDEX = 0, MSG_MSG_INDEX = 1, MSG_FORMATTED_TEXT_INDEX = 2; // indices of all OG_MSG_INDEX components + public static final int TIMESTAMP_INDEX = 0, MSG_INDEX = 1, DUPE_COUNTER_INDEX = 2; // indices of all main (modified message) components + public static final int MSG_NAME_INDEX = 0, MSG_MSG_INDEX = 1, MSG_FORMATTED_TEXT_INDEX = 2; // indices of all MSG_INDEX components /** * Matches a vanilla message, with captures for the playername and message. * Considers a message invalid if {@link net.minecraft.SharedConstants#isValidChar(char)} @@ -75,7 +75,7 @@ public static Text getCondensedMessage(Text incoming, int index) { // IF the last and incoming message bodies are equal, continue - if( incomingParts.get(OG_MSG_INDEX).getString().equalsIgnoreCase(comparingParts.get(OG_MSG_INDEX).getString()) ) { + if( incomingParts.get(MSG_INDEX).getString().equalsIgnoreCase(comparingParts.get(MSG_INDEX).getString()) ) { // info: according to some limited testing, incoming messages (incomingParts) will never contain a dupe counter, so it's been omitted from this check int dupes = (