New host (#11044)

This is not a new server, just a move to another host.

.github/workflows/deployment.yml

@@ -73,7 +73,7 @@ jobs:
         cd ../MindustryBuilds
         echo "Updating version to ${RELEASE_VERSION:1}"
         BNUM=$(($GITHUB_RUN_NUMBER + 1000))
-        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
+        echo versionName=8-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
         git add .
         git commit -m "Updating to build ${RELEASE_VERSION:1}"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds

README.md

@@ -18,7 +18,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases).
 
 If you'd rather compile on your own, follow these instructions.
-First, make sure you have [JDK 17](https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
+First, make sure you have [JDK 17](https://adoptium.net/temurin/releases/?os=any&arch=any&version=17) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
 
 ### Windows
 

android/src/mindustry/android/AndroidLauncher.java

@@ -73,28 +73,57 @@ public class AndroidLauncher extends AndroidApplication{
             @Override
             public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
                 //Required to load jar files in Android 14: https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading
-                jar.file().setReadOnly();
+                try{
-                return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
+                    jar.file().setReadOnly();
-                    @Override
+                    return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
-                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
+                        @Override
-                        //check for loaded state
+                        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
-                        Class<?> loadedClass = findLoadedClass(name);
+                            //check for loaded state
-                        if(loadedClass == null){
+                            Class<?> loadedClass = findLoadedClass(name);
-                            try{
+                            if(loadedClass == null){
-                                //try to load own class first
+                                try{
-                                loadedClass = findClass(name);
+                                    //try to load own class first
-                            }catch(ClassNotFoundException | NoClassDefFoundError e){
+                                    loadedClass = findClass(name);
-                                //use parent if not found
+                                }catch(ClassNotFoundException | NoClassDefFoundError e){
-                                return parent.loadClass(name);
+                                    //use parent if not found
+                                    return parent.loadClass(name);
+                                }
                             }
-                        }
 
-                        if(resolve){
+                            if(resolve){
-                            resolveClass(loadedClass);
+                                resolveClass(loadedClass);
+                            }
+                            return loadedClass;
                         }
-                        return loadedClass;
+                    };
+                }catch(SecurityException e){
+                    //`setReadOnly` to jar file in `/sdcard/Android/data/...` does not work on some Android 14 device
+                    //But in `/data/...` it works
+
+                    if(Build.VERSION.SDK_INT < VERSION_CODES.O_MR1){
+                        throw e;
                     }
-                };
+
+                    Fi cacheDir = new Fi(getCacheDir()).child("mods");
+                    cacheDir.mkdirs();
+
+                    //long file name support
+                    Fi modCacheDir = cacheDir.child(jar.nameWithoutExtension());
+                    Fi modCache = modCacheDir.child(Long.toHexString(jar.lastModified()) + ".zip");
+
+                    if(modCacheDir.equals(jar.parent())){
+                        //should not reach here, just in case
+                        throw e;
+                    }
+
+                    //Cache will be deleted when mod is removed
+                    if(!modCache.exists() || jar.length() != modCache.length()){
+                        modCacheDir.mkdirs();
+                        jar.copyTo(modCache);
+                    }
+                    modCache.file().setReadOnly();
+                    return loadJar(modCache, parent);
+                }
             }
 
             @Override

build.gradle

@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 buildscript{
     ext{
         arcHash = property("archash")
@@ -115,7 +117,7 @@ allprojects{
                 output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
             }
             new File(project(':core').projectDir, 'assets/locales').text = output
-            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().join("\n")
+            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().findAll{f -> f.endsWith(".msch")}.join("\n")
         }
 
         writeVersion = {
@@ -137,6 +139,7 @@ allprojects{
                 props["number"] = versionNumber
                 props["modifier"] = versionModifier
                 props["build"] = buildid
+                props["buildDate"] = new SimpleDateFormat("MMMM d, yyyy HH:mm a", Locale.getDefault()).format(new Date())
                 props["commitHash"] = "unknown"
                 if(project.hasProperty("showCommitHash")){
                     props["commitHash"] = getCommitHash()
@@ -241,6 +244,7 @@ project(":desktop"){
 
     dependencies{
         implementation project(":core")
+        implementation arcModule("extensions:profiling")
         implementation arcModule("extensions:discord")
         implementation arcModule("natives:natives-filedialogs")
         implementation arcModule("natives:natives-desktop")