saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

TabList

Browse Source
This commit is contained in:
selimaj-dev
2026-02-20 03:46:51 +01:00
parent 8015a23342
commit 46d3408be9
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
+2 -1
View File
@@ -7,6 +7,7 @@ import net.minecraft.client.util.InputUtil;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.SaturnClientConfig; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.client.ServiceClient;
import org.saturnclient.ui2.screens.EmoteWheel; import org.saturnclient.ui2.screens.EmoteWheel;
import org.saturnclient.ui2.screens.ShiftMenu; import org.saturnclient.ui2.screens.ShiftMenu;
@@ -46,7 +47,7 @@ public class KeyInputHandler {
AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(SaturnClient.client.player); AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(SaturnClient.client.player);
if (animationStack.isActive() && animationStack.getPriority() == 1000) { if (animationStack.isActive() && animationStack.getPriority() == 1000) {
animationStack.removeLayer(1000); animationStack.removeLayer(1000);
Auth.emote(""); ServiceClient.emote("");
} }
} }
}); });
src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java
+10 -9
View File
@@ -1,13 +1,14 @@
package org.saturnclient.saturnclient.mixin; package org.saturnclient.saturnclient.mixin;
import net.minecraft.client.network.PlayerListEntry; import net.minecraft.client.network.PlayerListEntry;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import java.util.UUID;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.saturnclient.saturnclient.SaturnClientConfig; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.auth.Auth; import org.saturnclient.saturnclient.client.player.SaturnPlayer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@@ -30,13 +31,13 @@ public abstract class TabListMixin {
public Text getDisplayName() { public Text getDisplayName() {
GameProfile profile = ((PlayerListEntry) (Object) this).getProfile(); GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
String name = profile.getName(); String name = profile.getName();
String uuid = profile.getId().toString().replaceAll("-", ""); UUID uuid = profile.getId();
MutableText iconText = Text.literal(SaturnClientConfig.getSaturnIndicator()) if (SaturnPlayer.get(uuid) != null) {
.styled(style -> style.withColor(SaturnClientConfig.getIconColor(uuid))); return Text.literal(SaturnClientConfig.getSaturnIndicator())
.styled(style -> style.withColor(SaturnClientConfig.getIconColor(uuid)))
Text nameText = Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)); .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
}
return Auth.players.containsKey(uuid) ? iconText.append(nameText) : Text.literal(name); return Text.literal(name);
} }
} }