Update minigame to Minecraft 1.19.4 (#29)

NucleoidMC · Mar 22, 2023 · b210de7 · b210de7
1 parent e667664
commit b210de7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'fabric-loom' version '1.0.+'
+  id 'fabric-loom' version '1.1.+'
   id 'maven-publish'
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.2
-loader_version=0.14.11
+minecraft_version=1.19.4
+yarn_mappings=1.19.4+build.1
+loader_version=0.14.17
 
 # Dependencies
-fabric_version=0.68.1+1.19.3
-plasmid_version=0.5+1.19.3-SNAPSHOT
+fabric_version=0.76.0+1.19.4
+plasmid_version=0.5+1.19.4-SNAPSHOT
 
 # Mod Properties
 mod_version=1.0.0

diff --git a/src/main/java/io/github/restioson/siege/game/active/SiegeActive.java b/src/main/java/io/github/restioson/siege/game/active/SiegeActive.java
@@ -21,6 +21,7 @@
 import net.minecraft.entity.projectile.PersistentProjectileEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.item.*;
+import net.minecraft.registry.tag.DamageTypeTags;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
@@ -429,7 +430,7 @@ private MutableText getDeathMessageAndIncStats(ServerPlayerEntity player, Damage
         } else if (participant != null && participant.attacker(time, world) != null) {
             eliminationMessage.append(participant.attacker(time, world).getDisplayName());
             attacker = this.participant(participant.attacker(time, world));
-        } else if (source == DamageSource.DROWN) {
+        } else if (source.isIn(DamageTypeTags.IS_DROWNING)) {
             eliminationMessage.append("forgetting to just keep swimming");
         } else {
             eliminationMessage = Text.literal(" died");

diff --git a/src/main/java/io/github/restioson/siege/game/active/SiegeCaptureLogic.java b/src/main/java/io/github/restioson/siege/game/active/SiegeCaptureLogic.java
@@ -11,6 +11,7 @@
 import net.minecraft.block.*;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LightningEntity;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
@@ -244,7 +245,7 @@ private void broadcastStartCapture(SiegeFlag flag, GameTeam captureTeam) {
         this.gameSpace.getPlayers().sendMessage(
                 Text.literal("The ")
                         .append(Text.literal(flag.name).formatted(Formatting.YELLOW))
-                        .append(" ")
+                        .append(ScreenTexts.SPACE)
                         .append(flag.presentTobe())
                         .append(" being captured by the ")
                         .append(captureTeam.config().name())
@@ -278,7 +279,7 @@ private void broadcastCaptured(SiegeFlag flag, GameTeam captureTeam) {
         this.gameSpace.getPlayers().sendMessage(
                 Text.literal("The ")
                         .append(Text.literal(flag.name).formatted(Formatting.YELLOW))
-                        .append(" ")
+                        .append(ScreenTexts.SPACE)
                         .append(flag.pastToBe())
                         .append(" been captured by the ")
                         .append(captureTeam.config().name())
@@ -297,7 +298,7 @@ private void broadcastSecured(SiegeFlag flag) {
         this.gameSpace.getPlayers().sendMessage(
                 Text.literal("The ")
                         .append(Text.literal(flag.name).formatted(Formatting.YELLOW))
-                        .append(" ")
+                        .append(ScreenTexts.SPACE)
                         .append(flag.pastToBe())
                         .append(" been defended by the ")
                         .append(flag.team.config().name())

diff --git a/src/main/java/io/github/restioson/siege/game/active/SiegeGateLogic.java b/src/main/java/io/github/restioson/siege/game/active/SiegeGateLogic.java
@@ -10,6 +10,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.item.Items;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
@@ -118,7 +119,7 @@ public void tickGate(SiegeGate gate) {
             this.game.gameSpace.getPlayers().sendMessage(
                     Text.literal("The ")
                             .append(Text.literal(gate.flag.name).formatted(Formatting.YELLOW))
-                            .append(" ")
+                            .append(ScreenTexts.SPACE)
                             .append(gate.flag.pastToBe())
                             .append(" been bashed open by the ")
                             .append(bashTeam.config().name())
@@ -132,7 +133,7 @@ public void tickGate(SiegeGate gate) {
             this.game.gameSpace.getPlayers().sendMessage(
                     Text.literal("The ")
                             .append(Text.literal(gate.flag.name).formatted(Formatting.YELLOW))
-                            .append(" ")
+                            .append(ScreenTexts.SPACE)
                             .append(gate.flag.pastToBe())
                             .append(" been repaired by the ")
                             .append(team.config().name())