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

Author: rubensworks

.github/workflows/ci.yml

@@ -73,6 +73,9 @@ jobs:
         run: ./gradlew test runGameTestServer jacocoTestReport
       - name: 'Submit coverage results'
         uses: coverallsapp/github-action@v2
+        with:
+            flag-name: ${{ matrix.java }}-${{ matrix.distribution }}
+            parallel: true
       - name: 'Deploy as GitHub CI artifacts'
         uses: actions/upload-artifact@v4
         if: startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
@@ -105,3 +108,14 @@ jobs:
           branch: gh-pages
           folder: build/docs/javadoc
           clean: true
+
+  coveralls:
+    name: Coverage check
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Consolidate test coverage from different jobs
+        uses: coverallsapp/github-action@v2
+        with:
+          parallel-finished: true
+          fail-on-error: false

.github/workflows/copilot-setup-steps.yml

@@ -45,8 +45,8 @@ jobs:
       - name: 'Build'
         run: ./gradlew build --no-daemon
         env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_KEY: ${{ secrets.MAVEN_KEY }}
+          MAVEN_USERNAME: ${{ github.actor }}
+          MAVEN_KEY: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_USER: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Warmup for game test server'

.gitignore

@@ -19,6 +19,7 @@ repo/*
 out/*
 keystore.jks
 .idea
+logs/
 
 # Ignore mac-specific file(s)
 .DS_Store

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'net.darkhax.curseforgegradle' version '1.1.28'
 	id 'com.github.kt3k.coveralls' version '2.12.0'
     id 'com.diffplug.spotless' version '6.25.0'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'com.gradleup.shadow' version '8.3.8'
 	id 'com.modrinth.minotaur' version '2.+'
 }
 

gradle.properties

@@ -33,5 +33,5 @@ org.gradle.caching=true
 # Dependencies
 graal_version=25.0.1
 cyclopscore_version=1.25.5-871
-integrateddynamics_version=1.24.1-1419
+integrateddynamics_version=1.24.1-1652
 commoncapabilities_version=2.9.7-303

src/main/java/org/cyclops/integratedscripting/IntegratedScripting.java

@@ -40,6 +40,7 @@
 import org.cyclops.integratedscripting.core.network.ScriptingData;
 import org.cyclops.integratedscripting.evaluate.translation.ValueTranslatorRegistry;
 import org.cyclops.integratedscripting.evaluate.translation.ValueTranslators;
+import org.cyclops.integratedscripting.gametest.GameTestsAdvancements;
 import org.cyclops.integratedscripting.gametest.GameTestsScripts;
 import org.cyclops.integratedscripting.inventory.container.ContainerScriptingDriveConfig;
 import org.cyclops.integratedscripting.inventory.container.ContainerTerminalScriptingConfig;
@@ -174,6 +175,7 @@ protected ICommonProxy constructCommonProxy() {
     @Override
     public Class<?>[] getGameTestClasses() {
         return new Class<?>[]{
+                GameTestsAdvancements.class,
                 GameTestsScripts.class
         };
     }