1.19 Update

.gitignore

@@ -1,13 +1,37 @@
-gradle.properties
-.gradle
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+# macOS system files
+.DS_Store
+
+# gradle build output files
 build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-.classpath
-.factorypath
+.gradle/
+
+# eclipse project files
+.settings/
 .project
-.settings
+.classpath
 bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/

.gitmodules

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

bootstrap.sh

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

build.gradle

@@ -1,86 +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.duelenhancer-og' // Declare bundle identifier.
-version = '1.0'
-
-def apiVersion = "1.18.2" // 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 {
-
-	name "purpur-repo" // Declare a name for the Purpur repository.
-        url "https://repo.purpurmc.org/snapshots" // Get Purpur API from PurpurMC's Maven repository.
-
-    }
-
-    maven {
-
-	name 'jitpack-repo' // Declare a name for the Jitpack repository.
-        url 'https://jitpack.io' // Import Jitpack repository for Duels API.
-
-    }
-
-}
-
-dependencies {
-
-    compileOnly "org.purpurmc.purpur:purpur-api:1.18.2-R0.1-SNAPSHOT" // Build the Purpur API.
-    compileOnly 'com.github.Realizedd.Duels:duels-api:3.5.1' // Build the Duels API.
-
-}
-
-shadowJar {
-
-    minimize()
-    
-}
-
-jar.dependsOn shadowJar
-
-tasks.jar.configure {
-
-    archiveClassifier = "part"
-
-}
-
-tasks.shadowJar.configure {
-
-    archiveClassifier = null
-
-}
-
-tasks.withType(JavaCompile).configureEach {
-
-    options.compilerArgs += ["-parameters"]
-    options.compilerArgs.add("-Xlint:deprecation")
-    options.encoding = 'UTF-8' // Override the system character set with a universal set.
-    options.fork = true // Enable compilation in a separate daemon process.
-
-}

build.gradle.kts

@@ -0,0 +1,94 @@
+plugins {
+    java // Tell gradle this is a java project.
+    id("io.github.goooler.shadow") version "8.1.8" // Import shadow plugin for dependency shading.
+    eclipse // Import eclipse plugin for IDE integration.
+    kotlin("jvm") version "1.9.23" // Import kotlin jvm plugin for kotlin/java integration.
+}
+
+java {
+    // Declare java version.
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+group = "net.trueog.duelenhancer-og" // Declare bundle identifier.
+version = "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()
+
+    maven {
+        url = uri("https://repo.purpurmc.org/snapshots") // Import the PurpurMC Maven Repository.
+    }
+    
+    maven {
+    
+    	url = uri("https://jitpack.io") // Import Jitpack repository for Duels API.
+    
+    }
+}
+
+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("com.github.Realizedd.Duels:duels-api:3.5.1") // Build the Duels API.
+    
+    // implementation(project(":libs:Utilities-OG"))
+    implementation(project(":libs:GxUI-OG"))
+}
+
+tasks.withType<AbstractArchiveTask>().configureEach { // Ensure reproducible builds.
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+}
+
+tasks.shadowJar {
+    exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed.
+    minimize()
+}
+
+tasks.jar {
+    dependsOn(tasks.shadowJar)
+    archiveClassifier.set("part")
+}
+
+tasks.shadowJar {
+    archiveClassifier.set("") // Use empty string instead of null
+    from("LICENSE") { // Copies license file.
+        into("/") // Sets destination for license file within the completed .jar.
+    }
+}
+
+tasks.jar {
+    dependsOn("shadowJar") // Ensures shadowJar gets run.
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.compilerArgs.add("-parameters")
+    options.encoding = "UTF-8" // Use UTF-8 encoding universally.
+    options.isFork = true
+}
+
+kotlin {
+    jvmToolchain(17) // Declare kotlin jvm toolchain version.
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17) // Declare JDK version.
+        vendor = JvmVendorSpec.GRAAL_VM // Declare JDK distribution.
+    }
+}

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.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,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 +80,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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,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,11 +198,15 @@ 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, 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" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# 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.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,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 +41,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,11 +57,11 @@ 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
 
@@ -75,13 +76,15 @@ set CLASSPATH=%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

settings.gradle

@@ -1 +0,0 @@
-rootProject.name = "DuelEnhancer-OG"

settings.gradle.kts

@@ -0,0 +1,10 @@
+rootProject.name = "DuelEnhancer-OG"
+
+// Execute bootstrap.sh
+exec {
+    workingDir(rootDir)
+    commandLine("sh", "bootstrap.sh")
+}
+
+// include("libs:Utilities-OG")
+include("libs:GxUI-OG")

src/main/java/plugin/DuelEnhancerOG.java

@@ -23,4 +23,4 @@ public class DuelEnhancerOG extends JavaPlugin {
 
 	}
 
-}
+}

src/main/java/plugin/Listeners.java

@@ -11,7 +11,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
 
 import me.realized.duels.api.Duels;
-import net.md_5.bungee.api.ChatColor;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 
 public class Listeners implements Listener {
 
@@ -42,7 +42,7 @@ public class Listeners implements Listener {
 			if(player.getGameMode() == GameMode.SURVIVAL) {
 
 				// Inform the player that they will stop spectating the match.
-				player.sendMessage(ChatColor.translateAlternateColorCodes('&', "&7[&2True&4OG&7] &6Out of bounds! Your Duel spectating session has ended."));
+				player.sendMessage(MiniMessage.miniMessage().deserialize("<gray>[<dark_green>True<red>OG<gray>] <gold>Out of bounds! Your Duel spectating session has ended."));
 
 				// Stop the player from spectating the match.
 				api.getSpectateManager().stopSpectating(player);

src/main/resources/plugin.yml

@@ -2,6 +2,6 @@ name: DuelEnhancer-OG
 author: NotAlexNoyle
 description: An extension to Duels by Realizedd made for TrueOG
 website: https://github.com/NotAlexNoyle/DuelEnhancer-OG/
-version: 1.0
-api-version: 1.18
+version:'${version}'
+api-version: '${apiVersion}'
 main: plugin.DuelEnhancerOG