From d859763a7cb541b054f99d4d9bfb12e81fdb33c4 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:02:36 +0900 Subject: [PATCH 01/10] feat: migrate to gradle --- .github/workflows/build-test.yml | 27 -- .github/workflows/build.yml | 38 +++ .github/workflows/deploy.yml | 29 -- .github/workflows/release.yml | 98 +++++-- .gitignore | 108 +++----- .pinact.yaml | 7 + build.gradle.kts | 113 ++++++++ gradle.properties | 11 + gradle/libs.versions.toml | 36 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ pom.xml | 164 ------------ settings.gradle.kts | 1 + .../azisaba/lgw/kdstatus/api/KDUserData.java | 20 ++ .../jp/azisaba/lgw/kdstatus/db/Database.java | 40 +++ .../lgw/kdstatus/db/KDUserDataRepository.java | 24 ++ src/main/resources/plugin.yml | 8 +- .../java/jp/azisaba/lgw/kdstatus/DBMain.java | 40 --- .../jp/azisaba/lgw/kdstatus/TestSize.java | 7 - .../lgw/kdstatus/sql/ConnectionTest.java | 43 --- .../azisaba/lgw/kdstatus/sql/RankingTest.java | 35 --- .../lgw/kdstatus/utils/UUIDConverterTest.java | 19 -- 24 files changed, 764 insertions(+), 456 deletions(-) delete mode 100644 .github/workflows/build-test.yml create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/deploy.yml create mode 100644 .pinact.yaml create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle.kts create mode 100644 src/main/java/jp/azisaba/lgw/kdstatus/api/KDUserData.java create mode 100644 src/main/java/jp/azisaba/lgw/kdstatus/db/Database.java create mode 100644 src/main/java/jp/azisaba/lgw/kdstatus/db/KDUserDataRepository.java delete mode 100644 src/test/java/jp/azisaba/lgw/kdstatus/DBMain.java delete mode 100644 src/test/java/jp/azisaba/lgw/kdstatus/TestSize.java delete mode 100644 src/test/java/jp/azisaba/lgw/kdstatus/sql/ConnectionTest.java delete mode 100644 src/test/java/jp/azisaba/lgw/kdstatus/sql/RankingTest.java delete mode 100644 src/test/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverterTest.java diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml deleted file mode 100644 index e33a14b..0000000 --- a/.github/workflows/build-test.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: Build Test -on: [push, workflow_dispatch] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-test: - name: Build with Java 8 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v5 - - uses: actions/setup-java@v5 - with: - java-version: "8" - distribution: "adopt" - cache: "maven" - - run: java -version - - run: mvn --version - - run: mvn -B package - - - name: Upload a Build Artifact - uses: actions/upload-artifact@v4.6.2 - with: - path: /home/runner/work/KDStatusReloaded/KDStatusReloaded/target/ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..54d6137 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,38 @@ +name: Build + +on: + push: + branches: + - main + pull_request: + branches: + - main + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + name: Build with Java 8 + runs-on: ubuntu-latest + timeout-minutes: 15 + + steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 + with: + distribution: "adopt" + java-version: 8 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 + + - name: Build with Gradle + run: ./gradlew build + + - name: Upload a Build Artifact + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + with: + path: build/libs/ diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 10fb7c2..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Deploy - -on: - workflow_dispatch: - push: - paths-ignore: - - "**.md" - - "renovate.json" - -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: read - steps: - - uses: actions/checkout@v5 - - name: Set up JDK 8 - uses: actions/setup-java@v5 - with: - java-version: '8' - distribution: 'adopt' - server-id: azisaba - - name: Build with Maven - run: mvn -B package --file pom.xml - - name: Prepare settings.xml - run: | - echo "azisaba${{ secrets.REPO_USERNAME }}${{ secrets.REPO_PASSWORD }}" > $HOME/.m2/settings.xml - - name: Deploy - run: mvn deploy \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c247c1..3fd8564 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,33 +1,93 @@ name: Release on: - push: - tags: - - "*" + workflow_dispatch: + inputs: + version: + description: 'Plugin version. ex: x.x.x, x.x.x-SNAPSHOT' + required: true + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: - build-and-release: + build-test: + name: Build test for release + runs-on: ubuntu-latest + timeout-minutes: 3 + steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 + with: + distribution: "adopt" + java-version: 8 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 + + - name: Build + run: ./gradlew build + env: + VERSION: ${{ github.event.inputs.version }} + + - name: Upload a Build Artifact + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + with: + path: build/libs/ + + release: + name: Create github release runs-on: ubuntu-latest + timeout-minutes: 15 + needs: + - build-test + permissions: contents: write + steps: - - name: Checkout - uses: actions/checkout@v5 - - name: Setup Java 8 - uses: actions/setup-java@v5.0.0 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: - distribution: "corretto" - java-version: "8" - cache: "maven" - - name: Check java version - run: java -version - - name: Check maven version - run: mvn --version - - name: Build - run: mvn -B package + distribution: "adopt" + java-version: 8 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 + + - name: Build for release + run: ./gradlew build + env: + VERSION: ${{ github.event.inputs.version }} + - name: Create release - uses: softprops/action-gh-release@v2.3.2 + uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2 with: draft: true - files: target/*.jar + files: build/libs/*.jar generate_release_notes: true + + publish: + name: Publish to azisaba repo + runs-on: ubuntu-latest + timeout-minutes: 15 + needs: + - build-test + + steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 + with: + distribution: "adopt" + java-version: 8 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 + + - name: Publish to azisaba repo + run: ./gradlew publish + env: + VERSION: ${{ github.event.inputs.version }} + REPO_USERNAME: ${{ secrets.REPO_USERNAME }} + REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }} diff --git a/.gitignore b/.gitignore index 4b8280d..3bfd6f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,89 +1,59 @@ +# Created by https://www.toptal.com/developers/gitignore/api/intellij,gradle +# Edit at https://www.toptal.com/developers/gitignore?templates=intellij,gradle -# Created by https://www.gitignore.io/api/maven,eclipse -# Edit at https://www.gitignore.io/?templates=maven,eclipse +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -### Eclipse ### -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject +# User-specific stuff +.idea/ -# CDT-specific (C/C++ Development Tooling) -.cproject +# CMake +cmake-build-*/ -# CDT- autotools -.autotools +# File-based project format +*.iws -# Java annotation processor (APT) -.factorypath +# IntelliJ +out/ -# PDT-specific (PHP Development Tools) -.buildpath +# mpeltonen/sbt-idea plugin +.idea_modules/ -# sbteclipse plugin -.target +# JIRA plugin +atlassian-ide-plugin.xml -# Tern plugin -.tern-project +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties -# TeXlipse plugin -.texlipse +### Gradle ### +.gradle +**/build/ +!src/**/build/ -# STS (Spring Tool Suite) -.springBeans +# Ignore Gradle GUI config +gradle-app.setting -# Code Recommenders -.recommenders/ +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar -# Annotation Processing -.apt_generated/ +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties -# Scala IDE specific (Scala & Java development for Eclipse) -.cache-main -.scala_dependencies -.worksheet +# Cache of project +.gradletasknamecache -### Eclipse Patch ### +# Eclipse Gradle plugin generated files # Eclipse Core .project - # JDT-specific (Eclipse Java Development Tools) .classpath -# Annotation Processing -.apt_generated +### Gradle Patch ### +# Java heap dump +*.hprof -.sts4-cache/ - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -.mvn/wrapper/maven-wrapper.jar - -# End of https://www.gitignore.io/api/maven,eclipse - -.idea/ -*.iml \ No newline at end of file +# End of https://www.toptal.com/developers/gitignore/api/intellij,gradle diff --git a/.pinact.yaml b/.pinact.yaml new file mode 100644 index 0000000..2eec92b --- /dev/null +++ b/.pinact.yaml @@ -0,0 +1,7 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/suzuki-shunsuke/pinact/refs/heads/main/json-schema/pinact.json +# pinact - https://github.com/suzuki-shunsuke/pinact +version: 3 +#files: +# - pattern: .github/workflows/*.yml + +ignore_actions: [] diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..9e2dd1c --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,113 @@ +plugins { + `java-library` + `maven-publish` + alias(libs.plugins.shadow) + alias(libs.plugins.lombok) + alias(libs.plugins.runPaper) +} + +val targetJavaVersion = 8 +version = System.getenv("VERSION") ?: "0.1.0-indev" + +// plugin metadata +val plWebsiteUrl: String by project +val plDescription: String by project + +repositories { + mavenCentral() + maven("https://oss.sonatype.org/content/groups/public/") + maven("https://hub.spigotmc.org/nexus/content/groups/public/") + maven("https://raw.githubusercontent.com/Rayzr522/maven-repo/master/") + maven("https://repo.maven.apache.org/maven2/") +} + +dependencies { + // system + compileOnly(libs.spigotApi) + + // include + implementation(libs.jsonmessage) + implementation(libs.mysqlConnectorJ) + implementation(libs.hikaricp) + implementation(libs.bundles.jdbi) + implementation(libs.jspecify) + testImplementation(libs.junit) +} + +java { + val javaVersion = JavaVersion.toVersion(targetJavaVersion) + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } +} + +tasks { + build { + dependsOn(shadowJar) + } + + processResources { + val props = + mapOf( + "version" to version, + "name" to name, + "description" to plDescription, + "websiteUrl" to plWebsiteUrl, + ) + inputs.properties(props) + filteringCharset = "UTF-8" + filesMatching("plugin.yml") { + expand(props) + } + } + + shadowJar { + isEnableRelocation = true + relocationPrefix = "net.azisaba.kdstatusreloaded.libs" + } + + runServer { + minecraftVersion("1.16.5") + } + + compileJava { + options.encoding = "UTF-8" + + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible) { + options.release.set(targetJavaVersion) + } + } + + javadoc { + options.encoding = "UTF-8" + } +} + +publishing { + publications { + create("maven") { + groupId = project.group.toString() + artifactId = project.name + version = project.version.toString() + artifact(tasks.jar) + } + } + + repositories { + maven { + name = "azisaba-repo" + credentials { + username = System.getenv("REPO_USERNAME") + password = System.getenv("REPO_PASSWORD") + } + url = + if (project.version.toString().endsWith("-SNAPSHOT")) { + uri("https://repo.azisaba.net/repository/maven-snapshots/") + } else { + uri("https://repo.azisaba.net/repository/maven-releases/") + } + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3092177 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,11 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true + +name = KDStatusReloaded +group = net.azisaba +description = KDStatusReloaded + +plDescription = KDStatus reloaded. +plWebsiteUrl = https://github.com/AzisabaNetwork/KDStatusReloaded diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..1ab27b1 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,36 @@ +[versions] +# plugin +shadow = "8.3.9" +lombok = "8.14.2" +runPaper = "2.3.1" # Latest version for java 8 + +# library +mysqlConnectorJ = "9.1.0" +hikaricp = "4.0.3" +jsonmessage = "1.3.1" +jdbiCore = "3.39.1" +jdbiSqlobject = "3.39.1" +jspecify = "1.0.0" +junit = "5.11.4" +spigotApi = "1.16.5-R0.1-SNAPSHOT" + +[plugins] +shadow = { id = "com.gradleup.shadow", version.ref = "shadow" } +lombok = { id = "io.freefair.lombok", version.ref = "lombok" } +runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" } + +[libraries] +mysqlConnectorJ = { module = "com.mysql:mysql-connector-j", version.ref = "mysqlConnectorJ" } +hikaricp = { module = "com.zaxxer:HikariCP", version.ref = "hikaricp" } +jsonmessage = { module = "me.rayzr522:jsonmessage", version.ref = "jsonmessage" } +jdbiCore = { module = "org.jdbi:jdbi3-core", version.ref = "jdbiCore" } +jdbiSqlobject = { module = "org.jdbi:jdbi3-sqlobject", version.ref = "jdbiSqlobject" } +jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" } +junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } +spigotApi = { module = "org.spigotmc:spigot-api", version.ref = "spigotApi" } + +[bundles] +jdbi = [ + "jdbiCore", + "jdbiSqlobject" +] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + 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\n' "$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="\\\"\\\"" + + +# 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, 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" \ + -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. +# +# 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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@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 +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +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= + + +@rem Execute Gradle +"%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% 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! +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 + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index fde3108..0000000 --- a/pom.xml +++ /dev/null @@ -1,164 +0,0 @@ - - 4.0.0 - - net.azisaba - KDStatusReloaded - 1.7.2 - - ${project.artifactId} - Record player kills and deaths - https://azisaba.net - - Azisaba Developer - https://github.com/${project.organization.name}/${project.name} - - - - 1.8 - UTF-8 - - - - - - org.junit - junit-bom - 5.11.4 - pom - import - - - - - - ${project.name} - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - false - - - *:* - - module-info.class - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - META-INF/*.MF - - - - - - org.spigotmc:1.16.5-R0.1-SNAPSHOT - org.junit.jupiter:junit-jupiter - - - - - - package - - shade - - - - - - maven-surefire-plugin - 3.5.2 - - - org.apache.maven.surefire - surefire-junit-platform - 3.5.3 - - - - small - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - rayzr-repo - https://raw.githubusercontent.com/Rayzr522/maven-repo/master/ - - - - - - org.spigotmc - spigot-api - 1.16.5-R0.1-SNAPSHOT - provided - - - org.projectlombok - lombok - 1.18.38 - - - me.rayzr522 - jsonmessage - 1.3.1 - - - com.mysql - mysql-connector-j - 9.1.0 - - - com.google.protobuf - protobuf-java - - - - - com.zaxxer - HikariCP - 4.0.3 - - - org.junit.jupiter - junit-jupiter - 5.11.4 - test - - - - - - azisaba - https://repo.azisaba.net/repository/maven-releases/ - - - azisaba - https://repo.azisaba.net/repository/maven-snapshots/ - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..8bfad90 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "KDStatusReloaded" diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/api/KDUserData.java b/src/main/java/jp/azisaba/lgw/kdstatus/api/KDUserData.java new file mode 100644 index 0000000..fd7581c --- /dev/null +++ b/src/main/java/jp/azisaba/lgw/kdstatus/api/KDUserData.java @@ -0,0 +1,20 @@ +package jp.azisaba.lgw.kdstatus.api; + +import java.util.UUID; + +public class KDUserData { + public final UUID uuid; + public String name; + public int totalKills, dailyKills, monthlyKills, yearlyKills; + public int deaths; + + public KDUserData(UUID uuid, String name, int totalKills, int dailyKills, int monthlyKills, int yearlyKills, int deaths) { + this.uuid = uuid; + this.name = name; + this.totalKills = totalKills; + this.dailyKills = dailyKills; + this.monthlyKills = monthlyKills; + this.yearlyKills = yearlyKills; + this.deaths = deaths; + } +} diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/db/Database.java b/src/main/java/jp/azisaba/lgw/kdstatus/db/Database.java new file mode 100644 index 0000000..861709c --- /dev/null +++ b/src/main/java/jp/azisaba/lgw/kdstatus/db/Database.java @@ -0,0 +1,40 @@ +package jp.azisaba.lgw.kdstatus.db; + +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; +import org.jdbi.v3.core.Jdbi; +import org.jspecify.annotations.NonNull; + +public class Database { + private final HikariDataSource hikariDataSource; + private Jdbi jdbi; + private KDUserDataRepository kdUserDataRepository; + + public Database(String host, int port, String database, String username, String password) { + // create HikariCP datasource + HikariConfig config = new HikariConfig(); + config.setJdbcUrl(String.format("jdbc:mysql://%s:%d/%s", host, port, database)); + config.setUsername(username); + config.setPassword(password); + hikariDataSource = new HikariDataSource(config); + + // jdbi initialization + jdbi = Jdbi.create(hikariDataSource); + kdUserDataRepository = jdbi.onDemand(KDUserDataRepository.class); + } + + @NonNull + public KDUserDataRepository kdUserDataRepository() { + if(kdUserDataRepository == null) throw new RuntimeException("KDUserDataRepository was already closed."); + return kdUserDataRepository; + } + + public void shutdown() { + // for safety + jdbi = null; + kdUserDataRepository = null; + + // close datasource + hikariDataSource.close(); + } +} diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/db/KDUserDataRepository.java b/src/main/java/jp/azisaba/lgw/kdstatus/db/KDUserDataRepository.java new file mode 100644 index 0000000..21905e6 --- /dev/null +++ b/src/main/java/jp/azisaba/lgw/kdstatus/db/KDUserDataRepository.java @@ -0,0 +1,24 @@ +package jp.azisaba.lgw.kdstatus.db; + +import jp.azisaba.lgw.kdstatus.api.KDUserData; +import org.jdbi.v3.sqlobject.config.RegisterBeanMapper; +import org.jdbi.v3.sqlobject.customizer.Bind; +import org.jdbi.v3.sqlobject.customizer.BindMethods; +import org.jdbi.v3.sqlobject.statement.SqlQuery; +import org.jdbi.v3.sqlobject.statement.SqlUpdate; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +@RegisterBeanMapper(KDUserData.class) +public interface KDUserDataRepository { + @SqlQuery("SELECT * FROM kill_death_data WHERE uuid = :uuid") + Optional findById(@Bind("uuid") UUID uuid); + + @SqlQuery("SELECT * FROM kill_death_data ORDER BY kills DESC LIMIT :limit") + List findTopByTotalKills(@Bind("limit") int limit); + + @SqlUpdate("INSERT INTO kill_death_data (uuid, name, kills, deaths, daily_kills, monthly_kills, yearly_kills, last_updated) VALUES (:uuid, :name, :totalKills, :deaths, :dailyKills, :monthlyKills, :yearlyKills, now())") + void save(@BindMethods KDUserData data); +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 020664d..2836115 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,9 +1,9 @@ -name: ${project.name} +name: '${name}' main: jp.azisaba.lgw.kdstatus.KDStatusReloaded -version: ${project.version} +version: '${version}' authors: [siloneco, matsu1213, sysnote8main] -description: "KDStatus reloaded." -website: ${project.url} +description: "${description}" +website: '${websiteUrl}' api-version: 1.16 commands: mystatus: diff --git a/src/test/java/jp/azisaba/lgw/kdstatus/DBMain.java b/src/test/java/jp/azisaba/lgw/kdstatus/DBMain.java deleted file mode 100644 index ae59453..0000000 --- a/src/test/java/jp/azisaba/lgw/kdstatus/DBMain.java +++ /dev/null @@ -1,40 +0,0 @@ -package jp.azisaba.lgw.kdstatus; - -import jp.azisaba.lgw.kdstatus.sql.HikariMySQLDatabase; -import jp.azisaba.lgw.kdstatus.sql.KillRankingData; -import jp.azisaba.lgw.kdstatus.sql.PlayerDataMySQLController; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; - -import java.util.List; -import java.util.UUID; -import java.util.logging.Logger; - -public class DBMain { - public static void main(String[] args) { - // init logger - Logger testLogger = Logger.getLogger("DBMain-Test"); - - // -- connect db - HikariMySQLDatabase db = new HikariMySQLDatabase( - Logger.getLogger("DBConnectionTest"), - 10, - "localhost", - "3306", - "kdstatusreloaded", - "root", - "mariadb" - ); - db.connect(); - // -- start - PlayerDataMySQLController controller = new PlayerDataMySQLController(db, testLogger); - List dataList = controller.getTopKillRankingData(TimeUnit.LIFETIME, 10); - for(KillRankingData data: dataList) { - testLogger.info("Name: " + data.getName()); - } - int rank = controller.getRank(UUID.fromString("e76cae7b-dc41-40f9-86bb-01afc463e66c"), TimeUnit.LIFETIME); - testLogger.info("Ranking: " + rank); - - // -- fin - db.close(); - } -} diff --git a/src/test/java/jp/azisaba/lgw/kdstatus/TestSize.java b/src/test/java/jp/azisaba/lgw/kdstatus/TestSize.java deleted file mode 100644 index 8f8b40d..0000000 --- a/src/test/java/jp/azisaba/lgw/kdstatus/TestSize.java +++ /dev/null @@ -1,7 +0,0 @@ -package jp.azisaba.lgw.kdstatus; - -public class TestSize { - public static final String SMALL = "small"; - public static final String MEDIUM = "medium"; - public static final String LARGE = "large"; -} diff --git a/src/test/java/jp/azisaba/lgw/kdstatus/sql/ConnectionTest.java b/src/test/java/jp/azisaba/lgw/kdstatus/sql/ConnectionTest.java deleted file mode 100644 index a52c38f..0000000 --- a/src/test/java/jp/azisaba/lgw/kdstatus/sql/ConnectionTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package jp.azisaba.lgw.kdstatus.sql; - -import jp.azisaba.lgw.kdstatus.TestSize; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Random; -import java.util.logging.Logger; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -@Tag(TestSize.LARGE) -public class ConnectionTest { - @Test - public void ConnectToDatabase() throws InterruptedException { - Random rnd = new Random(); - HikariMySQLDatabase db = new HikariMySQLDatabase( - Logger.getLogger("DBConnectionTest"), - 10, - "localhost", - "3306", - "kdstatusreloaded", - "root", - "mariadb" - ); - db.connect(); - for(int i=0;i<20;i++) { - assertTrue(db.isConnectionAlive()); - System.out.println("Connection is alive! " + i); - try(Connection conn = db.getConnection(); - PreparedStatement pstmt = conn.prepareStatement("SELECT 1")) { - assertTrue(pstmt.executeQuery().next()); - } catch (SQLException e) { - e.printStackTrace(); - } - Thread.sleep(rnd.nextInt(2000)); - } - db.close(); - } -} diff --git a/src/test/java/jp/azisaba/lgw/kdstatus/sql/RankingTest.java b/src/test/java/jp/azisaba/lgw/kdstatus/sql/RankingTest.java deleted file mode 100644 index 78ea6b4..0000000 --- a/src/test/java/jp/azisaba/lgw/kdstatus/sql/RankingTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package jp.azisaba.lgw.kdstatus.sql; - -import jp.azisaba.lgw.kdstatus.TestSize; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - -import java.util.logging.Logger; - -@Tag(TestSize.LARGE) -public class RankingTest { - private static HikariMySQLDatabase db; - @BeforeAll - public static void setup() { - db = new HikariMySQLDatabase( - Logger.getLogger("DBConnectionTest"), - 10, - "localhost", - "3306", - "kdstatusreloaded", - "root", - "mariadb" - ); - db.connect(); - } - - @AfterAll - public static void cleanup() { - db.close(); - } - - @Test - public void TestDailyRanking() {} -} diff --git a/src/test/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverterTest.java b/src/test/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverterTest.java deleted file mode 100644 index 1876b72..0000000 --- a/src/test/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverterTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package jp.azisaba.lgw.kdstatus.utils; - -import jp.azisaba.lgw.kdstatus.TestSize; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - -import java.util.UUID; - -import static org.junit.jupiter.api.Assertions.*; - -public class UUIDConverterTest { - @Test - @Tag(TestSize.SMALL) - public void UUIDToString() { - UUID uuid = UUID.randomUUID(); - assertEquals(uuid.toString(), UUIDConverter.insertDashUUID(uuid.toString().replace("-", ""))); - assertEquals(uuid, UUID.fromString(UUIDConverter.insertDashUUID(UUIDConverter.convert(uuid)))); - } -} From 2a8661c978813ef742e1e0a1a46f9719f1210fed Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:07:27 +0900 Subject: [PATCH 02/10] feat!: migrate package to net.azisaba --- .../kdstatusreloaded}/KDStatusConfig.java | 4 +-- .../kdstatusreloaded}/KDStatusReloaded.java | 25 +++++++++++-------- .../kdstatusreloaded}/api/KDUserData.java | 2 +- .../commands/KDStatusCommand.java | 6 ++--- .../commands/MyStatusCommand.java | 10 ++++---- .../kdstatusreloaded}/db/Database.java | 2 +- .../db/KDUserDataRepository.java | 4 +-- .../listeners/JoinQuitListener.java | 4 +-- .../listeners/KillDeathListener.java | 6 ++--- .../kdstatusreloaded}/sql/DBAuthConfig.java | 4 +-- .../sql/HikariMySQLDatabase.java | 2 +- .../kdstatusreloaded}/sql/KDUserData.java | 6 ++--- .../sql/KillDeathDataContainer.java | 10 ++++---- .../sql/KillRankingData.java | 2 +- .../kdstatusreloaded}/sql/MySQLHandler.java | 2 +- .../sql/PlayerDataController.java | 4 +-- .../sql/PlayerDataHikariMySQLController.java | 4 +-- .../sql/PlayerDataMySQLController.java | 6 ++--- .../sql/PlayerDataSQLController.java | 6 ++--- .../kdstatusreloaded}/sql/SQLHandler.java | 2 +- .../task/DBConnectionCheckTask.java | 4 +-- .../task/SavePlayerDataTask.java | 4 +-- .../azisaba/kdstatusreloaded}/utils/Chat.java | 2 +- .../kdstatusreloaded}/utils/TimeUnit.java | 2 +- .../utils/UUIDConverter.java | 2 +- src/main/resources/plugin.yml | 2 +- 26 files changed, 66 insertions(+), 61 deletions(-) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/KDStatusConfig.java (98%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/KDStatusReloaded.java (79%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/api/KDUserData.java (93%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/commands/KDStatusCommand.java (93%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/commands/MyStatusCommand.java (89%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/db/Database.java (96%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/db/KDUserDataRepository.java (91%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/listeners/JoinQuitListener.java (87%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/listeners/KillDeathListener.java (91%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/DBAuthConfig.java (92%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/HikariMySQLDatabase.java (99%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/KDUserData.java (97%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/KillDeathDataContainer.java (97%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/KillRankingData.java (92%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/MySQLHandler.java (96%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/PlayerDataController.java (87%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/PlayerDataHikariMySQLController.java (97%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/PlayerDataMySQLController.java (98%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/PlayerDataSQLController.java (97%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/sql/SQLHandler.java (98%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/task/DBConnectionCheckTask.java (92%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/task/SavePlayerDataTask.java (88%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/utils/Chat.java (91%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/utils/TimeUnit.java (95%) rename src/main/java/{jp/azisaba/lgw/kdstatus => net/azisaba/kdstatusreloaded}/utils/UUIDConverter.java (93%) diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusConfig.java b/src/main/java/net/azisaba/kdstatusreloaded/KDStatusConfig.java similarity index 98% rename from src/main/java/jp/azisaba/lgw/kdstatus/KDStatusConfig.java rename to src/main/java/net/azisaba/kdstatusreloaded/KDStatusConfig.java index 3e75d5a..25e1c05 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusConfig.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/KDStatusConfig.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus; +package net.azisaba.kdstatusreloaded; -import jp.azisaba.lgw.kdstatus.utils.Chat; +import net.azisaba.kdstatusreloaded.utils.Chat; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Sound; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java b/src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java similarity index 79% rename from src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java rename to src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java index 3a85553..1298d15 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java @@ -1,13 +1,18 @@ -package jp.azisaba.lgw.kdstatus; - -import jp.azisaba.lgw.kdstatus.commands.KDStatusCommand; -import jp.azisaba.lgw.kdstatus.commands.MyStatusCommand; -import jp.azisaba.lgw.kdstatus.listeners.JoinQuitListener; -import jp.azisaba.lgw.kdstatus.listeners.KillDeathListener; -import jp.azisaba.lgw.kdstatus.sql.*; -import jp.azisaba.lgw.kdstatus.task.DBConnectionCheckTask; -import jp.azisaba.lgw.kdstatus.task.SavePlayerDataTask; -import jp.azisaba.lgw.kdstatus.utils.Chat; +package net.azisaba.kdstatusreloaded; + +import net.azisaba.kdstatusreloaded.commands.KDStatusCommand; +import net.azisaba.kdstatusreloaded.commands.MyStatusCommand; +import net.azisaba.kdstatusreloaded.listeners.JoinQuitListener; +import net.azisaba.kdstatusreloaded.listeners.KillDeathListener; +import net.azisaba.kdstatusreloaded.sql.DBAuthConfig; +import net.azisaba.kdstatusreloaded.sql.HikariMySQLDatabase; +import net.azisaba.kdstatusreloaded.sql.KillDeathDataContainer; +import net.azisaba.kdstatusreloaded.sql.PlayerDataMySQLController; +import net.azisaba.kdstatusreloaded.sql.PlayerDataSQLController; +import net.azisaba.kdstatusreloaded.sql.SQLHandler; +import net.azisaba.kdstatusreloaded.task.DBConnectionCheckTask; +import net.azisaba.kdstatusreloaded.task.SavePlayerDataTask; +import net.azisaba.kdstatusreloaded.utils.Chat; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/api/KDUserData.java b/src/main/java/net/azisaba/kdstatusreloaded/api/KDUserData.java similarity index 93% rename from src/main/java/jp/azisaba/lgw/kdstatus/api/KDUserData.java rename to src/main/java/net/azisaba/kdstatusreloaded/api/KDUserData.java index fd7581c..25600f3 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/api/KDUserData.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/api/KDUserData.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.api; +package net.azisaba.kdstatusreloaded.api; import java.util.UUID; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/commands/KDStatusCommand.java b/src/main/java/net/azisaba/kdstatusreloaded/commands/KDStatusCommand.java similarity index 93% rename from src/main/java/jp/azisaba/lgw/kdstatus/commands/KDStatusCommand.java rename to src/main/java/net/azisaba/kdstatusreloaded/commands/KDStatusCommand.java index a973494..cc643dc 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/commands/KDStatusCommand.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/commands/KDStatusCommand.java @@ -1,7 +1,7 @@ -package jp.azisaba.lgw.kdstatus.commands; +package net.azisaba.kdstatusreloaded.commands; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import jp.azisaba.lgw.kdstatus.utils.Chat; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.utils.Chat; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/commands/MyStatusCommand.java b/src/main/java/net/azisaba/kdstatusreloaded/commands/MyStatusCommand.java similarity index 89% rename from src/main/java/jp/azisaba/lgw/kdstatus/commands/MyStatusCommand.java rename to src/main/java/net/azisaba/kdstatusreloaded/commands/MyStatusCommand.java index 3c0e9dd..7472856 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/commands/MyStatusCommand.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/commands/MyStatusCommand.java @@ -1,10 +1,10 @@ -package jp.azisaba.lgw.kdstatus.commands; +package net.azisaba.kdstatusreloaded.commands; import com.google.common.base.Strings; -import jp.azisaba.lgw.kdstatus.sql.KDUserData; -import jp.azisaba.lgw.kdstatus.sql.KillDeathDataContainer; -import jp.azisaba.lgw.kdstatus.utils.Chat; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; +import net.azisaba.kdstatusreloaded.sql.KDUserData; +import net.azisaba.kdstatusreloaded.sql.KillDeathDataContainer; +import net.azisaba.kdstatusreloaded.utils.Chat; +import net.azisaba.kdstatusreloaded.utils.TimeUnit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/db/Database.java b/src/main/java/net/azisaba/kdstatusreloaded/db/Database.java similarity index 96% rename from src/main/java/jp/azisaba/lgw/kdstatus/db/Database.java rename to src/main/java/net/azisaba/kdstatusreloaded/db/Database.java index 861709c..3d597f2 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/db/Database.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/db/Database.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.db; +package net.azisaba.kdstatusreloaded.db; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/db/KDUserDataRepository.java b/src/main/java/net/azisaba/kdstatusreloaded/db/KDUserDataRepository.java similarity index 91% rename from src/main/java/jp/azisaba/lgw/kdstatus/db/KDUserDataRepository.java rename to src/main/java/net/azisaba/kdstatusreloaded/db/KDUserDataRepository.java index 21905e6..e0ad8eb 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/db/KDUserDataRepository.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/db/KDUserDataRepository.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus.db; +package net.azisaba.kdstatusreloaded.db; -import jp.azisaba.lgw.kdstatus.api.KDUserData; +import net.azisaba.kdstatusreloaded.api.KDUserData; import org.jdbi.v3.sqlobject.config.RegisterBeanMapper; import org.jdbi.v3.sqlobject.customizer.Bind; import org.jdbi.v3.sqlobject.customizer.BindMethods; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/listeners/JoinQuitListener.java b/src/main/java/net/azisaba/kdstatusreloaded/listeners/JoinQuitListener.java similarity index 87% rename from src/main/java/jp/azisaba/lgw/kdstatus/listeners/JoinQuitListener.java rename to src/main/java/net/azisaba/kdstatusreloaded/listeners/JoinQuitListener.java index 3aaa4ef..b34bad4 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/listeners/JoinQuitListener.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/listeners/JoinQuitListener.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus.listeners; +package net.azisaba.kdstatusreloaded.listeners; -import jp.azisaba.lgw.kdstatus.sql.KillDeathDataContainer; +import net.azisaba.kdstatusreloaded.sql.KillDeathDataContainer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/listeners/KillDeathListener.java b/src/main/java/net/azisaba/kdstatusreloaded/listeners/KillDeathListener.java similarity index 91% rename from src/main/java/jp/azisaba/lgw/kdstatus/listeners/KillDeathListener.java rename to src/main/java/net/azisaba/kdstatusreloaded/listeners/KillDeathListener.java index 5bc162c..3d4f445 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/listeners/KillDeathListener.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/listeners/KillDeathListener.java @@ -1,7 +1,7 @@ -package jp.azisaba.lgw.kdstatus.listeners; +package net.azisaba.kdstatusreloaded.listeners; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import jp.azisaba.lgw.kdstatus.utils.Chat; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.utils.Chat; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/DBAuthConfig.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/DBAuthConfig.java similarity index 92% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/DBAuthConfig.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/DBAuthConfig.java index 3da737f..5e36c93 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/DBAuthConfig.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/DBAuthConfig.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/HikariMySQLDatabase.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java similarity index 99% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/HikariMySQLDatabase.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java index 0794d16..6db6b0f 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/HikariMySQLDatabase.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; import com.zaxxer.hikari.HikariConfig; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java similarity index 97% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java index 6acb369..599727e 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java @@ -1,7 +1,7 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.utils.TimeUnit; import lombok.Getter; import lombok.NonNull; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java similarity index 97% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java index ee11426..cf425df 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java @@ -1,9 +1,9 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import jp.azisaba.lgw.kdstatus.utils.Chat; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; -import jp.azisaba.lgw.kdstatus.utils.UUIDConverter; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.utils.Chat; +import net.azisaba.kdstatusreloaded.utils.TimeUnit; +import net.azisaba.kdstatusreloaded.utils.UUIDConverter; import lombok.NonNull; import me.rayzr522.jsonmessage.JSONMessage; import org.bukkit.Bukkit; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillRankingData.java similarity index 92% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/KillRankingData.java index 82f7e13..1471fee 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillRankingData.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; import lombok.Getter; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/MySQLHandler.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/MySQLHandler.java similarity index 96% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/MySQLHandler.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/MySQLHandler.java index d027300..b3cee1f 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/MySQLHandler.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/MySQLHandler.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; import lombok.Getter; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataController.java similarity index 87% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataController.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataController.java index 199ab38..df3682a 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataController.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; +import net.azisaba.kdstatusreloaded.utils.TimeUnit; import lombok.NonNull; import java.math.BigInteger; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java similarity index 97% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java index c20f9a5..2051251 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; +import net.azisaba.kdstatusreloaded.utils.TimeUnit; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java similarity index 98% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java index e0bb855..19b1f62 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java @@ -1,7 +1,7 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.utils.TimeUnit; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.slf4j.LoggerFactory; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java similarity index 97% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java index 5885ced..6a657ed 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java @@ -1,7 +1,7 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; -import jp.azisaba.lgw.kdstatus.utils.TimeUnit; -import jp.azisaba.lgw.kdstatus.utils.UUIDConverter; +import net.azisaba.kdstatusreloaded.utils.TimeUnit; +import net.azisaba.kdstatusreloaded.utils.UUIDConverter; import lombok.AccessLevel; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/SQLHandler.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/SQLHandler.java similarity index 98% rename from src/main/java/jp/azisaba/lgw/kdstatus/sql/SQLHandler.java rename to src/main/java/net/azisaba/kdstatusreloaded/sql/SQLHandler.java index 0213508..f51f421 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/SQLHandler.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/SQLHandler.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.sql; +package net.azisaba.kdstatusreloaded.sql; import org.bukkit.Bukkit; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/task/DBConnectionCheckTask.java b/src/main/java/net/azisaba/kdstatusreloaded/task/DBConnectionCheckTask.java similarity index 92% rename from src/main/java/jp/azisaba/lgw/kdstatus/task/DBConnectionCheckTask.java rename to src/main/java/net/azisaba/kdstatusreloaded/task/DBConnectionCheckTask.java index c78ddc0..79ded73 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/task/DBConnectionCheckTask.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/task/DBConnectionCheckTask.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus.task; +package net.azisaba.kdstatusreloaded.task; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; import lombok.RequiredArgsConstructor; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/task/SavePlayerDataTask.java b/src/main/java/net/azisaba/kdstatusreloaded/task/SavePlayerDataTask.java similarity index 88% rename from src/main/java/jp/azisaba/lgw/kdstatus/task/SavePlayerDataTask.java rename to src/main/java/net/azisaba/kdstatusreloaded/task/SavePlayerDataTask.java index dd73d52..07e4302 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/task/SavePlayerDataTask.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/task/SavePlayerDataTask.java @@ -1,6 +1,6 @@ -package jp.azisaba.lgw.kdstatus.task; +package net.azisaba.kdstatusreloaded.task; -import jp.azisaba.lgw.kdstatus.KDStatusReloaded; +import net.azisaba.kdstatusreloaded.KDStatusReloaded; import lombok.Getter; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/utils/Chat.java b/src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java similarity index 91% rename from src/main/java/jp/azisaba/lgw/kdstatus/utils/Chat.java rename to src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java index 27b1797..e7e48fb 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/utils/Chat.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.utils; +package net.azisaba.kdstatusreloaded.utils; import lombok.experimental.UtilityClass; import org.bukkit.ChatColor; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/utils/TimeUnit.java b/src/main/java/net/azisaba/kdstatusreloaded/utils/TimeUnit.java similarity index 95% rename from src/main/java/jp/azisaba/lgw/kdstatus/utils/TimeUnit.java rename to src/main/java/net/azisaba/kdstatusreloaded/utils/TimeUnit.java index 8f8b4a2..66f3ebd 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/utils/TimeUnit.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/utils/TimeUnit.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.utils; +package net.azisaba.kdstatusreloaded.utils; import java.util.Calendar; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverter.java b/src/main/java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java similarity index 93% rename from src/main/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverter.java rename to src/main/java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java index 58ae59a..f80a4fa 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverter.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java @@ -1,4 +1,4 @@ -package jp.azisaba.lgw.kdstatus.utils; +package net.azisaba.kdstatusreloaded.utils; import lombok.NonNull; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 2836115..84b775c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: '${name}' -main: jp.azisaba.lgw.kdstatus.KDStatusReloaded +main: net.azisaba.kdstatusreloaded.KDStatusReloaded version: '${version}' authors: [siloneco, matsu1213, sysnote8main] description: "${description}" From 83797b57ac3921a2c249abea78111497cd5b189b Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:14:27 +0900 Subject: [PATCH 03/10] feat: remove NonNull annotation from lombok --- .../net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java | 2 +- src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java | 2 +- .../azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java | 2 +- .../net/azisaba/kdstatusreloaded/sql/PlayerDataController.java | 2 +- .../kdstatusreloaded/sql/PlayerDataHikariMySQLController.java | 2 +- .../azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java | 2 +- .../azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java | 2 +- src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java | 2 -- .../java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java index 6db6b0f..2a788d3 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java @@ -4,8 +4,8 @@ import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import lombok.Getter; -import lombok.NonNull; import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.NonNull; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java index 599727e..b6d2b7a 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java @@ -3,9 +3,9 @@ import net.azisaba.kdstatusreloaded.KDStatusReloaded; import net.azisaba.kdstatusreloaded.utils.TimeUnit; import lombok.Getter; -import lombok.NonNull; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; +import org.jspecify.annotations.NonNull; import java.io.File; import java.io.IOException; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java index cf425df..70ae01e 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java @@ -4,10 +4,10 @@ import net.azisaba.kdstatusreloaded.utils.Chat; import net.azisaba.kdstatusreloaded.utils.TimeUnit; import net.azisaba.kdstatusreloaded.utils.UUIDConverter; -import lombok.NonNull; import me.rayzr522.jsonmessage.JSONMessage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; +import org.jspecify.annotations.NonNull; import java.io.File; import java.sql.ResultSet; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataController.java index df3682a..567db0d 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataController.java @@ -1,7 +1,7 @@ package net.azisaba.kdstatusreloaded.sql; import net.azisaba.kdstatusreloaded.utils.TimeUnit; -import lombok.NonNull; +import org.jspecify.annotations.NonNull; import java.math.BigInteger; import java.sql.ResultSet; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java index 2051251..4b895cf 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java @@ -1,8 +1,8 @@ package net.azisaba.kdstatusreloaded.sql; import net.azisaba.kdstatusreloaded.utils.TimeUnit; -import lombok.NonNull; import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.NonNull; import java.math.BigInteger; import java.sql.PreparedStatement; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java index 19b1f62..7f7f8c0 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java @@ -2,8 +2,8 @@ import net.azisaba.kdstatusreloaded.KDStatusReloaded; import net.azisaba.kdstatusreloaded.utils.TimeUnit; -import lombok.NonNull; import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.NonNull; import org.slf4j.LoggerFactory; import java.math.BigInteger; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java index 6a657ed..857be26 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java @@ -4,7 +4,7 @@ import net.azisaba.kdstatusreloaded.utils.UUIDConverter; import lombok.AccessLevel; import lombok.Getter; -import lombok.NonNull; +import org.jspecify.annotations.NonNull; import java.math.BigInteger; import java.sql.ResultSet; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java b/src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java index e7e48fb..689e46b 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/utils/Chat.java @@ -1,11 +1,9 @@ package net.azisaba.kdstatusreloaded.utils; -import lombok.experimental.UtilityClass; import org.bukkit.ChatColor; import java.text.MessageFormat; -@UtilityClass public class Chat { // メッセージをフォーマットして、&で色をつける diff --git a/src/main/java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java b/src/main/java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java index f80a4fa..fe3bc82 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/utils/UUIDConverter.java @@ -1,6 +1,6 @@ package net.azisaba.kdstatusreloaded.utils; -import lombok.NonNull; +import org.jspecify.annotations.NonNull; import java.util.UUID; From 958004e0f864be41163f399f3317ad858a4550d7 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:22:50 +0900 Subject: [PATCH 04/10] feat: remove lombok annotation --- .../kdstatusreloaded/KDStatusReloaded.java | 21 ++++++++++++++----- .../kdstatusreloaded/sql/DBAuthConfig.java | 17 +++++---------- .../sql/HikariMySQLDatabase.java | 18 ++++++++++++---- .../kdstatusreloaded/sql/KDUserData.java | 11 +++++++--- .../kdstatusreloaded/sql/KillRankingData.java | 3 --- .../kdstatusreloaded/sql/MySQLHandler.java | 13 ++++++------ .../sql/PlayerDataHikariMySQLController.java | 6 ++++-- .../sql/PlayerDataMySQLController.java | 7 +++++-- .../sql/PlayerDataSQLController.java | 8 ++----- .../task/DBConnectionCheckTask.java | 6 ++++-- .../task/SavePlayerDataTask.java | 6 ++++-- 11 files changed, 69 insertions(+), 47 deletions(-) diff --git a/src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java b/src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java index 1298d15..f4ef861 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java @@ -13,7 +13,6 @@ import net.azisaba.kdstatusreloaded.task.DBConnectionCheckTask; import net.azisaba.kdstatusreloaded.task.SavePlayerDataTask; import net.azisaba.kdstatusreloaded.utils.Chat; -import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -21,13 +20,9 @@ public class KDStatusReloaded extends JavaPlugin { - @Getter private KDStatusConfig pluginConfig; - @Getter private KillDeathDataContainer kdDataContainer; - @Getter private static KDStatusReloaded plugin; - @Getter private SavePlayerDataTask saveTask; private DBConnectionCheckTask dbCheckTask; @@ -113,4 +108,20 @@ public PlayerDataMySQLController getKDData() { return kdData; } + public KDStatusConfig getPluginConfig() { + return pluginConfig; + } + + public KillDeathDataContainer getKdDataContainer() { + return kdDataContainer; + } + + public static KDStatusReloaded getPlugin() { + return plugin; + } + + public SavePlayerDataTask getSaveTask() { + return saveTask; + } + } diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/DBAuthConfig.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/DBAuthConfig.java index 5e36c93..d431f9f 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/DBAuthConfig.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/DBAuthConfig.java @@ -1,8 +1,6 @@ package net.azisaba.kdstatusreloaded.sql; import net.azisaba.kdstatusreloaded.KDStatusReloaded; -import lombok.AccessLevel; -import lombok.Getter; import java.util.logging.Logger; @@ -10,16 +8,11 @@ * Safe auth config loader */ public class DBAuthConfig { - @Getter(AccessLevel.PROTECTED) - private static String host; - @Getter(AccessLevel.PROTECTED) - private static String port; - @Getter(AccessLevel.PROTECTED) - private static String database; - @Getter(AccessLevel.PROTECTED) - private static String user; - @Getter(AccessLevel.PROTECTED) - private static String password; + protected static String host; + protected static String port; + protected static String database; + protected static String user; + protected static String password; public static void loadAuthConfig() { host = getConfigAsString("host"); diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java index 2a788d3..cc38d5f 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/HikariMySQLDatabase.java @@ -3,8 +3,6 @@ import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import lombok.Getter; -import lombok.RequiredArgsConstructor; import org.jspecify.annotations.NonNull; import java.sql.Connection; @@ -18,16 +16,28 @@ /** * Wrapper class of HikariDataSource for MySQL */ -@RequiredArgsConstructor public class HikariMySQLDatabase { private final Logger logger; private final int maxPoolSize; private final String host, port, databaseName, user, password; - @Getter private boolean initialized; private HikariDataSource hikari; + public HikariMySQLDatabase(Logger logger, int maxPoolSize, String host, String port, String databaseName, String user, String password) { + this.logger = logger; + this.maxPoolSize = maxPoolSize; + this.host = host; + this.port = port; + this.databaseName = databaseName; + this.user = user; + this.password = password; + } + + public boolean isInitialized() { + return initialized; + } + public boolean isConnected() { if (hikari == null) return false; return hikari.isRunning(); diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java index b6d2b7a..b05412a 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KDUserData.java @@ -2,7 +2,6 @@ import net.azisaba.kdstatusreloaded.KDStatusReloaded; import net.azisaba.kdstatusreloaded.utils.TimeUnit; -import lombok.Getter; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.jspecify.annotations.NonNull; @@ -14,7 +13,6 @@ public class KDUserData { - @Getter private final UUID uuid; private YamlConfiguration conf; @@ -28,7 +26,6 @@ public class KDUserData { public static final String MONTHLY_KILLS_KEY = "MonthlyKill"; public static final String YEARLY_KILLS_KEY = "YearlyKill"; - @Getter private String name; private int totalKills, dailyKills, monthlyKills, yearlyKills; private int deaths; @@ -62,6 +59,14 @@ protected KDUserData(UUID uuid, String name, int totalKills, int deaths, int dai fixCorrectValue(); } + public String getName() { + return name; + } + + public UUID getUuid() { + return uuid; + } + /** * キル数を追加する * diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillRankingData.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillRankingData.java index 1471fee..5fd8cfd 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillRankingData.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillRankingData.java @@ -1,10 +1,7 @@ package net.azisaba.kdstatusreloaded.sql; -import lombok.Getter; - import java.util.UUID; -@Getter public class KillRankingData { private final UUID uuid; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/MySQLHandler.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/MySQLHandler.java index b3cee1f..8cfe9a3 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/MySQLHandler.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/MySQLHandler.java @@ -1,6 +1,5 @@ package net.azisaba.kdstatusreloaded.sql; -import lombok.Getter; import java.sql.Connection; import java.sql.DriverManager; @@ -8,7 +7,6 @@ public class MySQLHandler { - @Getter private Connection connection; public boolean isConnected() { @@ -23,11 +21,11 @@ public boolean isConnected() { public void connect() throws SQLException { if (isConnected()) return; String jdbcUrl = String.format("jdbc:mysql://%s:%s/%s?useSSL=false", - DBAuthConfig.getHost(), - DBAuthConfig.getPort(), - DBAuthConfig.getDatabase() + DBAuthConfig.host, + DBAuthConfig.port, + DBAuthConfig.database ); - connection = DriverManager.getConnection(jdbcUrl, DBAuthConfig.getUser(), DBAuthConfig.getPassword()); + connection = DriverManager.getConnection(jdbcUrl, DBAuthConfig.user, DBAuthConfig.password); } public void reconnect() throws SQLException { @@ -43,4 +41,7 @@ public void close() throws SQLException { connection = null; } + public Connection getConnection() { + return connection; + } } diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java index 4b895cf..82cad16 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataHikariMySQLController.java @@ -1,7 +1,6 @@ package net.azisaba.kdstatusreloaded.sql; import net.azisaba.kdstatusreloaded.utils.TimeUnit; -import lombok.RequiredArgsConstructor; import org.jspecify.annotations.NonNull; import java.math.BigInteger; @@ -14,11 +13,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -@RequiredArgsConstructor public class PlayerDataHikariMySQLController implements PlayerDataController { private final Logger logger; private HikariMySQLDatabase db; + public PlayerDataHikariMySQLController(Logger logger) { + this.logger = logger; + } + public void connect() { } diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java index 7f7f8c0..0d650f9 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataMySQLController.java @@ -2,7 +2,6 @@ import net.azisaba.kdstatusreloaded.KDStatusReloaded; import net.azisaba.kdstatusreloaded.utils.TimeUnit; -import lombok.RequiredArgsConstructor; import org.jspecify.annotations.NonNull; import org.slf4j.LoggerFactory; @@ -17,12 +16,16 @@ import java.util.logging.Level; import java.util.logging.Logger; -@RequiredArgsConstructor public class PlayerDataMySQLController { private static final org.slf4j.Logger log = LoggerFactory.getLogger(PlayerDataMySQLController.class); private final HikariMySQLDatabase sql; private final Logger logger; + public PlayerDataMySQLController(HikariMySQLDatabase sql, Logger logger) { + this.sql = sql; + this.logger = logger; + } + public void init() { if (sql.isConnected()) { logger.info("SQL Testing..."); diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java index 857be26..5a2e2a1 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/PlayerDataSQLController.java @@ -2,8 +2,6 @@ import net.azisaba.kdstatusreloaded.utils.TimeUnit; import net.azisaba.kdstatusreloaded.utils.UUIDConverter; -import lombok.AccessLevel; -import lombok.Getter; import org.jspecify.annotations.NonNull; import java.math.BigInteger; @@ -15,11 +13,9 @@ public class PlayerDataSQLController { - @Getter(value = AccessLevel.PROTECTED) - private final SQLHandler handler; + protected SQLHandler handler; - @Getter(value = AccessLevel.PROTECTED) - private final String tableName = "killdeathdata"; + protected String tableName = "killdeathdata"; public PlayerDataSQLController(SQLHandler handler) { this.handler = handler; diff --git a/src/main/java/net/azisaba/kdstatusreloaded/task/DBConnectionCheckTask.java b/src/main/java/net/azisaba/kdstatusreloaded/task/DBConnectionCheckTask.java index 79ded73..936803b 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/task/DBConnectionCheckTask.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/task/DBConnectionCheckTask.java @@ -1,7 +1,6 @@ package net.azisaba.kdstatusreloaded.task; import net.azisaba.kdstatusreloaded.KDStatusReloaded; -import lombok.RequiredArgsConstructor; import org.bukkit.scheduler.BukkitRunnable; import java.sql.Connection; @@ -9,10 +8,13 @@ import java.sql.SQLException; import java.util.logging.Level; -@RequiredArgsConstructor public class DBConnectionCheckTask extends BukkitRunnable { private final KDStatusReloaded plugin; + public DBConnectionCheckTask(KDStatusReloaded plugin) { + this.plugin = plugin; + } + @Override public void run() { try (Connection conn = plugin.sql.getConnection()) { diff --git a/src/main/java/net/azisaba/kdstatusreloaded/task/SavePlayerDataTask.java b/src/main/java/net/azisaba/kdstatusreloaded/task/SavePlayerDataTask.java index 07e4302..3c386ad 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/task/SavePlayerDataTask.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/task/SavePlayerDataTask.java @@ -1,7 +1,6 @@ package net.azisaba.kdstatusreloaded.task; import net.azisaba.kdstatusreloaded.KDStatusReloaded; -import lombok.Getter; import org.bukkit.scheduler.BukkitRunnable; /** @@ -12,7 +11,6 @@ public class SavePlayerDataTask extends BukkitRunnable { private final KDStatusReloaded plugin; - @Getter private long lastSavedTime = System.currentTimeMillis(); public SavePlayerDataTask(KDStatusReloaded plugin) { @@ -27,4 +25,8 @@ public void run() { lastSavedTime = System.currentTimeMillis(); plugin.getLogger().info("全プレイヤーデータをセーブしました。"); } + + public long getLastSavedTime() { + return lastSavedTime; + } } From 648c50f9c5667bbf8ba09f55b3148057acf28aac Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:24:28 +0900 Subject: [PATCH 05/10] fix: forget to change method call in KillDeathDataContainer --- .../kdstatusreloaded/sql/KillDeathDataContainer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java index 70ae01e..90d5e8c 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java @@ -197,14 +197,14 @@ public List getTopKillRankingData(TimeUnit unit, int count) thr if (!isMigrated) { // SQLHandlerが初期化されていない場合 - if (!sqlController.getHandler().isInitialized()) { + if (!sqlController.handler.isInitialized()) { throw new IllegalStateException("SQLHandler is not initialized yet."); } // データを取得する try { - ResultSet set = sqlController.getHandler().executeQuery("select uuid, name, " + unit.getSqlColumnName() - + " from " + sqlController.getTableName() + ResultSet set = sqlController.handler.executeQuery("select uuid, name, " + unit.getSqlColumnName() + + " from " + sqlController.tableName + " where last_updated >= " + getFirstMilliSecond(unit) + " order by " + unit.getSqlColumnName() + " DESC" + " LIMIT " + count); @@ -243,10 +243,10 @@ public List getTopKillRankingData(TimeUnit unit, int count) thr public int getRanking(@NonNull UUID uuid, @NonNull TimeUnit unit) { if (!isMigrated) { - ResultSet set = sqlController.getHandler().executeQuery( - "select uuid, name, kills, (SELECT count(*) FROM " + sqlController.getTableName() + ResultSet set = sqlController.handler.executeQuery( + "select uuid, name, kills, (SELECT count(*) FROM " + sqlController.tableName + " as p1 WHERE p1." + unit.getSqlColumnName() + " > p." + unit.getSqlColumnName() - + ") + 1 as rank FROM " + sqlController.getTableName() + " as p" + + ") + 1 as rank FROM " + sqlController.tableName + " as p" + " where uuid = '" + UUIDConverter.convert(uuid) + "' and last_updated > " + getFirstMilliSecond(unit) + " order by rank;"); try { From b2eeaacc5fb7b82e94f00563696a90473d17a744 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:26:04 +0900 Subject: [PATCH 06/10] feat!: remove lombok from dependency --- build.gradle.kts | 1 - gradle/libs.versions.toml | 2 -- 2 files changed, 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9e2dd1c..01607ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,6 @@ plugins { `java-library` `maven-publish` alias(libs.plugins.shadow) - alias(libs.plugins.lombok) alias(libs.plugins.runPaper) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1ab27b1..7512541 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,6 @@ [versions] # plugin shadow = "8.3.9" -lombok = "8.14.2" runPaper = "2.3.1" # Latest version for java 8 # library @@ -16,7 +15,6 @@ spigotApi = "1.16.5-R0.1-SNAPSHOT" [plugins] shadow = { id = "com.gradleup.shadow", version.ref = "shadow" } -lombok = { id = "io.freefair.lombok", version.ref = "lombok" } runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" } [libraries] From 10c96e00ebfa04fd0689300832d86bb781d7e21b Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:33:08 +0900 Subject: [PATCH 07/10] feat: remove jsonmessage from dependency --- build.gradle.kts | 1 - gradle/libs.versions.toml | 2 -- .../kdstatusreloaded/sql/KillDeathDataContainer.java | 7 ++++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 01607ee..f540619 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,6 @@ dependencies { compileOnly(libs.spigotApi) // include - implementation(libs.jsonmessage) implementation(libs.mysqlConnectorJ) implementation(libs.hikaricp) implementation(libs.bundles.jdbi) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7512541..652d1a2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,6 @@ runPaper = "2.3.1" # Latest version for java 8 # library mysqlConnectorJ = "9.1.0" hikaricp = "4.0.3" -jsonmessage = "1.3.1" jdbiCore = "3.39.1" jdbiSqlobject = "3.39.1" jspecify = "1.0.0" @@ -20,7 +19,6 @@ runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" } [libraries] mysqlConnectorJ = { module = "com.mysql:mysql-connector-j", version.ref = "mysqlConnectorJ" } hikaricp = { module = "com.zaxxer:HikariCP", version.ref = "hikaricp" } -jsonmessage = { module = "me.rayzr522:jsonmessage", version.ref = "jsonmessage" } jdbiCore = { module = "org.jdbi:jdbi3-core", version.ref = "jdbiCore" } jdbiSqlobject = { module = "org.jdbi:jdbi3-sqlobject", version.ref = "jdbiSqlobject" } jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" } diff --git a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java index 90d5e8c..7ba6184 100644 --- a/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java +++ b/src/main/java/net/azisaba/kdstatusreloaded/sql/KillDeathDataContainer.java @@ -4,7 +4,8 @@ import net.azisaba.kdstatusreloaded.utils.Chat; import net.azisaba.kdstatusreloaded.utils.TimeUnit; import net.azisaba.kdstatusreloaded.utils.UUIDConverter; -import me.rayzr522.jsonmessage.JSONMessage; +import net.md_5.bungee.api.ChatMessageType; +import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jspecify.annotations.NonNull; @@ -316,10 +317,10 @@ public void run() { file.delete(); finished++; - JSONMessage.create(Chat.f("&e移行中... &d{0}/{1}", finished, fileCount)).actionbar(p); + p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(Chat.f("&e移行中... &d{0}/{1}", finished, fileCount))); } - JSONMessage.create(Chat.f("&a完了！")).actionbar(p); + p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent("&a完了！")); } }.start(); } From 54875376eb5ac3bf4a0dc6bb2207765f4bba186b Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:37:45 +0900 Subject: [PATCH 08/10] chore: add readme --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..a715c94 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# KDStatusReloaded From e6126ac92f26eb89024b056338eb25a2bffa7268 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Tue, 9 Sep 2025 10:38:44 +0900 Subject: [PATCH 09/10] chore: add comment to dependencies --- build.gradle.kts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f540619..40926cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,10 +24,12 @@ dependencies { // system compileOnly(libs.spigotApi) - // include - implementation(libs.mysqlConnectorJ) + // database implementation(libs.hikaricp) + implementation(libs.mysqlConnectorJ) implementation(libs.bundles.jdbi) + + // check implementation(libs.jspecify) testImplementation(libs.junit) } From 86ed04faf02b9fa093035b576a2ce4048bfd0c03 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Sep 2025 02:30:51 +0000 Subject: [PATCH 10/10] chore(deps): update softprops/action-gh-release action to v2.3.3 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3fd8564..49a7837 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: VERSION: ${{ github.event.inputs.version }} - name: Create release - uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2 + uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3 with: draft: true files: build/libs/*.jar