diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..68234fe --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/Utilities-OG"] + path = libs/Utilities-OG + url = https://github.com/true-og/Utilities-OG diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..7e3516b --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,4 @@ +#!/usr/bin/bash + +# Fetch all submodule content. +git submodule update --force --recursive --init --remote diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 08751fc..0000000 --- a/build.gradle +++ /dev/null @@ -1,85 +0,0 @@ -plugins { - - id 'java' // Tell gradle this is a java project. - id 'com.github.johnrengelman.shadow' version '7.1.2' // Import utility to package libraries into .jar file. - id 'eclipse' // Import eclipse plugin for IDE integration. - -} - -group = 'net.trueog.noclip-og' // Declare bundle identifier. -version = '1.2.1' // Declare plugin version (will be in .jar). - -def apiVersion = "1.19" // Declare minecraft server target version. -def targetJavaVersion = 17 // Declare java compatibility minimum. - -apply plugin: "eclipse" // Enable integration with Eclipse IDE for development. - -processResources { - - def props = [ - version: version, - apiVersion: apiVersion, - ] - - inputs.properties props // Indicates to rerun if version changes. - - filesMatching("plugin.yml") { - - expand props - - } - -} - -repositories { - - mavenCentral() - - maven { - - url "https://repo.purpurmc.org/snapshots" // Get purpur API from purpur maven repository. - - } - - maven { - - url "https://jitpack.io" - - } - -} - -dependencies { - - compileOnly "org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT" // Declare purpur API version to be packaged. - implementation "com.github.christianniehaus:Utilities-OG:e9ebc26c1f" // Import Utilities-OG API. - -} - -shadowJar { - - minimize() - -} - -jar.dependsOn shadowJar - -tasks.jar.configure { - - archiveClassifier = "part" - -} - -tasks.shadowJar.configure { - - archiveClassifier = null - -} - -tasks.withType(JavaCompile).configureEach { - - options.compilerArgs += ["-parameters"] - options.encoding = 'UTF-8' // Override the system character set with a universal set. - options.fork = true // Enable compilation in a separate daemon process. - -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..00bf5a0 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,82 @@ +plugins { + id("com.gradleup.shadow") version "8.3.6" // Import shadow API. + java // Tell gradle this is a java project. + eclipse // Import eclipse plugin for IDE integration. + kotlin("jvm") version "2.1.21" // Import kotlin jvm plugin for kotlin/java integration. +} + +java { + // Declare java version. + sourceCompatibility = JavaVersion.VERSION_17 +} + +group = "net.trueog.noclip-og" // Declare bundle identifier. +version = "1.2.1" // Declare plugin version (will be in .jar). +val apiVersion = "1.19" // Declare minecraft server target version. + +tasks.named("processResources") { + val props = mapOf( + "version" to version, + "apiVersion" to apiVersion + ) + + inputs.properties(props) // Indicates to rerun if version changes. + + filesMatching("plugin.yml") { + expand(props) + } + from("LICENSE") { // Bundle license into .jars. + into("/") + } +} + +repositories { + mavenCentral() + gradlePluginPortal() + maven { + url = uri("https://repo.purpurmc.org/snapshots") + } +} + +dependencies { + compileOnly("org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT") // Declare purpur API version to be packaged. + compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.2.3") // Import MiniPlaceholders API. + compileOnly(project(":libs:Utilities-OG")) +} + +tasks.withType().configureEach { // Ensure reproducible .jars + isPreserveFileTimestamps = false + isReproducibleFileOrder = true +} + +tasks.shadowJar { + archiveClassifier.set("") // Use empty string instead of null. + exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed. + minimize() +} + +tasks.build { + dependsOn(tasks.shadowJar) +} + +tasks.jar { + archiveClassifier.set("part") +} + +tasks.withType().configureEach { + options.compilerArgs.add("-parameters") + options.compilerArgs.add("-Xlint:deprecation") // Triggers deprecation warning messages. + options.encoding = "UTF-8" + options.isFork = true +} + +kotlin { + jvmToolchain(17) +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + vendor = JvmVendorSpec.GRAAL_VM + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..002b867 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${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='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -133,22 +133,29 @@ 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. + if ! command -v java >/dev/null 2>&1 + then + 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 fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,18 +200,28 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..5eed7ee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/libs/Utilities-OG b/libs/Utilities-OG new file mode 160000 index 0000000..fd00e06 --- /dev/null +++ b/libs/Utilities-OG @@ -0,0 +1 @@ +Subproject commit fd00e062338f8c84dc4df38226a240a215ffc08c diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index dbdd920..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "NoClip-OG" \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..1217f44 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,13 @@ +rootProject.name = "NoClip-OG" + +// Run the bootstrap at configuration time. +val process = ProcessBuilder("sh", "bootstrap.sh") + .directory(rootDir) + .start() + +val exitValue = process.waitFor() +if (exitValue != 0) { + throw GradleException("bootstrap.sh failed with exit code $exitValue") +} + +include("libs:Utilities-OG")