diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..abad418 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,48 @@ +name: build +on: + push: + branches: + - master +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout repository + uses: actions/checkout@v2 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk 8.0 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 8.0 + - name: make gradle wrapper executable + run: chmod +x ./gradlew + # 第一次构建 + - name: build + continue-on-error: true + id: build_1 + run: ./gradlew build + # 第二次构建 + - name: build (retry 1) + continue-on-error: true + id: build_2 + if: steps.build_1.outcome == 'failure' + run: ./gradlew build + # 第三次构建 + - name: build (retry 2) + continue-on-error: true + id: build_3 + if: steps.build_2.outcome == 'failure' + run: ./gradlew build + # 第四次构建 + - name: build (retry 3) + id: build_4 + if: steps.build_3.outcome == 'failure' + run: ./gradlew build + # 上传构建文件 + - name: capture build artifacts + uses: actions/upload-artifact@v2 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..16fc6a7 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,24 @@ +name: Project Release +on: + release: + types: [ published ] +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout repository + uses: actions/checkout@v2 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk 8.0 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 8.0 + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + run: ./gradlew publish -PtaboolibUsername=$NEXUS_USERNAME -PtaboolibPassword=$NEXUS_PASSWORD diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f8baeaf --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.gradle +.idea +build +bin \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..0f859cf --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +# Building + +* [Gradle](https://gradle.org/) - Dependency Management + +The GradleWrapper in included in this project. + +**Windows:** + +``` +gradlew.bat clean build +``` + +**macOS/Linux:** + +``` +./gradlew clean build +``` + +Build artifacts should be found in `./build/libs` folder. \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..8ea8a84 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,69 @@ +plugins { + `java-library` + `maven-publish` + id("io.izzel.taboolib") version "1.56" + id("org.jetbrains.kotlin.jvm") version "1.5.10" +} + +taboolib { + install("common") + install("common-5") + install("module-chat") + install("module-configuration") + install("module-kether") + install("module-effect") + install("module-lang") + install("platform-bukkit") + install("expansion-command-helper") + classifier = null + version = "6.0.12-69" +} + +repositories { + mavenCentral() +} + +dependencies { + compileOnly("ink.ptms:nms-all:1.0.0") + compileOnly("ink.ptms.core:v11902:11902-minimize:mapped") + compileOnly("ink.ptms.core:v11902:11902-minimize:universal") + compileOnly(kotlin("stdlib")) + compileOnly(fileTree("libs")) +} + +tasks.withType { + options.encoding = "UTF-8" +} + +tasks.withType { + kotlinOptions { + jvmTarget = "1.8" + freeCompilerArgs = listOf("-Xjvm-default=all") + } +} + +configure { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +publishing { + repositories { + maven { + url = uri("https://repo.tabooproject.org/repository/releases") + credentials { + username = project.findProperty("taboolibUsername").toString() + password = project.findProperty("taboolibPassword").toString() + } + authentication { + create("basic") + } + } + } + publications { + create("library") { + from(components["java"]) + groupId = project.group.toString() + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7123e49 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +group=kim.hhhhhy.regions +version=1.0.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..94336fc Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..fe753c9 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..24a282f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name="RegionActionsLite" \ No newline at end of file diff --git a/src/main/kotlin/kim/hhhhhy/regions/RegionActionsLite.kt b/src/main/kotlin/kim/hhhhhy/regions/RegionActionsLite.kt new file mode 100644 index 0000000..0d804ae --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/RegionActionsLite.kt @@ -0,0 +1,37 @@ +package kim.hhhhhy.regions + +import kim.hhhhhy.regions.data.AreaSettings +import kim.hhhhhy.regions.data.ConfigSettings +import taboolib.common.LifeCycle +import taboolib.common.platform.Awake +import taboolib.common.platform.Plugin +import taboolib.common.platform.function.info + +object RegionActionsLite : Plugin() { + + override fun onEnable() { + info("区域命令!") + } + + fun reload() { + ConfigSettings.reloadConfig() + AreaSettings.reloadArea() + } + + @Awake(LifeCycle.ENABLE) + fun init() { + reload() + } + + @Awake(LifeCycle.ACTIVE) + fun autoReload() { + ConfigSettings.config.onReload { + info("检测到 config.yml 变动") + ConfigSettings.reloadConfig() + } + + AreaSettings.areasConfig.onReload { + AreaSettings.reloadArea() + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/kim/hhhhhy/regions/command/MainCommand.kt b/src/main/kotlin/kim/hhhhhy/regions/command/MainCommand.kt new file mode 100644 index 0000000..39b477b --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/command/MainCommand.kt @@ -0,0 +1,22 @@ +package kim.hhhhhy.regions.command + +import kim.hhhhhy.regions.RegionActionsLite +import org.bukkit.command.CommandSender +import taboolib.common.platform.command.CommandBody +import taboolib.common.platform.command.CommandHeader +import taboolib.common.platform.command.subCommand +import taboolib.platform.util.sendInfo + +@CommandHeader("regionactionslite", + aliases = ["ral", "ra"], + permission = "regionactions.command.*" +) +object MainCommand { + @CommandBody(permission = "regionactions.command.reload") + val reload = subCommand { + execute { sender, _, _-> + RegionActionsLite.reload() + sender.sendInfo("plugin-reload") + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/kim/hhhhhy/regions/data/AreaSettings.kt b/src/main/kotlin/kim/hhhhhy/regions/data/AreaSettings.kt new file mode 100644 index 0000000..1f435a8 --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/data/AreaSettings.kt @@ -0,0 +1,108 @@ +package kim.hhhhhy.regions.data + +import kim.hhhhhy.regions.data.area.AreaActions +import kim.hhhhhy.regions.data.area.AreaPosition +import kim.hhhhhy.regions.data.area.AreaType +import kim.hhhhhy.regions.data.area.AreaType.* +import kim.hhhhhy.regions.utils.evalKether +import org.bukkit.Location +import org.bukkit.entity.Player +import taboolib.common.platform.function.console +import taboolib.common.platform.function.info +import taboolib.common5.mirrorNow +import taboolib.module.configuration.Config +import taboolib.module.configuration.Configuration +import taboolib.module.lang.sendInfo +import java.util.concurrent.ConcurrentHashMap + + +data class AreaSettings( + val position: AreaPosition, + val actions: AreaActions +) { + companion object { + @Config("areas.yml", autoReload = true) + lateinit var areasConfig: Configuration + private set + + private val areasData = ConcurrentHashMap() + + fun reloadArea() { + areasData.clear() + val section = areasConfig.getConfigurationSection("Areas") ?: return + section.getKeys(false).forEach { id -> + val root = section.getConfigurationSection(id)!! + val position = AreaPosition(root.getConfigurationSection("position") ?: error("缺少坐标设置")) + val actions = AreaActions(root.getConfigurationSection("actions")) + areasData[id] = AreaSettings(position, actions) + } + console().sendInfo("plugin-areas-reload") + } + + fun getAreas(location: Location): List { + val x = location.x + val y = location.y + val z = location.z + /** + * xMax=-500.0, yMax=0.0, zMax=340.0, xMin=-510.0, yMin=110.0, zMin=350.0) + */ + return areasData.filter { + it.value.position.world == location.world?.name + && (x in it.value.position.xMax .. it.value.position.xMin || x in it.value.position.xMin .. it.value.position.xMax) + && (y in it.value.position.yMax .. it.value.position.yMin || y in it.value.position.yMin .. it.value.position.yMax) + && (z in it.value.position.zMax .. it.value.position.zMin || z in it.value.position.zMin .. it.value.position.zMax) + }.map { it.key } + + } + + private fun runEnterAction(player: Player, id: String) { + mirrorNow("RegionActionsLite:Actions:Enter") { + val actions = areasData[id]!!.actions.enter + if (ConfigSettings.baffleCache.hasNext("${player.name}-Enter").not()) { + return@mirrorNow + } + actions?.evalKether(player) + } + } + private fun runLeaveAction(player: Player, id: String) { + mirrorNow("RegionActionsLite:Actions:Leave") { + val actions = areasData[id]!!.actions.leave + if (ConfigSettings.baffleCache.hasNext("${player.name}-Leave").not()) { + return@mirrorNow + } + actions?.evalKether(player) + } + } + private fun runTickAction(player: Player, id: String) { + mirrorNow("RegionActionsLite:Actions:Tick") { + val actions = areasData[id]!!.actions.tick + if (ConfigSettings.baffleCache.hasNext("${player.name}-Tick").not()) { + return@mirrorNow + } + actions?.evalKether(player) + } + } + + /** + * 执行一次区域类型动作 + */ + fun runActions(player: Player, id: String, type: AreaType) { + when (type) { + ENTER -> { + runEnterAction(player, id) + } + LEAVE -> { + runLeaveAction(player, id) + } + TICK -> { + runTickAction(player, id) + } + ALL -> { + runEnterAction(player, id) + runLeaveAction(player, id) + runTickAction(player, id) + } + } + } + } +} diff --git a/src/main/kotlin/kim/hhhhhy/regions/data/ConfigSettings.kt b/src/main/kotlin/kim/hhhhhy/regions/data/ConfigSettings.kt new file mode 100644 index 0000000..cc44fd1 --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/data/ConfigSettings.kt @@ -0,0 +1,45 @@ +package kim.hhhhhy.regions.data + +import kim.hhhhhy.regions.data.area.AreaType +import kim.hhhhhy.regions.listeners.AreaListener +import org.bukkit.Bukkit +import taboolib.common.LifeCycle +import taboolib.common.platform.Awake +import taboolib.common.platform.function.console +import taboolib.common.platform.function.submitAsync +import taboolib.common5.Baffle +import taboolib.module.configuration.Config +import taboolib.module.configuration.Configuration +import taboolib.module.lang.sendInfo +import java.util.concurrent.TimeUnit + +object ConfigSettings { + + @Config(autoReload = true) + lateinit var config: Configuration + private set + + private var cooldown: Long = 3000 + + var baffleCache = Baffle.of(cooldown, TimeUnit.MILLISECONDS) + + private var actionTick: Long = 20 + + fun reloadConfig() { + cooldown = config.getLong("CommandBaffle.time", 3000) + actionTick = config.getLong("AreaSettings.TickAction", 20) + console().sendInfo("plugin-config-reload") + } + + @Awake(LifeCycle.ACTIVE) + fun runTickAction() { + submitAsync(now = false, period = actionTick) { + AreaListener.playerSet.forEach { (player, id) -> + Bukkit.getPlayerExact(player)?.let { p -> + AreaSettings.runActions(p, id, AreaType.TICK) + } + } + } + } + +} diff --git a/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaActions.kt b/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaActions.kt new file mode 100644 index 0000000..bf53e2f --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaActions.kt @@ -0,0 +1,16 @@ +package kim.hhhhhy.regions.data.area + +import taboolib.library.configuration.ConfigurationSection + +data class AreaActions( + val enter: String?, + val leave: String?, + val tick: String? +){ + constructor(section: ConfigurationSection?): this( + section?.getString("enter"), + section?.getString("leave"), + section?.getString("tick") + ) + +} diff --git a/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaPosition.kt b/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaPosition.kt new file mode 100644 index 0000000..e6e9e82 --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaPosition.kt @@ -0,0 +1,38 @@ +package kim.hhhhhy.regions.data.area + +import taboolib.common5.cdouble +import taboolib.library.configuration.ConfigurationSection + +data class AreaPosition( + val world: String, + val xMax: Double, + val yMax: Double, + val zMax: Double, + val xMin: Double, + val yMin: Double, + val zMin: Double, +) { + constructor(section: ConfigurationSection): this( + section.getString("world")!!, + section.getPosition("xMax"), + section.getPosition("yMax"), + section.getPosition("zMax"), + section.getPosition("xMin"), + section.getPosition("yMin"), + section.getPosition("zMin") + ) + companion object { + + private fun ConfigurationSection.getPosition(value: String): Double { + return when (value) { + "xMax" -> getString("max")!!.replace(" ", "").split(",").getOrElse(0) { 0 }.cdouble + "yMax" -> getString("max")!!.replace(" ", "").split(",").getOrElse(1) { 0 }.cdouble + "zMax" -> getString("max")!!.replace(" ", "").split(",").getOrElse(2) { 0 }.cdouble + "xMin" -> getString("min")!!.replace(" ", "").split(",").getOrElse(0) { 0 }.cdouble + "yMin" -> getString("min")!!.replace(" ", "").split(",").getOrElse(1) { 0 }.cdouble + "zMin" -> getString("min")!!.replace(" ", "").split(",").getOrElse(2) { 0 }.cdouble + else -> 0.0 + } + } + } +} diff --git a/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaType.kt b/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaType.kt new file mode 100644 index 0000000..ee36065 --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/data/area/AreaType.kt @@ -0,0 +1,5 @@ +package kim.hhhhhy.regions.data.area + +enum class AreaType { + ENTER, LEAVE, TICK, ALL +} \ No newline at end of file diff --git a/src/main/kotlin/kim/hhhhhy/regions/listeners/AreaListener.kt b/src/main/kotlin/kim/hhhhhy/regions/listeners/AreaListener.kt new file mode 100644 index 0000000..c5ca3f7 --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/listeners/AreaListener.kt @@ -0,0 +1,70 @@ +package kim.hhhhhy.regions.listeners + +import kim.hhhhhy.regions.data.AreaSettings +import kim.hhhhhy.regions.data.area.AreaType +import org.bukkit.event.player.PlayerMoveEvent +import org.bukkit.event.player.PlayerQuitEvent +import taboolib.common.platform.event.SubscribeEvent +import taboolib.common.platform.function.info + +object AreaListener { + val playerSet = mutableSetOf>() + + /*** + * 玩家进入区域前 + * playerSet 没有该玩家 to 区域id + * areas 不为空 + * 玩家进入区域后 + * playerSet 添加该玩家 to 区域id + * 执行区域id Kether enter + * 玩家退出区域 + * playerSet 有该玩家 to 区域id + * areas不包括该玩家的区域id + * 执行区域id Kether leave + */ + @SubscribeEvent + fun onPlayerMove(e: PlayerMoveEvent) { + val to = e.to ?: return + val player = e.player + val areas = AreaSettings.getAreas(to) + + if (areas.isNotEmpty()) { + + // 退出某个区域 + val filter = playerSet.filter { it.first == player.name && it !in areas.map { id -> player.name to id }.toSet() } + if (filter.isNotEmpty()) { + filter.forEach { (name, id) -> + if (playerSet.remove(name to id)) { + AreaSettings.runActions(player, id, AreaType.LEAVE) + } + } + } + + // 进入区域 + areas.forEach { + if (playerSet.add(player.name to it)) { + AreaSettings.runActions(player, it, AreaType.ENTER) + } + } + } else { + + // 退出所有区域 + val filter = playerSet.filter { it.first == player.name } + + if (filter.isNotEmpty()) { + filter.forEach { (name, id) -> + if (playerSet.remove(name to id)) { + AreaSettings.runActions(player, id, AreaType.LEAVE) + } + } + } + } + + } + + @SubscribeEvent + fun onPlayerQuit(e: PlayerQuitEvent) { + playerSet.removeAll { it.first == e.player.name } + } + +} \ No newline at end of file diff --git a/src/main/kotlin/kim/hhhhhy/regions/utils/KetherUtils.kt b/src/main/kotlin/kim/hhhhhy/regions/utils/KetherUtils.kt new file mode 100644 index 0000000..9db6099 --- /dev/null +++ b/src/main/kotlin/kim/hhhhhy/regions/utils/KetherUtils.kt @@ -0,0 +1,65 @@ +package kim.hhhhhy.regions.utils + +import org.bukkit.entity.Player +import taboolib.common.platform.function.console +import taboolib.common5.Coerce +import taboolib.module.kether.KetherShell +import taboolib.module.kether.ScriptFrame +import taboolib.module.kether.ScriptOptions +import taboolib.module.kether.script +import java.util.concurrent.CompletableFuture + + +fun ScriptFrame.getBukkitPlayer(): Player { + return script().sender?.castSafely() ?: error("No player selected.") +} + +fun List.evalKether(player: Player?, vars: Map = mapOf()): CompletableFuture { + return KetherShell.eval(this, ScriptOptions.builder().apply { + namespace(listOf("adyeshach", "adyeshach-inner", "chemdah", "taboo-public-work")) + sender(player ?: console()) + vars(vars) + }.build()) +} + +fun String.evalKether(player: Player?, vars: Map = mapOf()): CompletableFuture { + return KetherShell.eval(this, ScriptOptions.builder().apply { + namespace(listOf("adyeshach", "adyeshach-inner", "chemdah", "taboo-public-work")) + sender(player ?: console()) + vars(vars) + }.build()) +} + +fun String.evalKetherBoolean(player: Player?, vars: Map = mapOf()): Boolean { + if (this.isEmpty()) { + return true + } + return try { + KetherShell.eval(this, ScriptOptions.builder().apply { + namespace(listOf("adyeshach", "adyeshach-inner", "chemdah", "taboo-public-work")) + sender(player ?: console()) + vars(vars) + }.build()).thenApply { + Coerce.toBoolean(it) + }.get() + } catch (_: Exception) { + false + } +} + +fun List.evalKetherBoolean(player: Player?, vars: Map = mapOf()): Boolean { + if (this.isEmpty()) { + return true + } + return try { + KetherShell.eval(this, ScriptOptions.builder().apply { + namespace(listOf("adyeshach", "adyeshach-inner", "chemdah", "taboo-public-work")) + sender(player ?: console()) + vars(vars) + }.build()).thenApply { + Coerce.toBoolean(it) + }.get() + } catch (_: Exception) { + false + } +} diff --git a/src/main/resources/areas.yml b/src/main/resources/areas.yml new file mode 100644 index 0000000..ef20fe7 --- /dev/null +++ b/src/main/resources/areas.yml @@ -0,0 +1,23 @@ +Areas: + def1: + position: + world: "world" + max: "0, 0, 0" + min: "10,10,10" + actions: + enter: |- + tell "进入区域" + leave: |- + tell "离开区域" + tick: |- + tell "在该区域" + def2: + position: + world: "world" + min: "5,10,5" + max: "0,0,0" + actions: + enter: |- + tell "进入区域2" + leave: |- + tell "离开区域2" \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..8e2eaba --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,9 @@ +# 触发冷却 +CommandBaffle: + # 毫秒 + time: 3000 + +AreaSettings: + # 区域内持续执行 + # Tick / 次 + TickAction: 20 \ No newline at end of file diff --git a/src/main/resources/lang/zh_CN.yml b/src/main/resources/lang/zh_CN.yml new file mode 100644 index 0000000..403c1e6 --- /dev/null +++ b/src/main/resources/lang/zh_CN.yml @@ -0,0 +1,5 @@ +prefix: "&8[&fRegion Actions Lite&8]" + +plugin-reload: "插件已重载" +plugin-config-reload: "config.yml 配置已重载" +plugin-areas-reload: "areas.yml 配置已重载"