Port on new version of mindustry

.github/workflows/build-linux-natives/entrypoint.sh

@@ -28,7 +28,7 @@ curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyri
 echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
 apt-get -q update
 # install zulu JDK and Java build tools
-apt-get -yq install zulu17-jdk-headless maven ant
+apt-get -yq install zulu17-jdk-headless
 
 # Install cross-compilation toolchains
 apt-get -yq --force-yes install gcc g++
@@ -37,8 +37,4 @@ apt-get -yq --force-yes install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
 apt-get -yq --force-yes install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu libc6-dev-riscv64-cross
 
 # Build Linux natives
-./gradlew arc-core:jnigenBuildLinux64 --no-daemon
-
-# Pack artifacts
-find .  -name "*.so" | grep "arc-core/libs" > native-files-list
-zip natives-linux -@ < native-files-list
+./gradlew arc-core:jnigenBuildAllLinux extensions:filedialogs:jnigenBuildAllLinux extensions:freetype:jnigenBuildAllLinux --no-daemon

.github/workflows/gradle.yml

@@ -6,10 +6,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Set up JDK 17
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v5
       with:
+        distribution: 'temurin'
         java-version: 17
     - name: Run unit tests with gradle
       run: ./gradlew test

.github/workflows/natives.yml

@@ -15,50 +15,49 @@ jobs:
         uses: ./.github/workflows/build-linux-natives
         id: docker
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v5
+      - name: Upload natives
+        uses: actions/upload-artifact@v7
         with:
-          name: natives-linux.zip
-          path: natives-linux.zip
+          name: Linux natives
+          path: |
+            arc-core/build/natives
+            extensions/filedialogs/build/natives
+            extensions/freetype/build/natives
 
-  natives-windows:
+  natives-windows-android:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
+          distribution: 'temurin'
           java-version: 17
       - name: Install dependencies
         run: sudo apt install g++-mingw-w64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 gcc-mingw-w64 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64
       - name: Set env
         run: echo "NDK_HOME=$ANDROID_NDK_HOME" >> $GITHUB_ENV
       - name: Build natives
         run: |
-          ./gradlew arc-core:jnigenBuildWindows64
-          ./gradlew backends:backend-sdl:jnigenBuildWindows64
-          ./gradlew extensions:freetype:jnigenBuildWindows64
-      - name: Upload natives
-        uses: actions/upload-artifact@v5
+          ./gradlew arc-core:jnigenBuildAllWindows arc-core:jnigenBuildAllAndroid extensions:filedialogs:jnigenBuildAllWindows extensions:freetype:jnigenBuildAllWindows extensions:freetype:jnigenBuildAllAndroid
+        #  the SDL2 backend is being phased out
+        #  ./gradlew backends:backend-sdl:jnigenBuildAllWindows
+      - name: Upload arc-core natives
+        uses: actions/upload-artifact@v7
         with:
-          name: Arc-core desktop natives
+          name: Windows and Android natives
           path: |
-            backends/backend-sdl/libs/windows64/sdl-arc64.dll
-            natives/natives-desktop/libs/arc64.dll
-            natives/natives-freetype-desktop/libs/arc-freetype64.dll
-      - name: Upload Android natives
-        uses: actions/upload-artifact@v5
-        with:
-          name: Arc-core android natives
-          path: |
-            natives/natives-android/libs
+            arc-core/build/natives
+            extensions/filedialogs/build/natives
+            extensions/freetype/build/natives
   natives-mac:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v6
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
+          distribution: 'temurin'
           java-version: 17
       - name: Install dependencies
         run: |
@@ -68,24 +67,12 @@ jobs:
         env:
           MACOSX_DEPLOYMENT_TARGET: '10.9'
         run: |
-          ./gradlew arc-core:jnigenBuild
-       #   ./gradlew extensions:freetype:jnigenBuild
-          ./gradlew backends:backend-sdl:jnigenBuildAllWindows
+          ./gradlew arc-core:jnigenBuildAllMacOsX extensions:filedialogs:jnigenBuildAllMacOsX extensions:freetype:jnigenBuildAllMacOsX
       - name: Upload natives
-        uses: actions/upload-artifact@v5
-        with:
-          name: Arc-core MacOS natives
-          path: |
-            natives/natives-desktop/libs/libarc64.dylib
-            natives/natives-desktop/libs/libarcarm64.dylib
-          #  natives/natives-freetype-desktop/libs/libarc-freetype64.dylib
-          #  natives/natives-freetype-desktop/libs/libarc-freetypearm64.dylib
-          #  backends/backend-sdl/libs/macosx64/libsdl-arc64.dylib
-         #   backends/backend-sdl/libs/macosx64/libsdl-arcarm64.dylib
-      - name: Upload iOS natives
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
-          name: Arc-core iOS natives
+          name: MacOS natives
           path: |
