update to 1.21.3

BlossomMods · Oct 27, 2024 · 12ffe76 · 12ffe76
1 parent 8e994f5
commit 12ffe76
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.6
+
+* Update to support 1.21.3
+
 # 2.0.5
 
 * Update to support 1.21.1

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.8-SNAPSHOT'
     id 'maven-publish'
     id "com.modrinth.minotaur" version "2.+"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-mod_version=2.0.5
+mod_version=2.0.6
 maven_group=dev.codedsakura.blossom
 mod_slug=BlossomPVP
 archives_base_name=blossom-pvp
-supported_versions=1.21;1.21.1
+supported_versions=1.21.3;1.21.2
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.1
-yarn_mappings=build.3
-loader_version=0.16.5
+minecraft_version=1.21.3
+yarn_mappings=build.2
+loader_version=0.16.7
 
 # Dependencies
-blossomlib_version=2.5.9
+blossomlib_version=2.5.10
diff --git a/src/main/java/dev/codedsakura/blossom/pvp/mixin/PVPMixin.java b/src/main/java/dev/codedsakura/blossom/pvp/mixin/PVPMixin.java
@@ -6,6 +6,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.MutableText;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -41,15 +42,16 @@ public class PVPMixin {
         }
     }
 
+    @Unique
     void messageHelper(PlayerEntity attacker, PlayerEntity defender, String key) {
         MutableText attackerMessage = TextUtils.fTranslation(key + ".attacker", TextUtils.Type.WARN, defender);
-        if (attackerMessage.asTruncatedString(1).length() > 0) {
-            attacker.sendMessage(attackerMessage);
+        if (!attackerMessage.asTruncatedString(1).isEmpty()) {
+            attacker.sendMessage(attackerMessage, false);
         }
 
         MutableText defenderMessage = TextUtils.fTranslation(key + ".defender", TextUtils.Type.WARN, attacker);
-        if (defenderMessage.asTruncatedString(1).length() > 0) {
-            defender.sendMessage(defenderMessage);
+        if (!defenderMessage.asTruncatedString(1).isEmpty()) {
+            defender.sendMessage(defenderMessage, false);
         }
     }
 }