Skip to content

Fix compatibility with Feather Client #5436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix compatibility with Feather Client #5436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
395042e
Fix compatibility with Feather Client
IHaxU May 30, 2025
8547eac
Swapped the `isEntryMessage` field with a @Share
IHaxU May 30, 2025
3e5e7f9
Cleaned up ChatHudMixin
IHaxU May 30, 2025
65afb5e
Fixed crashes with Feather
IHaxU May 30, 2025
cdc479c
Rename @Share
IHaxU Jun 1, 2025
74610de
Rename @Share
IHaxU Jun 1, 2025
d499e44
Rename @Share
IHaxU Jun 1, 2025
f0fba6c
Rename @Share
IHaxU Jun 1, 2025
b2046c3
Fixed meteor crash on collectPlayerEntries caused by Constant
IHaxU Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions src/main/java/meteordevelopment/meteorclient/mixin/ChatHudMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.injector.ModifyReceiver;
import com.llamalad7.mixinextras.sugar.Local;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
import com.llamalad7.mixinextras.sugar.ref.LocalRef;
import meteordevelopment.meteorclient.MeteorClient;
import meteordevelopment.meteorclient.events.game.ReceiveMessageEvent;
import meteordevelopment.meteorclient.mixininterface.IChatHud;
Expand All @@ -23,16 +26,17 @@
import net.minecraft.client.gui.hud.ChatHud;
import net.minecraft.client.gui.hud.ChatHudLine;
import net.minecraft.client.gui.hud.MessageIndicator;
import net.minecraft.client.util.ChatMessages;
import net.minecraft.network.message.MessageSignatureData;
import net.minecraft.text.OrderedText;
import net.minecraft.text.StringVisitable;
import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.List;
Expand Down Expand Up @@ -79,16 +83,14 @@ private void onAddMessageAfterNewChatHudLine(ChatHudLine message, CallbackInfo c
((IChatHudLine) (Object) messages.getFirst()).meteor$setId(nextId);
}

@SuppressWarnings("DataFlowIssue")
@ModifyExpressionValue(method = "addVisibleMessage", at = @At(value = "NEW", target = "(ILnet/minecraft/text/OrderedText;Lnet/minecraft/client/gui/hud/MessageIndicator;Z)Lnet/minecraft/client/gui/hud/ChatHudLine$Visible;"))
private ChatHudLine.Visible onAddMessage_modifyChatHudLineVisible(ChatHudLine.Visible line, @Local(ordinal = 1) int j) {
private ChatHudLine.Visible onAddMessage_modifyChatHudLineVisible(ChatHudLine.Visible line, @Share("index") LocalIntRef indexRef) {
IMessageHandler handler = (IMessageHandler) client.getMessageHandler();
if (handler == null) return line;

IChatHudLineVisible meteorLine = (IChatHudLineVisible) (Object) line;
if (meteorLine == null) return line;

meteorLine.meteor$setSender(handler.meteor$getSender());
meteorLine.meteor$setStartOfEntry(j == 0);
meteorLine.meteor$setStartOfEntry(indexRef.get() == 0);

return line;
}
Expand Down Expand Up @@ -164,12 +166,30 @@ private MessageIndicator onRender_modifyIndicator(MessageIndicator indicator) {
return Modules.get().get(NoRender.class).noMessageSignatureIndicator() ? null : indicator;
}

// Get the variable `j` for later usage at onAddMessage_modifyChatHudLineVisible

@ModifyArg(method = "addVisibleMessage", at = @At(value = "INVOKE", target = "Ljava/util/List;get(I)Ljava/lang/Object;"))
private int addVisibleMessage_captureIndex(int index, @Share("index") LocalIntRef indexRef) {
indexRef.set(index);
return index;
}

// Get list for later usage at anti-spam

@Redirect(method = "addVisibleMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/ChatMessages;breakRenderedChatMessageLines(Lnet/minecraft/text/StringVisitable;ILnet/minecraft/client/font/TextRenderer;)Ljava/util/List;"))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Redirect is very bad for mod compatibility, capture the return value with a @ModifyExpressionValue instead

private List<OrderedText> addVisibleMessage_captureList(StringVisitable message, int width, TextRenderer textRenderer, @Share("listRef") LocalRef<List<OrderedText>> listRef) {
List<OrderedText> list = ChatMessages.breakRenderedChatMessageLines(message, width, textRenderer);
listRef.set(list);
return list;
}

// Anti spam

@Inject(method = "addVisibleMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/ChatHud;isChatFocused()Z"))
private void onBreakChatMessageLines(ChatHudLine message, CallbackInfo ci, @Local List<OrderedText> list) {
private void onBreakChatMessageLines(ChatHudLine message, CallbackInfo ci, @Share("listRef") LocalRef<List<OrderedText>> listRef) {
if (Modules.get() == null) return; // baritone calls addMessage before we initialise

List<OrderedText> list = listRef.get();
getBetterChat().lines.addFirst(list.size());
}

Expand Down
20 changes: 17 additions & 3 deletions src/main/java/meteordevelopment/meteorclient/mixin/PlayerListHudMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,38 @@
import net.minecraft.client.network.PlayerListEntry;
import net.minecraft.text.Text;
import net.minecraft.util.math.MathHelper;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import java.util.Comparator;
import java.util.List;

@Mixin(PlayerListHud.class)
public abstract class PlayerListHudMixin {
@Shadow
@Final
private MinecraftClient client;

@Shadow
@Final
private static Comparator<PlayerListEntry> ENTRY_ORDERING;

@Shadow
protected abstract List<PlayerListEntry> collectPlayerEntries();

@ModifyConstant(constant = @Constant(longValue = 80L), method = "collectPlayerEntries")
private long modifyCount(long count) {
@Inject(method = "collectPlayerEntries", at = @At("HEAD"), cancellable = true)
private void modifyCount(CallbackInfoReturnable<List<PlayerListEntry>> cir) {
BetterTab module = Modules.get().get(BetterTab.class);

return module.isActive() ? module.tabSize.get() : count;
if (client.player == null) return;

if (module.isActive()) {
cir.setReturnValue(client.player.networkHandler.getListedPlayerListEntries().stream().sorted(ENTRY_ORDERING).limit(module.tabSize.get()).toList());
}
}

@Inject(method = "getPlayerName", at = @At("HEAD"), cancellable = true)
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
},
"breaks": {
"optifabric": "*",
"feather": "*",
"origins": "*",
"sodium": "<0.6.12",
"morechathistory": "*"
Expand Down