-            natives/natives-ios/libs/libarc.a
-            natives/natives-freetype-ios/libs/libarc-freetype.a
+            arc-core/build/natives
+            extensions/freetype/build/natives
+            extensions/filedialogs/build/natives

.github/workflows/verify-gradle-wrapper.yml

@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: actions/checkout@v7
+      - uses: gradle/actions/wrapper-validation@v3

README.md

@@ -17,12 +17,14 @@ Please don't. While there is nothing stopping you from making other games with t
 There are too many things to list, but here are some highlights:
 
 - Soloud used as the audio engine across all platforms - faster, more consistent and more capable than libGDX's per-platform abstraction
-- SDL used as the desktop backend library instead of LWJGL+GLFW bindings - comes with its own benefits and drawbacks
+- SDL used as the desktop backend library instead of GLFW - comes with its own benefits and drawbacks
 - Removal of GWT module and all workarounds associated with it
 - Proper methods for drawing lines, polygons, etc in one sprite batch
 - Global sprite batch, texture atlas, asset manager, etc
 - Thin GL abstraction layer, state is cached to prevent unnecessary API calls
 - All APIs deal with 2D coordinates instead of attempting to share 2D and 3D classes (cameras, matrices, etc)
-- 3D package removed, some small parts moved to an extension
+- 3D rendering abstractions mostly removed
+- Simplification of most graphics abstractions (Framebuffer, Texture, Mesh, etc.)
+- OpenGL ES 3.0 as a minimum target
 - Java 8 target, heavy usage of lambdas in Scene2D code
-- Massive amount of refactored, merged, deleted classes (*especially* deleted)
+- Massive amount of refactored, merged, deleted classes

arc-core/build.gradle

@@ -77,34 +77,38 @@ jnigen{
         cppFlags += ["-flto"]
         linkerFlags += ["-flto"]
     }
