Skip to content

Commit fec009d

Browse files
moehreagmoehreag
committed
small cleanup + fixes from 1.8.9
1 parent 23d33c3 commit fec009d

34 files changed

+81
-77
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package io.github.axolotlclient.mixin;
2+
3+
import io.github.axolotlclient.util.FeatureDisabler;
4+
import net.minecraft.client.MinecraftClient;
5+
import net.minecraft.client.gui.screen.ConnectScreen;
6+
import net.minecraft.client.network.ServerAddress;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
11+
12+
@Mixin(ConnectScreen.class)
13+
public abstract class ConnectScreenMixin {
14+
15+
@Inject(method = "connect(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ServerAddress;)V", at = @At("HEAD"))
16+
private void onServerJoin(MinecraftClient client, ServerAddress address, CallbackInfo ci){
17+
FeatureDisabler.onServerJoin(address.getAddress());
18+
}
19+
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,4 @@ public void freePlayerData(CallbackInfo ci){
2222
}
2323
FeatureDisabler.clear();
2424
}
25-
26-
@Inject(method = "connect(Lnet/minecraft/client/network/ServerInfo;)V", at = @At("HEAD"))
27-
public void onServerJoin(ServerInfo entry, CallbackInfo ci){
28-
FeatureDisabler.onServerJoin(entry);
29-
}
3025
}

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@
44
import com.mojang.blaze3d.systems.RenderSystem;
55
import io.github.axolotlclient.AxolotlClient;
66
import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
7+
import net.minecraft.client.MinecraftClient;
78
import net.minecraft.client.font.TextRenderer;
89
import net.minecraft.client.gui.DrawableHelper;
910
import net.minecraft.client.gui.hud.PlayerListHud;
1011
import net.minecraft.client.network.PlayerListEntry;
1112
import net.minecraft.client.util.math.MatrixStack;
1213
import net.minecraft.text.MutableText;
14+
import net.minecraft.text.StringVisitable;
1315
import net.minecraft.text.Text;
1416
import org.spongepowered.asm.mixin.Mixin;
1517
import org.spongepowered.asm.mixin.injection.At;
18+
import org.spongepowered.asm.mixin.injection.Inject;
1619
import org.spongepowered.asm.mixin.injection.ModifyArg;
1720
import org.spongepowered.asm.mixin.injection.Redirect;
21+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1822

