Update to 1.21.8

Author: MattiDragon

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version '1.11-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -22,7 +22,7 @@ dependencies {
 
     modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version"
 
-    modImplementation(include('me.lucko:fabric-permissions-api:0.3.1'))
+    modImplementation(include("me.lucko:fabric-permissions-api:$permission_api_version"))
     modImplementation(include("xyz.nucleoid:plasmid:$plasmid_version"))
 }
 

changelog/1.2.0+1.21.1.md

@@ -0,0 +1 @@
+* Updated to 1.21.8 for ModFest: Toybox

gradle.properties

@@ -1,13 +1,14 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-loader_version=0.16.10
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
+loader_version=0.17.2
 
-mod_version=1.1.1
-maven_group=io.github.mattidragon.demobox
+mod_version=1.2.0
+maven_group=dev.mattidragon
 archives_base_name=DemoBox
 
-fabric_version=0.115.1+1.21.1
-plasmid_version=0.6.3-SNAPSHOT+1.21.1
+fabric_version=0.132.0+1.21.8
+plasmid_version=0.6.5+1.21.7
+permission_api_version=0.4.0

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 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,
+#   * DEFAULT_JVM_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 \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -4,15 +4,13 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.entry.RegistryEntryList;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructurePlacementData;
 import net.minecraft.text.Text;
-import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
@@ -34,6 +32,7 @@
 import xyz.nucleoid.plasmid.api.game.player.JoinAcceptorResult;
 import xyz.nucleoid.plasmid.api.game.player.JoinOffer;
 import xyz.nucleoid.plasmid.api.game.player.JoinOfferResult;
+import xyz.nucleoid.stimuli.event.EventResult;
 import xyz.nucleoid.stimuli.event.player.PlayerDeathEvent;
 
 import java.util.Arrays;
@@ -72,7 +71,7 @@ private static GameOpenProcedure open(GameOpenContext<Settings> context) {
            activity.listen(PlayerDeathEvent.EVENT, (player, source) -> {
                instance.gameSpace.getPlayers().kick(player);
                player.sendMessage(Text.translatable("demobox.demo.death").formatted(Formatting.RED));
-               return ActionResult.FAIL;
+               return EventResult.DENY;
            });
        });
     }
@@ -88,8 +87,13 @@ private void setup() {
         var server = world.getServer();
         var manager = server.getCommandFunctionManager();
         for (var id : settings.functions) {
-            manager.getFunction(id).ifPresentOrElse(function -> manager.execute(function, new ServerCommandSource(server, Vec3d.ZERO, Vec2f.ZERO, world, 2, "DemoBox Setup", Text.literal("DemoBox Setup"), server, null).withSilent()),
-                    () -> DemoBox.LOGGER.warn("Missing function: {}", id));
+            manager.getFunction(id).ifPresentOrElse(
+                    function -> manager.execute(
+                            function,
+                            new ServerCommandSource(server, Vec3d.ZERO, Vec2f.ZERO, world, 2, "DemoBox Setup", Text.literal("DemoBox Setup"), server, null).withSilent()
+                    ),
+                    () -> DemoBox.LOGGER.warn("Missing function: {}", id)
+            );
         }
     }
 
@@ -126,7 +130,7 @@ private JoinAcceptorResult onPlayerAccepted(JoinAcceptor joinAcceptor) {
     private static RuntimeWorldConfig createWorldConfig(DynamicRegistryManager registryManager) {
         var worldConfig = new RuntimeWorldConfig();
         worldConfig.setFlat(true);
-        var generatorConfig = new FlatChunkGeneratorConfig(Optional.of(RegistryEntryList.of()), registryManager.get(RegistryKeys.BIOME).entryOf(BiomeKeys.PLAINS), List.of());
+        var generatorConfig = new FlatChunkGeneratorConfig(Optional.of(RegistryEntryList.of()), registryManager.getEntryOrThrow(BiomeKeys.PLAINS), List.of());
         generatorConfig.getLayers().add(new FlatChunkGeneratorLayer(1, Blocks.BARRIER));
         generatorConfig.updateLayerBlocks();
         worldConfig.setGenerator(new FlatChunkGenerator(generatorConfig));

src/main/java/io/github/mattidragon/demobox/DemoBoxGame.java

@@ -2,7 +2,7 @@
   "command.demobox.open.fail": "Failed to open demo box",
   "demobox.demo.join": "%s joined the demo",
   "demobox.demo.leave": "%s left the game",
-  "demobox.demo.death": "You have died in the demo and thus removed from it. You can open another one if your want to.",
+  "demobox.demo.death": "You have died in the demo and have thus been removed from it. You can open another one if your want to continue.",
   "gameType.demobox.demo_box": "Demo Box",
 
   "demobox.info.1": "Welcome to the DemoBox!",

src/main/resources/data/demobox/lang/en_us.json

@@ -26,8 +26,8 @@
     "demobox.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.16.10",
+    "fabricloader": ">=0.17.2",
     "fabric-api": "*",
-    "minecraft": "1.21.1"
+    "minecraft": "1.21.8"
   }
 }