Merge branch '1.19.x'

Author: KonaeAkira

.github/workflows/beta.yml

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.0-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.modrinth.minotaur' version '2.+'
 }
@@ -107,7 +107,7 @@ modrinth {
 	versionNumber = "v${project.version}"
 	versionName = "Skyblocker ${project.mod_version} for ${project.suported_version}"
 	uploadFile = remapJar
-	gameVersions = ["1.18", "1.18.1", project.minecraft_version]
+	gameVersions = ["1.19", "1.19.1", project.minecraft_version]
 	loaders = ["fabric"]
 	versionType = "release"
 	dependencies = [ // Yet another array. Create a new `ModDependency` or `VersionDependency` with two strings - the ID and the scope

.github/workflows/buildrelease.yml

@@ -1,22 +1,22 @@
 org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US
 
 # Fabric Properties (https://fabricmc.net/versions.html)
-minecraft_version=1.18.2
-yarn_mappings=1.18.2+build.1
-loader_version=0.13.3
+minecraft_version=1.19.2
+yarn_mappings=1.19.2+build.1
+loader_version=0.14.8
 
 #Fabric api
-fabric_version=0.47.9+1.18.2
+fabric_version=0.58.6+1.19.2
 
 # Dependencies
 ## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files)
-clothconfig_version=6.2.57
+clothconfig_version=7.0.65
 ## Mod Menu (https://www.curseforge.com/minecraft/mc-mods/modmenu/files)
-mod_menu_version=3.1.0
+mod_menu_version=4.0.6
 
 # Mod Properties
-mod_version = 1.8.1
+mod_version = 1.8.2
 maven_group = me.xmrvizzy
 archives_base_name = skyblocker
 modrinth_id=y6DuFGwJ
-suported_version=1.18.x
+suported_version=1.19.2

build.gradle

@@ -4,7 +4,7 @@
 import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.LiteralText;
+import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.Text;
 
 import java.util.Objects;
@@ -19,7 +19,7 @@ public AutopetFilter() {
     public boolean onMatch(Text _message, Matcher matcher) {
         if (SkyblockerConfig.get().messages.hideAutopet == ChatFilterResult.ACTION_BAR) {
             Objects.requireNonNull(MinecraftClient.getInstance().player).sendMessage(
-                    new LiteralText(
+                    Text.literal(
                             _message.getString().replace("§a§lVIEW RULE", "")
                     ), true);
         }

gradle.properties

@@ -4,9 +4,10 @@
 import me.xmrvizzy.skyblocker.chat.ChatMessageListener;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.hud.ChatHudListener;
+import net.minecraft.client.gui.hud.ChatHud;
+import net.minecraft.client.gui.hud.MessageIndicator;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.network.MessageType;
+import net.minecraft.network.message.MessageSignatureData;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,17 +16,15 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.UUID;
-
-@Mixin(ChatHudListener.class)
+@Mixin(ChatHud.class)
 public class ChatHudListenerMixin {
 
     @Shadow
     @Final
     private MinecraftClient client;
 
-    @Inject(method = "onChatMessage", at = @At("HEAD"), cancellable = true)
-    public void onMessage(MessageType messageType, Text message, UUID senderUuid, CallbackInfo ci) {
+    @Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;ILnet/minecraft/client/gui/hud/MessageIndicator;Z)V", at = @At("HEAD"), cancellable = true)
+    public void onMessage(Text message, MessageSignatureData signature, int ticks, MessageIndicator indicator, boolean refresh, CallbackInfo ci) {
         if (!Utils.isOnSkyblock)
             return;
         String asString = message.getString();

src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java

@@ -6,6 +6,7 @@
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.network.encryption.PlayerPublicKey;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,8 +15,8 @@
 @Mixin(ClientPlayerEntity.class)
 public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
 
-    public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
-        super(world, profile);
+    public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, PlayerPublicKey publicKey) {
+        super(world, profile, publicKey);
     }
 
     @Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true)

src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java

@@ -31,7 +31,7 @@ public class BackpackPreview extends DrawableHelper {
     private static final BackpackPreview instance = new BackpackPreview();
     private static final Pattern PROFILE_PATTERN = Pattern.compile("Profile: ([a-zA-Z]+)");
     private static final Pattern ECHEST_PATTERN = Pattern.compile("Ender Chest.*\\((\\d+)/\\d+\\)");
-    private static final Pattern BACKPACK_PATTERN = Pattern.compile("Backpack.*\\((\\d+)/\\d+\\)");
+    private static final Pattern BACKPACK_PATTERN = Pattern.compile("Backpack.*\\(Slot #(\\d+)\\)");
     private static final int STORAGE_SIZE = 27;
 
     private static final Inventory[] storage = new Inventory[STORAGE_SIZE];

src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java

@@ -6,6 +6,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 

src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java

@@ -7,10 +7,10 @@
 import java.util.regex.Pattern;
 
 public class StatusBarTracker {
-    private static final Pattern STATUS_HEALTH = Pattern.compile("§[6c](\\d+)/(\\d+)❤(?:(\\+§c\\d+. *)| *)");
-    private static final Pattern DEFENSE_STATUS = Pattern.compile("§a(\\d+)§a❈ Defense *");
-    private static final Pattern MANA_USE = Pattern.compile("§b-\\d+ Mana \\(§\\S+(?:\\s\\S+)* *");
-    private static final Pattern MANA_STATUS = Pattern.compile("§b(\\d+)/(\\d+)✎ (?:Mana|§3(\\d+)ʬ) *");
+    private static final Pattern STATUS_HEALTH = Pattern.compile("§[6c](\\d+(,\\d\\d\\d)*)/(\\d+(,\\d\\d\\d)*)❤(?:(\\+§c(\\d+(,\\d\\d\\d)*). *)| *)");
+    private static final Pattern DEFENSE_STATUS = Pattern.compile("§a(\\d+(,\\d\\d\\d)*)§a❈ Defense *");
+    private static final Pattern MANA_USE = Pattern.compile("§b-(\\d+(,\\d\\d\\d)*) Mana \\(§\\S+(?:\\s\\S+)* *");
+    private static final Pattern MANA_STATUS = Pattern.compile("§b(\\d+(,\\d\\d\\d)*)/(\\d+(,\\d\\d\\d)*)✎ (?:Mana|§3(\\d+(,\\d\\d\\d)*)ʬ) *");
 
     private Resource health = new Resource(100, 100, 0);
     private Resource mana = new Resource(100, 100, 0);
@@ -29,19 +29,19 @@ public int getDefense() {
     }
 
     private int parseInt(Matcher m, int group) {
-        return Integer.parseInt(m.group(group));
+        return Integer.parseInt(m.group(group).replace(",", ""));
     }
 
     private void updateMana(Matcher m) {
         int value = parseInt(m, 1);
-        int max = parseInt(m, 2);
-        int overflow = m.group(3) == null ? 0 : parseInt(m, 3);
+        int max = parseInt(m, 3);
+        int overflow = m.group(5) == null ? 0 : parseInt(m, 5);
         this.mana = new Resource(value, max, overflow);
     }
 
     private void updateHealth(Matcher m) {
         int value = parseInt(m, 1);
-        int max = parseInt(m, 2);
+        int max = parseInt(m, 3);
         int overflow = 0;
         ClientPlayerEntity player = null;
         try {
@@ -75,9 +75,9 @@ public String update(String actionBar, boolean filterManaUse) {
         if (!matcher.lookingAt())
             return actionBar;
         updateHealth(matcher);
-        if (matcher.group(3) != null) {
+        if (matcher.group(5) != null) {
             sb.append("§c❤");
-            sb.append(matcher.group(3));
+            sb.append(matcher.group(5));
         }
         actionBar = reset(actionBar, matcher);
         if (matcher.usePattern(MANA_STATUS).lookingAt()) {