Update to 26.1-snapshot-6

Author: misode

.github/workflows/build.yml

@@ -1,36 +1,24 @@
-# Automatically build the project and run any configured tests for every push
-# and submitted pull request. This can help catch issues that only occur on
-# certain platforms or Java versions, and provides a first line of defence
-# against bad commits.
-
 name: build
 on: [pull_request, push]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-          21,    # Current Java LTS & minimum supported by Minecraft
-        ]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
         uses: gradle/wrapper-validation-action@v2
-      - name: setup jdk ${{ matrix.java }}
+      - name: setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 25
           distribution: 'microsoft'
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.13-SNAPSHOT'
+	id 'net.fabricmc.fabric-loom' version '1.15.3'
 	id 'maven-publish'
 }
 
@@ -34,11 +34,10 @@ loom {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
 }
 
@@ -51,7 +50,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
@@ -60,8 +59,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {

gradle.properties

@@ -4,13 +4,13 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.11
-loader_version=0.18.1
+minecraft_version=26.1-snapshot-6
+loader_version=0.18.4
 
 # Mod Properties
-mod_version=2.4.0
+mod_version=2.5.0-beta1
 maven_group=io.github.misode
 archives_base_name=packtest
 
 # Dependencies
-fabric_version=0.139.4+1.21.11
+fabric_version=0.143.2+26.1

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/io/github/misode/packtest/PackTest.java

@@ -97,7 +97,7 @@ private static void registerCommands(CommandDispatcher<CommandSourceStack> dispa
 	}
 
 	public static void runHeadlessServer(LevelStorageSource.LevelStorageAccess storage, PackRepository packRepository) {
-		GameTestServer.spin(thread -> GameTestServer.create(thread, storage, packRepository, Optional.empty(), false));
+		GameTestServer.spin(thread -> GameTestServer.create(thread, storage, packRepository, Optional.empty(), false, 0));
 	}
 
 	public static String wrapError(String message) {

src/main/java/io/github/misode/packtest/PackTestFunction.java

@@ -102,15 +102,15 @@ private Optional<Vec3> getDummyPos(CommandSourceStack source) {
         }
     }
 
-    public TestData<Holder<TestEnvironmentDefinition>> getTestData(HolderGetter.Provider registries) {
+    public TestData<Holder<TestEnvironmentDefinition<?>>> getTestData(HolderGetter.Provider registries) {
         var environments = registries.lookup(Registries.TEST_ENVIRONMENT).orElseThrow();
         Identifier environmentId = Optional.ofNullable(this.directives.get("environment")).map(Identifier::parse).orElse(GameTestEnvironments.DEFAULT_KEY.identifier());
-        Holder<TestEnvironmentDefinition> environment = environments.getOrThrow(ResourceKey.create(Registries.TEST_ENVIRONMENT, environmentId));
+        Holder<TestEnvironmentDefinition<?>> environment = environments.getOrThrow(ResourceKey.create(Registries.TEST_ENVIRONMENT, environmentId));
         Identifier structure = Optional.ofNullable(this.directives.get("template")).map(Identifier::parse).orElse(Identifier.withDefaultNamespace("empty"));
         int maxTicks = Optional.ofNullable(this.directives.get("timeout")).map(Integer::parseInt).orElse(100);
         boolean required = Optional.ofNullable(this.directives.get("optional")).map(s -> !Boolean.parseBoolean(s)).orElse(true);
         boolean skyAccess = Optional.ofNullable(this.directives.get("skyaccess")).map(Boolean::parseBoolean).orElse(false);
-        return new TestData<>(environment, structure, maxTicks, 0, required, Rotation.NONE, false, 1, 1, skyAccess);
+        return new TestData<>(environment, structure, maxTicks, 0, required, Rotation.NONE, false, 1, 1, skyAccess, 0);
     }
 
     public record Step(String line, int lineNumber) {

src/main/java/io/github/misode/packtest/commands/DummyCommand.java

@@ -273,10 +273,7 @@ private static int useEntity(CommandContext<CommandSourceStack> ctx, Vec3 pos) t
             pos = entity.position();
         }
         for (InteractionHand hand : InteractionHand.values()) {
-            if (entity.interactAt(dummy, pos, hand).consumesAction()) {
-                return 1;
-            }
-            if (dummy.interactOn(entity, hand).consumesAction()) {
+            if (dummy.interactOn(entity, hand, pos).consumesAction()) {
                 return 1;
             }
         }

src/main/java/io/github/misode/packtest/mixin/ForceLoadCommandMixin.java

@@ -21,7 +21,7 @@ private static boolean changeForceLoad(ServerLevel level, int x, int z, boolean
         return handleChange(level, x, z, toggle, original);
     }
 
-    @WrapOperation(method = "method_13377", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setChunkForced(IIZ)Z"))
+    @WrapOperation(method = "lambda$removeAll$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setChunkForced(IIZ)Z"))
     private static boolean removeAll(ServerLevel level, int x, int z, boolean toggle, Operation<Boolean> original) {
         return handleChange(level, x, z, toggle, original);
     }

src/main/java/io/github/misode/packtest/mixin/GameTestRunner1Mixin.java

@@ -13,12 +13,21 @@
 @Mixin(targets = "net.minecraft.gametest.framework.GameTestRunner$1")
 public class GameTestRunner1Mixin {
 
-    @WrapOperation(method = "method_56233", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setChunkForced(IIZ)Z"))
+    @WrapOperation(method = "lambda$testCompleted$1", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setChunkForced(IIZ)Z"))
     private boolean testCompleted(ServerLevel level, int x, int z, boolean value, Operation<Boolean> original) {
         if (TemporaryForcedChunks.isTemporary(level, x, z)) {
             TemporaryForcedChunks.unmarkTemporary(level, x, z);
             return original.call(level, x, z, value);
         }
         return false;
     }
+
+    @WrapOperation(method = "lambda$testFailed$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setChunkForced(IIZ)Z"))
+    private boolean testFailed(ServerLevel level, int x, int z, boolean value, Operation<Boolean> original) {
+        if (TemporaryForcedChunks.isTemporary(level, x, z)) {
+            TemporaryForcedChunks.unmarkTemporary(level, x, z);
+            return original.call(level, x, z, value);
+        }
+        return false;
+    }
 }

src/main/java/io/github/misode/packtest/mixin/GameTestServerMixin.java

@@ -60,8 +60,8 @@ private int onServerExit(int original) {
     @ModifyExpressionValue(method = "startTests", at = @At(value = "NEW", target = "(III)Lnet/minecraft/core/BlockPos;"))
     private BlockPos startTests(BlockPos original, ServerLevel level) {
         WorldBorder border = level.getWorldBorder();
-        int x = level.random.nextIntBetweenInclusive((int) border.getMinX(), (int) border.getMaxX());
-        int z = level.random.nextIntBetweenInclusive((int) border.getMinZ(), (int) border.getMaxZ());
+        int x = level.getRandom().nextIntBetweenInclusive((int) border.getMinX(), (int) border.getMaxX());
+        int z = level.getRandom().nextIntBetweenInclusive((int) border.getMinZ(), (int) border.getMaxZ());
         return new BlockPos(x, original.getY(), z);
     }
 }