diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 4d5b278..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Publish package to the Maven Repository -on: - push: - branches: [ master ] -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up Maven - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: temurin - cache: maven - - name: maven-settings-xml-action - uses: whelk-io/maven-settings-xml-action@v9 - with: - repositories: '[{ "id": "bolt-rip-public", "url": "https://repo.repsy.io/mvn/boltrip/public", "releases": { "enabled": "true" }, "snapshots": { "enabled": "true" } }]' - servers: '[{ "id": "bolt-rip-public", "username": "${{ secrets.MAVEN_USERNAME }}", "password": "${{ secrets.MAVEN_PASSWORD }}" }]' - - name: Publish package - run: mvn -B deploy diff --git a/.github/workflows/push-gh-release.yml b/.github/workflows/push-gh-release.yml index 8ae8fe5..ed7b985 100644 --- a/.github/workflows/push-gh-release.yml +++ b/.github/workflows/push-gh-release.yml @@ -12,11 +12,14 @@ jobs: 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/ingame-*.jar ingame.jar + # 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 == 'bolt-rip/ingame' && github.ref == 'refs/heads/master') && 'Publish' || 'Build' }} + run: ./gradlew ${{ (github.repository == 'bolt-rip/ingame' && github.ref == 'refs/heads/master') && 'publish' || 'build' }} + env: + GITHUB_TOKEN: ${{ (github.repository == 'bolt-rip/ingame' && github.ref == 'refs/heads/master') && secrets.GITHUB_TOKEN || '' }} - name: Create Release id: create_release if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master') @@ -36,12 +39,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./ingame.jar + asset_path: ./build/libs/ingame.jar asset_name: ingame.jar asset_content_type: application/java-archive - - name: trigger docker image building - run: | - curl -H "Authorization: token "${{ secrets.PERSONAL_ACCESS_TOKEN }}"" \ - --request POST \ - --data '{"event_type": "build"}' \ - https://api.github.com/repos/bolt-rip/config-pgm/dispatches diff --git a/.gitignore b/.gitignore index 64284a4..5201d22 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *.class # Package Files # -*.jar *.war *.ear @@ -102,7 +101,6 @@ application.macosx ### Some others ### MANIFEST.MF -dependency-reduced-pom.xml Thumbs.db src/main/resources/rebel.xml diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..3cb1e7f --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,65 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + id("buildlogic.java-conventions") + `maven-publish` + id("com.gradleup.shadow") +} + +tasks.named("shadowJar") { + archiveFileName = "ingame.jar" + destinationDirectory = rootProject.projectDir.resolve("build/libs") + + minimize() + + dependencies { + exclude(dependency("org.jetbrains:annotations")) + } + + relocate("co.aikar.taskchain", "rip.bolt.ingame.taskchain") + + exclude("META-INF/**") +} + +publishing { + publications.create("ingame") { + 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/bolt-rip/ingame") + 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 "rip.bolt.ingame.Ingame", + "version" to project.version, + "commitHash" to project.latestCommitHash(), + "url" to "https://github.com/bolt-rip/" + ) + } + } + + 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..86a8388 --- /dev/null +++ b/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts @@ -0,0 +1,70 @@ +plugins { + `java-library` + id("com.diffplug.spotless") + id("de.skuzzle.restrictimports") +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenLocal() + mavenCentral() + maven("https://www.jitpack.io") + 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 + maven("https://repo.ashcon.app/content/repositories/snapshots/") + maven("https://repo.aikar.co/content/groups/aikar/") +} + +dependencies { + api("tc.oc.occ:Dispense:1.0.0-SNAPSHOT") + api("com.squareup.retrofit2:retrofit:2.9.0") + api("com.squareup.retrofit2:converter-jackson:2.9.0") + api("com.squareup.retrofit2:converter-gson:2.9.0") + api("co.aikar:taskchain-bukkit:3.7.2") + api("org.java-websocket:Java-WebSocket:1.5.1") + + implementation("org.incendo:cloud-annotations:2.0.0") + implementation("org.jetbrains:annotations:22.0.0") + + compileOnly("app.ashcon:sportpaper:1.8.8-R0.1-SNAPSHOT") + compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT") + compileOnly("dev.pgm:Events:1.0.0-SNAPSHOT") +} + +group = "rip.bolt" +version = "1.0.0-SNAPSHOT" + +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 f5416f6..0000000 --- a/pom.xml +++ /dev/null @@ -1,186 +0,0 @@ - - 4.0.0 - rip.bolt - ingame - 1.0.0-SNAPSHOT - ingame - - - scm:git:git://github.com/bolt-rip/ingame.git - scm:git:git@github.com:bolt-rip/ingame.git - https://github.com/bolt-rip/ingame - - - - - bolt-rip-public - https://repo.repsy.io/mvn/boltrip/public - - - - - - aikar - https://repo.aikar.co/content/groups/aikar/ - - - pgm.fyi - https://repo.pgm.fyi/snapshots - - - jitpack.io - https://jitpack.io - - - ashcon-repo - https://repo.ashcon.app/content/repositories/snapshots - - - - - - app.ashcon - sportpaper - 1.8.8-R0.1-SNAPSHOT - provided - - - tc.oc.pgm - core - 0.16-SNAPSHOT - provided - - - dev.pgm - Events - 1.0.0-SNAPSHOT - provided - - - tc.oc.occ - Dispense - 1.0.0-SNAPSHOT - - - com.squareup.retrofit2 - retrofit - 2.9.0 - - - com.squareup.retrofit2 - converter-jackson - 2.9.0 - - - com.squareup.retrofit2 - converter-gson - 2.9.0 - - - co.aikar - taskchain-bukkit - 3.7.2 - - - org.java-websocket - Java-WebSocket - 1.5.1 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 21 - 21 - - - - - - pl.project13.maven - git-commit-id-plugin - 4.9.10 - - - - revision - - - - - false - false - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - co.aikar.taskchain - rip.bolt.ingame.taskchain - - - - - - package - - shade - - - - - *:* - - - - - - - - - com.coveo - fmt-maven-plugin - 2.9 - - - - - - - check - - - - - - - - true - src/main/resources - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..d1e6a48 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "ingame" \ No newline at end of file diff --git a/src/main/java/rip/bolt/ingame/api/definitions/BoltTournamentTeam.java b/src/main/java/rip/bolt/ingame/api/definitions/BoltTournamentTeam.java index bf7852a..a2efef9 100644 --- a/src/main/java/rip/bolt/ingame/api/definitions/BoltTournamentTeam.java +++ b/src/main/java/rip/bolt/ingame/api/definitions/BoltTournamentTeam.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import dev.pgm.events.EventsPlugin; import dev.pgm.events.team.TournamentTeam; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import tc.oc.pgm.teams.Team; public interface BoltTournamentTeam extends TournamentTeam { diff --git a/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java b/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java index 52ed9d2..6510f5b 100644 --- a/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java +++ b/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java @@ -2,10 +2,10 @@ import static rip.bolt.ingame.utils.Components.matchResult; -import javax.annotation.Nonnull; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.text.format.NamedTextColor; +import org.jetbrains.annotations.NotNull; public enum MatchResult implements ComponentLike { WIN(matchResult(NamedTextColor.GREEN)), @@ -19,7 +19,7 @@ public enum MatchResult implements ComponentLike { this.component = component; } - @Nonnull + @NotNull public Component asComponent() { return component; } diff --git a/src/main/java/rip/bolt/ingame/events/BoltMatchStatusChangeEvent.java b/src/main/java/rip/bolt/ingame/events/BoltMatchStatusChangeEvent.java index 3911a4c..38947d6 100644 --- a/src/main/java/rip/bolt/ingame/events/BoltMatchStatusChangeEvent.java +++ b/src/main/java/rip/bolt/ingame/events/BoltMatchStatusChangeEvent.java @@ -1,7 +1,7 @@ package rip.bolt.ingame.events; -import javax.annotation.Nullable; import org.bukkit.event.HandlerList; +import org.jetbrains.annotations.Nullable; import rip.bolt.ingame.api.definitions.BoltMatch; import rip.bolt.ingame.api.definitions.MatchStatus; @@ -9,7 +9,9 @@ public class BoltMatchStatusChangeEvent extends BoltMatchEvent { private static final HandlerList handlers = new HandlerList(); - @Nullable private final MatchStatus oldStatus; + @Nullable + private final MatchStatus oldStatus; + private final MatchStatus newStatus; public BoltMatchStatusChangeEvent( diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 1a512ed..74de26b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,6 @@ name: Ingame -main: rip.bolt.ingame.Ingame -version: ${project.version} (git-${git.commit.id.abbrev}) +main: ${mainClass} +version: ${version} (git-${commitHash}) +website: ${url} depend: [PGM, Events] softdepend: [Dispense]