Merge pull request #3 from NotAlexNoyle/main

Build system updates

.gitignore

@@ -19,6 +19,10 @@
 *.tar.gz
 *.rar
 
+# Build files
+build/
+.gradle/
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libs/Utilities-OG"]
+	path = libs/Utilities-OG
+	url = https://github.com/true-og/Utilities-OG

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Jul 13 07:29:49 CEST 2023
-gradle.version=8.1.1

bootstrap.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/bash
+
+# Fetch all submodule content.
+git submodule update --force --recursive --init --remote

build.gradle

@@ -1,88 +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'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.0' // Import eclipse plugin for IDE integration.
-
-}
-
-group = 'net.trueog.buffrates-og' // Declare bundle identifier.
-version = '2.0'
-
-def apiVersion = "1.19" // Declare minecraft server target version.
-def targetJavaVersion = 17 // Declare java compatibility minimum.
-
-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.
-
-    }
-
-}
-
-dependencies {
-
-    compileOnly "org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // Declare purpur API version to be packaged.
-
-}
-
-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.
-
-}
-kotlin {
-    jvmToolchain(17)
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-        vendor = JvmVendorSpec.GRAAL_VM
-    }
-}

build.gradle.kts

@@ -0,0 +1,83 @@
+plugins {
+    id("com.gradleup.shadow") version "8.3.5" // Import shadow API.
+    java // Tell gradle this is a java project.
+    eclipse // Import eclipse plugin for IDE integration.
+    kotlin("jvm") version "2.0.21" // Import kotlin jvm plugin for kotlin/java integration.
+}
+
+java {
+    // Declare java version.
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+group = "net.trueog.buffrates-og" // Declare bundle identifier.
+version = "2.1.1" // Declare plugin version (will be in .jar).
+val apiVersion = "1.19" // Declare minecraft server target version.
+
+tasks.named<ProcessResources>("processResources") {
+    val props = mapOf(
+        "version" to version,
+        "apiVersion" to apiVersion
+    )
+
+    inputs.properties(props) // Indicates to rerun if version changes.
+
+    filesMatching("plugin.yml") {
+        expand(props)
+    }
+}
+
+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.
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation(project(":libs:Utilities-OG"))
+}
+
+tasks.withType<AbstractArchiveTask>().configureEach { // Ensure reproducible builds.
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+}
+
+tasks.shadowJar {
+    archiveClassifier.set("") // Use empty string instead of null
+    from("LICENSE") {
+        into("/")
+    }
+    exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed.
+    minimize()
+}
+
+tasks.build {
+    dependsOn(tasks.shadowJar)
+}
+
+tasks.jar {
+    archiveClassifier.set("part")
+}
+
+tasks.withType<JavaCompile>().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
+    }
+}

build/20230719_15798476527391801884.compiler.options

@@ -1 +0,0 @@
-"-Xallow-no-source-files" "-classpath" "/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.purpurmc.purpur/purpur-api/1.18.2-R0.1-SNAPSHOT/c6b469c0bc0dad5feb8bb5542f3534b21d9b5380/purpur-api-1.18.2-R0.1-SNAPSHOT.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.0/e000bd084353d84c9e888f6fb341dc1f5b79d948/kotlin-stdlib-jdk8-1.9.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.6/ce1edb914c94ebc388f086c6827e8bdeec71ac2/commons-lang-2.6.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.md-5/bungeecord-chat/1.16-R0.4-deprecated+build.6/34a32cc95e1c5f12176cf0a8aeeff087ff8a17e0/bungeecord-chat-1.16-R0.4-deprecated+build.6.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.0.1-jre/119ea2b2bc205b138974d351777b20f02b92704b/guava-31.0.1-jre.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-minimessage/4.10.1/c433cd701761c75ca06b7f36eb2623068203dd61/adventure-text-minimessage-4.10.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-legacy/4.10.1/6eb6fdb21f15a189246040f6c974cdd772b7366a/adventure-text-serializer-legacy-4.10.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-plain/4.10.1/79a94890420706e6b86edd05a64dfb8b8360732c/adventure-text-serializer-plain-4.10.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-api/4.10.1/4c493f62cb16bef98998cac0bbb314c7eeab7548/adventure-api-4.10.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-key/4.10.1/48d2ec889cb82dd79d7b1178001cfecc28ff3c1c/adventure-key-4.10.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-gson/4.10.1/4d3145fe0ea5b64dbe1742ecb1724e142104180a/adventure-text-serializer-gson-4.10.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.9/8a432c1d6825781e21a02db2e2c33c5fde2833b9/gson-2.8.9.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.30/8fde7fe2586328ac3c68db92045e1c8759125000/snakeyaml-1.30.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.googlecode.json-simple/json-simple/1.1.1/c9ad4a0850ab676c5c64461a05ca524cdfff59f1/json-simple-1.1.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/8.5.6/76f95700418a68fbc4ac050525261f05dc681ca1/fastutil-8.5.6.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.17.1/d771af8e336e372fb5399c99edabe0919aeaf5b2/log4j-api-2.17.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.8.0-beta4/83b0359d847ee053d745be7ec0d8e9e8a44304b4/slf4j-api-1.8.0-beta4.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/io.sentry/sentry/5.4.0/34634400caa75e05c768a182d9afa566571f8b26/sentry-5.4.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.21.0/55aaf38ec65c7aee19697257d644493c06dee1fe/checker-qual-3.21.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.0/f320478990d05e0cfaadd74f9619fd6027adbf37/kotlin-stdlib-jdk7-1.9.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.9.0/8ee15ef0c67dc83d874f412d84378d7f0eb50b63/kotlin-stdlib-1.9.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.7.1/458d9042f7aa6fa9a634df902b37f544e15aacac/error_prone_annotations-2.7.1.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.0/cd65c21cfd1eec4d44ef09f9f52b6d9f8a720636/kotlin-stdlib-common-1.9.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/examination-string/1.3.0/6f34afef5c54ccce4996bc321abf77518b55b4bd/examination-string-1.3.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/net.kyori/examination-api/1.3.0/8a2d185275307f1e2ef2adf7152b9a0d1d44c30b/examination-api-1.3.0.jar:/Users/Sekalol15/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/23.0.0/8cc20c07506ec18e0834947b84a864bfc094484e/annotations-23.0.0.jar" "-d" "/Users/Sekalol15/Downloads/BuffRates-OG/build/classes/kotlin/main" "-jdk-home" "/LibrLine truncated

build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +0,0 @@
-3
-0