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

Author: rubensworks

.github/workflows/ci.yml

@@ -11,17 +11,20 @@ env:
 
 jobs:
   build:
-    name: Build for Java ${{ matrix.java }} on ${{ matrix.distribution }}
+    name: Build for Java ${{ matrix.java }} on ${{ matrix.distribution }} on ${{ matrix.os }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - 'ubuntu-latest'
         java:
           - 25
           - 26
         distribution:
           - 'adopt-hotspot'
           - 'oracle'
+          - 'temurin'
           - 'graalvm'
         include:
           - java: 25
@@ -34,6 +37,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
+      - name: Start VM
+        if: matrix.os == 'openbsd'
+        uses: cross-platform-actions/action@v1.3.0
+        with:
+          operating_system: freebsd
+          version: '15.1'
       - name: 'Setup Java'
         uses: actions/setup-java@v4
         with:

CHANGELOG-1.21.1.md

@@ -1,8 +1,19 @@
 # Changelog for Minecraft 1.21.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.21.1-1.0.25"></a>
+## [1.21.1-1.0.25](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.24...1.21.1-1.0.25) - 2026-08-04 07:40:56
+
+
+### Changed
+* Update to Graal 25.1.3
+
+### Fixed
+* Fix unable to run on some OSes such as OpenBSD
+* Don't crash when evaluating a non-existing script
+
 <a name="1.21.1-1.0.24"></a>
-## [1.21.1-1.0.24](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.23...1.21.1-1.0.24) - 2026-07-22 16:26:07
+## [1.21.1-1.0.24](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.23...1.21.1-1.0.24) - 2026-07-22 16:26:07 +0200
 
 
 ### Fixed

CHANGELOG-26.1.2.md

@@ -1,8 +1,18 @@
 # Changelog for Minecraft 26.1.2
 All notable changes to this project will be documented in this file.
 
+<a name="26.1.2-1.0.26"></a>
+## [26.1.2-1.0.26](https://github.com/CyclopsMC/IntegratedScripting/compare/26.1.2-1.0.25...26.1.2-1.0.26) - 2026-08-04 07:44:11
+
+
+### Changed
+* Update to Graal 25.1.3
+
+### Fixed
+* Fix unable to run on some OSes such as OpenBSD
+
 <a name="26.1.2-1.0.25"></a>
-## [26.1.2-1.0.25](https://github.com/CyclopsMC/IntegratedScripting/compare/26.1.2-1.0.24...26.1.2-1.0.25) - 2026-07-28 16:57:46
+## [26.1.2-1.0.25](https://github.com/CyclopsMC/IntegratedScripting/compare/26.1.2-1.0.24...26.1.2-1.0.25) - 2026-07-28 16:57:46 +0200
 
 
 ### Fixed

gradle.properties

@@ -29,7 +29,7 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Dependencies
-graal_version=25.0.1
+graal_version=25.1.3
 cyclopscore_version=1.30.0-1056
 integrateddynamics_version=1.33.4-1858
 commoncapabilities_version=2.11.8-360

resources/changelog/1.21.1-1.0.25.txt

@@ -0,0 +1,9 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.25.5 or higher.
+
+Changes:
+* Update to Graal 25.1.3
+
+Fixes:
+* Fix unable to run on some OSes such as OpenBSD
+* Don't crash when evaluating a non-existing script

resources/changelog/26.1.2-1.0.26.txt

@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.30.1 or higher.
+
+Changes:
+* Update to Graal 25.1.3
+
+Fixes:
+* Fix unable to run on some OSes such as OpenBSD

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

@@ -66,6 +66,7 @@ public class IntegratedScripting extends ModBaseNeoForge<IntegratedScripting> {
 
     public IntegratedScripting(IEventBus modEventBus) {
         super(Reference.MOD_ID, (instance) -> _instance = instance, modEventBus);
+        System.out.println("RUNNING ON OS: " + System.getProperty("os.name") + " " + System.getProperty("os.version") + " " + System.getProperty("os.arch"));
 
         try {
             PackagedDependenciesLoader.load();

src/main/java/org/cyclops/integratedscripting/core/packageddependencies/PackagedDependenciesLoader.java

@@ -27,6 +27,11 @@
  */
 public class PackagedDependenciesLoader {
     public static void load() throws IOException {
+        // Forcefully make Graal run on unsupported OSes (such as OpenBSD). It will fall back to a slower version.
+        System.setProperty("polyglot.engine.allowUnsupportedPlatform", "true");
+        System.setProperty("polyglot.engine.userResourceCache", System.getProperty("java.io.tmpdir"));
+
+        // Load libraries
         JsonObject jo;
         Path tmp = FMLLoader.getCurrent().getGameDir().resolve("libraries-integratedscripting");
         Files.createDirectories(tmp);