Skip to content

Commit 285999d

Browse files
moehreagmoehreag
committed
last commit for release
1 parent 805aa40 commit 285999d

File tree

7 files changed

+56
-75
lines changed

7 files changed

+56
-75
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/io/github/axolotlclient/AxolotlClient.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import net.minecraft.entity.player.PlayerEntity;
2222
import net.minecraft.resource.Resource;
2323
import net.minecraft.resource.pack.ResourcePack;
24+
import net.minecraft.scoreboard.Team;
2425
import net.minecraft.util.Identifier;
2526
import org.quiltmc.loader.api.ModContainer;
2627
import org.quiltmc.loader.api.QuiltLoader;
@@ -152,8 +153,8 @@ public static void addBadge(Entity entity, MatrixStack matrices){
152153

153154
int x = -(MinecraftClient.getInstance().textRenderer.getWidth(
154155
entity.getUuid() == MinecraftClient.getInstance().player.getUuid()?
155-
(NickHider.Instance.hideOwnName.get() ? NickHider.Instance.hiddenNameSelf.get(): entity.getName().getString()):
156-
(NickHider.Instance.hideOtherNames.get() ? NickHider.Instance.hiddenNameOthers.get(): entity.getName().getString())
156+
(NickHider.Instance.hideOwnName.get() ? NickHider.Instance.hiddenNameSelf.get(): Team.decorateName(entity.getScoreboardTeam(), entity.getName()).getString()):
157+
(NickHider.Instance.hideOtherNames.get() ? NickHider.Instance.hiddenNameOthers.get(): Team.decorateName(entity.getScoreboardTeam(), entity.getName()).getString())
157158
)/2 + (AxolotlClient.CONFIG.customBadge.get() ? MinecraftClient.getInstance().textRenderer.getWidth(AxolotlClient.CONFIG.badgeText.get()): 10));
158159

159160
RenderSystem.setShaderColor(1, 1, 1, 1);

‎src/main/java/io/github/axolotlclient/mixin/MixinChatHud.java‎

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
66
import net.minecraft.client.MinecraftClient;
77
import net.minecraft.client.gui.hud.ChatHud;
8+
import net.minecraft.client.network.AbstractClientPlayerEntity;
9+
import net.minecraft.text.MutableText;
810
import net.minecraft.text.Text;
911
import org.spongepowered.asm.mixin.Mixin;
1012
import org.spongepowered.asm.mixin.injection.At;
@@ -13,67 +15,42 @@
1315
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1416

1517
@Mixin(ChatHud.class)
16-
public class MixinChatHud {
18+
public abstract class MixinChatHud {
1719

1820
@Inject(method = "addMessage(Lnet/minecraft/text/Text;IIZ)V", at = @At("HEAD"))
19-
public void autoGG(Text message, int messageId, int timestamp, boolean bl, CallbackInfo ci){
21+
public void autoThings(Text message, int messageId, int timestamp, boolean bl, CallbackInfo ci){
2022
AutoGG.Instance.onMessage(message);
2123
AutoBoop.Instance.onMessage(message);
2224
}
2325

2426
@ModifyArg(method = "addMessage(Lnet/minecraft/text/Text;I)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/ChatHud;addMessage(Lnet/minecraft/text/Text;IIZ)V"))
2527
public Text editChat(Text message) {
2628

27-
String msg = message.getString();
28-
String newMsg;
29+
if(NickHider.Instance.hideOwnName.get() || NickHider.Instance.hideOtherNames.get()) {
30+
String msg = message.getString();
2931

30-
String playerName = MinecraftClient.getInstance().player.getName().getString();
31-
if (NickHider.Instance.hideOwnName.get() && msg.contains(playerName)){
32-
newMsg = msg.replace(playerName, NickHider.Instance.hiddenNameSelf.get());
33-
return Text.literal(newMsg);
34-
}
35-
/*|| AxolotlClient.CONFIG.NickHider.hideOtherNames) {
36-
assert MinecraftClient.getInstance().player != null;
32+
String playerName = MinecraftClient.getInstance().player.getDisplayName().getString();
33+
if (NickHider.Instance.hideOwnName.get() && msg.contains(playerName)) {
34+
msg = msg.replaceAll(playerName, NickHider.Instance.hiddenNameSelf.get());
3735

38-
LiteralText name = new LiteralText("");
36+
}
3937

40-
LiteralText editedMessage = new LiteralText("");
41-
String sender;
38+
if (NickHider.Instance.hideOtherNames.get()) {
39+
for (AbstractClientPlayerEntity player : MinecraftClient.getInstance().world.getPlayers()) {
40+
if (msg.contains(player.getDisplayName().getString())) {
41+
msg = msg.replaceAll(player.getDisplayName().getString(), NickHider.Instance.hiddenNameOthers.get());
42+
}
43+
}
44+
}
4245

43-
if (message.getString().contains(">")) {
44-
sender = message.getString().split(">")[0].split("<")[1];
45-
} else if (message.getString().contains(":")) {
46-
sender = message.getString().split(":")[0];
47-
if (sender.contains("]")) {
48-
String[] send = sender.split("] ");
49-
sender = send[send.length - 1];
50-
}if (sender.contains("[NPC]"))return message;
51-
if (sender.contains(" ")) return message;
52-
} else {return message;}
5346

54-
if (Objects.equals(sender, MinecraftClient.getInstance().player.getName().getString())) {
55-
name.append(Axolotlclient.CONFIG.NickHider.hideOwnName ? new LiteralText(Axolotlclient.CONFIG.NickHider.OwnName) : MinecraftClient.getInstance().player.getName()).setStyle(message.getStyle());
56-
} else {
57-
name.append(new LiteralText(Axolotlclient.CONFIG.NickHider.hideOtherNames ? Axolotlclient.CONFIG.NickHider.otherName : sender).setStyle(message.getStyle()));
58-
}
59-
60-
String[] msg = message.getString().split(sender);
61-
for (String s : msg) {
62-
editedMessage.append(s);
63-
if (!Objects.equals(s, msg[msg.length - 1])) {
64-
editedMessage.append(name);
65-
}
66-
}
67-
68-
69-
if (!editedMessage.getString().split(":")[0].contains("<") && editedMessage.getString().split(":")[0].contains("] " ) && !editedMessage.getString().contains("[NPC]")){
70-
editedMessage = new LiteralText(editedMessage.getString().split("] ")[editedMessage.getString().split("] ").length-1]);
71-
}
72-
73-
74-
return editedMessage.setStyle(message.getStyle().withFont(Axolotlclient.FONT));
75-
}*/
76-
return message;
47+
return Text.literal(msg).copy().setStyle(message.getStyle());
48+
}
49+
return message;
7750
}
7851

52+
@ModifyArg(method = "addMessage(Lnet/minecraft/text/Text;I)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;info(Ljava/lang/String;Ljava/lang/Object;)V"), index = 1, remap = false)
53+
public Object noNamesInLogIfHidden(Object o){
54+
return editChat((Text.of((String) o))).getString();
55+
}
7956
}

‎src/main/java/io/github/axolotlclient/mixin/MixinMinecraftClient.java‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.minecraft.SharedConstants;
66
import net.minecraft.client.MinecraftClient;
77
import net.minecraft.client.RunArgs;
8+
import org.quiltmc.loader.api.QuiltLoader;
89
import org.spongepowered.asm.mixin.Mixin;
910
import org.spongepowered.asm.mixin.injection.At;
1011
import org.spongepowered.asm.mixin.injection.Inject;
@@ -31,26 +32,12 @@ private String redirectVersion(RunArgs.Game game) {
3132
return SharedConstants.getGameVersion().getName();
3233
}
3334

34-
@Redirect(
35-
method = "<init>",
36-
at = @At(
37-
value = "FIELD",
38-
target = "Lnet/minecraft/client/RunArgs$Game;versionType:Ljava/lang/String;"
39-
)
40-
)
41-
private String redirectVersionType(RunArgs.Game game) {
42-
String versionType = game.versionType;
43-
44-
if (versionType.endsWith("Fabric")) {
45-
if (versionType.endsWith("/Fabric")) {
46-
return versionType.substring(0, versionType.length() - 7);
47-
}
48-
49-
return "release";
50-
}
51-
52-
return versionType;
53-
}
35+
@Inject(method = "getVersionType", at = @At("HEAD"), cancellable = true)
36+
public void noVersionType(CallbackInfoReturnable<String> cir){
37+
if(QuiltLoader.getModContainer("axolotlclient").isPresent()) {
38+
cir.setReturnValue(QuiltLoader.getModContainer("axolotlclient").get().metadata().version().raw());
39+
}
40+
}
5441

5542
@Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;checkIs64Bit()Z"))
5643
public void startup(RunArgs runArgs, CallbackInfo ci){
@@ -63,7 +50,7 @@ public void stop(CallbackInfo ci){
6350
DiscordRPC.shutdown();
6451
}
6552

66-
@Inject(method = "startOnlineMode", at = @At(value = "HEAD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;method_1236(Lnet/minecraft/entity/player/PlayerEntity;)V"))
53+
@Inject(method = "startOnlineMode", at = @At(value = "HEAD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;method_1236(Lnet/minecraft/entity/player/PlayerEntity;)V", shift = At.Shift.AFTER))
6754
public void login(CallbackInfo ci){
6855
NetworkHelper.setOnline();
6956
}

‎src/main/java/io/github/axolotlclient/mixin/MixinPlayerListHud.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
import com.mojang.authlib.GameProfile;
44
import com.mojang.blaze3d.systems.RenderSystem;
55
import io.github.axolotlclient.AxolotlClient;
6+
import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
67
import net.minecraft.client.font.TextRenderer;
78
import net.minecraft.client.gui.DrawableHelper;
89
import net.minecraft.client.gui.hud.PlayerListHud;
910
import net.minecraft.client.network.PlayerListEntry;
1011
import net.minecraft.client.util.math.MatrixStack;
12+
import net.minecraft.text.MutableText;
1113
import net.minecraft.text.Text;
1214
import org.spongepowered.asm.mixin.Mixin;
1315
import org.spongepowered.asm.mixin.injection.At;
16+
import org.spongepowered.asm.mixin.injection.ModifyArg;
1417
import org.spongepowered.asm.mixin.injection.Redirect;
1518

1619
@Mixin(PlayerListHud.class)
@@ -39,4 +42,15 @@ public int moveName(TextRenderer instance, MatrixStack matrices, Text text, floa
3942
cachedPlayer=null;
4043
return instance.drawWithShadow(matrices, text, x, y, color);
4144
}
45+
46+
@ModifyArg(method = "getPlayerName", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;applyGameModeFormatting(Lnet/minecraft/client/network/PlayerListEntry;Lnet/minecraft/text/MutableText;)Lnet/minecraft/text/Text;"), index = 1)
47+
public MutableText hideNames(MutableText name){
48+
if(NickHider.Instance.hideOwnName.get()){
49+
return Text.literal(NickHider.Instance.hiddenNameSelf.get());
50+
}
51+
if(NickHider.Instance.hideOtherNames.get()){
52+
return Text.literal(NickHider.Instance.hiddenNameOthers.get());
53+
}
54+
return name;
55+
}
4256
}

‎src/main/java/io/github/axolotlclient/mixin/MixinPlayerRenderer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public abstract class MixinPlayerRenderer {
2020
public void modifiyName(Args args){
2121
if(AxolotlClient.CONFIG != null) {
2222
AbstractClientPlayerEntity player = args.get(0);
23-
if(player.getUuid()== MinecraftClient.getInstance().player.getUuid() &&
23+
if(player.getUuid() == MinecraftClient.getInstance().player.getUuid() &&
2424
NickHider.Instance.hideOwnName.get()){
25-
args.set(2, Text.literal(NickHider.Instance.hiddenNameSelf.get()));
25+
args.set(1, Text.literal(NickHider.Instance.hiddenNameSelf.get()));
2626
} else if(player.getUuid()!=MinecraftClient.getInstance().player.getUuid() &&
2727
NickHider.Instance.hideOtherNames.get()){
28-
args.set(2, Text.literal(NickHider.Instance.hiddenNameOthers.get()));
28+
args.set(1, Text.literal(NickHider.Instance.hiddenNameOthers.get()));
2929
}
3030
}
3131
}

‎src/main/resources/assets/axolotlclient/lang/en_us.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949

5050
"motionBlur": "Motion Blur",
5151
"zoom": "Zoom",
52+
"timeChanger": "Time Changer",
53+
"time": "Time",
5254
"blockOutlines": "Block Outlines",
5355
"outlineWidth": "Outline Width",
5456

@@ -79,7 +81,8 @@
7981
"nickhider": "NickHider",
8082
"hiddenNameSelf": "Hide yourself as:",
8183
"hiddenNameOthers": "Hide others as:",
82-
"hideOwnName": "Hide your own name. <br>Also filters your name in chat messages.",
84+
"hideOwnName": "Hide your name",
85+
"hideOwnName.tooltip": "Hides your own name. <br>Also filters your name in chat messages.",
8386
"hideOtherNames": "Hide others' names",
8487
"hideOtherNames.tooltip": "Hides other people's names. <br>Only filters chat names.",
8588
"hideOwnSkin": "Hide your own skin",

0 commit comments

Comments
 (0)