Add option to hide tip messages

moehreag · moehreag · commit 68d155efa0f7 · 2022-11-23T23:11:35.000+01:00
- replace a few *.Instance.* calls with getters
diff --git a/src/main/java/io/github/axolotlclient/AxolotlClient.java b/src/main/java/io/github/axolotlclient/AxolotlClient.java
@@ -194,8 +194,8 @@ public static void addBadge(Entity entity, MatrixStack matrices){
 				assert MinecraftClient.getInstance().player != null;
 				int x = -(MinecraftClient.getInstance().textRenderer.getWidth(
 						entity.getUuid() == MinecraftClient.getInstance().player.getUuid()?
-						(NickHider.Instance.hideOwnName.get() ? NickHider.Instance.hiddenNameSelf.get(): Team.decorateName(entity.getScoreboardTeam(), entity.getName()).getString()):
-						(NickHider.Instance.hideOtherNames.get() ? NickHider.Instance.hiddenNameOthers.get(): Team.decorateName(entity.getScoreboardTeam(), entity.getName()).getString())
+						(NickHider.getInstance().hideOwnName.get() ? NickHider.getInstance().hiddenNameSelf.get(): Team.decorateName(entity.getScoreboardTeam(), entity.getName()).getString()):
+						(NickHider.getInstance().hideOtherNames.get() ? NickHider.getInstance().hiddenNameOthers.get(): Team.decorateName(entity.getScoreboardTeam(), entity.getName()).getString())
 				)/2 + (AxolotlClient.CONFIG.customBadge.get() ? MinecraftClient.getInstance().textRenderer.getWidth(" "+ Formatting.strip(AxolotlClient.CONFIG.badgeText.get())): 10));
 
 				RenderSystem.setShaderColor(1, 1, 1, 1);
diff --git a/src/main/java/io/github/axolotlclient/mixin/ChatHudMixin.java b/src/main/java/io/github/axolotlclient/mixin/ChatHudMixin.java
@@ -24,6 +24,7 @@
 
 import io.github.axolotlclient.modules.hypixel.autoboop.AutoBoop;
 import io.github.axolotlclient.modules.hypixel.autogg.AutoGG;
+import io.github.axolotlclient.modules.hypixel.autotip.AutoTip;
 import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.client.gui.hud.ChatMessageTag;
@@ -38,16 +39,20 @@
 @Mixin(ChatHud.class)
 public abstract class ChatHudMixin {
 
-    @Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/gui/hud/ChatMessageTag;)V", at = @At("HEAD"))
+    @Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/gui/hud/ChatMessageTag;)V", at = @At("HEAD"), cancellable = true)
 	public void autoThings(Text message, MessageSignature signature, ChatMessageTag tag, CallbackInfo ci){
-		AutoGG.Instance.onMessage(message);
-		AutoBoop.Instance.onMessage(message);
+		AutoGG.getInstance().onMessage(message);
+		AutoBoop.getInstance().onMessage(message);
+
+		if(AutoTip.getInstance().onChatMessage(message)){
+			ci.cancel();
+		}
 	}
 
 	@ModifyArg(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/gui/hud/ChatMessageTag;)V",
 			at = @At(value = "INVOKE",
 					target = "Lnet/minecraft/client/gui/hud/ChatHud;addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/chat/MessageSignature;ILnet/minecraft/client/gui/hud/ChatMessageTag;Z)V"), index = 0)
 	public Text editChat(Text message) {
-        return NickHider.Instance.editMessage(message);
+        return NickHider.getInstance().editMessage(message);
 	}
 }
diff --git a/src/main/java/io/github/axolotlclient/mixin/PlayerEntityRendererMixin.java b/src/main/java/io/github/axolotlclient/mixin/PlayerEntityRendererMixin.java
@@ -43,11 +43,11 @@ public void modifiyName(Args args){
         if(AxolotlClient.CONFIG != null) {
             AbstractClientPlayerEntity player = args.get(0);
             if(player.getUuid() == MinecraftClient.getInstance().player.getUuid() &&
-                    NickHider.Instance.hideOwnName.get()){
-                args.set(1, Text.literal(NickHider.Instance.hiddenNameSelf.get()));
+                    NickHider.getInstance().hideOwnName.get()){
+                args.set(1, Text.literal(NickHider.getInstance().hiddenNameSelf.get()));
             } else if(player.getUuid()!=MinecraftClient.getInstance().player.getUuid() &&
-                    NickHider.Instance.hideOtherNames.get()){
-                args.set(1, Text.literal(NickHider.Instance.hiddenNameOthers.get()));
+                    NickHider.getInstance().hideOtherNames.get()){
+                args.set(1, Text.literal(NickHider.getInstance().hiddenNameOthers.get()));
             }
         }
     }
