From 739abce169399a8ab17ae3fa9db8ed510d52586b Mon Sep 17 00:00:00 2001 From: hex Date: Fri, 18 Apr 2025 18:20:03 +0200 Subject: [PATCH 01/10] feat: initial commit (stole codebase from solarcore) --- .gitignore | 3 + ...otlin-compiler-17222474266913412287.salive | 0 CivilCore.iml | 13 - README.md | 3 + build.gradle.kts | 34 +++ build.sh | 4 - db.ps1 | 2 - docker-compose.yml | 8 - gradle.properties | 5 + gradle/libs.versions.toml | 8 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ kls_database.db | Bin 0 -> 36864 bytes pom.xml | 106 -------- run.ps1 | 9 - settings.gradle.kts | 13 + .../java/rip/iwakura/civilcore/CivilCore.java | 50 ---- .../java/rip/iwakura/civilcore/Court.java | 89 ------- .../java/rip/iwakura/civilcore/Database.java | 188 ------------- .../rip/iwakura/civilcore/PlayerHandler.java | 72 ----- .../java/rip/iwakura/civilcore/Utils.java | 64 ----- .../civilcore/commands/TeamChatCommand.java | 83 ------ .../civilcore/commands/TeamCommand.java | 111 -------- .../iwakura/civilcore/discord/Discord.java | 108 -------- .../civilcore/discord/MessageReceive.java | 22 -- .../iwakura/civilcore/types/CoreCommand.java | 7 - .../rip/iwakura/civilcore/types/DbPlayer.java | 17 -- .../rip/iwakura/civilcore/types/Team.java | 19 -- src/main/kotlin/rip/iwakura/civil/Core.kt | 9 + src/main/resources/plugin.yml | 17 -- 32 files changed, 428 insertions(+), 989 deletions(-) rename src/main/resources/config.yml => .kotlin/sessions/kotlin-compiler-17222474266913412287.salive (100%) delete mode 100644 CivilCore.iml create mode 100644 README.md create mode 100644 build.gradle.kts delete mode 100755 build.sh delete mode 100644 db.ps1 delete mode 100644 docker-compose.yml 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 100644 gradlew create mode 100644 gradlew.bat create mode 100644 kls_database.db delete mode 100644 pom.xml delete mode 100644 run.ps1 create mode 100644 settings.gradle.kts delete mode 100644 src/main/java/rip/iwakura/civilcore/CivilCore.java delete mode 100644 src/main/java/rip/iwakura/civilcore/Court.java delete mode 100644 src/main/java/rip/iwakura/civilcore/Database.java delete mode 100644 src/main/java/rip/iwakura/civilcore/PlayerHandler.java delete mode 100644 src/main/java/rip/iwakura/civilcore/Utils.java delete mode 100644 src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java delete mode 100644 src/main/java/rip/iwakura/civilcore/commands/TeamCommand.java delete mode 100644 src/main/java/rip/iwakura/civilcore/discord/Discord.java delete mode 100644 src/main/java/rip/iwakura/civilcore/discord/MessageReceive.java delete mode 100644 src/main/java/rip/iwakura/civilcore/types/CoreCommand.java delete mode 100644 src/main/java/rip/iwakura/civilcore/types/DbPlayer.java delete mode 100644 src/main/java/rip/iwakura/civilcore/types/Team.java create mode 100644 src/main/kotlin/rip/iwakura/civil/Core.kt delete mode 100644 src/main/resources/plugin.yml diff --git a/.gitignore b/.gitignore index aa0659f..5cede7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ target/ test_server/ +.gradle +build/ +server/ diff --git a/src/main/resources/config.yml b/.kotlin/sessions/kotlin-compiler-17222474266913412287.salive similarity index 100% rename from src/main/resources/config.yml rename to .kotlin/sessions/kotlin-compiler-17222474266913412287.salive diff --git a/CivilCore.iml b/CivilCore.iml deleted file mode 100644 index 9cb719e..0000000 --- a/CivilCore.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - BUKKIT - - 1 - - - - \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..15ec143 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# CivilCore (v2) + +PaperMC plugin written in Kotlin for civil.iwakura.rip. diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..59b73a7 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,34 @@ +group = "rip.iwakura" +version = "0.1.0" + +plugins { + java + kotlin("jvm") version "2.1.10" + id("com.github.johnrengelman.shadow") version "7.1.2" + id("de.eldoria.plugin-yml.paper") version "0.7.1" +} + +repositories { + mavenCentral() + maven { + name = "papermc" + url = uri("https://repo.papermc.io/repository/maven-public/") + } +} + +paper { + main = "rip.iwakura.civil.Core" + authors = listOf("hex", "grng") + apiVersion = "1.21" +} + + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") + library("com.google.code.gson", "gson", "2.10.1") // All platform plugins + shadow("org.jetbrains.kotlin:kotlin-stdlib:2.1.10") +} + +kotlin { + jvmToolchain(21) +} diff --git a/build.sh b/build.sh deleted file mode 100755 index 88d8a70..0000000 --- a/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -mvn clean package dependency:copy -DskipTests -DmcVersion=1.21 -DoutputDirectory=test_server/plugins -cd test_server -java -jar server.jar -nogui -cd ../ diff --git a/db.ps1 b/db.ps1 deleted file mode 100644 index 01fddb1..0000000 --- a/db.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -docker-compose up -docker ps \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 5765784..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3' -services: - civil_test_db: - environment: - - POSTGRES_PASSWORD=TEST123 - image: postgres:16.3 - ports: - - 5432:5432 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..377538c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +# 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 + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..ca02e23 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +kotlin-gradle-plugin = "2.0.20" + +[libraries] +kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-gradle-plugin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /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.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /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=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +: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/kls_database.db b/kls_database.db new file mode 100644 index 0000000000000000000000000000000000000000..34efb9200cbdfc75744ad7fa37f2b99726d35e12 GIT binary patch literal 36864 zcmeHQ+izS+UT)iQJWeJtyTdAT(JN6IdIFq+gnqE<+SlDjhUIoZ!Ir38jaKVS;Wuyb_7qt z&-gYoesaL$=|;={>;yhA|ME{8OAnX6dh&ZGevGH_78!^PL_1w!5%Vw(Tv`E7u1X+p6Ecp$7LZDs#_W>I{015B}}Zi#IQw zzkO->_W27}E-fGY+2wajyL|cD?Mv@py19Jg=H;vBZ{At{?Mru-&wqIP`sHh=>FT9x zx6duFs^0Q9&)>ZGjq^9(WhCQgmakpEy?pJ%D_72Je*MV8sWhGWPGtMWdKk@b}Gjq+w-N^&P{r^uJOP@Y3 z2N!Wf1|kEIfyh8)ATkgchzvvqA_I|u$UtNuGH@6S9DDmnV{v}wPyYPxzVnassBm_; z_r1yt$JfaoQHb=`16;J)o-Qu&Nf+F`KQ*0sq}+guh%{Z;ydH$%Lj%Sn6`-3MM5EBulAr zsr5W7GOmp+pY-NG?&gVnC`%Bh)-G`+`1EgTNNJJ(~mfJMVd|^y(gtY}> znz&qen`MH@B6HT7{iR+IX^sn*K`{fMJ0S570HdtS!S&FK9`T#K%}j?cob0RJwRTe9p(fH2i8n-XYL%5lG2=681yj7Bd7%i-XA+t; z^TO7J0ss`MDVnS90>a|-5FRT)=y%k8S3hGdmZZva$ra19T;yPc7TOD`jKOy+%{2E+ zd*jGbn5-&UB#a=5YhvQ)Q>0s7|LlPy}1*IuxyQLw)zfGElh{1;|8t!kGs7x>8=Mf z2%@A#l3bcxxjZu&SB}XnWei=2OPu4}Sb*fpk|HZcrOnzNa8Dg`9(X*bInz=ROA#wgN_4WTIB=nOjqCO5cY%u^2Cn{~ zhd>FY0<^-Xnexu(25cGQGARpfQbv{boaa>N9AQe^9ngj~OrSen-2u8O!|H0>U#xxyxTicZw@-oXFGBE2Mlh|BR#U|Y;sKrm6VXm-}x_-xuZ z42ENvBBKP6pXO*}rYSWH12$%sXkAY%O9eMvdC4bW?(Q=6*gDb1MRgmvyNBO5*V~B9 zW8h)-pon2s2$n;uEgWT>h$5FPqtX-@I#ZP!ascqUzDdS;bqmNJ96s{4TTy1K!)Ds& zRu&`&%b28lPdNtu%xWp6(4J)~FLKTfKt8N*68gF7CZK=&kf0;Nmurxts}(oqTW6M# z%;iM^%o6m9v@ofmlHz=$#!BW>E;6?p^+Z*Zcw5y6z&qt?W3NC^_r@?aM)2ylJ!ZzE z6OaO3>Z!>zR!G_yOeKiGOxUM7m%1R*;9X(mZorduO(MQn-I#Cu;gs{OfOyR|^F(iS zRvhM~J=-+*)Bs}>Bh8zn#hTWw_nc7!XV2Cm{}z==PErKejH)ndqOUNKv7BZ!#UNoZ zQRT!CDY@8PEe5Ous;wh%v$_uAzdKz=DZ8z8weEUrX84%YuSVlPqpd6)3T@uHcK*h# zZ(P5P*;`62w@zZ1m6+Y8f;na_#hfk6^V|_qD2~a}c0B?4Ry|mEFIFGpexdSV{~xA* z@fI0~3`7PZ1CfEqKx7~?5E+OJL`rZkwIS#Dcj0zh|=HHd)*I=({&_{}X_lGQag%=Kr?<=XuWmZvx*hIRF0~AWWH$7S7kh z&i_9P7|&h)|E~kolxfEMU*kQr{QomR^^4E{e-|j8$Nc|yfb03q|33|MQ^v=M%Up+^ z|Nk|>c@gvfzY5$_o|t>Bv=2G||Lwy;b;#@guRNPJe&+fAUk2_MGyi`X$Y0R>|F;1B zMauvGHQ;@*^8erb-1+~TZ~kZohdt%IcE`k|b-z1kLk2T^X!ZxTUFx6#hB7pm z2*D|oT3m4hL92!Q7V2dJxt1uD;9An1rNfp?(3J*Z*~uR@0PxUv$Dt+ijzS}%Ge?Tl zaSQF3b&f;i34tIhI8#t!Y-=u?VPAc`{(r6UmyM;t$)BG5)``DAG57Ml;~yXU*|GN) z|7`K-OScyO;^==Jy)ge*^NUA*IQLI;ug`X8{$b{g#=oP;|JkjmK0eZz3>)ut&BhuO zcKyV&Zas?4>8g%G-Y$>p-k_khB)7AF@_4@Qs!({ZH z+UU0+jeoS!PlgZ8vNLeKb#&H|&KUX}mLpm~O;=H+NVFGRz|>Je~%X*z~iA!vUz?xj0k(4>$&hkRTr zPBOxBt}Ws;q{u9#8YTpiLe|J2mr5qf0Z;(*YV{Goq|<>3W5+(t9n2c~=#y}3z{#$? zh73`12hqPkgcgEx;Z#bfb{v7AfawKD8+DbsEV?4f*4SRF9s=9bU)!qPPDW>q>J3V- zaE1>ZIJ|~HRf?1uN-&(U+>%tN6dnKqn4nV4a}UM4*j0MsJULr!0Nm%iPPnf#OPKSI z99axnlV^}g3n;f?zagyCE)#{c8FaRVgw+Fd$z!Bj-Y!A+yTgcO0Ju|5jY2z5MxcG+ z))pNjyl@bZ87Vv!Lc!<(@>8e{Qy4v@9&RFxr?n{r{frSysACfGxvCGuQ%*jg7;%4_ zVD1$p@j3-c=L^e)CCq9V-{4&GsbO59qu?AG^@S~lQN<+Qr0M~$n*L0hWO(a4*1P?3 z(Cs~Lu8sa^^r+)z5>5;%rI`e@qCl8Wy;KFxEdr&oaSU2o19z1DE1KxTuT&2J`OKj} zh7pl#k3cH;pim=}FkV5Jj(Qr3{ z2Pm)|0Rp0==R#Sk1<4%-%M4wV3Ybl(0ut&GheLSd5p&ym=POkgFyEgJ=EV53%DQ^h zB*TXtV@{Z*k_6sM5{y~Po%HaVAeqlF|13>6AKQAG}>p_3>)@974GPBHZA;CRN zk>K+pJ=w3GU<-tLYSeF3t3dq}s}s1PnftEid+D=^x`<89fOt zg&+V#s(=>)HJC+l%$cF#7nU(C44R*D%$r?K5Clf$>J}b?IbPiZn5VeByw+XCqAk(A zaz)t^wq?QeCR_=iIoxCv&5UQ5s2hcm(c`R#1(>y}z^pxIhTwx+C4nZCthsrqS^=C_ zrt5Hlo1p_keLwOh!{RD|y#?c}01OYyg@O`ve)xdt)ZyBM43=ORv=KFvt%B%BVO54{ G@BacFwNU&3 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 976bac2..0000000 --- a/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - - UTF-8 - 21 - 21 - 1.21 - - - rip.iwakura - CivilCore - 0.1c - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - papermc - https://repo.papermc.io/repository/maven-public/ - - - jitpack.io - https://jitpack.io - - - - - - net.dv8tion - JDA - 5.0.1 - compile - - - club.minnced - discord-webhooks - 0.1.6 - compile - - - org.postgresql - postgresql - 42.7.3 - compile - - - - org.spigotmc - spigot-api - ${mcVersion}-R0.1-SNAPSHOT - - - - org.spigotmc - plugin-annotations - 1.2.3-SNAPSHOT - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.0 - - - package - - shade - - - false - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.1 - - - org.apache.maven.plugins - maven-dependency-plugin - 3.5.0 - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - true - - - - - - - diff --git a/run.ps1 b/run.ps1 deleted file mode 100644 index 3260453..0000000 --- a/run.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -if (-not (Test-Path -Path test_server)) { - New-Item -ItemType Directory -Path test_server -} - -# mvn clean package dependency:copy -DskipTests -DoutputDirectory=test_server/plugins - -Set-Location -Path test_server -java -jar server.jar -nogui -Set-Location -Path .. \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..b790ed4 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.11.1/userguide/multi_project_builds.html in the Gradle documentation. + */ + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + +rootProject.name = "civil-core" diff --git a/src/main/java/rip/iwakura/civilcore/CivilCore.java b/src/main/java/rip/iwakura/civilcore/CivilCore.java deleted file mode 100644 index 137e0e1..0000000 --- a/src/main/java/rip/iwakura/civilcore/CivilCore.java +++ /dev/null @@ -1,50 +0,0 @@ -package rip.iwakura.civilcore; - -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; - -import org.bukkit.Bukkit; -import org.bukkit.WorldCreator; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; - -import net.md_5.bungee.api.ChatColor; -import rip.iwakura.civilcore.commands.TeamChatCommand; -import rip.iwakura.civilcore.commands.TeamCommand; -import rip.iwakura.civilcore.discord.Discord; - -public class CivilCore extends JavaPlugin { - public Database db = new Database(); - public Discord bot; - public ArrayList teamChatRegister = new ArrayList<>(); - - @Override - public void onEnable() { - this.saveDefaultConfig(); - - this.bot = new Discord(getConfig().getString("discord.token"), getConfig().getString("discord.channel"), this); - this.bot.initialize(); - - if (Bukkit.getWorld("court") == null) { - new WorldCreator("court").createWorld(); - } - - try { - Class.forName("org.postgresql.Driver"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - - try { - db.connect(this.getConfig().getString("database.url")); - } catch (SQLException e) { - e.printStackTrace(); - } - getServer().getPluginManager().registerEvents(new PlayerHandler(this), this); - getServer().getPluginManager().registerEvents(new Court(), this); - this.getCommand("team").setExecutor(new TeamCommand(this)); - this.getCommand("court").setExecutor(new Court()); - this.getCommand("tc").setExecutor(new TeamChatCommand(this)); - } -} diff --git a/src/main/java/rip/iwakura/civilcore/Court.java b/src/main/java/rip/iwakura/civilcore/Court.java deleted file mode 100644 index b0e723a..0000000 --- a/src/main/java/rip/iwakura/civilcore/Court.java +++ /dev/null @@ -1,89 +0,0 @@ -package rip.iwakura.civilcore; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockBurnEvent; -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.block.BlockSpreadEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.player.PlayerBucketEmptyEvent; - -public class Court implements Listener,CommandExecutor{ - private World court_world = Bukkit.getWorld("court"); - - private Location court_location = new Location(court_world, 4.5, 70.0, 0.5, -90f, 1.0f); - - @EventHandler - public void PlayerPlaceWater(PlayerBucketEmptyEvent e) { - Player p = (Player) e.getPlayer(); - if (!p.getLocation().getWorld().getName().equals("court")) return; - e.setCancelled(true); - } - - @EventHandler - public void PlayerHurt(EntityDamageEvent e) { - if (!(e.getEntity() instanceof Player)) return; - Player p = (Player) e.getEntity(); - - if (!p.getLocation().getWorld().getName().equals("court")) return; - - e.setCancelled(true); - - if (e.getCause() == DamageCause.VOID) { - p.teleport(court_location); - return; - } - } - - @EventHandler - public void PlayerBreak(BlockBreakEvent e) { - if (e.getPlayer().isOp()) return; - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @EventHandler - public void PlayerPlace(BlockPlaceEvent e) { - if (e.getPlayer().isOp()) return; - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @EventHandler - public void PlayerBurn(BlockBurnEvent e) { - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @EventHandler - public void FireSpread(BlockSpreadEvent e) { - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @Override - public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Non-player type."); - return true; - } - - Player p = (Player) sender; - - switch (args[0]) { - case "enter": - p.teleport(court_location); - break; - case "leave": - Location loc = p.getBedSpawnLocation(); - if (loc == null) { - loc = Bukkit.getWorld("world").getSpawnLocation(); - } - p.teleport(loc); - break; - } - return true; - } - -} diff --git a/src/main/java/rip/iwakura/civilcore/Database.java b/src/main/java/rip/iwakura/civilcore/Database.java deleted file mode 100644 index 044fc05..0000000 --- a/src/main/java/rip/iwakura/civilcore/Database.java +++ /dev/null @@ -1,188 +0,0 @@ -package rip.iwakura.civilcore; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Types; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import org.bukkit.Bukkit; - -import rip.iwakura.civilcore.types.DbPlayer; -import rip.iwakura.civilcore.types.Team; - -public class Database { - public ArrayList players = new ArrayList(); - public ArrayList teams = new ArrayList(); - - private Connection c = null; - - public boolean tableExists(String table) throws SQLException { - if (c.getMetaData().getTables(null, null, table, null).next()) { - return true; - } - return false; - } - - public DbPlayer getPlayerByName(String name) { - List filtered = players.stream().filter( - s -> s.name.equals(name)) - .collect(Collectors.toList()); - if (filtered.isEmpty()) return null; - return filtered.getFirst(); - } - - public Team getTeamByName(String name) { - List filtered = teams.stream().filter( - s -> s.name.equals(name)) - .collect(Collectors.toList()); - if (filtered.isEmpty()) return null; - return filtered.getFirst(); - } - - public void update(String sql) throws SQLException { - Statement stmt = c.createStatement(); - stmt.executeUpdate(sql); - stmt.close(); - } - - public void addPlayerToTeam(Team team, DbPlayer player) throws SQLException { - String sql = "UPDATE players SET TEAM_ID = ? WHERE name = ?; "; - PreparedStatement stmt = c.prepareStatement(sql); - - stmt.setInt(1, team.id); - stmt.setString(2, player.name); - - stmt.executeUpdate(); - - stmt.close(); - - refreshPlayers(); - } - - public void refreshTeams() throws SQLException { - teams.clear(); - Statement stmt = c.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT * FROM teams;"); - - while (rs.next()) { - String name = rs.getString("name"); - String prefix = rs.getString("prefix"); - int id = rs.getInt("team_id"); - - Team team = new Team(name,prefix,id); - teams.add(team); - } - stmt.close(); - rs.close(); - } - - public List getPlayersInTeam(String team_name) { - List filtered = players.stream().filter( - s -> { - if (s.team.name == null) return false; - return s.team.name.equals(team_name); - }) - .collect(Collectors.toList()); - if(filtered.isEmpty()) return null; - return filtered; - } - - public void refreshPlayers() throws SQLException { - players.clear(); - String sql = "SELECT players.NAME AS player_name, teams.NAME AS team_name, teams.TEAM_ID as t_team_id, teams.PREFIX AS team_prefix " + - "FROM players LEFT JOIN teams ON players.TEAM_ID = teams.TEAM_ID"; - - Statement stmt = c.createStatement(); - ResultSet rs = stmt.executeQuery(sql); - - - while (rs.next()) { - String p_name = rs.getString("player_name"); - String t_name = rs.getString("team_name"); - int t_id = rs.getInt("t_team_id"); - String t_prefix = rs.getString("team_prefix"); - - Team team = new Team(t_name, t_prefix, t_id); - DbPlayer player = new DbPlayer(p_name, team); - players.add(player); - } - stmt.close(); - rs.close(); - } - - public void insertPlayer(DbPlayer player) throws SQLException { - String sql = "INSERT INTO players (NAME,TEAM_ID) " + - "VALUES(?, ?);"; - PreparedStatement stmt = c.prepareStatement(sql); - - stmt.setString(1, player.name); - if(player.team != null) { - stmt.setInt(2, player.team.id); - } else { - stmt.setNull(2, Types.NULL); - } - - stmt.executeUpdate(); - - stmt.close(); - - refreshPlayers(); - } - - public void insertTeam(Team team) throws SQLException { - String sql = "INSERT INTO teams (NAME,PREFIX) " + - "VALUES(?, ?);"; - PreparedStatement stmt = c.prepareStatement(sql); - - stmt.setString(1, team.name); - stmt.setString(2, team.prefix); - - stmt.executeUpdate(); - - stmt.close(); - - refreshTeams(); - } - - - - public void connect(String url) throws SQLException { - try { - Class.forName("org.postgresql.Driver"); - c = DriverManager.getConnection(url); - } catch (Exception e) { - e.printStackTrace(); - Bukkit.getLogger().info("Failed to connect to the database."); - Bukkit.getServer().getPluginManager().disablePlugin(new CivilCore()); - return; - } - Bukkit.getLogger().info("Connected to the database."); - if (!tableExists("teams")) { - String sql = "CREATE TABLE teams " + - "(TEAM_ID SERIAL PRIMARY KEY," + - " NAME TEXT NOT NULL," + - " PREFIX TEXT NOT NULL)"; - update(sql); - } - if (!tableExists("players")) { - String sql = "CREATE TABLE players " + - "(NAME TEXT PRIMARY KEY NOT NULL," + - " TEAM_ID INT, " + - " CONSTRAINT TEAM" + - " FOREIGN KEY(TEAM_ID)" + - " REFERENCES teams(TEAM_ID))"; - update(sql); - } - - refreshTeams(); - refreshPlayers(); - - Bukkit.getLogger().info("Database has been initialized."); - } -} diff --git a/src/main/java/rip/iwakura/civilcore/PlayerHandler.java b/src/main/java/rip/iwakura/civilcore/PlayerHandler.java deleted file mode 100644 index e2eebb2..0000000 --- a/src/main/java/rip/iwakura/civilcore/PlayerHandler.java +++ /dev/null @@ -1,72 +0,0 @@ -package rip.iwakura.civilcore; - -import java.sql.SQLException; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerJoinEvent; - -import net.md_5.bungee.api.ChatColor; -import rip.iwakura.civilcore.types.DbPlayer; - -public class PlayerHandler implements Listener { - - private final CivilCore civilCore; - - public PlayerHandler(CivilCore civilCore) { - this.civilCore = civilCore; - } - - @EventHandler - public void PlayerChat(AsyncPlayerChatEvent e) { - e.setCancelled(true); - - Player p = e.getPlayer(); - String player_name = p.getName(); - boolean inTeamChat = civilCore.teamChatRegister.contains(p); - - DbPlayer dbPlayer = civilCore.db.getPlayerByName(player_name); - String prefix = (inTeamChat ? ChatColor.DARK_GREEN + "TEAM >" + ChatColor.RESET : "") - + (dbPlayer.team.prefix == null ? - "" : - ChatColor.translateAlternateColorCodes('&', inTeamChat ? "" : "[" + dbPlayer.team.prefix + "]")); - String message = String.format("%s %s: %s", prefix, player_name, e.getMessage()); - - if (!inTeamChat) { - Bukkit.broadcastMessage(message); - civilCore.bot.sendMessage(e); - } else { - List players = civilCore.db.getPlayersInTeam(dbPlayer.team.name); - - if (players == null) return; - - for (DbPlayer team_dbp : players) { - Player team_p = Bukkit.getPlayer(team_dbp.name); - - if (team_p == null) continue; - - team_p.sendMessage(message); - } - } - - } - - @EventHandler - public void PlayerJoinEvent(PlayerJoinEvent e) { - Player p = e.getPlayer(); - String player_name = p.getName(); - if(civilCore.db.getPlayerByName(player_name) == null) { - DbPlayer dbPlayer = new DbPlayer(p.getName(), null); - try { - civilCore.db.insertPlayer(dbPlayer); - } catch (SQLException e1) { - e1.printStackTrace(); - } - } - - } -} diff --git a/src/main/java/rip/iwakura/civilcore/Utils.java b/src/main/java/rip/iwakura/civilcore/Utils.java deleted file mode 100644 index a12486d..0000000 --- a/src/main/java/rip/iwakura/civilcore/Utils.java +++ /dev/null @@ -1,64 +0,0 @@ -package rip.iwakura.civilcore; - -import java.util.ArrayList; - -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; - -import net.md_5.bungee.api.ChatColor; - -public class Utils { - private static String buffer = ""; - - private static void finishBuffer(ArrayList args) { - args.add(buffer); - buffer = ""; - } - - public static void exceptionHandler(Exception e, CommandSender sender) { - sender.sendMessage(ChatColor.RED + "Failed to execute command: " + e.getMessage()); - } - - public static ArrayList parser(String[] original_args) { - ArrayList args = new ArrayList(); - - String joined_args = String.join(" ", original_args); - - boolean inColon = false; - char lastCharacter = ' '; - - for (int i = 0; i < joined_args.length(); i++) { - char currentCharacter = joined_args.charAt(i); - - switch (currentCharacter) { - case '"': - if (!inColon) { - inColon = true; - } else { - inColon = false; - finishBuffer(args); - } - break; - - case ' ': - if (!inColon && lastCharacter != '"') { - finishBuffer(args); - break; - } - - if (lastCharacter != '"') buffer += " "; - break; - - default: - buffer+=currentCharacter; - if (i == joined_args.length() - 1) { - finishBuffer(args); - } - break; - } - lastCharacter = currentCharacter; - } - if (inColon) return null; - return args; - } -} diff --git a/src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java b/src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java deleted file mode 100644 index 33b66e1..0000000 --- a/src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java +++ /dev/null @@ -1,83 +0,0 @@ -package rip.iwakura.civilcore.commands; - -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -import net.md_5.bungee.api.ChatColor; -import org.jetbrains.annotations.NotNull; -import rip.iwakura.civilcore.Utils; -import rip.iwakura.civilcore.CivilCore; -import rip.iwakura.civilcore.types.DbPlayer; - -import java.util.List; -import java.util.Objects; - -public class TeamChatCommand implements CommandExecutor { - private final CivilCore civilCore; - - public TeamChatCommand(CivilCore civilCore) { - this.civilCore = civilCore; - } - - private String getPrefix(String name, boolean inTeamChat) { - DbPlayer dbPlayer = civilCore.db.getPlayerByName(name); - return (inTeamChat ? ChatColor.DARK_GREEN + "TEAM >" + ChatColor.RESET : "") - + (dbPlayer.team.prefix == null ? - "" : - ChatColor.translateAlternateColorCodes('&', inTeamChat ? "" : "[" + dbPlayer.team.prefix + "]")); - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - args = Objects.requireNonNull(Utils.parser(args)).toArray(new String[0]); - - if (!(sender instanceof Player p)) return true; - if (args.length == 0) { - if (civilCore.teamChatRegister.contains(p)) { - civilCore.teamChatRegister.remove(p); - p.sendMessage(ChatColor.GREEN + "You are now in the " + ChatColor.GOLD + "GLOBAL" + ChatColor.GREEN + " channel"); - } else { - civilCore.teamChatRegister.add(p); - p.sendMessage(ChatColor.GREEN + "You are now in the " + ChatColor.GOLD + "TEAM" + ChatColor.GREEN + " channel"); - } - return true; - } - - String message = String.join(" ", args); - - String player_name = p.getName(); - boolean inTeamChat = civilCore.teamChatRegister.contains(p); - - DbPlayer dbPlayer = civilCore.db.getPlayerByName(player_name); - - if (inTeamChat) { - // Send message to global chat - civilCore.teamChatRegister.remove(p); - String formatted = String.format("%s%s: %s", getPrefix(player_name, false) + " ", player_name, message); - Bukkit.broadcastMessage(formatted); - civilCore.bot.sendMessage(p, message); - civilCore.teamChatRegister.add(p); - } else { - // Send message to team chat - civilCore.teamChatRegister.add(p); - String formatted = String.format("%s%s: %s", getPrefix(player_name, true) + " ", player_name, message); - List players = civilCore.db.getPlayersInTeam(dbPlayer.team.name); - - if (players == null) return true; - - for (DbPlayer team_dbp : players) { - Player team_p = Bukkit.getPlayer(team_dbp.name); - - if (team_p == null) continue; - - team_p.sendMessage(formatted); - } - civilCore.teamChatRegister.remove(p); - } - - return true; - } -} \ No newline at end of file diff --git a/src/main/java/rip/iwakura/civilcore/commands/TeamCommand.java b/src/main/java/rip/iwakura/civilcore/commands/TeamCommand.java deleted file mode 100644 index 66040dd..0000000 --- a/src/main/java/rip/iwakura/civilcore/commands/TeamCommand.java +++ /dev/null @@ -1,111 +0,0 @@ -package rip.iwakura.civilcore.commands; - -import java.sql.SQLException; - -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; - -import net.md_5.bungee.api.ChatColor; -import rip.iwakura.civilcore.Utils; -import rip.iwakura.civilcore.CivilCore; -import rip.iwakura.civilcore.types.DbPlayer; -import rip.iwakura.civilcore.types.Team; - -public class TeamCommand implements CommandExecutor { - private CivilCore civilCore = null; - - public TeamCommand(CivilCore civilCore) { - this.civilCore = civilCore; - } - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - args = Utils.parser(args).toArray(new String[0]); - - if(args.length == 0) { - sender.sendMessage(ChatColor.RED + "Usage: /team [options]"); - return true; - }; - - switch (args[0]) { - case "list": - if (args.length < 2) { - sender.sendMessage(ChatColor.RED + "Usage: /team list "); - return true; - } - - switch (args[1]) { - case "players": - for (DbPlayer dbPlayer : civilCore.db.players) { - if (dbPlayer.team != null) sender.sendMessage(ChatColor.GREEN + String.format("%s belonging to team %s", dbPlayer.name, dbPlayer.team.name)); - if (dbPlayer.team == null) sender.sendMessage(ChatColor.GREEN + String.format("%s does not belong to any team.", dbPlayer.name)); - } - return true; - case "teams": - for (Team team : civilCore.db.teams) { - sender.sendMessage(ChatColor.GREEN + String.format("%s with prefix %s", team.name, ChatColor.translateAlternateColorCodes('&', "&r" + team.prefix))); - } - return true; - default: - sender.sendMessage(ChatColor.RED + "Usage: /team list "); - return true; - } - case "create": - if(args.length < 3) { - sender.sendMessage(ChatColor.RED + "Usage: /team create "); - return true; - }; - - Team team = new Team(args[1], args[2], null); - - try { - civilCore.db.insertTeam(team); - sender.sendMessage(ChatColor.GREEN + String.format("Successfully made team %s with prefix %s", args[1], ChatColor.translateAlternateColorCodes('&', "&r" + args[2]))); - } catch (Exception e) { - e.printStackTrace(); - Utils.exceptionHandler(e, sender); - } - - break; - case "add": - if(args.length < 3) { - sender.sendMessage(ChatColor.RED + "Usage: /team add "); - return true; - }; - - Team found_team = civilCore.db.getTeamByName(args[2]); - DbPlayer dbPlayer = civilCore.db.getPlayerByName(args[1]); - - if (found_team == null) { - sender.sendMessage(ChatColor.RED + "The team you are referencing does not exist."); - return true; - } - - String success_msg = ChatColor.GREEN + String.format("Successfully added %s to team %s.", args[1], args[2]); - - if(dbPlayer == null) { - dbPlayer = new DbPlayer(args[1], found_team); - try { - civilCore.db.insertPlayer(dbPlayer); - sender.sendMessage(success_msg); - } catch (Exception e) { - e.printStackTrace(); - Utils.exceptionHandler(e, sender); - } - return true; - } - - try { - civilCore.db.addPlayerToTeam(found_team, dbPlayer); - sender.sendMessage(success_msg); - } catch (Exception e) { - e.printStackTrace(); - Utils.exceptionHandler(e, sender); - } - break; - } - return true; - } -} diff --git a/src/main/java/rip/iwakura/civilcore/discord/Discord.java b/src/main/java/rip/iwakura/civilcore/discord/Discord.java deleted file mode 100644 index be440ee..0000000 --- a/src/main/java/rip/iwakura/civilcore/discord/Discord.java +++ /dev/null @@ -1,108 +0,0 @@ -package rip.iwakura.civilcore.discord; - -import java.util.EnumSet; - -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.checkerframework.common.reflection.qual.GetConstructor; - -import club.minnced.discord.webhook.WebhookClient; -import club.minnced.discord.webhook.WebhookClientBuilder; -import club.minnced.discord.webhook.send.WebhookMessage; -import club.minnced.discord.webhook.send.WebhookMessageBuilder; -import net.dv8tion.jda.api.JDA; -import net.dv8tion.jda.api.JDABuilder; -import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.dv8tion.jda.api.requests.GatewayIntent; -import rip.iwakura.civilcore.CivilCore; -import net.dv8tion.jda.api.events.session.ReadyEvent; -import rip.iwakura.civilcore.types.DbPlayer; - -public class Discord extends ListenerAdapter { - private String token; - private CivilCore civilCore; - - public String channelId; - - private TextChannel channel; - private WebhookClient webhook; - - public JDA bot; - - private EnumSet intents = EnumSet.of(GatewayIntent.GUILD_MESSAGES, GatewayIntent.MESSAGE_CONTENT, GatewayIntent.GUILD_WEBHOOKS); - - public Discord(String token, String channelId, CivilCore civilCore){ - this.civilCore = civilCore; - this.channelId = channelId; - this.token = token; - } - - public void initialize() { - this.bot = JDABuilder.createLight(token, intents) - .addEventListeners(new MessageReceive(civilCore)) - .addEventListeners(this) - .build(); - } - - public void sendMessage(AsyncPlayerChatEvent e) { - DbPlayer dbPlayer = civilCore.db.getPlayerByName(e.getPlayer().getName()); - String prefix = (dbPlayer.team.prefix == null ? - "" : - "[" + dbPlayer.team.prefix + "]"); - - String player_name = e.getPlayer().getName(); - WebhookMessageBuilder builder = new WebhookMessageBuilder() - .setUsername(prefix + " " + player_name) - .setAvatarUrl(String.format("https://mc-heads.net/avatar/%s", player_name)) - .setContent(e.getMessage()); - webhook.send(builder.build()); - //channel.sendMessage(String.format("%s: %s", e.getPlayer().getName(), e.getMessage())).complete(); - } - - public void sendMessage(Player p, String message) { - DbPlayer dbPlayer = civilCore.db.getPlayerByName(p.getName()); - String prefix = (dbPlayer.team.prefix == null ? - "" : - "[" + dbPlayer.team.prefix + "]"); - - WebhookMessageBuilder builder = new WebhookMessageBuilder() - .setUsername(prefix + " " + p.getName()) - .setAvatarUrl(String.format("https://mc-heads.net/avatar/%s", p.getName())) - .setContent(message); - webhook.send(builder.build()); - //channel.sendMessage(String.format("%s: %s", p.getName(), message)).complete(); - } - - public void sendMessage(String message, String name) { - DbPlayer dbPlayer = civilCore.db.getPlayerByName(name); - String prefix = (dbPlayer.team.prefix == null ? - "" : - "[" + dbPlayer.team.prefix + "]"); - - WebhookMessageBuilder builder = new WebhookMessageBuilder() - .setUsername(prefix + " " + name) - .setAvatarUrl(String.format("https://mc-heads.net/avatar/%s", name)) - .setContent(message); - webhook.send(builder.build()); - //channel.sendMessage(String.format("%s: %s", name, message)).complete(); - } - - @Override - public void onReady(ReadyEvent e) { - this.channel = bot.getTextChannelById(channelId); - String webhook_token = civilCore.getConfig().getString("discord.webhook.token"); - if (webhook_token != null) { - Long webhook_id = Long.parseLong(civilCore.getConfig().getString("discord.webhook.id")); - this.webhook = new WebhookClientBuilder(webhook_id, webhook_token).build(); - } else { - channel.createWebhook("CivilBot").queue((hook) -> { - civilCore.getConfig().set("discord.webhook.id", hook.getId()); - civilCore.getConfig().set("discord.webhook.token", hook.getToken()); - civilCore.saveConfig(); - this.webhook = new WebhookClientBuilder(Long.parseLong(hook.getId()), hook.getToken()).build(); - }); - } - } -} diff --git a/src/main/java/rip/iwakura/civilcore/discord/MessageReceive.java b/src/main/java/rip/iwakura/civilcore/discord/MessageReceive.java deleted file mode 100644 index a2a5617..0000000 --- a/src/main/java/rip/iwakura/civilcore/discord/MessageReceive.java +++ /dev/null @@ -1,22 +0,0 @@ -package rip.iwakura.civilcore.discord; - -import org.bukkit.Bukkit; - -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.md_5.bungee.api.ChatColor; -import rip.iwakura.civilcore.CivilCore; - -public class MessageReceive extends ListenerAdapter { - private CivilCore civilCore; - - public MessageReceive (CivilCore civilCore) { - this.civilCore = civilCore; - } - - @Override - public void onMessageReceived(MessageReceivedEvent e) { - if (e.getAuthor().isBot()) return; - if(e.getChannel().getId().equals(civilCore.bot.channelId)) Bukkit.broadcastMessage(String.format("%sDiscord%s %s: %s", ChatColor.BLUE, ChatColor.RESET, e.getAuthor().getName(), e.getMessage())); - } -} diff --git a/src/main/java/rip/iwakura/civilcore/types/CoreCommand.java b/src/main/java/rip/iwakura/civilcore/types/CoreCommand.java deleted file mode 100644 index 9f24454..0000000 --- a/src/main/java/rip/iwakura/civilcore/types/CoreCommand.java +++ /dev/null @@ -1,7 +0,0 @@ -package rip.iwakura.civilcore.types; - -import org.bukkit.command.CommandSender; - -public interface CoreCommand { - public boolean run(CommandSender sender); -} diff --git a/src/main/java/rip/iwakura/civilcore/types/DbPlayer.java b/src/main/java/rip/iwakura/civilcore/types/DbPlayer.java deleted file mode 100644 index 5e1d6bd..0000000 --- a/src/main/java/rip/iwakura/civilcore/types/DbPlayer.java +++ /dev/null @@ -1,17 +0,0 @@ -package rip.iwakura.civilcore.types; - -/* - * Player Type - * @String name - * @Team team - */ -public class DbPlayer { - - public Team team = null; - public String name = null; - - public DbPlayer(String name, Team team) { - this.name = name; - this.team = team; - } -} diff --git a/src/main/java/rip/iwakura/civilcore/types/Team.java b/src/main/java/rip/iwakura/civilcore/types/Team.java deleted file mode 100644 index 704bf3a..0000000 --- a/src/main/java/rip/iwakura/civilcore/types/Team.java +++ /dev/null @@ -1,19 +0,0 @@ -package rip.iwakura.civilcore.types; - -/* - * Team Type - * @string name - * @string prefix - */ -public class Team { - - public String prefix = null; - public String name = null; - public Integer id = null; - - public Team(String name, String prefix, Integer id) { - this.prefix = prefix; - this.name = name; - this.id = id; - } -} diff --git a/src/main/kotlin/rip/iwakura/civil/Core.kt b/src/main/kotlin/rip/iwakura/civil/Core.kt new file mode 100644 index 0000000..73b8775 --- /dev/null +++ b/src/main/kotlin/rip/iwakura/civil/Core.kt @@ -0,0 +1,9 @@ +package rip.iwakura.civil + +import org.bukkit.plugin.java.JavaPlugin + +class Core: JavaPlugin() { + override fun onEnable() { + logger.info { "Hello there! We are booting up..." } + } +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index 529c1fa..0000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,17 +0,0 @@ -main: rip.iwakura.civilcore.CivilCore -name: CivilCore -version: 0.1 -description: Core plugin for the CivilWars SMP -api-version: 1.21 -author: hex -commands: - team: - description: Team Manager - usage: / - permission: "civil.teams" - court: - description: Court Manager - usage: / - tc: - description: Team Chat - usage: / From 044a0d674a1cf4a60fbe0e77abe3e0bd3eaa790c Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 19 Apr 2025 00:29:35 +0200 Subject: [PATCH 02/10] meow :3 --- .classpath | 18 ++++++++++ ...otlin-compiler-17222474266913412287.salive | 0 .project | 34 ++++++++++++++++++ .settings/org.eclipse.buildship.core.prefs | 13 +++++++ bin/main/paper-plugin.yml | 7 ++++ bin/main/rip/iwakura/civil/Core.class | Bin 0 -> 534 bytes build.gradle.kts | 12 ++++--- build.sh | 10 ++++++ kls_database.db | Bin 36864 -> 36864 bytes src/main/java/rip/iwakura/civil/Core.java | 10 ++++++ src/main/kotlin/rip/iwakura/civil/Core.kt | 9 ----- 11 files changed, 100 insertions(+), 13 deletions(-) create mode 100644 .classpath delete mode 100644 .kotlin/sessions/kotlin-compiler-17222474266913412287.salive create mode 100644 .project create mode 100644 .settings/org.eclipse.buildship.core.prefs create mode 100644 bin/main/paper-plugin.yml create mode 100644 bin/main/rip/iwakura/civil/Core.class create mode 100644 build.sh create mode 100644 src/main/java/rip/iwakura/civil/Core.java delete mode 100644 src/main/kotlin/rip/iwakura/civil/Core.kt diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..58ad8b1 --- /dev/null +++ b/.classpath @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.kotlin/sessions/kotlin-compiler-17222474266913412287.salive b/.kotlin/sessions/kotlin-compiler-17222474266913412287.salive deleted file mode 100644 index e69de29..0000000 diff --git a/.project b/.project new file mode 100644 index 0000000..765ab9b --- /dev/null +++ b/.project @@ -0,0 +1,34 @@ + + + civil-core-civilcore + Project civilcore created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + + 1745013535336 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..8fc1399 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments=--init-script /home/hex/.cache/jdtls/config/org.eclipse.osgi/248/0/.cp/gradle/init/init.gradle +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=/opt/openjdk-bin-21.0.6_p7 +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/bin/main/paper-plugin.yml b/bin/main/paper-plugin.yml new file mode 100644 index 0000000..3f63ddd --- /dev/null +++ b/bin/main/paper-plugin.yml @@ -0,0 +1,7 @@ +api-version: "1.21" +name: civil-core +version: 0.1.0 +main: rip.iwakura.civil.Core +authors: + - hex + - grng diff --git a/bin/main/rip/iwakura/civil/Core.class b/bin/main/rip/iwakura/civil/Core.class new file mode 100644 index 0000000000000000000000000000000000000000..98b62227d93946a9590585a691ca99ab5a94dda7 GIT binary patch literal 534 zcmZ`#T}uK%6g}fd>b7NBnw7!&ram~Yff0lh5laMyJ&!tVlhck&yZXC&G3cQm(2t7l zs^m*CaKFynbMLud-yfdyNr40U4zK8VL-74eCV z0~PXTF%|rV%-teq*f>+6iq09*jb@)A(={XMAdP~HEH)U5z6#}S{4$XCUJSHkDEVe6 zbYEDN=Q4MVxH zoT&xP>P42AI>{ZJo{8;HUa3TJA-QNfAw->)Pt*B<6h(9)vN_5)c}70ldPn|k0Xt+9 wn2OjW>#kxKTa+ { + val isDebug = providers.gradleProperty("isDebug") + if (isDebug.isPresent()) { + destinationDirectory.set(file(isDebug)) + } +} dependencies { compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") library("com.google.code.gson", "gson", "2.10.1") // All platform plugins - shadow("org.jetbrains.kotlin:kotlin-stdlib:2.1.10") } -kotlin { - jvmToolchain(21) +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..5e2b430 --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +catch () { + echo "An error occured: see above." + exit 1 +} + +./gradlew build -PisDebug=./server/plugins || catch + +cd server && java -jar server.jar -nogui && cd .. diff --git a/kls_database.db b/kls_database.db index 34efb9200cbdfc75744ad7fa37f2b99726d35e12..4fd9015b48931738ec0583ca1a99d8e9befdc284 100644 GIT binary patch delta 3471 zcmeHKO>9&}9N&HIzS7d#@=a5vB*uV9_q{j!-pqR-TKWb3q!cJh#dc=iyt1&}*X*`v zqmeE+3RDD~!~;lDOiYZ4h~eOk5D%V2!bvYCT#X4adN%RDuOBQN^s)yJ95&hc&CGB9 z|KFSW|7K?Awb^;?Qd8ZwSS(fzzbg1uT;59J+rAyk8u8!MJ);O~bk^m9gqX z{L`MF*MC_^;1`8r^;kQixCw5#}&1 zxK9Lk0%58@dYjbk?yB12tZ4n!au;OS*AvkME_DUPn51lid>8uxW;P8-3KFsjMJ}P# zvNL^cAE?NN97 zSDH(K3F;u%LyX}7va&!YZ2259A2Xj2i(vw7llbap|E7lJ&ybV^*hV9^7Y6DVl=IBu z9z~Aj_%uMSW!WBqKb9k0*e*0+9&%DnfE68RenizSaUyo68mN%^e&C`m9bi5h9W1$T zqcJAaiCCdMW*iGAgmFx~Z6qgF z2&XdXY)gL1&!ia~i6U6slb;VZTpp~d))s5V3e_-n?~$2rSTOVT3ueA< zdG|+VzV>l5Ujw}*X1*GlC1$?rk(oFAi<#G##mt|9wM)#r4w_Gxc`ZOs9ORYdGxM7A znmNc=eluTDHZ!jREz4-;dil&e0g;u@%qxMdOlDrOWajk~ev4zU>Fl@=h3Dir9I5$4 z01Guo_uy>TdNn_`Lj7>6HGWl9&6*Xz#I9a0&|rrYm9d!;zwZe7^aR`n^M)@@8a#b6 zo#A0l0ChU!!%ZL`PUpDD8xwE=Xq7(P7ApRGwu%>?)g)KVg=?B*>UQClE-3`JAA&2s z0y3H$Q=86wsmoD7Pej*|&2uYN;{6#-zNu#4pVQ<~RVS}#@(m~Ras&!X z8@wSJ)%6dCba^C_cB%9f;lU3N>GE}eM;6yAzBn3{cJ_cSUjvvf!nJDt>@i&)2I$3Q z=)k!?O%AK;=f2S8A?Sf;2fRRvk;(Jpnmh=#Na^wbe1!hxo;!12>2e4LTg%XcPF;QT z(XcM}0}P*Lk)z|nTbdjMQLy^!0?_S)L>C?>pL`5K55VB1(o(6KFCNxqKR|0>K2kR> G4*df{F+_;~ delta 3400 zcmeHKU2GIp6y6=XQwyza{KKZwRx1^R?%sRn_lA(v(w3hVC6JjD_NPHy32cJa3i*F>nn-HVEns|1WE(;Gntq&$_vXi;rJ@-35 zGv|JHW^&q0PP^Dp(;AD#s_-BEE-iQBt=|u)Q}Ha^Nj1bktFzD;3fOL05oWi;8)m1b(CML6*+6}*ScXg2@Nm<;tL|~b|>4<=F(_lh~-5!h`v`syvK!$>vrjC7Y?0=!)h?sZ`akk2o+Lk zo~whO*Y{}Z9r%0W0Aw~)wow=Tha|)hxaV`nbZllzJFuuU1xLsdjvWYJSX_AUdrt%0 z+)!DaUlsX(UhTvTdpAZj(&y5nf|0z?Hbq(Tst{u9z$3rf;VTXPg%Fr|d*K4hLI*CB%VOu8@Jnw;e(ZVfh5wds`kA&r#bT(>t^(DxT?u zmgF|EFcdfN!jL+CXqwXFoV#AgOkvrU!}4*}j|U^df2?q;R6j;Gh>@*>TbmY>g}^*h z5@H6HZ6hhiI9$W_4WDv~4~P1av(Ru{Gl1)x8taOWA*r?^+fc-|Y;$d)aunAYA@xnq z#mDUXwjqh@1tc^)i+eWVKBBJVAT~EWqFSr^60uWNNX6jC%@=gF1(~rcu(4({WVve@ zR5~)?2BX}e(r{V8q@=VaUtL`d-o6sM8mry% z+?kqRYg(ah`0~?k$NE0)_NU$cKkxS2x-#%henPfcv@Ip!UfLg7NSHzCyjS`U&#Ivtz>O*MCeyOQra5H;DS4Yv;R`iuWzK?6_186*TRaZw4 z-4~rBn&%cnLLJf6`!J*CG<6tiW-n{%5bg+Ta7i`%G25@HY1}6|@bF&`^QZfDbug;b z!cLNh`###Ct0{yBANtCFD%68^W}B`i5ynq|D1>Uro!P6a0|>1sLfg*vYH9-J&wj0| z49=`8MmBqHL{n+pT0mF(v8J1fGq>ix(bYH_(;{@gONZ}19?;c3ghz^S=lR2$8pER4 o@aK7?8^uHmUlpHzf Date: Sat, 19 Apr 2025 05:57:43 +0200 Subject: [PATCH 03/10] feat: entire fucking database base and team features and prefixes and shit i worked on this for like 7 hours straight this night i want to kms i need SLEEEEEEP --- .classpath | 6 ++ .gitignore | 1 + .project | 2 +- bin/main/paper-plugin.yml | 2 +- bin/main/rip/iwakura/civil/Core.class | Bin 534 -> 4030 bytes build.gradle.kts | 15 ++-- build.sh | 2 +- settings.gradle.kts | 2 +- src/main/java/rip/iwakura/civil/Core.java | 31 +++++++ src/main/java/rip/iwakura/civil/Database.java | 83 ++++++++++++++++++ .../civil/commands/PlayerArgument.java | 77 ++++++++++++++++ .../java/rip/iwakura/civil/commands/Team.java | 79 +++++++++++++++++ .../iwakura/civil/commands/TeamArgument.java | 75 ++++++++++++++++ .../rip/iwakura/civil/events/ChatHandler.java | 51 +++++++++++ .../rip/iwakura/civil/events/JoinHandler.java | 25 ++++++ .../rip/iwakura/civil/types/CivilPlayer.java | 38 ++++++++ .../rip/iwakura/civil/types/CivilTeam.java | 43 +++++++++ src/main/resources/config.yml | 2 + src/main/resources/log4j.properties | 16 ++++ 19 files changed, 541 insertions(+), 9 deletions(-) create mode 100644 src/main/java/rip/iwakura/civil/Database.java create mode 100644 src/main/java/rip/iwakura/civil/commands/PlayerArgument.java create mode 100644 src/main/java/rip/iwakura/civil/commands/Team.java create mode 100644 src/main/java/rip/iwakura/civil/commands/TeamArgument.java create mode 100644 src/main/java/rip/iwakura/civil/events/ChatHandler.java create mode 100644 src/main/java/rip/iwakura/civil/events/JoinHandler.java create mode 100644 src/main/java/rip/iwakura/civil/types/CivilPlayer.java create mode 100644 src/main/java/rip/iwakura/civil/types/CivilTeam.java create mode 100644 src/main/resources/config.yml create mode 100644 src/main/resources/log4j.properties diff --git a/.classpath b/.classpath index 58ad8b1..720c4f0 100644 --- a/.classpath +++ b/.classpath @@ -12,6 +12,12 @@ + + + + + + diff --git a/.gitignore b/.gitignore index 5cede7c..9108392 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ test_server/ .gradle build/ server/ +bin/ diff --git a/.project b/.project index 765ab9b..28c5951 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - civil-core-civilcore + CivilCore Project civilcore created by Buildship. diff --git a/bin/main/paper-plugin.yml b/bin/main/paper-plugin.yml index 3f63ddd..5db0a58 100644 --- a/bin/main/paper-plugin.yml +++ b/bin/main/paper-plugin.yml @@ -1,5 +1,5 @@ api-version: "1.21" -name: civil-core +name: CivilCore version: 0.1.0 main: rip.iwakura.civil.Core authors: diff --git a/bin/main/rip/iwakura/civil/Core.class b/bin/main/rip/iwakura/civil/Core.class index 98b62227d93946a9590585a691ca99ab5a94dda7..4c18cb3b66d51639c9896a289ac9ab5b71047265 100644 GIT binary patch literal 4030 zcmb_f`F9jq75-iVRMHg70Aa@o5SS*>R0J2WStfLXBzD5m5sdpw_e-ZpbyZVU9X54z zbOslgaYkoxMrU!u?H4#244mWfXODlA$M02DLO0#S<~YApcing2eRui3`)>W~KM(!^ zU=V*X&?d0iw=0%?Mb1`zX%*}_+p)5quMDgZ*zNfxYpOasYll|Fsg`Wlx+LeMHOj}? z=v|OicwC@8ec*z?imX>uDYRp?2?HGh>vFcM#;fHi z$WJTB@w%^gzEj-YeNlBwUv*D;UP#66YNfxwKZUK> zZeSZdd6Fp;JFt_1+U~R`(3OtQbR^HphdwQ34qVVKe$2$PIswlFa!w7YX<2o`tmjVK zB?G$!wm&(mdiP!vJ=hlq81E7|!~kn*SBQ+Uz@hEA*0k*?>l7ccb|Pln&k2}|)$FhO zP6`LmXP{TWdP-v^K8{bsF2#`w>~9u+V@6WwhNS_qvy-uX(!@%v>ck;@+Q6p-wlqn# znp2L6&)~B}Sbq4z@cChZZOzK76*DOuLB_!6SdYk7aM`i)=W@eW3#y{CW8x@|38aXY zF%<-|L>O*bgiCGdbp215cpifUG$AC=pF~&>s_4|lICbT-7&b7(y4Pg)WW+WTr|@}! z_4Fd<*_d?c3Zc8VzOo4`>y$F9F@i4`7!`Q7#&R=N6FH0ttSQ=o=1XiwU{|^pJ#`xi zSp#Qixe=5FuUwXHF|a0-ET=GzbGnY_she)X)uqM|b6~>67s0NuQPb3(R)uQ?M=eD? z$f#}4s>q7+%Z2!Nu_HN)+7?sohSt*VVf~tz$aLaM__BdXfn%*23a?dE@R+&4#8>cD zwwUahv9ZDNp}fG^mOX1`aDs>Qob_$bw?q57E<$DlyYtsgd;{MkvizzmaH&}W>(ZTR zJwG$7k)!;_0y`Z`iJd7F4HTXtPfZhULSdTJ@m0wVLgh!rNDdLWmHxkzmTB3-@&U*2 zn=xVIQqr-MKc}hIRZq2iBxZsfP1|xkZR14)?DIX1%!q&)SfifpCMih4#W~GW-$Z~= zU~OHZc)uO4lw(Q5)bnn5hOPxW0b*af%5P3-Z8 z$@_M7NWy1h_Vem&LiT#Bvf<=IS(qJ@mE=zEaAbL^D0>D3D$N|J-`{fO4)g(1ZWRN+|fKz#|>KBxrzK9OZuYNs-@Txz_;Zhg6GN!^AugL2C0`D4lM_^Ah zs6?}e?aq0#EK$T3D#~eD2tEIriC^MZBx3oINZ{YK6IZe`HXido=*fBBY_*bUoK9*a zbsP0sH}yflTZ7M*Xcsp0CIIdR+dsi5Ku)n)^`T zOzY-q8TrIkvL3(X2tDGmMQ0ru1S&A_2Z4PJ1#DIZ1ApSD!1AgbapRg{H$!RXpupa& zM`ZqM=RbZ&@!82YD_Q|o_TES8E(L8c`CLUYuoi3hG^773`L>R4gy7<4p{MRP%5L}0 zUoUcNjdsjyVV&*}6WZ0Yjlq>jd+nGqb600pAn&CvGy1A1&Z^8!qZB$Bv~U zoxS|Yuoh5!Hn delta 246 zcmYL>I|{;J5QOK?JAdLUzN0aSAQ})`3lT)D?Zg9Uk;XK37M>vl^c*%3EOG$vV=Jyv zA`7#-Gt8H`XNf;v_XNNkPRN%XW$N$!!;C>34A%_OBG~RYMCc}DDB)$J6it+1h0hVI zL_OA5YG|maM=R!tP1sSu+~{aDPw0Xm1O^1Us7$KTH>S;K%iayzHH|sxCnggHsrkE2 n1GpEXV3lK3{{&7Mph2fG> { - val isDebug = providers.gradleProperty("isDebug") - if (isDebug.isPresent()) { - destinationDirectory.set(file(isDebug)) +tasks { + register("copyToServer") { + from(shadowJar) + destinationDir = File("server/plugins") + } + build { + dependsOn(shadowJar) } } dependencies { compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") + implementation("com.j256.ormlite", "ormlite-jdbc", "6.1") + implementation("org.postgresql", "postgresql", "42.7.5") library("com.google.code.gson", "gson", "2.10.1") // All platform plugins } diff --git a/build.sh b/build.sh index 5e2b430..1404b4f 100644 --- a/build.sh +++ b/build.sh @@ -5,6 +5,6 @@ catch () { exit 1 } -./gradlew build -PisDebug=./server/plugins || catch +./gradlew clean build copyToServer || catch cd server && java -jar server.jar -nogui && cd .. diff --git a/settings.gradle.kts b/settings.gradle.kts index b790ed4..82d9ae2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,4 +10,4 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } -rootProject.name = "civil-core" +rootProject.name = "CivilCore" diff --git a/src/main/java/rip/iwakura/civil/Core.java b/src/main/java/rip/iwakura/civil/Core.java index b5cdd84..c04addb 100644 --- a/src/main/java/rip/iwakura/civil/Core.java +++ b/src/main/java/rip/iwakura/civil/Core.java @@ -1,10 +1,41 @@ package rip.iwakura.civil; +import java.sql.SQLException; +import java.util.logging.Level; + +import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; +import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents; +import rip.iwakura.civil.events.ChatHandler; +import rip.iwakura.civil.commands.Team; +import rip.iwakura.civil.events.JoinHandler; + public class Core extends JavaPlugin { + public Database database; + @Override public void onEnable() { getLogger().info("Hello world! We are booting up..."); + + saveDefaultConfig(); + + try { + this.database = new Database(getConfig().getString("database.url")); + } catch (SQLException e) { + getLogger().log(Level.SEVERE, e.getMessage()); + Bukkit.getPluginManager().disablePlugin(this); + + return; + } + + Team teamCommand = new Team(database); + + this.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> { + commands.registrar().register(teamCommand.getCommand()); + }); + + getServer().getPluginManager().registerEvents(new JoinHandler(database), this); + getServer().getPluginManager().registerEvents(new ChatHandler(this), this); } } diff --git a/src/main/java/rip/iwakura/civil/Database.java b/src/main/java/rip/iwakura/civil/Database.java new file mode 100644 index 0000000..6cabcb0 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/Database.java @@ -0,0 +1,83 @@ +package rip.iwakura.civil; + +import java.sql.SQLException; +import java.util.List; +import java.util.UUID; + +import org.apache.logging.log4j.LogManager; +import org.bukkit.entity.Player; + +import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.dao.DaoManager; +import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.logger.LoggerFactory; +import com.j256.ormlite.support.ConnectionSource; +import com.j256.ormlite.table.TableUtils; + +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import rip.iwakura.civil.types.CivilPlayer; +import rip.iwakura.civil.types.CivilTeam; + +public class Database { + private final Dao playerDao; + private final Dao teamDao; + private ConnectionSource connectionSource; + + public Database(String uri) throws SQLException { + connectionSource = new JdbcConnectionSource(uri); + + + TableUtils.createTableIfNotExists(connectionSource, CivilPlayer.class); + TableUtils.createTableIfNotExists(connectionSource, CivilTeam.class); + + playerDao = DaoManager.createDao(connectionSource, CivilPlayer.class); + teamDao = DaoManager.createDao(connectionSource, CivilTeam.class); + } + + public void createPlayer(Player p) throws SQLException { + playerDao.create( + new CivilPlayer(p.getUniqueId(), p.getName()) + ); + } + + public void createTeam(String name, String prefix) throws SQLException { + teamDao.create( + new CivilTeam(name, prefix) + ); + } + + public void joinTeam(Player p, CivilTeam team) throws SQLException { + CivilPlayer civilPlayer = playerDao.queryForId(p.getUniqueId()); + civilPlayer.setTeam(team); + playerDao.update(civilPlayer); + } + + public void joinTeam(CivilPlayer p, CivilTeam team) throws SQLException { + p.setTeam(team); + playerDao.update(p); + } + + public CivilTeam getTeam(String team) throws SQLException { + return teamDao.queryForId(team); + } + + public List getAllTeams() throws SQLException { + return teamDao.queryForAll(); + } + + public CivilPlayer getPlayer(String name) throws SQLException { + return playerDao.queryBuilder().where().eq("name", name).queryForFirst(); + } + + public CivilPlayer getPlayer(UUID uuid) throws SQLException { + return playerDao.queryForId(uuid); + } + + public CivilPlayer getPlayer(Player p) throws SQLException { + return playerDao.queryForId(p.getUniqueId()); + } + + public List getAllPlayers() throws SQLException { + return playerDao.queryForAll(); + } +} diff --git a/src/main/java/rip/iwakura/civil/commands/PlayerArgument.java b/src/main/java/rip/iwakura/civil/commands/PlayerArgument.java new file mode 100644 index 0000000..0979be7 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/commands/PlayerArgument.java @@ -0,0 +1,77 @@ +package rip.iwakura.civil.commands; + +import java.sql.SQLException; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import org.bukkit.entity.Player; + +import com.mojang.brigadier.Message; +import com.mojang.brigadier.arguments.ArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; + +import io.papermc.paper.command.brigadier.MessageComponentSerializer; +import io.papermc.paper.command.brigadier.argument.CustomArgumentType; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import rip.iwakura.civil.types.CivilPlayer; +import rip.iwakura.civil.Database; + +/** + * PlayerArgument + */ +public class PlayerArgument implements CustomArgumentType.Converted { + private Database database; + + public PlayerArgument(Database database) { + this.database = database; + } + + @Override + public CivilPlayer convert(String playerName) throws CommandSyntaxException { + try { + CivilPlayer civilPlayer = database.getPlayer(playerName); + + if (civilPlayer == null) { + final Message message = MessageComponentSerializer.message() + .serialize(Component.text(playerName + " doesn't exist!", NamedTextColor.RED)); + throw new CommandSyntaxException(new SimpleCommandExceptionType(message), message); + } + + return civilPlayer; + + } catch (SQLException e) { + final Message message = MessageComponentSerializer.message() + .serialize(Component.text("Uh oh, an error occured!", NamedTextColor.RED)); + throw new CommandSyntaxException(new SimpleCommandExceptionType(message), message); + } + } + + @Override + public CompletableFuture listSuggestions(CommandContext ctx, SuggestionsBuilder builder) { + try { + List players = database.getAllPlayers(); + + for (CivilPlayer player : players) { + String name = player.getName(); + + if (name.toLowerCase().startsWith(builder.getRemainingLowerCase())) { + builder.suggest(name); + } + } + } catch (SQLException e) { + } + + return builder.buildFuture(); + } + + @Override + public ArgumentType getNativeType() { + return StringArgumentType.word(); + } +} diff --git a/src/main/java/rip/iwakura/civil/commands/Team.java b/src/main/java/rip/iwakura/civil/commands/Team.java new file mode 100644 index 0000000..3bfb7c8 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/commands/Team.java @@ -0,0 +1,79 @@ +package rip.iwakura.civil.commands; + +import java.sql.SQLException; + +import javax.xml.crypto.Data; + +import org.bukkit.entity.Player; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.tree.LiteralCommandNode; + +import io.papermc.paper.command.brigadier.CommandSourceStack; +import io.papermc.paper.command.brigadier.Commands; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import rip.iwakura.civil.Database; +import rip.iwakura.civil.types.*; + +public class Team { + private Database database; + + public Team(Database database) { + this.database = database; + } + + private LiteralArgumentBuilder createTeam() { + return Commands.literal("create") + .then( + Commands.argument("name", StringArgumentType.string()) + .then( + Commands.argument("prefix", StringArgumentType.string()) + .executes(ctx -> { + String name = StringArgumentType.getString(ctx, "name"); + String prefix = StringArgumentType.getString(ctx, "prefix"); + + try { + database.createTeam(name, prefix); + return Command.SINGLE_SUCCESS; + } catch (SQLException e) { + ctx.getSource().getSender().sendMessage( + Component.text(e.getMessage(), NamedTextColor.RED)); + return 0; + } + }))); + } + + // Add a player to a team. + private LiteralArgumentBuilder joinTeam() { + return Commands.literal("add") + .then( + Commands.argument("player", new PlayerArgument(database)) + .then( + Commands.argument("team", new TeamArgument(database)) + .executes(ctx -> { + CivilTeam civilTeam = ctx.getArgument("team", CivilTeam.class); + CivilPlayer civilPlayer = ctx.getArgument("player", + CivilPlayer.class); + + try { + database.joinTeam(civilPlayer, civilTeam); + return Command.SINGLE_SUCCESS; + } catch (SQLException e) { + ctx.getSource().getSender().sendMessage( + Component.text(e.getMessage(), NamedTextColor.RED)); + return 0; + } + }))); + }; + + public LiteralCommandNode getCommand() { + return Commands.literal("team") + .then(createTeam()) + .then(joinTeam()).build(); + } + +} diff --git a/src/main/java/rip/iwakura/civil/commands/TeamArgument.java b/src/main/java/rip/iwakura/civil/commands/TeamArgument.java new file mode 100644 index 0000000..3a9988a --- /dev/null +++ b/src/main/java/rip/iwakura/civil/commands/TeamArgument.java @@ -0,0 +1,75 @@ +package rip.iwakura.civil.commands; + +import java.sql.SQLException; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import com.mojang.brigadier.Message; +import com.mojang.brigadier.arguments.ArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; + +import io.papermc.paper.command.brigadier.MessageComponentSerializer; +import io.papermc.paper.command.brigadier.argument.CustomArgumentType; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import rip.iwakura.civil.types.CivilTeam; +import rip.iwakura.civil.Database; + +/** + * TeamArgument + */ +public class TeamArgument implements CustomArgumentType.Converted { + private Database database; + + public TeamArgument(Database database) { + this.database = database; + } + + @Override + public CivilTeam convert(String teamName) throws CommandSyntaxException { + try { + CivilTeam civilTeam = database.getTeam(teamName); + + if (civilTeam == null) { + final Message message = MessageComponentSerializer.message() + .serialize(Component.text(teamName + " doesn't exist!", NamedTextColor.RED)); + throw new CommandSyntaxException(new SimpleCommandExceptionType(message), message); + } + + return civilTeam; + + } catch (SQLException e) { + final Message message = MessageComponentSerializer.message() + .serialize(Component.text("Uh oh, an error occured!", NamedTextColor.RED)); + throw new CommandSyntaxException(new SimpleCommandExceptionType(message), message); + } + } + + @Override + public CompletableFuture listSuggestions(CommandContext ctx, SuggestionsBuilder builder) { + try { + List teams = database.getAllTeams(); + + for (CivilTeam team : teams) { + String name = team.getName(); + + if (name.toLowerCase().startsWith(builder.getRemainingLowerCase())) { + builder.suggest(name); + } + } + } catch (SQLException e) { + } + + return builder.buildFuture(); + } + + @Override + public ArgumentType getNativeType() { + return StringArgumentType.string(); + } +} diff --git a/src/main/java/rip/iwakura/civil/events/ChatHandler.java b/src/main/java/rip/iwakura/civil/events/ChatHandler.java new file mode 100644 index 0000000..2a6bda1 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/events/ChatHandler.java @@ -0,0 +1,51 @@ +package rip.iwakura.civil.events; + +import java.sql.SQLException; +import java.util.logging.Level; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +import io.papermc.paper.chat.ChatRenderer; +import io.papermc.paper.event.player.AsyncChatEvent; +import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import rip.iwakura.civil.Core; +import rip.iwakura.civil.Database; + +public class ChatHandler implements Listener, ChatRenderer { + private Core core; + private Database database; + + public ChatHandler(Core core) { + this.core = core; + this.database = core.database; + } + + @EventHandler + public void chatHandler(AsyncChatEvent event) { + event.renderer(this); + } + + @Override + public Component render(Player source, Component sourceDisplayName, Component message, Audience viewer) { + String prefix = null; + + try { + prefix = database.getPlayer(source).getTeam().getPrefix(); + } catch (SQLException e) { + core.getLogger().log(Level.WARNING, e.getMessage());; + } catch (NullPointerException e) { + } + + if (prefix == null) prefix = ""; + + return MiniMessage.miniMessage() + .deserialize(prefix) + .append(sourceDisplayName) + .append(Component.text(": ")) + .append(message); + } +} diff --git a/src/main/java/rip/iwakura/civil/events/JoinHandler.java b/src/main/java/rip/iwakura/civil/events/JoinHandler.java new file mode 100644 index 0000000..77f8082 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/events/JoinHandler.java @@ -0,0 +1,25 @@ +package rip.iwakura.civil.events; + +import java.sql.SQLException; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; + +import rip.iwakura.civil.Database; + +public class JoinHandler implements Listener { + private Database database; + + public JoinHandler(Database database) { + this.database = database; + } + + @EventHandler + public void chatHandler(PlayerJoinEvent event) throws SQLException { + Player p = event.getPlayer(); + + if (database.getPlayer(p) == null) database.createPlayer(p); + } +} diff --git a/src/main/java/rip/iwakura/civil/types/CivilPlayer.java b/src/main/java/rip/iwakura/civil/types/CivilPlayer.java new file mode 100644 index 0000000..2ca4014 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/types/CivilPlayer.java @@ -0,0 +1,38 @@ +package rip.iwakura.civil.types; + +import java.util.UUID; + +import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.table.DatabaseTable; + +@DatabaseTable(tableName = "players") +public class CivilPlayer { + @DatabaseField(id = true, canBeNull = false, generatedId = false, columnName = "uuid") + private UUID uuid; + + @DatabaseField(canBeNull = false, columnName = "name") + private String name; + + @DatabaseField(canBeNull = true, foreign = true, foreignAutoRefresh = true) + private CivilTeam team; + + public CivilPlayer() { + } + + public CivilPlayer(UUID uuid, String name) { + this.uuid = uuid; + this.name = name; + } + + public void setTeam(CivilTeam team) { + this.team = team; + } + + public CivilTeam getTeam() { + return team; + } + + public String getName() { + return name; + } +} diff --git a/src/main/java/rip/iwakura/civil/types/CivilTeam.java b/src/main/java/rip/iwakura/civil/types/CivilTeam.java new file mode 100644 index 0000000..c6fb73e --- /dev/null +++ b/src/main/java/rip/iwakura/civil/types/CivilTeam.java @@ -0,0 +1,43 @@ +package rip.iwakura.civil.types; + +import org.bukkit.Location; + +import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.table.DatabaseTable; + +@DatabaseTable(tableName = "teams") +public class CivilTeam { + @DatabaseField(id = true) + private String name; + + @DatabaseField(canBeNull = false) + private String prefix; + + /*@DatabaseField(canBeNull = true) + private Location home;*/ + + public CivilTeam() { + } + + public CivilTeam(String name, String prefix) { + this.name = name; + this.prefix = prefix; + } + + public String getName() { + return name; + } + + public String getPrefix() { + return prefix; + } +/* + public void setHome(Location home) { + this.home = home; + } + + public Location getHome() { + return home; + } + */ +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..40ac02b --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,2 @@ +database: + url: "" diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties new file mode 100644 index 0000000..ccf1f99 --- /dev/null +++ b/src/main/resources/log4j.properties @@ -0,0 +1,16 @@ +log4j.rootLogger=INFO, stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout + +# print the date in ISO 8601 format +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%p] %c{1} %m%n + +# be more verbose with our code +log4j.logger.com.j256.ormlite=DEBUG + +# to enable logging of arguments to all of the SQL calls +# uncomment the following lines +log4j.logger.com.j256.ormlite.stmt.mapped.BaseMappedStatement=TRACE +log4j.logger.com.j256.ormlite.stmt.mapped.MappedCreate=TRACE +log4j.logger.com.j256.ormlite.stmt.StatementExecutor=TRACE From 26971e75bbdf16532d0042ba82e59205f8c358c9 Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 19 Apr 2025 21:46:49 +0200 Subject: [PATCH 04/10] feat: discord -> teamchat linking, custom join/leave messages, and /team home command --- bin/main/rip/iwakura/civil/Core.class | Bin 4030 -> 7697 bytes build.gradle.kts | 2 + src/main/java/rip/iwakura/civil/Core.java | 66 +++++- src/main/java/rip/iwakura/civil/Database.java | 37 +++- src/main/java/rip/iwakura/civil/Discord.java | 104 ++++++++++ .../java/rip/iwakura/civil/commands/Team.java | 195 ++++++++++++++---- .../iwakura/civil/discord/LinkCommand.java | 56 +++++ .../rip/iwakura/civil/events/JoinHandler.java | 9 +- .../iwakura/civil/events/LeaveHandler.java | 21 ++ .../iwakura/civil/events/TeamChatHandler.java | 39 ++++ .../exceptions/InvalidChannelException.java | 12 ++ .../rip/iwakura/civil/types/CivilTeam.java | 49 ++++- 12 files changed, 531 insertions(+), 59 deletions(-) create mode 100644 src/main/java/rip/iwakura/civil/Discord.java create mode 100644 src/main/java/rip/iwakura/civil/discord/LinkCommand.java create mode 100644 src/main/java/rip/iwakura/civil/events/LeaveHandler.java create mode 100644 src/main/java/rip/iwakura/civil/events/TeamChatHandler.java create mode 100644 src/main/java/rip/iwakura/civil/exceptions/InvalidChannelException.java diff --git a/bin/main/rip/iwakura/civil/Core.class b/bin/main/rip/iwakura/civil/Core.class index 4c18cb3b66d51639c9896a289ac9ab5b71047265..62d9a58d95981dd832db10e3b8df8da70ac3cfd4 100644 GIT binary patch literal 7697 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 diff --git a/build.gradle.kts b/build.gradle.kts index e1607bc..3a1fbe7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,6 +33,8 @@ tasks { dependencies { compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") + implementation("club.minnced:discord-webhooks:0.8.4") + implementation("net.dv8tion:JDA:5.3.2") implementation("com.j256.ormlite", "ormlite-jdbc", "6.1") implementation("org.postgresql", "postgresql", "42.7.5") library("com.google.code.gson", "gson", "2.10.1") // All platform plugins diff --git a/src/main/java/rip/iwakura/civil/Core.java b/src/main/java/rip/iwakura/civil/Core.java index c04addb..1f21b89 100644 --- a/src/main/java/rip/iwakura/civil/Core.java +++ b/src/main/java/rip/iwakura/civil/Core.java @@ -1,18 +1,72 @@ package rip.iwakura.civil; import java.sql.SQLException; +import java.util.ArrayList; import java.util.logging.Level; import org.bukkit.Bukkit; +import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; +import net.dv8tion.jda.api.utils.messages.MessageCreateData; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import rip.iwakura.civil.events.ChatHandler; +import rip.iwakura.civil.events.TeamChatHandler; import rip.iwakura.civil.commands.Team; import rip.iwakura.civil.events.JoinHandler; +import rip.iwakura.civil.types.CivilPlayer; public class Core extends JavaPlugin { public Database database; + public Discord discord; + + public java.util.List teamChatToggled; + + public Component renderTeamChat(CivilPlayer p, Component message) { + return Component.text("TEAM") + .color(NamedTextColor.BLUE) + .decoration(TextDecoration.BOLD, true) + .appendSpace() + .append(Component.text(p.getName()) + .append(Component.text(": ")) + .append(message) + .color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false)); + } + + public Component renderTeamChat(User author, String message) { + return Component.text("TEAM") + .color(NamedTextColor.BLUE) + .decoration(TextDecoration.BOLD, true) + .append(Component.text(" Discord", NamedTextColor.BLUE).decoration(TextDecoration.BOLD, false) + .appendSpace() + .append(Component.text(author.getName()) + .append(Component.text(": ")) + .append(Component.text(message)) + .color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false))); + } + + + public void sendTeamMessage(CivilPlayer author, Component message) throws SQLException { + Component deserializedMessage = renderTeamChat(author, message); + discord.sendMessage(author, PlainTextComponentSerializer.plainText().serialize(message)); + for (CivilPlayer member : database.getAllPlayers(author.getTeam())) { + Player player = Bukkit.getPlayer(member.getName()); + + if (!player.isOnline()) + continue; + + player.sendMessage(deserializedMessage); + } + } @Override public void onEnable() { @@ -20,16 +74,19 @@ public class Core extends JavaPlugin { saveDefaultConfig(); + teamChatToggled = new ArrayList<>(); + try { - this.database = new Database(getConfig().getString("database.url")); + this.database = new Database(getConfig().getString("database.url"), this); } catch (SQLException e) { getLogger().log(Level.SEVERE, e.getMessage()); Bukkit.getPluginManager().disablePlugin(this); - - return; } - Team teamCommand = new Team(database); + this.discord = new Discord(this); + discord.connect(getConfig().getString("discord.token")); + + Team teamCommand = new Team(this); this.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> { commands.registrar().register(teamCommand.getCommand()); @@ -37,5 +94,6 @@ public class Core extends JavaPlugin { getServer().getPluginManager().registerEvents(new JoinHandler(database), this); getServer().getPluginManager().registerEvents(new ChatHandler(this), this); + getServer().getPluginManager().registerEvents(new TeamChatHandler(this), this); } } diff --git a/src/main/java/rip/iwakura/civil/Database.java b/src/main/java/rip/iwakura/civil/Database.java index 6cabcb0..1669d2f 100644 --- a/src/main/java/rip/iwakura/civil/Database.java +++ b/src/main/java/rip/iwakura/civil/Database.java @@ -4,17 +4,17 @@ import java.sql.SQLException; import java.util.List; import java.util.UUID; -import org.apache.logging.log4j.LogManager; +import org.bukkit.Location; import org.bukkit.entity.Player; import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.jdbc.JdbcConnectionSource; -import com.j256.ormlite.logger.LoggerFactory; import com.j256.ormlite.support.ConnectionSource; import com.j256.ormlite.table.TableUtils; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import rip.iwakura.civil.exceptions.InvalidChannelException; import rip.iwakura.civil.types.CivilPlayer; import rip.iwakura.civil.types.CivilTeam; @@ -22,28 +22,27 @@ public class Database { private final Dao playerDao; private final Dao teamDao; private ConnectionSource connectionSource; + private Core core; - public Database(String uri) throws SQLException { + public Database(String uri, Core core) throws SQLException { connectionSource = new JdbcConnectionSource(uri); - TableUtils.createTableIfNotExists(connectionSource, CivilPlayer.class); TableUtils.createTableIfNotExists(connectionSource, CivilTeam.class); playerDao = DaoManager.createDao(connectionSource, CivilPlayer.class); teamDao = DaoManager.createDao(connectionSource, CivilTeam.class); + this.core = core; } public void createPlayer(Player p) throws SQLException { playerDao.create( - new CivilPlayer(p.getUniqueId(), p.getName()) - ); + new CivilPlayer(p.getUniqueId(), p.getName())); } public void createTeam(String name, String prefix) throws SQLException { teamDao.create( - new CivilTeam(name, prefix) - ); + new CivilTeam(name, prefix)); } public void joinTeam(Player p, CivilTeam team) throws SQLException { @@ -65,6 +64,10 @@ public class Database { return teamDao.queryForAll(); } + public List getAllTeams(Long channel) throws SQLException { + return teamDao.queryBuilder().where().eq("channel", channel).query(); + } + public CivilPlayer getPlayer(String name) throws SQLException { return playerDao.queryBuilder().where().eq("name", name).queryForFirst(); } @@ -80,4 +83,20 @@ public class Database { public List getAllPlayers() throws SQLException { return playerDao.queryForAll(); } + + public List getAllPlayers(CivilTeam team) throws SQLException { + return playerDao.queryBuilder().where().eq("team_id", team.getName()).query(); + } + + public void setHome(CivilTeam team, Location location) throws SQLException { + team.setHome(location); + teamDao.update(team); + } + + public void linkChannel(CivilTeam team, TextChannel channel) throws SQLException { + team.setChannel(channel.getIdLong()); + + team.setWebhook(channel.createWebhook("CivilCore").complete().getUrl()); + teamDao.update(team); + } } diff --git a/src/main/java/rip/iwakura/civil/Discord.java b/src/main/java/rip/iwakura/civil/Discord.java new file mode 100644 index 0000000..a344563 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/Discord.java @@ -0,0 +1,104 @@ +package rip.iwakura.civil; + +import java.sql.SQLException; +import java.util.List; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + +import com.mojang.brigadier.arguments.StringArgumentType; + +import club.minnced.discord.webhook.WebhookClient; +import club.minnced.discord.webhook.WebhookClientBuilder; +import club.minnced.discord.webhook.send.WebhookMessageBuilder; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Webhook; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; +import net.dv8tion.jda.api.interactions.commands.OptionType; +import net.dv8tion.jda.api.interactions.commands.build.Commands; +import net.dv8tion.jda.api.requests.GatewayIntent; +import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; +import rip.iwakura.civil.discord.LinkCommand; +import rip.iwakura.civil.types.CivilPlayer; +import rip.iwakura.civil.types.CivilTeam; + +/** + * Discord + */ +public class Discord extends ListenerAdapter { + private Core core; + public JDA jda; + + public Discord(Core core) { + this.core = core; + } + + public void sendMessage(CivilPlayer p, String message) { + String webhook = p.getTeam().getWebhook(); + if (webhook != null) { + WebhookClient client = WebhookClient.withUrl(webhook); + client.send(new WebhookMessageBuilder().setUsername(p.getName()) + .setAvatarUrl("https://www.mc-heads.net/avatar/" + p.getName()).setContent(message).build()); + } + } + + public void connect(String token) { + jda = JDABuilder.createDefault(token) + .enableIntents(GatewayIntent.MESSAGE_CONTENT, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MEMBERS) + .addEventListeners(this) + .addEventListeners(new LinkCommand(core)) + .build(); + + try { + jda.awaitReady(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + registerCommands(core.getConfig().getLong("discord.guild")); + } + + public void registerCommands(Long guildId) { + Guild guild = jda.getGuildById(guildId); + + if (guild == null) { + core.getLogger().info("Guild ID not found."); + return; + } + + guild.updateCommands().addCommands(Commands.slash("link", "Link in-game team chat to a discord channel.") + .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.MANAGE_CHANNEL)) + .addOption(OptionType.STRING, "team", "Name of the team you want to link to the current channel.", true, + true)) + .queue(); + } + + @Override + public void onMessageReceived(MessageReceivedEvent event) { + if (event.getAuthor().isBot()) return; + + try { + List linked_teams = core.database.getAllTeams(event.getChannel().getIdLong()); + + for (CivilTeam team : linked_teams) { + List members = core.database.getAllPlayers(team); + + for (CivilPlayer member : members) { + Player player = Bukkit.getPlayerExact(member.getName()); + + if (player == null || !player.isOnline()) continue; + + player.sendMessage(core.renderTeamChat(event.getAuthor(),event.getMessage().getContentDisplay())); + } + } + } catch (SQLException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/rip/iwakura/civil/commands/Team.java b/src/main/java/rip/iwakura/civil/commands/Team.java index 3bfb7c8..8db4450 100644 --- a/src/main/java/rip/iwakura/civil/commands/Team.java +++ b/src/main/java/rip/iwakura/civil/commands/Team.java @@ -1,79 +1,200 @@ package rip.iwakura.civil.commands; import java.sql.SQLException; +import java.text.Format; -import javax.xml.crypto.Data; - +import org.bukkit.Location; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import com.mojang.brigadier.Command; +import com.mojang.brigadier.arguments.LongArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.tree.LiteralCommandNode; import io.papermc.paper.command.brigadier.CommandSourceStack; import io.papermc.paper.command.brigadier.Commands; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; +import net.kyori.adventure.text.minimessage.MiniMessage; +import rip.iwakura.civil.Core; import rip.iwakura.civil.Database; +import rip.iwakura.civil.exceptions.InvalidChannelException; import rip.iwakura.civil.types.*; public class Team { private Database database; + private Core core; - public Team(Database database) { - this.database = database; + public Team(Core core) { + this.core = core; + this.database = core.database; } - private LiteralArgumentBuilder createTeam() { + private LiteralArgumentBuilder createTeam() { return Commands.literal("create") - .then( - Commands.argument("name", StringArgumentType.string()) - .then( - Commands.argument("prefix", StringArgumentType.string()) + .requires(source -> source.getSender().hasPermission("civil.team.create")) + .then( + Commands.argument("name", StringArgumentType.string()) + .then( + Commands.argument("prefix", StringArgumentType.string()) + .executes(ctx -> { + String name = StringArgumentType.getString(ctx, "name"); + String prefix = StringArgumentType.getString(ctx, "prefix"); + CommandSender sender = ctx.getSource().getSender(); + + try { + database.createTeam(name, prefix); + sender.sendMessage( + Component + .text("Successfully created team ", + NamedTextColor.GREEN) + .append(Component + .text(name, NamedTextColor.GOLD)) + .append(Component.text(" with prefix: \"")) + .append(MiniMessage.miniMessage() + .deserialize(prefix)) + .append(Component.text("\""))); + + return Command.SINGLE_SUCCESS; + } catch (SQLException e) { + ctx.getSource().getSender().sendMessage( + Component.text(e.getMessage(), NamedTextColor.RED)); + e.printStackTrace(); + return 0; + } + }))); + } + + // Send team chat message + private LiteralArgumentBuilder homeCommand() { + return Commands.literal("home") + .requires(sender -> sender.getSender() instanceof Player) + .executes(ctx -> { + Player p = (Player) ctx.getSource().getSender(); + + try { + CivilPlayer cPlayer = core.database.getPlayer(p); + p.teleport(cPlayer.getTeam().getHome(core)); + p.sendRichMessage("You have been teleported to your team's home."); + return Command.SINGLE_SUCCESS; + } catch (SQLException e) { + e.printStackTrace(); + } + + return 0; + }).then(Commands.literal("set") + .requires(sender -> sender.getSender() instanceof Player) .executes(ctx -> { - String name = StringArgumentType.getString(ctx, "name"); - String prefix = StringArgumentType.getString(ctx, "prefix"); + Player p = (Player) ctx.getSource().getSender(); try { - database.createTeam(name, prefix); + CivilPlayer cPlayer = database.getPlayer(p); + + Location location = p.getLocation(); + + database.setHome(cPlayer.getTeam(), location); + + p.sendRichMessage("Your team's home location has been set to: " + + String.format("%d %d %d", Math.round(location.x()), + Math.round(location.y()), Math.round(location.z()))); return Command.SINGLE_SUCCESS; + } catch (SQLException e) { - ctx.getSource().getSender().sendMessage( - Component.text(e.getMessage(), NamedTextColor.RED)); - return 0; + e.printStackTrace(); } - }))); + + return 1; + })); + + } + + // Send team chat message + private LiteralArgumentBuilder teamChat() { + return Commands.literal("chat") + .requires(sender -> sender.getSender() instanceof Player) + .executes(ctx -> { + Player p = (Player) ctx.getSource().getSender(); + + if (core.teamChatToggled.contains(p)) { + core.teamChatToggled.remove(p); + p.sendRichMessage("Team chat disabled."); + } else { + core.teamChatToggled.add(p); + p.sendRichMessage("Team chat enabled."); + } + + return Command.SINGLE_SUCCESS; + }).then(Commands.argument("message", StringArgumentType.greedyString()) + .requires(sender -> sender.getSender() instanceof Player) + .executes(ctx -> { + CommandSender sender = ctx.getSource().getSender(); + String message = StringArgumentType.getString(ctx, "message"); + + try { + CivilPlayer p = database.getPlayer((Player) sender); + + core.sendTeamMessage(p, message); + + return Command.SINGLE_SUCCESS; + + } catch (SQLException e) { + sender.sendRichMessage("Uh oh, something went wrong!"); + e.printStackTrace(); + } + + return 1; + })); + } // Add a player to a team. private LiteralArgumentBuilder joinTeam() { return Commands.literal("add") - .then( - Commands.argument("player", new PlayerArgument(database)) - .then( - Commands.argument("team", new TeamArgument(database)) - .executes(ctx -> { - CivilTeam civilTeam = ctx.getArgument("team", CivilTeam.class); - CivilPlayer civilPlayer = ctx.getArgument("player", - CivilPlayer.class); + .requires(source -> source.getSender().hasPermission("civil.team.add")) + .then( + Commands.argument("player", new PlayerArgument(database)) + .then( + Commands.argument("team", new TeamArgument(database)) + .executes(ctx -> { + CivilTeam civilTeam = ctx.getArgument("team", CivilTeam.class); + CivilPlayer civilPlayer = ctx.getArgument("player", + CivilPlayer.class); + CommandSender sender = ctx.getSource().getSender(); - try { - database.joinTeam(civilPlayer, civilTeam); - return Command.SINGLE_SUCCESS; - } catch (SQLException e) { - ctx.getSource().getSender().sendMessage( - Component.text(e.getMessage(), NamedTextColor.RED)); - return 0; - } - }))); + try { + database.joinTeam(civilPlayer, civilTeam); + + sender.sendMessage( + Component + .text("Successfully added ", + NamedTextColor.GREEN) + .append(Component + .text(civilPlayer.getName(), + NamedTextColor.GOLD)) + .append(Component.text(" to team ")) + .append(Component + .text(civilTeam.getName(), + NamedTextColor.AQUA))); + return Command.SINGLE_SUCCESS; + } catch (SQLException e) { + ctx.getSource().getSender().sendMessage( + Component.text(e.getMessage(), NamedTextColor.RED)); + e.printStackTrace(); + return 0; + } + }))); }; - public LiteralCommandNode getCommand() { + public LiteralCommandNode getCommand() { return Commands.literal("team") - .then(createTeam()) - .then(joinTeam()).build(); + .then(createTeam()) + .then(joinTeam()) + .then(teamChat()) + .then(homeCommand()) + .build(); } } diff --git a/src/main/java/rip/iwakura/civil/discord/LinkCommand.java b/src/main/java/rip/iwakura/civil/discord/LinkCommand.java new file mode 100644 index 0000000..c5db068 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/discord/LinkCommand.java @@ -0,0 +1,56 @@ +package rip.iwakura.civil.discord; + +import java.sql.SQLException; +import java.util.List; +import java.util.logging.StreamHandler; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; +import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import net.dv8tion.jda.api.interactions.commands.Command; +import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction; +import rip.iwakura.civil.Core; +import rip.iwakura.civil.types.CivilTeam; + +/** + * LinkCommand + */ +public class LinkCommand extends ListenerAdapter { + private Core core; + + public LinkCommand(Core core) { + this.core = core; + } + + @Override + public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { + try { + if (event.getName().equals("link")) { + core.database.linkChannel(core.database.getTeam(event.getOption("team").getAsString()),event.getChannel().asTextChannel()); + event.reply("Successfully linked channel to team chat.").queue(); + } + } catch (SQLException e) { + e.printStackTrace(); + } + } + + @Override + public void onCommandAutoCompleteInteraction(CommandAutoCompleteInteractionEvent event) { + try { + if (event.getName().equals("link") && event.getFocusedOption().getName().equals("team")) { + List teamNames = core.database.getAllTeams().stream().map(CivilTeam::getName).collect( + Collectors.toList()); + + List options = teamNames.stream() + .filter(name -> name.startsWith(event.getFocusedOption().getValue())) + .map(name -> new Command.Choice(name, name)).collect(Collectors.toList()); + + event.replyChoices(options).queue(); + } + } catch (SQLException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/rip/iwakura/civil/events/JoinHandler.java b/src/main/java/rip/iwakura/civil/events/JoinHandler.java index 77f8082..770a8d4 100644 --- a/src/main/java/rip/iwakura/civil/events/JoinHandler.java +++ b/src/main/java/rip/iwakura/civil/events/JoinHandler.java @@ -7,6 +7,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; +import net.kyori.adventure.text.minimessage.MiniMessage; import rip.iwakura.civil.Database; public class JoinHandler implements Listener { @@ -17,9 +18,13 @@ public class JoinHandler implements Listener { } @EventHandler - public void chatHandler(PlayerJoinEvent event) throws SQLException { + public void joinHandler(PlayerJoinEvent event) throws SQLException { Player p = event.getPlayer(); - if (database.getPlayer(p) == null) database.createPlayer(p); + event.joinMessage(MiniMessage.miniMessage() + .deserialize("[+] " + p.getName() + "")); + + if (database.getPlayer(p) == null) + database.createPlayer(p); } } diff --git a/src/main/java/rip/iwakura/civil/events/LeaveHandler.java b/src/main/java/rip/iwakura/civil/events/LeaveHandler.java new file mode 100644 index 0000000..18ce883 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/events/LeaveHandler.java @@ -0,0 +1,21 @@ +package rip.iwakura.civil.events; + +import java.sql.SQLException; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerQuitEvent; + +import net.kyori.adventure.text.minimessage.MiniMessage; + +public class LeaveHandler implements Listener { + + @EventHandler + public void leaveHandler(PlayerQuitEvent event) throws SQLException { + Player p = event.getPlayer(); + + event.quitMessage(MiniMessage.miniMessage() + .deserialize("[-] " + p.getName() + "")); + } +} diff --git a/src/main/java/rip/iwakura/civil/events/TeamChatHandler.java b/src/main/java/rip/iwakura/civil/events/TeamChatHandler.java new file mode 100644 index 0000000..d097852 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/events/TeamChatHandler.java @@ -0,0 +1,39 @@ +package rip.iwakura.civil.events; + +import java.sql.SQLException; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; + +import io.papermc.paper.chat.ChatRenderer; +import io.papermc.paper.event.player.AsyncChatEvent; +import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import rip.iwakura.civil.Core; +import rip.iwakura.civil.Database; +import rip.iwakura.civil.types.CivilPlayer; + +public class TeamChatHandler implements Listener { + private Core core; + private Database database; + + public TeamChatHandler(Core core) { + this.core = core; + this.database = core.database; + } + + @EventHandler(priority = EventPriority.HIGHEST) + public void chatHandler(AsyncChatEvent event) throws SQLException { + if (core.teamChatToggled.contains(event.getPlayer())) { + CivilPlayer p = database.getPlayer(event.getPlayer()); + + core.sendTeamMessage(p, MiniMessage.miniMessage() + .deserialize(PlainTextComponentSerializer.plainText().serialize(event.message()))); + event.setCancelled(true); + } + } +} diff --git a/src/main/java/rip/iwakura/civil/exceptions/InvalidChannelException.java b/src/main/java/rip/iwakura/civil/exceptions/InvalidChannelException.java new file mode 100644 index 0000000..14d56ec --- /dev/null +++ b/src/main/java/rip/iwakura/civil/exceptions/InvalidChannelException.java @@ -0,0 +1,12 @@ +package rip.iwakura.civil.exceptions; + +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; + +/** + * InvalidChannelException + */ +public class InvalidChannelException extends Exception { + public InvalidChannelException(Long channelId) { + super("Channel with ID: " + channelId.toString() + " could not be found."); + } +} diff --git a/src/main/java/rip/iwakura/civil/types/CivilTeam.java b/src/main/java/rip/iwakura/civil/types/CivilTeam.java index c6fb73e..b6ebf97 100644 --- a/src/main/java/rip/iwakura/civil/types/CivilTeam.java +++ b/src/main/java/rip/iwakura/civil/types/CivilTeam.java @@ -5,6 +5,8 @@ import org.bukkit.Location; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import rip.iwakura.civil.Core; + @DatabaseTable(tableName = "teams") public class CivilTeam { @DatabaseField(id = true) @@ -13,8 +15,23 @@ public class CivilTeam { @DatabaseField(canBeNull = false) private String prefix; - /*@DatabaseField(canBeNull = true) - private Location home;*/ + @DatabaseField(canBeNull = true) + private Long channel; + + @DatabaseField(canBeNull = true) + private String webhook; + + @DatabaseField(canBeNull = true) + private double home_x; + + @DatabaseField(canBeNull = true) + private double home_y; + + @DatabaseField(canBeNull = true) + private double home_z; + + @DatabaseField(canBeNull = true) + private String home_world; public CivilTeam() { } @@ -31,13 +48,31 @@ public class CivilTeam { public String getPrefix() { return prefix; } -/* + public void setHome(Location home) { - this.home = home; + this.home_x = home.x(); + this.home_y = home.y(); + this.home_z = home.z(); + this.home_world = home.getWorld().getName(); } - public Location getHome() { - return home; + public Location getHome(Core core) { + return new Location(core.getServer().getWorld(home_world), home_x, home_y, home_z); + } + + public void setChannel(Long channel) { + this.channel = channel; + } + + public Long getChannel() { + return channel; + } + + public void setWebhook(String webhook) { + this.webhook = webhook; + } + + public String getWebhook() { + return webhook; } - */ } From 4361201b78eb1901d20624aeab703ce2ff90b29b Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 20 Apr 2025 14:05:11 +0200 Subject: [PATCH 05/10] fix: nullpointerexception when player is not online --- .gitignore | 1 + src/main/java/rip/iwakura/civil/Core.java | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9108392..b161ed0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ test_server/ build/ server/ bin/ +bin/* diff --git a/src/main/java/rip/iwakura/civil/Core.java b/src/main/java/rip/iwakura/civil/Core.java index 1f21b89..c2b5fd1 100644 --- a/src/main/java/rip/iwakura/civil/Core.java +++ b/src/main/java/rip/iwakura/civil/Core.java @@ -47,24 +47,27 @@ public class Core extends JavaPlugin { .color(NamedTextColor.BLUE) .decoration(TextDecoration.BOLD, true) .append(Component.text(" Discord", NamedTextColor.BLUE).decoration(TextDecoration.BOLD, false) - .appendSpace() - .append(Component.text(author.getName()) - .append(Component.text(": ")) - .append(Component.text(message)) - .color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false))); + .appendSpace() + .append(Component.text(author.getName()) + .append(Component.text(": ")) + .append(Component.text(message)) + .color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false))); } - public void sendTeamMessage(CivilPlayer author, Component message) throws SQLException { Component deserializedMessage = renderTeamChat(author, message); discord.sendMessage(author, PlainTextComponentSerializer.plainText().serialize(message)); for (CivilPlayer member : database.getAllPlayers(author.getTeam())) { - Player player = Bukkit.getPlayer(member.getName()); + try { + Player player = Bukkit.getPlayer(member.getName()); - if (!player.isOnline()) + if (player == null || !player.isOnline()) + continue; + + player.sendMessage(deserializedMessage); + } catch (Exception e) { continue; - - player.sendMessage(deserializedMessage); + } } } From 6cb0f04170530fd6e3b1f79f838b55254d7574bb Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 20 Apr 2025 14:06:14 +0200 Subject: [PATCH 06/10] feat: minimsg support in team chat (global chat soon?) --- bin/main/paper-plugin.yml | 7 ------- bin/main/rip/iwakura/civil/Core.class | Bin 7697 -> 0 bytes .../java/rip/iwakura/civil/commands/Team.java | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 bin/main/paper-plugin.yml delete mode 100644 bin/main/rip/iwakura/civil/Core.class diff --git a/bin/main/paper-plugin.yml b/bin/main/paper-plugin.yml deleted file mode 100644 index 5db0a58..0000000 --- a/bin/main/paper-plugin.yml +++ /dev/null @@ -1,7 +0,0 @@ -api-version: "1.21" -name: CivilCore -version: 0.1.0 -main: rip.iwakura.civil.Core -authors: - - hex - - grng diff --git a/bin/main/rip/iwakura/civil/Core.class b/bin/main/rip/iwakura/civil/Core.class deleted file mode 100644 index 62d9a58d95981dd832db10e3b8df8da70ac3cfd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7697 zcmb_h2Xq|O6}?ZAHS%h3k*lzc<*s6DTre1~3$iR?o0VK7%NRpov^$c=+Q#fkSdfG? z(jdJ;dUblRgJmxS(gPuc6w(u?L3-~U=l+?|7Vk=4pTjvivors{_x`K*zyI~fQ};ax zpiQ=Es1VF{?4)7eYz_`NrV+M>?Wob7a4Zc~f<*~uz~~zq9JJF$GCDM1$BiTAuxae# zV~_hSsEL?qv(HRfg889hS=;^Dpg@b*sc^!H2W_-ZtPCIsdV4~G~$dpra zG8SQphQ)%`ao6onI59JAbeSB?qDreph-icVEMS~ z7HF!Y87+cI;RF{K>}@>nidj`B@9EFT81Z-?%szt{ZY$do1SZS3(f|*>!g^T=zts&l_Vq=3+u3g7=FsZ6NOUF;ZoKAv6p6-$14JucRBN5Xu zleXcao=sfYpCalN`=cylYOtI5-mu+6W(6U86*TM<43xlx@%8mfw5)>hh{jN^7CkBz z_H!#zWjvvkDxgE@!>W3hxVlV8O?a*=b_>Bj#e7wW-8mMB(9;Oo+-?FLN5fW91uLcD zdciC=S5r4djqbgn>|6kX8+6RZoXLDMb!e!mMHt+dxgTCNE~YWswi&f=u^evLCiiP@ zDR#WTsohx;9sL;KR_anJ8dVAtWX1&vC-8(}>o|fzE|FywY$&tZifTB37!n%dg8E`y z@RL+W5;qZdR1~uj+*oD=i&kvvRo+kOn1pJDN<%t^akB?DDo0q?^jEPmc_5|8f&q-+ zRt>iZE-oe>>yUIj3(po@L?CO6`mF%_i}mMG-d(^)yj+7+i`(!#4bNp0;#!rR(eZq| zfK_d$Ep9KWSZ0smrAxEZA7}V($BQ+*h;@>aFgB~>C3q?Kq_~?jg^0Vm?}!yn)8;$y zat(J1rss8I+uUYS$1CtkW(7_4S{`nSB@m@){64N0uf}UNyoUW(p7erVPsi)R;ya(^~{1jp@tfb8^h*p%N?8gjmHdupW zM9LjjG@59*IpIVjiy97C4W?r?^d%B$5;hDaTU%QL_y9hn;e&KuF0_TBbbJ^eVSw#; ze}WiQDmcAL#gFN@NA=9pQ|7R>-Rd`oqU`?S{q}%{6M`8z`E8D4j;Q86fa931>guG9 z$p|PZr*xb~#xvC87ObP8d7%xvLU~4Ux4C{hY8hAY;Zgg;wEupAK6W5!9de=pJb+JX zcu-(mpfDYu!lylzyrx(6FU31XiC#lh`)Acz;&XykC0I%ThI?R8X!8X;tl=TSoSfsb zfw6|IsE#k<5hho6M{mbI_7?S?MsDdA5VHQR!=pOBteT?$3(ZGE75lH~_$t1}dLT!x z@=C}kVJ@S72Oih)4SbX5GPi)$xvYb4992<_ojDgY=BGvhW3Y)D#&AaY|A#zjmO@Y8+co&HCz_phq&1xwwBm~O zr#hZcxvw$h;zTkHKck|>xE)T!VrD#&G86&_@FdQtRQ{!oU*Xrxe7YuN_gmqSaMa3r zr;XmR6GqZZT23tN{f?ciqhr(t107HEpzCvYsLwIqO~!BWdkw!6Y%W)jw;L6THH}BoI=BPc%#g*zvG`8{&4|*Diq{9T*trgZyqWfYk=5gIc_lgMFe*? zmaXo1P79VTVPb<--V6S#<9~R{hb_w)RwX&Buq4_4aX45jz~h=o;r{GRYEsDqNO8)$ ziJ3BXCG5EGf`C-WB-WZ#vqnlqcdWZ%U9#+@MwiJFaIZ%4{K+Ef=s%!5N<5*gVYf!0_Bgo#%+!v|{qmfZJ~g zcrQ$GR$bJL^+n93s|CqYPAjA@J3+i0bxgO$ zB)n`=8=gPTD-&u$HY1ieqOP!VoN33h2p_8Bjr!DGybEM$ERdzTER*F7m8YAkqpgh> zCMLfr@3z#XWewGE_Y6Vk>5M9y_`(}Xg0bIF-ug7Iv#D5?Z&037eMhF;tJXkwV#oJhMkq0WoBaCaj3XZtLS--q`VB?#f2UtrilR{brbF zmJwan$~qQaEH@;0G{4pIIX&TC{il|O5{bc~WQp65ygsLZQEh7Zf(iG}*{@dndaj zr#)(>QdUZnEj$w!1+Y{YG`Ui6$;6~=biJ7IR*gLb`-w{a@-WUfHfX4Ee|d=DS1sQw zpmUB*9j5R(l_Lg!xzS-#^C?U_?vkjsL=ge=F@sOtBfw0|;ulK^bNE!u51`6j^ibX0 z)42Eq8Zua3!DGRS6IfZ5!P-jop220Jep^PdkyLe8@{z$dmu}_Q%L!bS$6M+0x^wq% znF=VCnrQ{Fgw`#^G%TZX%lWnfEokIjY7^Q>v7g`9l18cB;Hl=T4IIKw>~c*xgsTyv zRAox1Z^{#ttNb@IktuauwDC0d&^%AYeDgA3k62`2p0VTFc#ffK>2aWy3K=wXH4R4@;qbO_m zu5l#X+_G{M&+KZx7dN(?MjwN7xB{bya=>Bq(xW(fSes z_w(hW&G+N@!BhD7N!-iVk%Jr?t-Eg&pJ1JR<|LeB{2!lUIDya8wO<;=W2f=;<_x}7 z0n*0~lI#a3aifZb%lad-j^Zcx<4HC3bH)3M6ZlQbefSfQ!QU#uk^f|HR(Qm(IH*E) zN~)SOq7}^4l3Ok+8lIwtr+LH2Y2949YBhc8#cGRN>^m8;tBD+)oZZ9uy-dA**otmm z=J)a%`T!z0$m8K5-mKk#yKo~fK1@8sDCUy$VLygzFh{0K9akc~%#fLUQ&HkST$7CD zoM{0C${bWE(?j l+( Date: Sat, 26 Apr 2025 19:02:05 +0200 Subject: [PATCH 07/10] feat: docker compose file for db testing --- docker-compose.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..93ceec2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3' +services: + civil_test_db: + environment: + - POSTGRES_PASSWORD=TEST123 + image: docker.io/postgres:16.3 + ports: + - 127.0.0.1:5432:5432 From d0e6f470c852e4e654504b2a2a17d10169896f12 Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 26 Apr 2025 19:04:41 +0200 Subject: [PATCH 08/10] feat: spawn command & fix version (2.1.1) --- build.gradle.kts | 2 +- src/main/java/rip/iwakura/civil/Core.java | 11 +++ .../rip/iwakura/civil/commands/Spawn.java | 72 +++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 src/main/java/rip/iwakura/civil/commands/Spawn.java diff --git a/build.gradle.kts b/build.gradle.kts index 3a1fbe7..79c11f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ group = "rip.iwakura" -version = "0.1.0" +version = "2.1.1" plugins { java diff --git a/src/main/java/rip/iwakura/civil/Core.java b/src/main/java/rip/iwakura/civil/Core.java index c2b5fd1..f31c471 100644 --- a/src/main/java/rip/iwakura/civil/Core.java +++ b/src/main/java/rip/iwakura/civil/Core.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.logging.Level; import org.bukkit.Bukkit; +import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; @@ -21,6 +22,7 @@ import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import rip.iwakura.civil.events.ChatHandler; import rip.iwakura.civil.events.TeamChatHandler; +import rip.iwakura.civil.commands.Spawn; import rip.iwakura.civil.commands.Team; import rip.iwakura.civil.events.JoinHandler; import rip.iwakura.civil.types.CivilPlayer; @@ -71,6 +73,13 @@ public class Core extends JavaPlugin { } } + public Location getSpawn() { + return new Location(Bukkit.getWorld(getConfig().getString("spawn.world")), + getConfig().getDouble("spawn.x"), getConfig().getDouble("spawn.y"), + getConfig().getDouble("spawn.z"), (float) getConfig().getDouble("spawn.yaw"), + (float) getConfig().getDouble("spawn.pitch")); + }; + @Override public void onEnable() { getLogger().info("Hello world! We are booting up..."); @@ -90,9 +99,11 @@ public class Core extends JavaPlugin { discord.connect(getConfig().getString("discord.token")); Team teamCommand = new Team(this); + Spawn spawnCommand = new Spawn(this); this.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> { commands.registrar().register(teamCommand.getCommand()); + commands.registrar().register(spawnCommand.getCommand()); }); getServer().getPluginManager().registerEvents(new JoinHandler(database), this); diff --git a/src/main/java/rip/iwakura/civil/commands/Spawn.java b/src/main/java/rip/iwakura/civil/commands/Spawn.java new file mode 100644 index 0000000..7ccbe63 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/commands/Spawn.java @@ -0,0 +1,72 @@ +package rip.iwakura.civil.commands; + +import java.sql.SQLException; +import java.text.Format; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.checkerframework.common.reflection.qual.GetConstructor; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.arguments.LongArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.tree.LiteralCommandNode; + +import io.papermc.paper.command.brigadier.CommandSourceStack; +import io.papermc.paper.command.brigadier.Commands; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.kyori.adventure.text.minimessage.translation.MiniMessageTranslator; +import rip.iwakura.civil.Core; +import rip.iwakura.civil.Database; +import rip.iwakura.civil.exceptions.InvalidChannelException; +import rip.iwakura.civil.types.*; + +public class Spawn { + private Core core; + + public Spawn(Core core) { + this.core = core; + } + + public LiteralCommandNode getCommand() { + return Commands.literal("spawn") + .requires(ctx -> ctx.getSender() instanceof Player) + .executes(ctx -> { + Player p = (Player) ctx.getSource().getSender(); + + if (!core.getConfig().contains("spawn")) { + p.sendMessage(MiniMessage.miniMessage().deserialize("The spawn has not been set yet.")); + return 0; + } + + p.teleport(core.getSpawn()); + + return Command.SINGLE_SUCCESS; + }) + .then(Commands.literal("set").requires( + ctx -> ctx.getSender() instanceof Player && ctx.getSender().hasPermission("civil.spawn.set")) + .executes(ctx -> { + Player p = (Player) ctx.getSource().getSender(); + Location loc = p.getLocation(); + + core.getConfig().set("spawn.world", loc.getWorld().getName()); + core.getConfig().set("spawn.x", loc.x()); + core.getConfig().set("spawn.y", loc.y()); + core.getConfig().set("spawn.z", loc.z()); + core.getConfig().set("spawn.yaw", loc.getYaw()); + core.getConfig().set("spawn.pitch", loc.getPitch()); + + p.sendMessage(MiniMessage.miniMessage().deserialize("Set the server spawn to your current position.")); + + return Command.SINGLE_SUCCESS; + })) + .build(); + } + +} From 42108267154b984beb71dacd55dbc92507323b6c Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 26 Apr 2025 19:37:23 +0200 Subject: [PATCH 09/10] fix: tp to spawn on respawn & save config --- src/main/java/rip/iwakura/civil/Core.java | 2 ++ .../rip/iwakura/civil/commands/Spawn.java | 4 ++++ .../iwakura/civil/events/RespawnHandler.java | 23 +++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 src/main/java/rip/iwakura/civil/events/RespawnHandler.java diff --git a/src/main/java/rip/iwakura/civil/Core.java b/src/main/java/rip/iwakura/civil/Core.java index f31c471..04c8cae 100644 --- a/src/main/java/rip/iwakura/civil/Core.java +++ b/src/main/java/rip/iwakura/civil/Core.java @@ -25,6 +25,7 @@ import rip.iwakura.civil.events.TeamChatHandler; import rip.iwakura.civil.commands.Spawn; import rip.iwakura.civil.commands.Team; import rip.iwakura.civil.events.JoinHandler; +import rip.iwakura.civil.events.RespawnHandler; import rip.iwakura.civil.types.CivilPlayer; public class Core extends JavaPlugin { @@ -109,5 +110,6 @@ public class Core extends JavaPlugin { getServer().getPluginManager().registerEvents(new JoinHandler(database), this); getServer().getPluginManager().registerEvents(new ChatHandler(this), this); getServer().getPluginManager().registerEvents(new TeamChatHandler(this), this); + getServer().getPluginManager().registerEvents(new RespawnHandler(this), this); } } diff --git a/src/main/java/rip/iwakura/civil/commands/Spawn.java b/src/main/java/rip/iwakura/civil/commands/Spawn.java index 7ccbe63..af683cf 100644 --- a/src/main/java/rip/iwakura/civil/commands/Spawn.java +++ b/src/main/java/rip/iwakura/civil/commands/Spawn.java @@ -62,6 +62,10 @@ public class Spawn { core.getConfig().set("spawn.yaw", loc.getYaw()); core.getConfig().set("spawn.pitch", loc.getPitch()); + core.getServer().getWorld("world").setSpawnLocation(loc); + + core.saveConfig(); + p.sendMessage(MiniMessage.miniMessage().deserialize("Set the server spawn to your current position.")); return Command.SINGLE_SUCCESS; diff --git a/src/main/java/rip/iwakura/civil/events/RespawnHandler.java b/src/main/java/rip/iwakura/civil/events/RespawnHandler.java new file mode 100644 index 0000000..45c2202 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/events/RespawnHandler.java @@ -0,0 +1,23 @@ +package rip.iwakura.civil.events; +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.player.PlayerRespawnEvent; + +import rip.iwakura.civil.Core; + +public class RespawnHandler implements Listener { + private Core core; + + public RespawnHandler(Core core) { + this.core = core; + } + + @EventHandler + public void respawnEvent(PlayerRespawnEvent ev) { + if (ev.isBedSpawn()) return; + + ev.setRespawnLocation(core.getSpawn()); + } +} From cbc3552d1504ed9dcab75490a981debbd216eb60 Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 18 May 2025 20:25:11 +0200 Subject: [PATCH 10/10] add: team info --- .../java/rip/iwakura/civil/commands/Team.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/main/java/rip/iwakura/civil/commands/Team.java b/src/main/java/rip/iwakura/civil/commands/Team.java index fb56dc4..7242f20 100644 --- a/src/main/java/rip/iwakura/civil/commands/Team.java +++ b/src/main/java/rip/iwakura/civil/commands/Team.java @@ -1,5 +1,6 @@ package rip.iwakura.civil.commands; +import java.util.List; import java.sql.SQLException; import java.text.Format; @@ -188,12 +189,42 @@ public class Team { }))); }; + // List team info. + private LiteralArgumentBuilder getTeamInfo() { + return Commands.literal("info") + .then( + Commands.argument("team", new TeamArgument(database)) + .executes(ctx -> { + try { + CivilTeam civilTeam = ctx.getArgument("team", CivilTeam.class); + CommandSender sender = ctx.getSource().getSender(); + + String finalMessage = String.format( + "Team: %s\nPrefix: %s\nPlayers:", + civilTeam.getName(), civilTeam.getPrefix()); + + List members = database.getAllPlayers(civilTeam); + + for (CivilPlayer member : members) + finalMessage += " " + member.getName(); + + sender.sendMessage(MiniMessage.miniMessage().deserialize(finalMessage)); + + return Command.SINGLE_SUCCESS; + } catch (SQLException e) { + e.printStackTrace(); + return -1; + } + })); + }; + public LiteralCommandNode getCommand() { return Commands.literal("team") .then(createTeam()) .then(joinTeam()) .then(teamChat()) .then(homeCommand()) + .then(getTeamInfo()) .build(); }