Merge remote-tracking branch 'origin/master-26-lts' into master-26

Author: rubensworks

.github/workflows/ci.yml

@@ -22,9 +22,13 @@ jobs:
         distribution:
           - 'adopt-hotspot'
           - 'oracle'
+          - 'graalvm'
         include:
           - java: 25
             distribution: 'microsoft'
+        exclude:
+          - java: 26 # GraalVM doesn't support Java 26 yet
+            distribution: 'graalvm'
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v4
@@ -81,6 +85,18 @@ jobs:
         with:
           if-no-files-found: error
           path: build/libs/*
+      - name: 'Copy mod jars to production server'
+        run: ./gradlew copyDependencies
+      - name: 'Test in production server'
+        timeout-minutes: 10
+        uses: headlesshq/mc-server-test@1.1.1
+        env:
+          CYCLOPSMC_ENABLEDGAMETESTSGLOBAL: true
+        with:
+          java: ${{ env.java_version }}
+          mc: 26.2
+          modloader: neoforge
+          test-file: './mc-server-test.json'
       - name: 'Deploy to CurseForge'
         if: (startsWith(github.ref, 'refs/tags/') || (!startsWith(github.event.head_commit.message, 'Bump mod version') && startsWith(github.ref, 'refs/heads/master'))) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
         env:

build.gradle

@@ -405,3 +405,17 @@ compileJava.dependsOn updateGitHooks
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
+
+def cyclopsArtifacts = configurations.runtimeClasspath.incoming.artifacts.resolvedArtifacts.map { artifacts ->
+    artifacts.findAll { artifact ->
+        def id = artifact.variant.owner
+        id instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier &&
+                id.group.startsWith("org.cyclops")
+    }.collect { it.file }
+}
+tasks.register("copyDependencies", Copy) {
+    from(cyclopsArtifacts)
+    from(tasks.named("jar"))
+    into(layout.projectDirectory.dir("run/mods"))
+    dependsOn(tasks.named("jar"))
+}

gradle.properties

@@ -30,6 +30,6 @@ org.gradle.caching=true
 
 # Dependencies
 graal_version=25.0.1
-cyclopscore_version=1.30.0-1038
+cyclopscore_version=1.30.0-1056
 integrateddynamics_version=1.33.4-1858
 commoncapabilities_version=2.11.8-360

mc-server-test.json

@@ -0,0 +1,26 @@
+{
+  "name": "Server with Game Tests",
+  "steps": [
+    {
+      "type": "ENDS_WITH",
+      "message": "For help, type \"help\""
+    },
+    {
+      "type": "SEND",
+      "message": "test run integratedscripting:*"
+    },
+    {
+      "type": "ENDS_WITH",
+      "message": "All required tests passed :)",
+      "timeout": 600
+    },
+    {
+      "type": "SEND",
+      "message": "stop",
+      "timeout": 60
+    },
+    {
+      "type": "SUCCESS"
+    }
+  ]
+}

src/main/java/org/cyclops/integratedscripting/gametest/GameTestsScripts.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.Lists;
 import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.GameTestAssertException;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
@@ -137,10 +138,17 @@ public void testScriptsDisplayScriptInfiniteLoop(GameTestHelper helper) {
         Pair<PartTypePanelDisplay, PartTypePanelDisplay.State> partAndState = placeVariableInDisplayPanel(helper.getLevel(), positions.displayPanel(), variableAdded);
 
         helper.succeedWhen(() -> {
-            helper.assertValueEqual(partAndState.getRight().getGlobalErrors(), Lists.newArrayList(
-                    Component.translatable("script.integratedscripting.error.member_not_in_network", positions.diskId(), "abc", "script0.js"),
-                    Component.translatable("script.integratedscripting.error.member_not_in_network", positions.diskId(), "abc", "script0.js")
-            ), Component.literal("Display panel errors do not match"));
+            try {
+                helper.assertValueEqual(partAndState.getRight().getGlobalErrors(), Lists.newArrayList(
+                        Component.translatable("script.integratedscripting.error.member_not_in_network", positions.diskId(), "abc", "script0.js"),
+                        Component.translatable("script.integratedscripting.error.member_not_in_network", positions.diskId(), "abc", "script0.js")
+                ), "Display panel errors do not match");
+            } catch (GameTestAssertException e) {
+                helper.assertValueEqual(partAndState.getRight().getGlobalErrors(), Lists.newArrayList(
+                        Component.translatable("script.integratedscripting.error.script_missing", "script0.js", positions.diskId()),
+                        Component.translatable("script.integratedscripting.error.script_missing", "script0.js", positions.diskId())
+                ), "Display panel errors do not match");
+            }
         });
     }