-    addLinux(x64, x86){
+    addLinux(x64, x86)
+    addLinux(x64, ARM)
+    each({it.os == Linux}){
         headerDirs += (String[])["$root/soloud/src/backend/miniaudio/"]
         cppIncludes += (String[])["$root/soloud/src/backend/miniaudio/*.cpp"]
         cppFlags += "-DWITH_MINIAUDIO"
         libraries += "-lpthread -lrt -lm -ldl".split(" ")
     }
+    addWindows(x64, x86){
+        headerDirs += (String[])["$root/soloud/src/backend/miniaudio/"]
+        cppIncludes += (String[])["$root/soloud/src/backend/miniaudio/*.cpp"]
+        cppFlags += ["-msse", "-DWITH_MINIAUDIO"]
+    }
     addAndroid(){
         linkerFlags += "-llog -lOpenSLES".split(" ")
         cppIncludes += (String[])["$root/soloud/src/backend/opensles/*.cpp"]
         cppFlags += ["-DWITH_OPENSLES"]
         androidApplicationMk += ["APP_STL := c++_static"]
     }
-    addMac(x64, x86){
+    addMac(x64, x86)
+    addMac(x64, ARM)
+    each({it.os == MacOsX}){
         cppIncludes += (String[])["$root/soloud/src/backend/coreaudio/*.mm"]
-        cppFlags = ["-std=c++11", "-DWITH_COREAUDIO"]
+        cppFlags += (String[])["-std=c++11", "-DWITH_COREAUDIO"]
         libraries += "-Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox".split(" ")
     }
-    addMac(x64, ARM){
-        cppIncludes += (String[])["$root/soloud/src/backend/coreaudio/*.mm"]
-        cppFlags = ["-std=c++11", "-DWITH_COREAUDIO"]
-        libraries += "-Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox".split(" ")
-    }
-    addIOS(){
+    addIOS{
         headerDirs += (String[])["$root/iosgl"]
-        cppIncludes += (String[])["$root/soloud/src/backend/coreaudio/*.mm", "$root/iosgl/**"]
-        cppFlags += ["-stdlib=libc+", "-std=c++11", "-DWITH_COREAUDIO"]
-        libraries += "-Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox".split(" ")
-        linkerFlags += "-undefined dynamic_lookup"
+        cppIncludes += (String[])["$root/soloud/src/backend/coreaudio/*.mm", "$root/iosgl/**.cpp"]
+        cppFlags += (String[])["-stdlib=libc++", "-std=c++11", "-DWITH_COREAUDIO"]
+        libraries += "-Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AVFoundation -Wl,-framework,Foundation".split(" ")
+        linkerFlags += (String[])["-undefined", "dynamic_lookup"]
     }
 }
 

arc-core/src/arc/Core.java

@@ -8,7 +8,9 @@
 import arc.graphics.g2d.Batch;
 import arc.graphics.g2d.TextureAtlas;
 import arc.scene.Scene;
-import arc.util.I18NBundle;
+import arc.util.*;
+
+import java.util.concurrent.*;
 
 /**
  * Global references to all of Arc's core modules.
@@ -27,6 +29,7 @@ public class Core{
     public static Scene scene;
     public static AssetManager assets;
     public static TextureAtlas atlas;
+    public static ExecutorService executor = Threads.executor("Main Executor", OS.cores);
 
     public static GL20 gl;
     public static GL20 gl20;

arc-core/src/arc/Settings.java

@@ -371,7 +371,8 @@ public int getInt(String name, int def){
     }
 
     public boolean getBool(String name, boolean def){
-        return (boolean)get(name, def);
+        Object val = get(name, def);
+        return val instanceof Boolean ? (Boolean)val : def;
     }
 
     public byte[] getBytes(String name, byte[] def){
@@ -423,6 +424,21 @@ public void putAll(ObjectMap<String, Object> map){
         }
     }
 
+    /** Toggles a boolean value. */
+    public void toggle(String name){
+        put(name, !getBool(name));
+    }
+
+    /** JS compatibility method. */
+    public void putInt(String name, int value){
+        put(name, value);
+    }
+
+    /** JS compatibility method. */
+    public void putFloat(String name, float value){
+        put(name, value);
+    }
+
     /** Stores an object in the preference map. */
     public synchronized void put(String name, Object object){
         if(object instanceof Float || object instanceof Integer || object instanceof Boolean || object instanceof Long

arc-core/src/arc/assets/AssetManager.java

@@ -8,6 +8,7 @@
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
 import arc.struct.*;
+import arc.struct.ObjectMap.*;
 import arc.util.*;
 
 import java.util.concurrent.*;
@@ -104,6 +105,19 @@ public synchronized <T> T get(String fileName, Class<T> type){
         return asset;
     }
 
+    /**
+     * @param fileName the asset file name
+     * @param type the asset type
+     * @return the asset, or null if not found
+     */
+    public synchronized <T> T getOrNull(String fileName, Class<T> type){
+        ObjectMap<String, RefCountedContainer> assetsByType = assets.get(type);
+        if(assetsByType == null) return null;
+        RefCountedContainer assetContainer = assetsByType.get(fileName);
+        if(assetContainer == null) return null;
+        return (T)assetContainer.object;
+    }
+
     /**
      * @param type the asset type
      * @return all the assets matching the specified type
@@ -118,6 +132,23 @@ public synchronized <T> Seq<T> getAll(Class<T> type, Seq<T> out){
         return out;
     }
 
+    /**
+     * @param type the asset type
+     * @return all the assets matching the specified type as entries by file name
+     */
+    public synchronized <T> Seq<Entry<String, T>> getAllEntries(Class<T> type, Seq<Entry<String, T>> out){
+        ObjectMap<String, RefCountedContainer> assetsByType = assets.get(type);
+        if(assetsByType != null){
+            for(ObjectMap.Entry<String, RefCountedContainer> asset : assetsByType.entries()){
+                Entry<String, T> entry = new Entry<>();
+                entry.key = asset.key;
+                entry.value = (T)asset.value.object;
+                out.add(entry);
+            }
+        }
+        return out;
+    }
+
     /**
      * @param assetDescriptor the asset descriptor
      * @return the asset
@@ -156,8 +187,7 @@ public synchronized boolean contains(String fileName, Class type){
      * @param fileName the file name
      */
     public synchronized void unload(String fileName){
-        // check if it's currently processed (and the first element in the stack, thus not a dependency)
-        // and cancel if necessary
+        // check if it's currently processed (and the first element in the stack, thus not a dependency) and cancel if necessary
         if(tasks.size > 0){
             AssetLoadingTask currAsset = tasks.first();
             if(currAsset.assetDesc.fileName.equals(fileName)){
@@ -182,10 +212,12 @@ public synchronized void unload(String fileName){
 
         // get the asset and its type
         Class type = assetTypes.get(fileName);
-        if(type == null) throw new ArcRuntimeException("Asset not loaded: " + fileName);
+        if(type == null) return;
 
         RefCountedContainer assetRef = assets.get(type).get(fileName);
 
+        if(assetRef == null) return;
+
         // if it is reference counted, decrement ref count and check if we can really get rid of it.
         assetRef.count--;
         if(assetRef.count <= 0){
@@ -565,7 +597,7 @@ private void addTask(AssetDescriptor assetDesc){
     }
 
     /** Adds an asset to this AssetManager */
-    protected <T> void addAsset(final String fileName, Class<T> type, T asset){
+    public <T> void addAsset(final String fileName, Class<T> type, T asset){
         // add the asset to the filename lookup
         assetTypes.put(fileName, type);
 

arc-core/src/arc/audio/AudioBus.java

@@ -36,11 +36,17 @@ public void play(){
         id = sourcePlay(handle);
     }
 
+    @Override
     public void stop(){
         Core.audio.stop(id);
         id = 0;
     }
 
+    @Override
+    public float getLength(){
+        return 0;
+    }
+
     public void fadeFilterParam(int filter, int attribute, float value, float timeSec){
         Core.audio.fadeFilterParam(id, filter, attribute, value, timeSec);
     }