diff --git a/src/main/java/io/github/axolotlclient/mixin/PlayerListEntryMixin.java b/src/main/java/io/github/axolotlclient/mixin/PlayerListEntryMixin.java
@@ -43,11 +43,11 @@ public abstract class PlayerListEntryMixin {
     @Inject(method = "getSkinTexture", at = @At("RETURN"), cancellable = true)
     public void hideSkins(CallbackInfoReturnable<Identifier> cir){
         if(profile.equals(MinecraftClient.getInstance().player.getGameProfile()) &&
-                NickHider.Instance.hideOwnSkin.get()){
+                NickHider.getInstance().hideOwnSkin.get()){
 
             cir.setReturnValue(DefaultSkinHelper.getTexture(profile.getId()));
         } else if(!profile.equals(MinecraftClient.getInstance().player.getGameProfile()) &&
-                NickHider.Instance.hideOtherSkins.get()){
+                NickHider.getInstance().hideOtherSkins.get()){
 
             cir.setReturnValue(DefaultSkinHelper.getTexture(profile.getId()));
         }
diff --git a/src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java b/src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java
@@ -60,11 +60,11 @@ public GameProfile getPlayerGameProfile(PlayerListEntry instance){
 	@Inject(method = "getPlayerName", at = @At("HEAD"), cancellable = true)
 	public void nickHider(PlayerListEntry playerEntry, CallbackInfoReturnable<String> cir){
 		if(playerEntry.getProfile().getId()==MinecraftClient.getInstance().player.getUuid() &&
-				NickHider.Instance.hideOwnName.get()){
-			cir.setReturnValue(NickHider.Instance.hiddenNameSelf.get());
+				NickHider.getInstance().hideOwnName.get()){
+			cir.setReturnValue(NickHider.getInstance().hiddenNameSelf.get());
 		} else if(playerEntry.getProfile().getId()!=MinecraftClient.getInstance().player.getUuid() &&
-				NickHider.Instance.hideOtherNames.get()){
-			cir.setReturnValue(NickHider.Instance.hiddenNameOthers.get());
+				NickHider.getInstance().hideOtherNames.get()){
+			cir.setReturnValue(NickHider.getInstance().hiddenNameOthers.get());
 		}
 	}
 
@@ -97,11 +97,11 @@ public int moveName(TextRenderer instance, MatrixStack matrices, Text text, floa
 
 	@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)
 	public MutableText hideNames(MutableText name){
-		if(NickHider.Instance.hideOwnName.get()){
-			return Text.literal(NickHider.Instance.hiddenNameSelf.get());
+		if(NickHider.getInstance().hideOwnName.get()){
+			return Text.literal(NickHider.getInstance().hiddenNameSelf.get());
 		}
-		if(NickHider.Instance.hideOtherNames.get()){
-			return Text.literal(NickHider.Instance.hiddenNameOthers.get());
+		if(NickHider.getInstance().hideOtherNames.get()){
+			return Text.literal(NickHider.getInstance().hiddenNameOthers.get());
 		}
 		return name;
 	}
diff --git a/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelMods.java b/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelMods.java
@@ -57,10 +57,10 @@ public void init() {
         category.add(cacheMode);
 
         addSubModule(LevelHead.getInstance());
-        addSubModule(AutoGG.Instance);
-        addSubModule(AutoTip.INSTANCE);
-        addSubModule(NickHider.Instance);
-		addSubModule(AutoBoop.Instance);
+        addSubModule(AutoGG.getInstance());
+        addSubModule(AutoTip.getInstance());
+        addSubModule(NickHider.getInstance());
+		addSubModule(AutoBoop.getInstance());
 
         subModules.forEach(AbstractHypixelMod::init);
 
diff --git a/src/main/java/io/github/axolotlclient/modules/hypixel/autoboop/AutoBoop.java b/src/main/java/io/github/axolotlclient/modules/hypixel/autoboop/AutoBoop.java
@@ -26,13 +26,15 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 import io.github.axolotlclient.modules.hypixel.AbstractHypixelMod;
 import io.github.axolotlclient.util.Util;
+import lombok.Getter;
 import net.minecraft.text.Text;
 
 
 // Based on https://github.com/VeryHolyCheeeese/AutoBoop/blob/main/src/main/java/autoboop/AutoBoop.java
 public class AutoBoop implements AbstractHypixelMod {
 
-	public static AutoBoop Instance = new AutoBoop();
+	@Getter
+	private final static AutoBoop Instance = new AutoBoop();
 
 	protected OptionCategory cat = new OptionCategory("autoBoop");
 	protected BooleanOption enabled = new BooleanOption("enabled", "autoBoop", false);
diff --git a/src/main/java/io/github/axolotlclient/modules/hypixel/autogg/AutoGG.java b/src/main/java/io/github/axolotlclient/modules/hypixel/autogg/AutoGG.java
@@ -27,6 +27,7 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.StringOption;
 import io.github.axolotlclient.modules.hypixel.AbstractHypixelMod;
 import io.github.axolotlclient.util.Util;
+import lombok.Getter;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 
@@ -41,7 +42,8 @@
 
 public class AutoGG implements AbstractHypixelMod {
 
-    public static AutoGG Instance = new AutoGG();
+    @Getter
+    private final static AutoGG Instance = new AutoGG();
 
     private final OptionCategory category = new OptionCategory("autogg");
     private final MinecraftClient client = MinecraftClient.getInstance();
diff --git a/src/main/java/io/github/axolotlclient/modules/hypixel/autotip/AutoTip.java b/src/main/java/io/github/axolotlclient/modules/hypixel/autotip/AutoTip.java
@@ -26,21 +26,31 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 import io.github.axolotlclient.modules.hypixel.AbstractHypixelMod;
 import io.github.axolotlclient.util.Util;
+import lombok.Getter;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.Text;
+
+import java.util.regex.Pattern;
 
 public class AutoTip implements AbstractHypixelMod {
 
-    public static AutoTip INSTANCE = new AutoTip();
+    @Getter
+    private final static AutoTip Instance = new AutoTip();
 
     private final OptionCategory category = new OptionCategory("autotip");
 
     private final BooleanOption enabled = new BooleanOption("enabled", false);
+    private final BooleanOption hideMessages = new BooleanOption("hideTipMessages", false);
+
+    private final Pattern messagePattern = Pattern.compile("^You tipped [0-9]+ players in [0-9]+ different games!$");
+    private final Pattern tippedPattern = Pattern.compile("^You already tipped everyone that has boosters active, so there isn't anybody to be tipped right now!$");
+
     private long lastTime;
     private boolean init = false;
 
     @Override
     public void init() {
-        category.add(enabled);
+        category.add(enabled, hideMessages);
         init=true;
     }
 
@@ -64,6 +74,11 @@ public void tick() {
         }
     }
 
+    public boolean onChatMessage(Text text){
+        return enabled.get() && hideMessages.get() &&
+                (messagePattern.matcher(text.getString()).matches() || tippedPattern.matcher(text.getString()).matches());
+    }
+
     @Override
     public boolean tickable() {
         return true;
diff --git a/src/main/java/io/github/axolotlclient/modules/hypixel/nickhider/NickHider.java b/src/main/java/io/github/axolotlclient/modules/hypixel/nickhider/NickHider.java
@@ -26,13 +26,15 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 import io.github.axolotlclient.AxolotlclientConfig.options.StringOption;
 import io.github.axolotlclient.modules.hypixel.AbstractHypixelMod;
+import lombok.Getter;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.text.Text;
 
 public class NickHider implements AbstractHypixelMod {
 
-    public static NickHider Instance = new NickHider();
+    @Getter
+    private final static NickHider Instance = new NickHider();
 
     private final OptionCategory category = new OptionCategory("nickhider");
 
diff --git a/src/main/java/io/github/axolotlclient/util/Util.java b/src/main/java/io/github/axolotlclient/util/Util.java
@@ -25,7 +25,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.glfw.Window;
-import io.github.axolotlclient.modules.hud.util.Rectangle;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.ChatPreview;
 import net.minecraft.scoreboard.Scoreboard;
@@ -126,7 +125,7 @@ public static double calculateDistance(double x1, double x2, double y1, double y
 	private static final ChatPreview whateverThisIs = new ChatPreview(MinecraftClient.getInstance());
 	public static void sendChatMessage(String msg) {
         Text text = net.minecraft.util.Util.map(whateverThisIs.tryConsumeResponse(msg), ChatPreview.Response::response);
-		MinecraftClient.getInstance().player.sendCommand(msg, text);
+		MinecraftClient.getInstance().player.sendCommand(msg.substring(1), text);
 	}
 
     public static void sendChatMessage(Text msg){
diff --git a/src/main/resources/assets/axolotlclient/lang/en_us.json b/src/main/resources/assets/axolotlclient/lang/en_us.json
@@ -103,6 +103,8 @@
 	"onPVPL": "Active on PVPLand",
 	"onMMC": "Active on MineMen.club",
 	"autotip": "AutoTip",
+	"hideTipMessages": "Hide Tip Messages",
+	"hideTipMessages.tooltip": "Hides Tip Messages. Currently only works <br>if you have set your hypixel language to english.",
 	"nickhider": "NickHider",
 	"hiddenNameSelf": "Hide yourself as:",
 	"hiddenNameOthers": "Hide others as:",

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ public void modifiyName(Args args){`
`43`	`43`	`if(AxolotlClient.CONFIG != null) {`
`44`	`44`	`AbstractClientPlayerEntity player = args.get(0);`
`45`	`45`	`if(player.getUuid() == MinecraftClient.getInstance().player.getUuid() &&`
`46`		`- NickHider.Instance.hideOwnName.get()){`
`47`		`- args.set(1, Text.literal(NickHider.Instance.hiddenNameSelf.get()));`
	`46`	`+ NickHider.getInstance().hideOwnName.get()){`
	`47`	`+ args.set(1, Text.literal(NickHider.getInstance().hiddenNameSelf.get()));`
`48`	`48`	`} else if(player.getUuid()!=MinecraftClient.getInstance().player.getUuid() &&`
`49`		`- NickHider.Instance.hideOtherNames.get()){`
`50`		`- args.set(1, Text.literal(NickHider.Instance.hiddenNameOthers.get()));`
	`49`	`+ NickHider.getInstance().hideOtherNames.get()){`
	`50`	`+ args.set(1, Text.literal(NickHider.getInstance().hiddenNameOthers.get()));`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ public GameProfile getPlayerGameProfile(PlayerListEntry instance){`
`60`	`60`	`@Inject(method = "getPlayerName", at = @At("HEAD"), cancellable = true)`
`61`	`61`	`public void nickHider(PlayerListEntry playerEntry, CallbackInfoReturnable<String> cir){`
`62`	`62`	`if(playerEntry.getProfile().getId()==MinecraftClient.getInstance().player.getUuid() &&`
`63`		`- NickHider.Instance.hideOwnName.get()){`
`64`		`- cir.setReturnValue(NickHider.Instance.hiddenNameSelf.get());`
	`63`	`+ NickHider.getInstance().hideOwnName.get()){`
	`64`	`+ cir.setReturnValue(NickHider.getInstance().hiddenNameSelf.get());`
`65`	`65`	`} else if(playerEntry.getProfile().getId()!=MinecraftClient.getInstance().player.getUuid() &&`
`66`		`- NickHider.Instance.hideOtherNames.get()){`
`67`		`- cir.setReturnValue(NickHider.Instance.hiddenNameOthers.get());`
	`66`	`+ NickHider.getInstance().hideOtherNames.get()){`
	`67`	`+ cir.setReturnValue(NickHider.getInstance().hiddenNameOthers.get());`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -97,11 +97,11 @@ public int moveName(TextRenderer instance, MatrixStack matrices, Text text, floa`
`97`	`97`
`98`	`98`	`@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)`
`99`	`99`	`public MutableText hideNames(MutableText name){`
`100`		`- if(NickHider.Instance.hideOwnName.get()){`
`101`		`- return Text.literal(NickHider.Instance.hiddenNameSelf.get());`
	`100`	`+ if(NickHider.getInstance().hideOwnName.get()){`
	`101`	`+ return Text.literal(NickHider.getInstance().hiddenNameSelf.get());`
`102`	`102`	`}`
`103`		`- if(NickHider.Instance.hideOtherNames.get()){`
`104`		`- return Text.literal(NickHider.Instance.hiddenNameOthers.get());`
	`103`	`+ if(NickHider.getInstance().hideOtherNames.get()){`
	`104`	`+ return Text.literal(NickHider.getInstance().hiddenNameOthers.get());`
`105`	`105`	`}`
`106`	`106`	`return name;`
`107`	`107`	`}`