diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 645d24c..15698e1 100644 --- a/.github/workflows/gradle.yml +++ b/.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 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1fca504..dab7093 100644 --- a/build.gradle +++ b/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 { diff --git a/gradle.properties b/gradle.properties index 56cfa16..44fc15d 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e411586..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100644 --- a/gradlew +++ b/gradlew @@ -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,11 +198,15 @@ 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" \ @@ -205,6 +214,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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 diff --git a/src/main/java/jerozgen/gomoku/Gomoku.java b/src/main/java/jerozgen/gomoku/Gomoku.java index 11f2857..2bdebd5 100644 --- a/src/main/java/jerozgen/gomoku/Gomoku.java +++ b/src/main/java/jerozgen/gomoku/Gomoku.java @@ -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); } } diff --git a/src/main/java/jerozgen/gomoku/game/GomokuConfig.java b/src/main/java/jerozgen/gomoku/game/GomokuConfig.java index 4579190..0d6c4a1 100644 --- a/src/main/java/jerozgen/gomoku/game/GomokuConfig.java +++ b/src/main/java/jerozgen/gomoku/game/GomokuConfig.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> blocks, - int firstMovePlaces, int eachMovePlaces, int moveDuration, - Optional statisticBundleNamespace) { - public static final Codec 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> blocks, + int firstMovePlaces, + int eachMovePlaces, + int moveDuration, + Optional statisticBundleNamespace +) { + public static final MapCodec 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), diff --git a/src/main/java/jerozgen/gomoku/game/GomokuGame.java b/src/main/java/jerozgen/gomoku/game/GomokuGame.java index 87892bb..3c30693 100644 --- a/src/main/java/jerozgen/gomoku/game/GomokuGame.java +++ b/src/main/java/jerozgen/gomoku/game/GomokuGame.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 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 consumer) { diff --git a/src/main/java/jerozgen/gomoku/game/GomokuStatisticKeys.java b/src/main/java/jerozgen/gomoku/game/GomokuStatisticKeys.java index 9145457..58a3145 100644 --- a/src/main/java/jerozgen/gomoku/game/GomokuStatisticKeys.java +++ b/src/main/java/jerozgen/gomoku/game/GomokuStatisticKeys.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 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() {} diff --git a/src/main/java/jerozgen/gomoku/game/GomokuTexts.java b/src/main/java/jerozgen/gomoku/game/GomokuTexts.java index cf9cd99..d169cc3 100644 --- a/src/main/java/jerozgen/gomoku/game/GomokuTexts.java +++ b/src/main/java/jerozgen/gomoku/game/GomokuTexts.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); } diff --git a/src/main/java/jerozgen/gomoku/game/phase/GomokuActivePhase.java b/src/main/java/jerozgen/gomoku/game/phase/GomokuActivePhase.java index f81d793..d2ddb7d 100644 --- a/src/main/java/jerozgen/gomoku/game/phase/GomokuActivePhase.java +++ b/src/main/java/jerozgen/gomoku/game/phase/GomokuActivePhase.java @@ -10,20 +10,20 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.Util; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.world.GameMode; -import xyz.nucleoid.plasmid.game.GameActivity; -import xyz.nucleoid.plasmid.game.event.GameActivityEvents; -import xyz.nucleoid.plasmid.game.event.GamePlayerEvents; -import xyz.nucleoid.plasmid.game.player.PlayerOffer; -import xyz.nucleoid.plasmid.game.player.PlayerOfferResult; -import xyz.nucleoid.plasmid.game.rule.GameRuleType; -import xyz.nucleoid.plasmid.game.stats.StatisticKeys; +import xyz.nucleoid.plasmid.api.game.GameActivity; +import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents; +import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents; +import xyz.nucleoid.plasmid.api.game.player.JoinAcceptor; +import xyz.nucleoid.plasmid.api.game.player.JoinAcceptorResult; +import xyz.nucleoid.plasmid.api.game.rule.GameRuleType; +import xyz.nucleoid.plasmid.api.game.stats.StatisticKeys; +import xyz.nucleoid.stimuli.event.EventResult; import xyz.nucleoid.stimuli.event.block.BlockUseEvent; import xyz.nucleoid.stimuli.event.entity.EntityUseEvent; @@ -52,7 +52,7 @@ public GomokuActivePhase(GomokuGame game) { protected void setupPhase(GameActivity activity) { activity.listen(GameActivityEvents.ENABLE, this::start); activity.listen(GameActivityEvents.TICK, this::tick); - activity.listen(GamePlayerEvents.OFFER, this::offerPlayer); + activity.listen(GamePlayerEvents.ACCEPT, this::acceptPlayer); activity.listen(GamePlayerEvents.LEAVE, this::removePlayer); activity.listen(BlockUseEvent.EVENT, this::onBlockUse); activity.listen(EntityUseEvent.EVENT, this::onEntityUse); @@ -86,10 +86,9 @@ private void tick() { updateTimer(currentPlayer()); } - private PlayerOfferResult offerPlayer(PlayerOffer offer) { - return offer.accept(game.world(), game.board().spawnPos()).and(() -> { - offer.player().changeGameMode(GameMode.SPECTATOR); - }); + private JoinAcceptorResult acceptPlayer(JoinAcceptor offer) { + return offer.teleport(game.world(), game.board().spawnPos()) + .thenRunForEach(player -> player.changeGameMode(GameMode.SPECTATOR)); } private void removePlayer(ServerPlayerEntity player) { @@ -128,14 +127,14 @@ private ActionResult onBlockUse(ServerPlayerEntity player, Hand hand, BlockHitRe return ActionResult.SUCCESS; } - private ActionResult onEntityUse(ServerPlayerEntity player, Entity entity, Hand hand, EntityHitResult hit) { - if (hand != Hand.MAIN_HAND) return ActionResult.PASS; - if (!player.isSneaking()) return ActionResult.PASS; - if (hit == null) return ActionResult.PASS; - if (hit.getEntity().getType() != EntityType.PLAYER) return ActionResult.PASS; - if (!queue.contains(player)) return ActionResult.PASS; + private EventResult onEntityUse(ServerPlayerEntity player, Entity entity, Hand hand, EntityHitResult hit) { + if (hand != Hand.MAIN_HAND) return EventResult.PASS; + if (!player.isSneaking()) return EventResult.PASS; + if (hit == null) return EventResult.PASS; + if (hit.getEntity().getType() != EntityType.PLAYER) return EventResult.PASS; + if (!queue.contains(player)) return EventResult.PASS; var target = (ServerPlayerEntity) hit.getEntity(); - if (!queue.contains(target)) return ActionResult.PASS; + if (!queue.contains(target)) return EventResult.PASS; // accept request var targetRequests = swapRequests.get(target); @@ -152,7 +151,7 @@ private ActionResult onEntityUse(ServerPlayerEntity player, Entity entity, Hand playerToBlock.put(player, targetBlock); game.gameSpace().getPlayers().sendMessage(GomokuTexts.swap(player, target)); if (playerIndex == 0 || targetIndex == 0) startTurn(currentPlayer()); - return ActionResult.SUCCESS; + return EventResult.ALLOW; } // send request @@ -161,10 +160,10 @@ private ActionResult onEntityUse(ServerPlayerEntity player, Entity entity, Hand if (previousTime == null || Util.getMeasuringTimeMs() - previousTime > REQUEST_DURATION) { player.sendMessage(GomokuTexts.swapRequest$toExecutor(target), false); target.sendMessage(GomokuTexts.swapRequest$toTarget(player), false); - return ActionResult.SUCCESS; + return EventResult.ALLOW; } - return ActionResult.PASS; + return EventResult.PASS; } private void win(ServerPlayerEntity winner) { @@ -227,8 +226,8 @@ private void endTurn(ServerPlayerEntity player) { private void startTurn(ServerPlayerEntity player) { moveStartTime = Util.getMeasuringTimeMs(); moveSeconds = game.config().moveDuration(); - player.playSound(SoundEvents.BLOCK_NOTE_BLOCK_BELL.value(), SoundCategory.PLAYERS, 1, 1); - player.playSound(SoundEvents.BLOCK_NOTE_BLOCK_CHIME.value(), SoundCategory.PLAYERS, 1, 1); + player.playSoundToPlayer(SoundEvents.BLOCK_NOTE_BLOCK_BELL.value(), SoundCategory.PLAYERS, 1, 1); + player.playSoundToPlayer(SoundEvents.BLOCK_NOTE_BLOCK_CHIME.value(), SoundCategory.PLAYERS, 1, 1); player.setStackInHand(Hand.OFF_HAND, playerToBlock.get(player).asItem().getDefaultStack()); updateTimer(player); } @@ -249,7 +248,7 @@ private void updateTimer(ServerPlayerEntity player) { } else { moveSeconds = seconds; if (seconds <= 10) { - player.playSound(SoundEvents.UI_BUTTON_CLICK.value(), SoundCategory.PLAYERS, .6f, 1); + player.playSoundToPlayer(SoundEvents.UI_BUTTON_CLICK.value(), SoundCategory.PLAYERS, .6f, 1); if (seconds == 0) moveSeconds = -1; } } diff --git a/src/main/java/jerozgen/gomoku/game/phase/GomokuEndingPhase.java b/src/main/java/jerozgen/gomoku/game/phase/GomokuEndingPhase.java index 0ef4bb5..f95068c 100644 --- a/src/main/java/jerozgen/gomoku/game/phase/GomokuEndingPhase.java +++ b/src/main/java/jerozgen/gomoku/game/phase/GomokuEndingPhase.java @@ -3,12 +3,12 @@ import jerozgen.gomoku.game.GomokuGame; import jerozgen.gomoku.game.GomokuTexts; import net.minecraft.util.Util; -import xyz.nucleoid.plasmid.game.GameActivity; -import xyz.nucleoid.plasmid.game.GameCloseReason; -import xyz.nucleoid.plasmid.game.event.GameActivityEvents; -import xyz.nucleoid.plasmid.game.event.GamePlayerEvents; -import xyz.nucleoid.plasmid.game.player.PlayerOffer; -import xyz.nucleoid.plasmid.game.player.PlayerOfferResult; +import xyz.nucleoid.plasmid.api.game.GameActivity; +import xyz.nucleoid.plasmid.api.game.GameCloseReason; +import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents; +import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents; +import xyz.nucleoid.plasmid.api.game.player.JoinOffer; +import xyz.nucleoid.plasmid.api.game.player.JoinOfferResult; public class GomokuEndingPhase extends GomokuPhase { public static final long ENDING_DURATION = 10 * 1000; @@ -26,7 +26,7 @@ protected void setupPhase(GameActivity activity) { activity.listen(GamePlayerEvents.OFFER, this::offerPlayer); } - private PlayerOfferResult offerPlayer(PlayerOffer offer) { + private JoinOfferResult offerPlayer(JoinOffer offer) { return offer.reject(GomokuTexts.finishedError()); } diff --git a/src/main/java/jerozgen/gomoku/game/phase/GomokuPhase.java b/src/main/java/jerozgen/gomoku/game/phase/GomokuPhase.java index 3a39caf..763c8cc 100644 --- a/src/main/java/jerozgen/gomoku/game/phase/GomokuPhase.java +++ b/src/main/java/jerozgen/gomoku/game/phase/GomokuPhase.java @@ -1,7 +1,7 @@ package jerozgen.gomoku.game.phase; import jerozgen.gomoku.game.GomokuGame; -import xyz.nucleoid.plasmid.game.GameActivity; +import xyz.nucleoid.plasmid.api.game.GameActivity; public abstract class GomokuPhase { protected final GomokuGame game; diff --git a/src/main/java/jerozgen/gomoku/game/phase/GomokuWaitingPhase.java b/src/main/java/jerozgen/gomoku/game/phase/GomokuWaitingPhase.java index 525e921..5895909 100644 --- a/src/main/java/jerozgen/gomoku/game/phase/GomokuWaitingPhase.java +++ b/src/main/java/jerozgen/gomoku/game/phase/GomokuWaitingPhase.java @@ -3,16 +3,18 @@ import jerozgen.gomoku.game.GomokuGame; import jerozgen.gomoku.game.GomokuTexts; import net.minecraft.world.GameMode; -import xyz.nucleoid.plasmid.game.GameActivity; -import xyz.nucleoid.plasmid.game.GameResult; -import xyz.nucleoid.plasmid.game.common.GameWaitingLobby; -import xyz.nucleoid.plasmid.game.common.config.PlayerConfig; -import xyz.nucleoid.plasmid.game.event.GameActivityEvents; -import xyz.nucleoid.plasmid.game.event.GamePlayerEvents; -import xyz.nucleoid.plasmid.game.player.PlayerOffer; -import xyz.nucleoid.plasmid.game.player.PlayerOfferResult; +import xyz.nucleoid.plasmid.api.game.GameActivity; +import xyz.nucleoid.plasmid.api.game.GameResult; +import xyz.nucleoid.plasmid.api.game.common.GameWaitingLobby; +import xyz.nucleoid.plasmid.api.game.common.config.PlayerLimiterConfig; +import xyz.nucleoid.plasmid.api.game.common.config.WaitingLobbyConfig; +import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents; +import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents; +import xyz.nucleoid.plasmid.api.game.player.JoinAcceptor; +import xyz.nucleoid.plasmid.api.game.player.JoinAcceptorResult; import java.util.List; +import java.util.OptionalInt; public class GomokuWaitingPhase extends GomokuPhase { public GomokuWaitingPhase(GomokuGame game) { @@ -22,23 +24,27 @@ public GomokuWaitingPhase(GomokuGame game) { @Override protected void setupPhase(GameActivity activity) { var blockCount = game.config().blocks().stream().mapToInt(List::size).sum(); - var playerConfig = game.config().playerConfig(); - var newPlayerConfig = new PlayerConfig( + var playerConfig = game.config().players(); + var newPlayerConfig = new WaitingLobbyConfig( + new PlayerLimiterConfig( + OptionalInt.of(Math.min(blockCount, playerConfig.playerConfig().maxPlayers().orElse(Integer.MAX_VALUE))), + playerConfig.playerConfig().allowSpectators() + ), Math.min(playerConfig.minPlayers(), blockCount), - Math.min(playerConfig.maxPlayers(), blockCount), Math.min(playerConfig.thresholdPlayers(), blockCount), playerConfig.countdown()); GameWaitingLobby.addTo(activity, newPlayerConfig); - activity.listen(GamePlayerEvents.OFFER, this::offerPlayer); + activity.listen(GamePlayerEvents.ACCEPT, this::acceptPlayer); activity.listen(GameActivityEvents.REQUEST_START, this::requestStart); } - private PlayerOfferResult offerPlayer(PlayerOffer offer) { - return offer.accept(game.world(), game.board().spawnPos()).and(() -> { - offer.player().sendMessage(GomokuTexts.description(game), false); - offer.player().changeGameMode(GameMode.ADVENTURE); - }); + private JoinAcceptorResult acceptPlayer(JoinAcceptor offer) { + return offer.teleport(game.world(), game.board().spawnPos()) + .thenRunForEach(player -> { + player.sendMessage(GomokuTexts.description(game), false); + player.changeGameMode(GameMode.ADVENTURE); + }); } private GameResult requestStart() { diff --git a/src/main/resources/data/gomoku/games/connect6.json b/src/main/resources/data/gomoku/plasmid/game/connect6.json similarity index 100% rename from src/main/resources/data/gomoku/games/connect6.json rename to src/main/resources/data/gomoku/plasmid/game/connect6.json diff --git a/src/main/resources/data/gomoku/games/connect6_37x37.json b/src/main/resources/data/gomoku/plasmid/game/connect6_37x37.json similarity index 100% rename from src/main/resources/data/gomoku/games/connect6_37x37.json rename to src/main/resources/data/gomoku/plasmid/game/connect6_37x37.json diff --git a/src/main/resources/data/gomoku/games/gomoku.json b/src/main/resources/data/gomoku/plasmid/game/gomoku.json similarity index 100% rename from src/main/resources/data/gomoku/games/gomoku.json rename to src/main/resources/data/gomoku/plasmid/game/gomoku.json diff --git a/src/main/resources/data/gomoku/games/gomoku4.json b/src/main/resources/data/gomoku/plasmid/game/gomoku4.json similarity index 100% rename from src/main/resources/data/gomoku/games/gomoku4.json rename to src/main/resources/data/gomoku/plasmid/game/gomoku4.json diff --git a/src/main/resources/data/gomoku/games/gomoku_19x19.json b/src/main/resources/data/gomoku/plasmid/game/gomoku_19x19.json similarity index 100% rename from src/main/resources/data/gomoku/games/gomoku_19x19.json rename to src/main/resources/data/gomoku/plasmid/game/gomoku_19x19.json diff --git a/src/main/resources/data/gomoku/games/gomoku_23x23.json b/src/main/resources/data/gomoku/plasmid/game/gomoku_23x23.json similarity index 100% rename from src/main/resources/data/gomoku/games/gomoku_23x23.json rename to src/main/resources/data/gomoku/plasmid/game/gomoku_23x23.json diff --git a/src/main/resources/data/gomoku/games/gomoku_37x37.json b/src/main/resources/data/gomoku/plasmid/game/gomoku_37x37.json similarity index 100% rename from src/main/resources/data/gomoku/games/gomoku_37x37.json rename to src/main/resources/data/gomoku/plasmid/game/gomoku_37x37.json diff --git a/src/main/resources/data/gomoku/games/tictactoe.json b/src/main/resources/data/gomoku/plasmid/game/tictactoe.json similarity index 100% rename from src/main/resources/data/gomoku/games/tictactoe.json rename to src/main/resources/data/gomoku/plasmid/game/tictactoe.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5e1c0ac..69a5d57 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -16,9 +16,9 @@ ] }, "depends": { - "fabricloader": ">=0.14.20", + "fabricloader": "*", "fabric": "*", - "minecraft": ">=1.20.1", - "plasmid": ">=0.5.101" + "minecraft": ">=1.21.4", + "plasmid": ">=0.6" } }