diff --git a/build.gradle.kts b/build.gradle.kts index 184a805a..7257ef5a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,7 @@ import arc.util.* import arc.util.serialization.* import de.undercouch.gradle.tasks.download.Download import ent.* +import mmc.JarMindustryTask import java.io.* import org.jetbrains.kotlin.gradle.plugin.KaptExtension diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 00000000..985c8324 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,22 @@ + + +apply plugin: 'groovy' +apply plugin: 'java' + + +repositories{ + mavenCentral() + maven { url 'https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository' } +} +println "root: "+getRootDir() +dependencies{ + compileOnly gradleApi() + compileOnly localGroovy() + compileOnly("org.jetbrains:annotations:24.0.1") + implementation 'commons-io:commons-io:2.6' + + + + compileOnly 'org.projectlombok:lombok:1.18.30' + annotationProcessor 'org.projectlombok:lombok:1.18.30' +} \ No newline at end of file diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar new file mode 100644 index 00000000..6ada4090 Binary files /dev/null and b/buildSrc/build/libs/buildSrc.jar differ diff --git a/buildSrc/build/tmp/compileJava/compileTransaction/stash-dir/JarMindustryTask.class.uniqueId0 b/buildSrc/build/tmp/compileJava/compileTransaction/stash-dir/JarMindustryTask.class.uniqueId0 new file mode 100644 index 00000000..ac010ade Binary files /dev/null and b/buildSrc/build/tmp/compileJava/compileTransaction/stash-dir/JarMindustryTask.class.uniqueId0 differ diff --git a/buildSrc/build/tmp/compileJava/previous-compilation-data.bin b/buildSrc/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 00000000..dac769c1 Binary files /dev/null and b/buildSrc/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/buildSrc/build/tmp/jar/MANIFEST.MF b/buildSrc/build/tmp/jar/MANIFEST.MF new file mode 100644 index 00000000..59499bce --- /dev/null +++ b/buildSrc/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.jar b/buildSrc/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..94336fca Binary files /dev/null and b/buildSrc/gradle/wrapper/gradle-wrapper.jar differ diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.properties b/buildSrc/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..84a0b92f --- /dev/null +++ b/buildSrc/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/buildSrc/gradlew b/buildSrc/gradlew new file mode 100644 index 00000000..cccdd3d5 --- /dev/null +++ b/buildSrc/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/buildSrc/gradlew.bat b/buildSrc/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/buildSrc/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/buildSrc/src/main/java/mmc/JarMindustryTask.java b/buildSrc/src/main/java/mmc/JarMindustryTask.java new file mode 100644 index 00000000..4a9f4133 --- /dev/null +++ b/buildSrc/src/main/java/mmc/JarMindustryTask.java @@ -0,0 +1,78 @@ +package mmc; + +import org.apache.commons.io.*; +import org.gradle.api.*; +import org.gradle.api.tasks.*; +import org.gradle.api.tasks.bundling.*; +import org.jetbrains.annotations.*; +import org.slf4j.*; + +import java.io.*; +import java.nio.charset.*; +import java.util.*; + +public class JarMindustryTask extends DefaultTask{ + static final Logger logger = LoggerFactory.getLogger(JarMindustryTask.class); + + public static String defaultMindustryPath(){ + String mindustryDataDir = System.getenv("MINDUSTRY_DATA_DIR"); + if(mindustryDataDir != null) return mindustryDataDir; + return MockOS.getAppDataDirectoryString("Mindustry"); + } + + + private static String[] parseOutputs(@Nullable File outputFile) throws IOException{ + if(outputFile == null || !outputFile.exists()) return new String[]{defaultMindustryPath()}; + String[] lines = FileUtils.readFileToString(outputFile, Charset.defaultCharset()) + .replace(System.lineSeparator(), "\n") + .replaceAll("((#|//)[^\n]*\n|\n?(#|//)[^\n]*$)", "")//removing comments + .replaceAll("\n\n+", "")//removing blank lines + .split("\n"); + for(int i = 0; i < lines.length; i++){ + if(lines[i].equals("classic")){ + lines[i] = defaultMindustryPath() + File.pathSeparator + "mods"; + } + } + return lines; + } + + @NotNull + private static File resultJar(Project project, AbstractArchiveTask jar){ + if(true) return jar.getArchiveFile().get().getAsFile(); + String archiveFileName = jar.getArchiveFileName().get(); + + return new File(project.getBuildDir(), "libs/" + archiveFileName); + } + + @TaskAction + public void copyResultJar() throws IOException{ + Project project = getProject(); + AbstractArchiveTask jar = (AbstractArchiveTask)project.getTasks().getByName("jar"); + File source = resultJar(project, jar); + String[] strings = parseOutputs(findOutputFile(project)); + for(String path : strings){ + File destination = new File(project.file(path), source.getName()); + if(destination.exists()){ + //noinspection ResultOfMethodCallIgnored + destination.delete(); + } + FileUtils.copyFile(source, destination); + System.out.println("[I] Jar copied to `" + destination.getAbsolutePath() + "`"); + } + } + + @Nullable + private File findOutputFile(@Nullable Project project){ + if(project == null) return null; + File file = project.file("outputDirectories.txt"); + if(file.exists()) return file; + file = project.file("modsDirectories.txt"); + if(file.exists()){ + logger.warn("`modsDirectories.txt` is deprecated, use `outputDirectories.txt`"); + return file; + } + Project parent = project.getParent(); + if(parent == project) return null;//VERY, VERY strange, but I think can happen. + return findOutputFile(parent); + } +} diff --git a/buildSrc/src/main/java/mmc/MockOS.java b/buildSrc/src/main/java/mmc/MockOS.java new file mode 100644 index 00000000..e581ab91 --- /dev/null +++ b/buildSrc/src/main/java/mmc/MockOS.java @@ -0,0 +1,40 @@ +package mmc; + +public class MockOS{ + + /** User's home directory. */ + public static final String userHome = prop("user.home"); + public static boolean isWindows = propNoNull("os.name").contains("Windows"); + public static boolean isLinux = propNoNull("os.name").contains("Linux") || propNoNull("os.name").contains("BSD"); + public static boolean isMac = propNoNull("os.name").contains("Mac"); + + public static String env(String name){ + return System.getenv(name); + } + + public static String propNoNull(String name){ + String s = prop(name); + return s == null ? "" : s; + } + + public static String prop(String name){ + return System.getProperty(name); + } + + public static String getAppDataDirectoryString(String appname){ + if(MockOS.isWindows){ + return env("AppData") + "\\" + appname; + }else if(isLinux){ + if(System.getenv("XDG_DATA_HOME") != null){ + String dir = System.getenv("XDG_DATA_HOME"); + if(!dir.endsWith("/")) dir += "/"; + return dir + appname + "/"; + } + return userHome + "/.local/share/" + appname + "/"; + }else if(isMac){ + return userHome + "/Library/Application Support/" + appname + "/"; + }else{ //else, probably web + return ""; + } + } +} diff --git a/revisions/FlyingUnit/0.json b/revisions/FlyingUnit/0.json new file mode 100644 index 00000000..545bb6c8 --- /dev/null +++ b/revisions/FlyingUnit/0.json @@ -0,0 +1 @@ +{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/revisions/LegsUnit/0.json b/revisions/LegsUnit/0.json new file mode 100644 index 00000000..545bb6c8 --- /dev/null +++ b/revisions/LegsUnit/0.json @@ -0,0 +1 @@ +{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/revisions/UnitEntity/0.json b/revisions/UnitEntity/0.json new file mode 100644 index 00000000..545bb6c8 --- /dev/null +++ b/revisions/UnitEntity/0.json @@ -0,0 +1 @@ +{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file