diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..cf004d7 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +name: Build +on: + pull_request: + workflow_dispatch: + push: + branches: + - master +jobs: + build: + permissions: + contents: read + packages: write + runs-on: ubuntu-latest + steps: + - id: checkout + name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - id: setup-java + name: Setup Java + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: temurin + # Configures gradle with caching + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + # Run "gradlew publish" for origin/master and "gradlew build" for PRs or elsewhere + - name: Execute Gradle ${{ (github.repository == 'PGMDev/Events' && github.ref == 'refs/heads/master') && 'Publish' || 'Build' }} + run: ./gradlew ${{ (github.repository == 'PGMDev/Events' && github.ref == 'refs/heads/master') && 'publish' || 'build' }} + env: + GITHUB_TOKEN: ${{ (github.repository == 'PGMDev/Events' && github.ref == 'refs/heads/master') && secrets.GITHUB_TOKEN || '' }} + - id: artifact + name: Upload Jar + uses: actions/upload-artifact@v4 + with: + name: Events.jar + path: build/libs/Events.jar + if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index fdf04bf..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Events CI -on: - pull_request: - branches: ['*'] - push: - branches: ['*'] -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: temurin - cache: maven - - name: Build jar - run: mvn --batch-mode --update-snapshots verify - - name: Move generated jar file - run: mv target/Events*.jar Events.jar - - name: Create Release - id: create_release - if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master') - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: events-${{github.sha}} - release_name: Release ${{github.sha}} - draft: false - prerelease: false - - name: Upload Release Asset - id: upload-release-asset - if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master') - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./Events.jar - asset_name: Events.jar - asset_content_type: application/java-archive diff --git a/.gitignore b/.gitignore index b7fc95f..077a269 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *.class # Package Files # -*.jar *.war *.ear @@ -95,3 +94,6 @@ application.linux64 application.windows32 application.windows64 application.macosx + +# Gradle +build/ \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 8f4f12a..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 - hooks: - - id: check-yaml - - id: end-of-file-fixer - - id: trailing-whitespace - - repo: local - hooks: - - id: google-format - name: apply google-format - entry: mvn com.coveo:fmt-maven-plugin:format - language: system - pass_filenames: false diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..e07587a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,63 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + id("buildlogic.java-conventions") + `maven-publish` + id("com.gradleup.shadow") +} + +tasks.named("shadowJar") { + archiveFileName = "Events.jar" + archiveClassifier.set("") + + minimize() + + dependencies { + exclude(dependency("org.jetbrains:annotations")) + } + + exclude("META-INF/**") +} + +publishing { + publications.create("events") { + groupId = project.group as String + artifactId = project.name + version = project.version as String + + artifact(tasks["shadowJar"]) + } + repositories { + maven { + name = "ghPackages" + url = uri("https://maven.pkg.github.com/PGMDev/Events") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } +} + +tasks { + processResources { + filesMatching(listOf("plugin.yml")) { + expand( + "name" to project.name, + "description" to project.description, + "mainClass" to "dev.pgm.events.EventsPlugin", + "version" to project.version, + "commitHash" to project.latestCommitHash(), + "url" to "https://pgm.dev/" + ) + } + } + + named("jar") { + enabled = false + } + + named("build") { + dependsOn(shadowJar) + } +} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..7afcf6e --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + `kotlin-dsl` +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} + +dependencies { + implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.0") + implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA4") + implementation("de.skuzzle.restrictimports:restrict-imports-gradle-plugin:2.6.0") +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts new file mode 100644 index 0000000..94c6609 --- /dev/null +++ b/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts @@ -0,0 +1,60 @@ +plugins { + `java-library` + id("com.diffplug.spotless") + id("de.skuzzle.restrictimports") +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenLocal() + mavenCentral() + maven("https://oss.sonatype.org/content/repositories/snapshots/") // Snapshots + maven("https://repo.pgm.fyi/snapshots/") // PGM-specific depdencies + maven("https://repo.papermc.io/repository/maven-public/") // Needed for bungeecord-chat +} + +dependencies { + compileOnly("dev.pgm.paper:paper-api:1.8_1.21.1-SNAPSHOT") + compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT") + compileOnly("net.md-5:bungeecord-chat:1.20-R0.2-deprecated+build.18") + compileOnly("org.incendo:cloud-annotations:2.0.0") + compileOnly("org.jetbrains:annotations:22.0.0") +} + +group = "dev.pgm" +version = "1.0.0-SNAPSHOT" +description = "Manage PvP tournament events" + +tasks { + withType() { + options.encoding = "UTF-8" + } + withType() { + options.encoding = "UTF-8" + } +} + +spotless { + ratchetFrom = "origin/master" + java { + removeUnusedImports() + palantirJavaFormat("2.47.0").style("GOOGLE").formatJavadoc(true) + } +} + + +restrictImports { + group { + reason = "Use org.jetbrains.annotations to add annotations" + bannedImports = listOf("javax.annotation.**") + } + group { + reason = "Use tc.oc.pgm.util.Assert to add assertions" + bannedImports = listOf("com.google.common.base.Preconditions.**", "java.util.Objects.requireNonNull") + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt new file mode 100644 index 0000000..a173b54 --- /dev/null +++ b/buildSrc/src/main/kotlin/extensions.kt @@ -0,0 +1,16 @@ +import org.gradle.api.Project +import java.io.ByteArrayOutputStream + + +fun Project.latestCommitHash(): String { + return runGitCommand(listOf("rev-parse", "--short", "HEAD")) +} + +fun Project.runGitCommand(args: List): String { + val byteOut = ByteArrayOutputStream() + exec { + commandLine = listOf("git") + args + standardOutput = byteOut + } + return byteOut.toString(Charsets.UTF_8.name()).trim() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9355b41 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# 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 +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + 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 +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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" \ + -classpath "$CLASSPATH" \ + 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. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/pom.xml b/pom.xml deleted file mode 100644 index c2d3f50..0000000 --- a/pom.xml +++ /dev/null @@ -1,194 +0,0 @@ - - 4.0.0 - dev.pgm - Events - 1.0.0-SNAPSHOT - Events - - - 21 - 21 - UTF-8 - - - - - ashcon-repo - https://repo.ashcon.app/content/repositories/snapshots - - - pgm.fyi - https://repo.pgm.fyi/snapshots - - - - - app.ashcon - sportpaper - 1.8.8-R0.1-SNAPSHOT - provided - - - tc.oc.pgm - core - 0.16-SNAPSHOT - provided - - - org.jdom - jdom2 - 2.0.6.1 - - - org.jetbrains - annotations - 22.0.0 - provided - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - - - org.incendo - cloud-annotations - 2.0.0-rc.2 - - - - - - - - com.diffplug.spotless - spotless-maven-plugin - 2.43.0 - - origin/master - - - - 2.47.0 - - true - - - - - - - check - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.2.1 - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - 2.1.0 - - - - - - enforce-jdk - - enforce - - - - - - [${maven.compiler.target},) - - - - - - - enforce-imports - process-sources - - enforce - - - - - Use org.jetbrains.annotations to add annotations - javax.annotation.** - - - Use tc.oc.pgm.util.Assert to add assertions - - com.google.common.base.Preconditions.** - java.util.Objects.requireNonNull - - - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - *:* - - - app.ashcon:sportpaper - tc.oc.pgm:core - tc.oc.pgm:util - - - - - - - - - - true - src/main/resources - - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..f94e8a0 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "events" \ No newline at end of file diff --git a/src/main/java/dev/pgm/events/xml/MapFormatXMLParser.java b/src/main/java/dev/pgm/events/xml/MapFormatXMLParser.java index 3272360..a051106 100644 --- a/src/main/java/dev/pgm/events/xml/MapFormatXMLParser.java +++ b/src/main/java/dev/pgm/events/xml/MapFormatXMLParser.java @@ -9,10 +9,10 @@ import java.io.File; import java.io.IOException; import java.time.Duration; -import org.jdom2.Document; -import org.jdom2.Element; -import org.jdom2.JDOMException; -import org.jdom2.input.SAXBuilder; +import tc.oc.pgm.lib.org.jdom2.Document; +import tc.oc.pgm.lib.org.jdom2.Element; +import tc.oc.pgm.lib.org.jdom2.JDOMException; +import tc.oc.pgm.lib.org.jdom2.input.SAXBuilder; public class MapFormatXMLParser { @@ -37,18 +37,16 @@ public static TournamentFormat parse(Element root) throws JDOMException { if (bestOfArgs == null) throw new IllegalArgumentException("No best-of specified on format!"); int bestOf = Integer.parseInt(bestOfArgs); - TournamentRoundOptions options = - new TournamentRoundOptions( - false, - true, - true, - Duration.ofSeconds(20), - Duration.ofSeconds(30), - Duration.ofSeconds(40), - new BestOfCalculation<>(bestOf)); - TournamentFormat format = - new TournamentFormatImpl( - EventsPlugin.get().getTeamManager(), options, new RoundReferenceHolder()); + TournamentRoundOptions options = new TournamentRoundOptions( + false, + true, + true, + Duration.ofSeconds(20), + Duration.ofSeconds(30), + Duration.ofSeconds(40), + new BestOfCalculation<>(bestOf)); + TournamentFormat format = new TournamentFormatImpl( + EventsPlugin.get().getTeamManager(), options, new RoundReferenceHolder()); if (!root.getName().toLowerCase().equals("format")) System.out.println( diff --git a/src/main/java/dev/pgm/events/xml/RoundParser.java b/src/main/java/dev/pgm/events/xml/RoundParser.java index be73fe2..ea23595 100644 --- a/src/main/java/dev/pgm/events/xml/RoundParser.java +++ b/src/main/java/dev/pgm/events/xml/RoundParser.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.jdom2.Element; +import tc.oc.pgm.lib.org.jdom2.Element; public class RoundParser { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ff9b848..011cf5c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,6 @@ name: Events -main: dev.pgm.events.EventsPlugin -version: 1.0.0-SNAPSHOT -depend: [PGM] +description: ${description} +main: ${mainClass} +version: ${version} (git-${commitHash}) +website: ${url} +depend: [PGM] \ No newline at end of file