Update to Minecraft 1.21.4

Author: Jerozgen

.github/workflows/gradle.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     if: "! contains(toJSON(github.event.head_commit.message), '[Skip CI]')"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -25,7 +25,7 @@ jobs:
         run: ./gradlew build
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: Gomoku
           path: build/libs

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.4-SNAPSHOT'
+    id 'fabric-loom' version '1.9-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -36,7 +36,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
-    it.options.release = 17
+    it.options.release = 21
 }
 
 base {
@@ -45,8 +45,8 @@ base {
 
 java {
     withSourcesJar()
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.14.24
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
+loader_version=0.16.9
 # Mod Properties
 mod_version=1.0
 maven_group=jerozgen
 archives_base_name=gomoku
 # Dependencies
-fabric_version=0.90.7+1.20.2
-plasmid_version=0.5.102-SNAPSHOT+1.20.2
+fabric_version=0.111.0+1.21.4
+plasmid_version=0.6.3-SNAPSHOT+1.21.4

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -4,13 +4,13 @@
 import jerozgen.gomoku.game.GomokuGame;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.util.Identifier;
-import xyz.nucleoid.plasmid.game.GameType;
+import xyz.nucleoid.plasmid.api.game.GameType;
 
 public class Gomoku implements ModInitializer {
     public static final String ID = "gomoku";
 
     @Override
     public void onInitialize() {
-        GameType.register(new Identifier(ID, "gomoku"), GomokuConfig.CODEC, GomokuGame::open);
+        GameType.register(Identifier.of(ID, "gomoku"), GomokuConfig.CODEC, GomokuGame::open);
     }
 }

src/main/java/jerozgen/gomoku/Gomoku.java

@@ -1,25 +1,31 @@
 package jerozgen.gomoku.game;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import jerozgen.gomoku.game.board.BoardConfig;
 import net.minecraft.block.Block;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.dynamic.Codecs;
-import xyz.nucleoid.plasmid.game.common.config.PlayerConfig;
-import xyz.nucleoid.plasmid.game.stats.GameStatisticBundle;
+import xyz.nucleoid.plasmid.api.game.common.config.WaitingLobbyConfig;
+import xyz.nucleoid.plasmid.api.game.stats.GameStatisticBundle;
 
 import java.util.List;
 import java.util.Optional;
 
 import static net.minecraft.block.Blocks.*;
 
-public record GomokuConfig(PlayerConfig playerConfig, BoardConfig boardConfig, List<List<Block>> blocks,
-                           int firstMovePlaces, int eachMovePlaces, int moveDuration,
-                           Optional<String> statisticBundleNamespace) {
-    public static final Codec<GomokuConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-            PlayerConfig.CODEC.fieldOf("players").forGetter(GomokuConfig::playerConfig),
-            BoardConfig.CODEC.fieldOf("board").forGetter(GomokuConfig::boardConfig),
+public record GomokuConfig(
+        WaitingLobbyConfig players,
+        BoardConfig board,
+        List<List<Block>> blocks,
+        int firstMovePlaces,
+        int eachMovePlaces,
+        int moveDuration,
+        Optional<String> statisticBundleNamespace
+) {
+    public static final MapCodec<GomokuConfig> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
+            WaitingLobbyConfig.CODEC.fieldOf("players").forGetter(GomokuConfig::players),
+            BoardConfig.CODEC.fieldOf("board").forGetter(GomokuConfig::board),
             Registries.BLOCK.getCodec().listOf().listOf().fieldOf("blocks").orElseGet(GomokuConfig::defaultBlocks).forGetter(GomokuConfig::blocks),
             Codecs.POSITIVE_INT.optionalFieldOf("first_move_places", 1).forGetter(GomokuConfig::firstMovePlaces),
             Codecs.POSITIVE_INT.optionalFieldOf("each_move_places", 1).forGetter(GomokuConfig::eachMovePlaces),

src/main/java/jerozgen/gomoku/game/GomokuConfig.java

@@ -5,22 +5,23 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import xyz.nucleoid.fantasy.RuntimeWorldConfig;
-import xyz.nucleoid.plasmid.game.GameActivity;
-import xyz.nucleoid.plasmid.game.GameOpenContext;
-import xyz.nucleoid.plasmid.game.GameOpenProcedure;
-import xyz.nucleoid.plasmid.game.GameSpace;
-import xyz.nucleoid.plasmid.game.event.GameActivityEvents;
-import xyz.nucleoid.plasmid.game.rule.GameRuleType;
-import xyz.nucleoid.plasmid.game.stats.GameStatisticBundle;
-import xyz.nucleoid.plasmid.game.world.generator.TemplateChunkGenerator;
+import xyz.nucleoid.plasmid.api.game.GameActivity;
+import xyz.nucleoid.plasmid.api.game.GameOpenContext;
+import xyz.nucleoid.plasmid.api.game.GameOpenProcedure;
+import xyz.nucleoid.plasmid.api.game.GameSpace;
+import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents;
+import xyz.nucleoid.plasmid.api.game.rule.GameRuleType;
+import xyz.nucleoid.plasmid.api.game.stats.GameStatisticBundle;
+import xyz.nucleoid.plasmid.api.game.world.generator.TemplateChunkGenerator;
 
+import java.util.Collections;
 import java.util.function.Consumer;
 
 public record GomokuGame(GomokuConfig config, Board board, GameSpace gameSpace, ServerWorld world,
                          GameStatisticBundle statistics) {
     public static GameOpenProcedure open(GameOpenContext<GomokuConfig> context) {
         var config = context.config();
-        var board = new Board(config.boardConfig());
+        var board = new Board(config.board());
         var template = board.template();
         var generator = new TemplateChunkGenerator(context.server(), template);
         var worldConfig = new RuntimeWorldConfig().setGenerator(generator).setTimeOfDay(6000);
@@ -53,7 +54,7 @@ private void tick() {
 
     public void spawn(ServerPlayerEntity player) {
         var spawnPos = board.spawnPos();
-        player.teleport(world, spawnPos.x, spawnPos.y, spawnPos.z, player.getYaw(), player.getPitch());
+        player.teleport(world, spawnPos.x, spawnPos.y, spawnPos.z, Collections.emptySet(), player.getYaw(), player.getPitch(), true);
     }
 
     public void stat(Consumer<GameStatisticBundle> consumer) {

src/main/java/jerozgen/gomoku/game/GomokuGame.java

@@ -2,7 +2,7 @@
 
 import jerozgen.gomoku.Gomoku;
 import net.minecraft.util.Identifier;
-import xyz.nucleoid.plasmid.game.stats.StatisticKey;
+import xyz.nucleoid.plasmid.api.game.stats.StatisticKey;
 
 public final class GomokuStatisticKeys {
     // global
@@ -14,7 +14,7 @@ public final class GomokuStatisticKeys {
     public static final StatisticKey<Integer> BLOCKS_PLACED = StatisticKey.intKey(id("blocks_placed"));
 
     private static Identifier id(String path) {
-        return new Identifier(Gomoku.ID, path);
+        return Identifier.of(Gomoku.ID, path);
     }
 
     private GomokuStatisticKeys() {}

src/main/java/jerozgen/gomoku/game/GomokuStatisticKeys.java

@@ -4,23 +4,24 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import xyz.nucleoid.plasmid.api.game.config.GameConfig;
 
 public final class GomokuTexts {
     public static MutableText description(GomokuGame game) {
-        var chainSize = game.config().boardConfig().winConfig().size();
-        var gameName = game.gameSpace().getMetadata().sourceConfig().name();
+        var chainSize = game.config().board().winConfig().size();
+        var gameName = GameConfig.name(game.gameSpace().getMetadata().sourceConfig());
         return Text.empty().formatted(Formatting.GRAY)
                 .append("\n").append(gameName.copy()
                         .formatted(Formatting.BOLD)
                         .formatted(Formatting.WHITE))
                 .append("\n").append(Text.translatable("text.gomoku.desc" + (chainSize == 5 ? "" : ".custom_chain"),
-                                chainSize))
+                        chainSize))
                 .append("\n")
                 .append("\n").append(Text.translatable("text.gomoku.desc.controls.swap",
-                                Text.translatable("text.gomoku.combined_keybind",
-                                        Text.translatable("%s", Text.keybind("key.sneak")),
-                                        Text.translatable("%s", Text.keybind("key.use")))
-                                        .formatted(Formatting.WHITE)))
+                        Text.translatable("text.gomoku.combined_keybind",
+                                        Text.keybind("key.sneak"),
+                                        Text.keybind("key.use"))
+                                .formatted(Formatting.WHITE)))
                 .append("\n");
 
     }
@@ -33,11 +34,11 @@ public static MutableText description(GomokuGame game) {
 
     public static MutableText swapRequest$toTarget(ServerPlayerEntity executor) {
         return Text.translatable("text.gomoku.swap.request.to_target",
-                executor.getDisplayName(),
-                Text.translatable("text.gomoku.combined_keybind",
-                        Text.translatable("%s", Text.keybind("key.sneak")),
-                        Text.translatable("%s", Text.keybind("key.use")))
-                        .formatted(Formatting.WHITE))
+                        executor.getDisplayName(),
+                        Text.translatable("text.gomoku.combined_keybind",
+                                        Text.keybind("key.sneak"),
+                                        Text.keybind("key.use"))
+                                .formatted(Formatting.WHITE))
                 .formatted(Formatting.GRAY);
     }