1923
@Mixin(PlayerListHud.class)
2024
public abstract class PlayerListHudMixin {
@@ -28,6 +32,32 @@ public GameProfile getPlayerGameProfile(PlayerListEntry instance){
2832
return instance.getProfile();
2933
}
3034

35+
MinecraftClient client = MinecraftClient.getInstance();
36+
private PlayerListEntry playerListEntry;
37+
38+
@Inject(method = "getPlayerName", at = @At("HEAD"), cancellable = true)
39+
public void nickHider(PlayerListEntry playerEntry, CallbackInfoReturnable<String> cir){
40+
if(playerEntry.getProfile().getId()==MinecraftClient.getInstance().player.getUuid() &&
41+
NickHider.Instance.hideOwnName.get()){
42+
cir.setReturnValue(NickHider.Instance.hiddenNameSelf.get());
43+
} else if(playerEntry.getProfile().getId()!=MinecraftClient.getInstance().player.getUuid() &&
44+
NickHider.Instance.hideOtherNames.get()){
45+
cir.setReturnValue(NickHider.Instance.hiddenNameOthers.get());
46+
}
47+
}
48+
49+
@ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;getPlayerName(Lnet/minecraft/client/network/PlayerListEntry;)Lnet/minecraft/text/Text;"))
50+
public PlayerListEntry getPlayer(PlayerListEntry playerEntry){
51+
playerListEntry = playerEntry;
52+
return playerEntry;
53+
}
54+
55+
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;getWidth(Lnet/minecraft/text/StringVisitable;)I"))
56+
public int moveName(TextRenderer instance, StringVisitable text){
57+
if(AxolotlClient.CONFIG.showBadges.get() && AxolotlClient.isUsingClient(playerListEntry.getProfile().getId())) return instance.getWidth(text)+10;
58+
return instance.getWidth(text);
59+
}
60+
3161
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;drawWithShadow(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/text/Text;FFI)I"))
3262
public int moveName(TextRenderer instance, MatrixStack matrices, Text text, float x, float y, int color){
3363
if(AxolotlClient.CONFIG.showBadges.get() && AxolotlClient.isUsingClient(cachedPlayer.getId())){
@@ -43,6 +73,11 @@ public int moveName(TextRenderer instance, MatrixStack matrices, Text text, floa
4373
return instance.drawWithShadow(matrices, text, x, y, color);
4474
}
4575

76+
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;renderLatencyIcon(Lnet/minecraft/client/util/math/MatrixStack;IIILnet/minecraft/client/network/PlayerListEntry;)V"))
77+
private void moveLatencyIcon(){
78+
79+
}
80+
4681
@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)
4782
public MutableText hideNames(MutableText name){
4883
if(NickHider.Instance.hideOwnName.get()){

‎src/main/java/io/github/axolotlclient/modules/hud/HudManager.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import net.minecraft.client.option.KeyBind;
1919
import net.minecraft.client.util.math.MatrixStack;
2020
import net.minecraft.util.Identifier;
21-
import org.quiltmc.qsl.lifecycle.api.client.event.ClientTickEvents;
2221

2322
import java.util.*;
2423
import java.util.stream.Collectors;
@@ -46,13 +45,6 @@ public static HudManager getInstance() {
4645
private HudManager() {
4746
this.entries = new LinkedHashMap<>();
4847
client = MinecraftClient.getInstance();
49-
ClientTickEvents.END.register(minecraftClient -> {
50-
for (HudEntry entry : getEntries()) {
51-
if (entry.tickable() && entry.isEnabled()) {
52-
entry.tick();
53-
}
54-
}
55-
});
5648
}
5749

5850
static KeyBind key = new KeyBind("key.openHud", InputUtil.KEY_RIGHT_SHIFT_CODE, "category.axolotlclient");

‎src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,6 @@ public void setBounds(float scale) {
187187
trueBounds = new Rectangle(scaledX, scaledY, (int) (getWidth() * getScale()), (int) (getHeight() * getScale()));
188188
}
189189

190-
/*@Override
191-
public Tab toTab() {
192-
// Need to cast KronConfig to Option
193-
return Tab.ofOptions(getId(), getNameKey(), getConfigurationOptions().stream().map((o -> (Option<?>) o)).collect(Collectors.toList()));
194-
}*/
195-
196190
/**
197191
* Returns a list of options that should be shown in configuration screens
198192
*
@@ -209,7 +203,7 @@ public List<Option<?>> getConfigurationOptions() {
209203
/**
210204
* Returns a list of options that should be saved. By default, this includes {@link #getConfigurationOptions()}
211205
*
212-
* @return
206+
* @return a list of options
213207
*/
214208
@Override
215209
public List<Option<?>> getSaveOptions() {

‎src/main/java/io/github/axolotlclient/modules/hud/gui/entry/BoxHudEntry.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
55
import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
66
import io.github.axolotlclient.AxolotlclientConfig.options.Option;
7-
import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
87
import io.github.axolotlclient.modules.hud.gui.AbstractHudEntry;
98
import net.minecraft.client.util.math.MatrixStack;
109

‎src/main/java/io/github/axolotlclient/modules/hud/gui/entry/SimpleTextHudEntry.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.github.axolotlclient.AxolotlclientConfig.options.EnumOption;
77
import io.github.axolotlclient.AxolotlclientConfig.options.IntegerOption;
88
import io.github.axolotlclient.AxolotlclientConfig.options.Option;
9-
import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
109
import io.github.axolotlclient.modules.hud.gui.component.DynamicallyPositionable;
1110
import io.github.axolotlclient.modules.hud.gui.layout.AnchorPoint;
1211
import io.github.axolotlclient.modules.hud.gui.layout.Justification;

‎src/main/java/io/github/axolotlclient/modules/hud/gui/entry/TextHudEntry.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
55
import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
66
import io.github.axolotlclient.AxolotlclientConfig.options.Option;
7-
import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
87

98
import java.util.List;
109

‎src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CoordsHud.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public static String getXDir(int dir) {
5858
/**
5959
* Get direction. 1 = North, 2 North East, 3 East, 4 South East...
6060
*
61-
* @param yaw
62-
* @return
61+
* @param yaw the player's yaw
62+
* @return a Direction value of 0-360 degrees.
6363
*/
6464
public static int getDirection(double yaw) {
6565
yaw %= 360;

‎src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
66
import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
77
import io.github.axolotlclient.AxolotlclientConfig.options.Option;
8-
import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
98
import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
109
import io.github.axolotlclient.modules.hud.util.DrawPosition;
1110
import io.github.axolotlclient.modules.hud.util.DrawUtil;

0 commit comments

Comments
 (0)