From c07870ac8b57fdaebd172cd5f2d0a96c1e638722 Mon Sep 17 00:00:00 2001 From: Samuel Voeller <12182390+xCykrix@users.noreply.github.com> Date: Wed, 14 Aug 2024 18:58:06 -0400 Subject: [PATCH 1/4] refactor: update code --- .editorconfig | 34 --- .gitattributes | 82 ------ .github/ISSUE_TEMPLATE/blank-issue.md | 13 - .github/ISSUE_TEMPLATE/bug-report.md | 31 --- .github/ISSUE_TEMPLATE/config.yml | 10 - .github/ISSUE_TEMPLATE/enhancement-request.md | 28 -- .github/ISSUE_TEMPLATE/security-concern.md | 31 --- .github/PULL_REQUEST_TEMPLATE.md | 49 ---- .github/settings.yml | 85 ------ .github/stale.yml | 23 -- .github/workflows/compile.yml | 29 -- .gitignore | 27 +- .vscode/settings.json | 4 - LICENSE | 15 -- README.md | 60 ----- build.gradle | 47 ++++ gradle.properties | 0 gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++++++++++++++++++ gradlew.bat | 92 +++++++ pom.xml | 110 -------- settings.gradle | 1 + .../xcykrix/dynamiclights/DynamicLights.java | 45 ---- .../module/DynamicLightCommand.java | 96 ------- .../module/events/PlayerHandlerEvent.java | 58 ---- .../dynamiclights/util/LightManager.java | 221 ---------------- .../dynamiclights/util/LightSources.java | 84 ------ .../xCykrix/dynamicLights/DynamicLights.java | 37 +++ src/main/resources/config.yml | 2 +- src/main/resources/language.yml | 16 +- src/main/resources/lights.yml | 44 ++-- src/main/resources/plugin.yml | 26 +- 33 files changed, 493 insertions(+), 1163 deletions(-) delete mode 100644 .editorconfig delete mode 100644 .gitattributes delete mode 100644 .github/ISSUE_TEMPLATE/blank-issue.md delete mode 100644 .github/ISSUE_TEMPLATE/bug-report.md delete mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/enhancement-request.md delete mode 100644 .github/ISSUE_TEMPLATE/security-concern.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .github/settings.yml delete mode 100644 .github/stale.yml delete mode 100644 .github/workflows/compile.yml delete mode 100644 .vscode/settings.json delete mode 100644 LICENSE delete mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle.properties 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 delete mode 100644 pom.xml create mode 100644 settings.gradle delete mode 100644 src/main/java/com/github/xcykrix/dynamiclights/DynamicLights.java delete mode 100644 src/main/java/com/github/xcykrix/dynamiclights/module/DynamicLightCommand.java delete mode 100644 src/main/java/com/github/xcykrix/dynamiclights/module/events/PlayerHandlerEvent.java delete mode 100644 src/main/java/com/github/xcykrix/dynamiclights/util/LightManager.java delete mode 100644 src/main/java/com/github/xcykrix/dynamiclights/util/LightSources.java create mode 100644 src/main/java/github/xCykrix/dynamicLights/DynamicLights.java diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index f7b855d..0000000 --- a/.editorconfig +++ /dev/null @@ -1,34 +0,0 @@ -# http://editorconfig.org -root = true - -[*] -indent_style = space -indent_size = 4 -charset = utf-8 -end_of_line = lf -trim_trailing_whitespace = true -insert_final_newline = true - -[*.sh] -shell_variant = bash -binary_next_line = true -switch_case_indent = true -space_redirects = true -keep_padding = true -function_next_line = true -never_split = true - -[.github/**] -ignore = true - -[.rc/**] -ignore = true - -[.git/**] -ignore = true - -[.vscode/**] -ignore = true - -[.idea/**] -ignore = true diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index b1505fd..0000000 --- a/.gitattributes +++ /dev/null @@ -1,82 +0,0 @@ -# Common settings that generally should always be used with your language specific settings - -# Auto detect text files and perform LF normalization -* text=auto - -# -# The above will handle all files NOT found below -# - -# Documents -*.bibtex text diff=bibtex -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain -*.md text diff=markdown -*.mdx text diff=markdown -*.tex text diff=tex -*.adoc text -*.textile text -*.mustache text -*.csv text -*.tab text -*.tsv text -*.txt text -*.sql text - -# Graphics -*.png binary -*.jpg binary -*.jpeg binary -*.gif binary -*.tif binary -*.tiff binary -*.ico binary -# SVG treated as text by default. -*.svg text -# If you want to treat it as binary, -# use the following line instead. -# *.svg binary -*.eps binary - -# Scripts -*.bash text eol=lf -*.fish text eol=lf -*.sh text eol=lf -*.zsh text eol=lf -# These are explicitly windows files and should use crlf -*.bat text eol=crlf -*.cmd text eol=crlf -*.ps1 text eol=crlf - -# Serialisation -*.json text -*.toml text -*.xml text -*.yaml text -*.yml text - -# Archives -*.7z binary -*.gz binary -*.tar binary -*.tgz binary -*.zip binary - -# Text files where line endings should be preserved -*.patch -text - -# -# Exclude files from exporting -# - -.gitattributes export-ignore -.gitignore export-ignore -.gitkeep export-ignore diff --git a/.github/ISSUE_TEMPLATE/blank-issue.md b/.github/ISSUE_TEMPLATE/blank-issue.md deleted file mode 100644 index 36ba99b..0000000 --- a/.github/ISSUE_TEMPLATE/blank-issue.md +++ /dev/null @@ -1,13 +0,0 @@ ---- - -name: 'Blank Issue' -about: 'This template is used to create a blank issue without a template. Please use our templates where applicable.' -title: 'The title of your issue.' -ref: 'main' -labels: - - 'State: Conversation' - ---- - -We are assuming that you are an expert user. Please follow our templates unless -you know what you are doing. diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md deleted file mode 100644 index a443b94..0000000 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ /dev/null @@ -1,31 +0,0 @@ ---- - -name: 'Bug Report' -about: 'This template is used to report unintended behavior of our projects.' -title: '[BUG] A brief overview of your concern.' -ref: 'main' -labels: - - 'Type: Bug' - - 'State: Conversation' - ---- - -**Describe the Bug**: A clear and concise description of what is problematic. - -**Information / Steps to Reproduce**: - -1. Provide detailed steps on how to reproduce the issue. -2. Key aspects of how the environment was set up. -3. Code or repository that can be used to consistently reproduce the behavior. -4. Please include any and all errors that are generated. - -**Expected Behavior**: Please explain the behavior you expected the application -to implement. - -**Current Environment**: Please detail the specs and operating system of the -machine you are currently using. If possible, please replicate this issue across -multiple different operating systems. Please include the version of our project -that you are using. - -**Additional Context**: Please provide any additional information you feel -should be shared, if applicable. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 5baad47..0000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,10 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: Official Support - url: mailto:samuel.voeller@amethyst.live - about: For support, security concerns or violations of Code of Conduct. - - name: Security Reports - url: mailto:report@amethyst.live - - name: Community Live-Chat - url: https://discord.gg/5Z4FXY7 - about: Need faster help or have a small question? Join us on Discord! Get official and community support fast and effectively. diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md deleted file mode 100644 index 4236c34..0000000 --- a/.github/ISSUE_TEMPLATE/enhancement-request.md +++ /dev/null @@ -1,28 +0,0 @@ ---- - -name: 'Enhancement Request' -about: 'This template is used to request enhancements to be added in our projects.' -title: '[FEAT] A brief overview of your request.' -ref: 'main' -labels: - - 'Type: Enhancement' - - 'State: Conversation' - ---- - -**Describe the Request**: A clear and concise description of what you are -requesting. - -**Information**: - -1. How would you like to see this implemented? -2. How do you feel this will benefit the project? -3. Is there any existing functionality that may need changed to support this? -4. Will this functionality replace or otherwise deprecate existing - functionality? - -**Expected Behavior**: Please explain the behavior you are expecting the -application to implement. - -**Additional Context**: Please provide any additional information you feel -should be shared, if applicable. diff --git a/.github/ISSUE_TEMPLATE/security-concern.md b/.github/ISSUE_TEMPLATE/security-concern.md deleted file mode 100644 index cc5d2c1..0000000 --- a/.github/ISSUE_TEMPLATE/security-concern.md +++ /dev/null @@ -1,31 +0,0 @@ ---- - -name: 'Security Concern' -about: 'This template is used to report concerns over the security implementations in our projects.' -title: '[SEC] A brief overview of your concern.' -ref: 'main' -labels: - - 'Type: Infrastructure' - - 'Priority: Critical' - - 'State: Conversation' - ---- - -**Describe the Concern**: A clear and concise description of what is -problematic. - -**Information / Steps to Reproduce**: - -1. Provide detailed steps on how to reproduce the issue. -2. Key aspects of how the environment was set up. -3. Code or repository that can be used to consistently reproduce the behavior. -4. Please include any and all errors that are generated. - -**Expected Behavior**: Please explain the behavior you expected the application -to implement. - -**Mitigation**: Please explain how you believe that we can mitigate this concern -to prevent exploitation. - -**Additional Context**: Please provide any additional information you feel -should be shared, if applicable. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 0a7c83f..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,49 +0,0 @@ -# Pull Request - -## Summary and Information - - - -... - -Referencing Issue(s): # - -Fixing Issue(s): # - -## Summary of Testing - -To what extent did you test this pull request? Did any tests require -modification to result in a passing state (breaking changes)? - -I tested this PR by ... (description of testing methods) - -- [ ] Tests passed with no modification. -- [ ] Tests passed with modification. -- [ ] Tests are not currently passing. -- [ ] Tests need to be added to exist for the case covered in this issue. - -## Checklist for Integrity - -- [ ] The changes follow the style guidelines defined in the project. -- [ ] I have performed a self-review of my code, including testing intentionally - incorrect information. -- [ ] I have commented my code, particularly in hard to understand or complex - areas. -- [ ] The changes have not generated any new errors or warning by - static-analysis tooling. -- [ ] All dependant changes have been merged and published in downstream - modules. -- [ ] To the best of my knowledge, all information in this pull request is - vulnerability free and well researched. - - [ ] This pull request may require more research or analysis of complex logic - or technology. - - [ ] This pull request contains regular expression addition or modifications - which may need verification. - - [ ] This pull request contains database logic which may need verification of - proper user-input sterilization. diff --git a/.github/settings.yml b/.github/settings.yml deleted file mode 100644 index 3d2a18d..0000000 --- a/.github/settings.yml +++ /dev/null @@ -1,85 +0,0 @@ -repository: - security_and_analysis: - advanced_security: - status: enabled - secret_scanning: - status: enabled - - has_issues: true - has_projects: true - has_wiki: true - default_branch: main - - allow_squash_merge: true - allow_merge_commit: true - allow_rebase_merge: true - allow_auto_merge: false - delete_branch_on_merge: true - - enable_automated_security_fixes: true - enable_vulnerability_alerts: true - -labels: - - name: "Complexity: High" - color: "F9D0C4" - - name: "Complexity: Medium" - color: "FEF2C0" - - name: "Complexity: Low" - color: "D4C5F9" - - name: "Priority: Critical" - color: "000000" - - name: "Priority: High" - color: "F9D0C4" - - name: "Priority: Medium" - color: "FEF2C0" - - name: "Priority: Low" - color: "D4C5F9" - - name: "State: Help Wanted" - color: "0E8A16" - - name: "State: Work in Progress" - color: "5319E7" - - name: "State: Conversation" - color: "27828C" - - name: "State: Blocked" - color: "000000" - - name: "State: Postponed" - color: "C5DEF5" - - name: "State: Unassigned" - color: "BFDADC" - - name: "Type: Enhancement" - color: "1D76DB" - - name: "Type: Bug" - color: "B60205" - - name: "Type: Infrastructure" - color: "FBCA04" - - name: "Type: Dependencies" - color: "D4C5F9" - - name: "Meta: Question" - color: "BFDADC" - - name: "Meta: Duplicate" - color: "BFDADC" - - name: "Meta: Abandoned" - color: "808080" - -branches: - - name: main - protection: - required_pull_request_reviews: - dismiss_stale_reviews: true - require_code_owner_reviews: true - required_approving_review_count: 1 - dismissal_restrictions: - users: [] - teams: [] - required_status_checks: - strict: true - contexts: [] - enforce_admins: false - required_linear_history: true - allow_force_pushes: false - allow_deletions: false - required_conversation_resolution: true - restrictions: - apps: [] - users: [] - teams: [] diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 62253f8..0000000 --- a/.github/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -daysUntilStale: 14 -daysUntilClose: 3 -exemptLabels: - - "Priority: Critical" - - "Priority: High" - - "Priority: Medium" - - "Priority: Low" - - "State: Help Wanted" - - "State: Postponed" - - "State: Work in Progress" -staleLabel: 'Meta: Abandoned' -markComment: > - This submission has been flagged as abandoned due to lack of activity. Is there something specific that is causing this to be delayed? - - Please leave a comment if this issue has not yet been resolved, otherwise it will be automatically closed in the near future. -closeComment: > - Following with the previous comment, this submission has been automatically closed. - - This was due to the following: - - No activity has been made for the past 14 days. - - There are no labels that indicate this is a protected issue. - - If this issue is still relevant and needs to be opened again in the future, please leave a comment elaborating upon the reason to continue with this issue. diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml deleted file mode 100644 index 25c3780..0000000 --- a/.github/workflows/compile.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: "Java Continuous Integration" - -on: - push: - branches: [main, staging] - pull_request: - branches: [main, staging] - -jobs: - validate: - runs-on: ubuntu-latest - - name: Java Maven Build - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'adopt' - architecture: x64 - server-id: github - server-username: GITHUB_USER_REF - server-password: GITHUB_TOKEN_REF - - name: Compile - run: "mvn -B -Pgithub --update-snapshots clean package --file pom.xml" - env: - GITHUB_USER_REF: ${{ secrets.GH_USERNAME }} - GITHUB_TOKEN_REF: ${{ secrets.GH_PAT }} diff --git a/.gitignore b/.gitignore index 4788b4b..3c37caf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,11 @@ # IntelliJ out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml # Compiled class file *.class @@ -95,19 +100,19 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -target/ +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next +# Cache of project +.gradletasknamecache -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -.mvn/wrapper/maven-wrapper.jar -.flattened-pom.xml +**/build/ # Common working directory run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7721ac5..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "automatic", - "java.compile.nullAnalysis.mode": "automatic" -} diff --git a/LICENSE b/LICENSE deleted file mode 100644 index bd7219f..0000000 --- a/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -Permission is hereby granted, without written agreement and without license or -royalty fees, to use, copy, modify, and distribute this software and its -documentation for any purpose, provided that the above copyright notice and the -following two paragraphs appear in all copies of this software. - -IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE -OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE COPYRIGHT HOLDER HAS BEEN -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND -THE COPYRIGHT HOLDER HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, -ENHANCEMENTS, OR MODIFICATIONS. diff --git a/README.md b/README.md deleted file mode 100644 index 6445a41..0000000 --- a/README.md +++ /dev/null @@ -1,60 +0,0 @@ -# DynamicLights - -Emit Light from Held Items using the 1.17 Light Blocks in Spigot/Paper Servers. - -## Usage/Examples - -Commands - -- /dynamiclights lock (dynamiclights.lock) - - Prevents placing Lanterns and Torches from the offhand. Useful for held - lights while exploring or eating. -- /dynamiclights toggle (dynamiclights.toggle) - - Toggle the rendering of lights for your client to reduce client impact. -- /dynamiclights reload (dynamiclights.reload) - - Dynamically reload the `lights.yml` configuration to add or adjust light - levels. - - `config.yml` requires a restart due to async tasks at this time. - -## FAQ - -#### How does this plugin work? - -DynamicLights works by creating a thread for each player and rendering a -[Light Block](https://minecraft.fandom.com/wiki/Light_Block) at their head -location for all online players asynchronously. - -At the player's head location, DynamicLights will send a block change packet to -all players within the culling range. DynamicLights does NOT modify the world. - -This plugin requires ProtocolLib to be present. - -#### Can I change which items glow and work underwater? - -Yes! In the "lights.yml" file you can add any item from -https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Material.html exactly as it -appears to set custom light levels. You can also make them work underwater! - -#### Lights flickers in Blocks like Tall Grass, Sea Grass, and Kelp. Why? - -DynamicLights utilizes the -[Light Block](https://minecraft.fandom.com/wiki/Light_Block) to render the light -in the world for all players. As this is an actual block, it requires there to -be open air or open water to be used and cannot be placed on transparent blocks -or blocks without collision. - -## Deployment - -This plugin is based on the PluginCommon API. Updates to PluginCommon will -provide verioned and shaded assets associated with this plugin. - -Reference GH Actions: https://www.schakko.de/2020/12/19/using-github-workflow-with-maven-dependencies-from-a-private-github-package-registry/ - -1. Update POM XML Plugins and Dependencies. -2. Update POM XML Version. -3. Build Plugin -4. Verify in 1.17 to Latest Version -5. Update GitHub Source Code -6. Tag Version to Last Commit -7. Add Release -8. Update Spigot diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..5f9feae --- /dev/null +++ b/build.gradle @@ -0,0 +1,47 @@ +plugins { + id 'com.gradleup.shadow' version '8.3.0' + id 'java' +} + +group = 'github.xCykrix' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() + maven { + name = "spigotmc-repo" + url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/groups/public/" + } + flatDir { + dirs("../SpigotDevkit/build/libs") + } +} + +dependencies { + compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") + implementation("github.xCykrix:SpigotDevkit:1.0-0-SNAPSHOT-all") +} + +// Target Java Build (Java 17, Minecraft 1.17.x) +def targetJavaVersion = 17 +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } +} + +processResources { + def props = [version: version] + inputs.properties props + filteringCharset 'UTF-8' + filesMatching('plugin.yml') { + expand props + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e69de29 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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 + +@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/pom.xml b/pom.xml deleted file mode 100644 index c984462..0000000 --- a/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - 4.0.0 - - com.github.xcykrix - DynamicLights - 1.0.7 - jar - - DynamicLights - - - 17 - 17 - 17 - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.1 - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - - - - - github - - - github - GitHub PluginCommon - https://maven.pkg.github.com/xcykrix/plugincommon - true - true - - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - aikar - https://repo.aikar.co/content/groups/aikar/ - - - dmulloy2-repo - https://repo.dmulloy2.net/repository/public/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - - - - org.spigotmc - spigot-api - 1.20.4-R0.1-SNAPSHOT - provided - - - com.github.xcykrix - plugincommon - 1.0.0-SNAPSHOT - - - com.comphenix.protocol - ProtocolLib - 5.2.0-SNAPSHOT - provided - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..073a543 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'DynamicLights' diff --git a/src/main/java/com/github/xcykrix/dynamiclights/DynamicLights.java b/src/main/java/com/github/xcykrix/dynamiclights/DynamicLights.java deleted file mode 100644 index 7add9df..0000000 --- a/src/main/java/com/github/xcykrix/dynamiclights/DynamicLights.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.github.xcykrix.dynamiclights; - -import com.comphenix.protocol.utility.MinecraftVersion; -import com.github.xcykrix.dynamiclights.module.DynamicLightCommand; -import com.github.xcykrix.dynamiclights.util.LightManager; -import com.github.xcykrix.dynamiclights.util.LightSources; -import com.github.xcykrix.plugincommon.PluginCommon; -import com.github.xcykrix.plugincommon.api.records.Resource; -import org.bukkit.entity.Player; - -@SuppressWarnings({"unused", "Entrypoint to Spigot API"}) -public final class DynamicLights extends PluginCommon { - - private LightManager lightManager; - - @Override - public void initialize() { - // Set Earliest Supported Version - this.setEarliestSupportedVersion(MinecraftVersion.CAVES_CLIFFS_2); - - // Register Configurations - this.configurationAPI - .register(new Resource("config.yml", null, this.getResource("config.yml"))) - .register(new Resource("lights.yml", null, this.getResource("lights.yml"))) - .registerLanguageFile(this.getResource("language.yml")); - - // Initialize Light Manager - this.lightManager = new LightManager(this, new LightSources(this)); - - // Register Commands - this.commandAPI.register(new DynamicLightCommand(this, lightManager)); - - // Register Current Players for Tracking. - for (Player player : this.getServer().getOnlinePlayers()) { - lightManager.addPlayer(player); - } - } - - @Override - public void shutdown() { - if (this.lightManager != null) { - this.lightManager.shutdown(); - } - } -} diff --git a/src/main/java/com/github/xcykrix/dynamiclights/module/DynamicLightCommand.java b/src/main/java/com/github/xcykrix/dynamiclights/module/DynamicLightCommand.java deleted file mode 100644 index 9e2789c..0000000 --- a/src/main/java/com/github/xcykrix/dynamiclights/module/DynamicLightCommand.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.github.xcykrix.dynamiclights.module; - -import com.github.xcykrix.dynamiclights.module.events.PlayerHandlerEvent; -import com.github.xcykrix.dynamiclights.util.LightManager; -import com.github.xcykrix.dynamiclights.util.LightSources; -import com.github.xcykrix.plugincommon.PluginCommon; -import com.github.xcykrix.plugincommon.api.helper.configuration.LanguageFile; -import com.github.xcykrix.plugincommon.extendables.implement.Initialize; -import com.shaded._100.aikar.commands.BaseCommand; -import com.shaded._100.aikar.commands.CommandHelp; -import com.shaded._100.aikar.commands.annotation.CommandAlias; -import com.shaded._100.aikar.commands.annotation.CommandPermission; -import com.shaded._100.aikar.commands.annotation.Description; -import com.shaded._100.aikar.commands.annotation.HelpCommand; -import com.shaded._100.aikar.commands.annotation.Subcommand; -import java.io.IOException; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandAlias("dynamiclights|dynamiclight|dl") -public class DynamicLightCommand extends BaseCommand implements Initialize { - - private final PluginCommon pluginCommon; - private final LightManager lightManager; - private final LanguageFile languageFile; - - public DynamicLightCommand(PluginCommon pluginCommon, LightManager lightManager) { - this.pluginCommon = pluginCommon; - this.lightManager = lightManager; - this.languageFile = this.pluginCommon.configurationAPI.getLanguageFile(); - } - - @Override - public void initialize() { - pluginCommon.getServer().getPluginManager() - .registerEvents(new PlayerHandlerEvent(pluginCommon, this.lightManager), pluginCommon); - } - - @Subcommand("toggle") - @CommandPermission("dynamiclights.toggle") - @Description("Toggle rendering light sources for your client.") - public void toggle(Player player) { - boolean status = this.lightManager.lightToggleStatus.getOrDefault( - player.getUniqueId().toString(), - this.lightManager.toggle); - if (!status) { - this.pluginCommon.adventureAPI.getAudiences().player(player).sendMessage( - this.languageFile.getComponentFromID("toggle-on", true)); - this.lightManager.lightToggleStatus.put(player.getUniqueId().toString(), true); - } else { - this.pluginCommon.adventureAPI.getAudiences().player(player).sendMessage( - this.languageFile.getComponentFromID("toggle-off", true)); - this.lightManager.lightToggleStatus.put(player.getUniqueId().toString(), false); - } - } - - @Subcommand("lock") - @CommandPermission("dynamiclights.lock") - @Description("Toggle placing light sources from your Off Hand.") - public void lock(Player player) { - boolean status = this.lightManager.lightLockStatus.getOrDefault( - player.getUniqueId().toString(), true); - if (!status) { - this.pluginCommon.adventureAPI.getAudiences().player(player).sendMessage( - this.languageFile.getComponentFromID("enable-lock", true)); - this.lightManager.lightLockStatus.put(player.getUniqueId().toString(), true); - } else { - this.pluginCommon.adventureAPI.getAudiences().player(player).sendMessage( - this.languageFile.getComponentFromID("disable-lock", true)); - this.lightManager.lightLockStatus.put(player.getUniqueId().toString(), false); - } - } - - @Subcommand("reload") - @CommandPermission("dynamiclights.reload") - @Description("Reload the light level configuration file. Changes to config.yml require a Server Reboot.") - public void reload(Player player) { - try { - this.pluginCommon.configurationAPI.get("lights.yml").reload(); - this.lightManager.updateLightSources(new LightSources(this.pluginCommon)); - this.pluginCommon.adventureAPI.getAudiences().player(player).sendMessage( - this.languageFile.getComponentFromID("reload", true)); - } catch (IOException e) { - this.pluginCommon.adventureAPI.getAudiences().player(player).sendMessage( - this.languageFile.getComponentFromID("reload-error", true)); - this.pluginCommon.getLogger().severe("Failed to reload lights.yml configuration."); - this.pluginCommon.getLogger().severe(ExceptionUtils.getStackTrace(e)); - } - } - - @HelpCommand - public void help(CommandSender sender, CommandHelp helpCommand) { - helpCommand.showHelp(); - } -} diff --git a/src/main/java/com/github/xcykrix/dynamiclights/module/events/PlayerHandlerEvent.java b/src/main/java/com/github/xcykrix/dynamiclights/module/events/PlayerHandlerEvent.java deleted file mode 100644 index 786a682..0000000 --- a/src/main/java/com/github/xcykrix/dynamiclights/module/events/PlayerHandlerEvent.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.github.xcykrix.dynamiclights.module.events; - -import com.github.xcykrix.dynamiclights.util.LightManager; -import com.github.xcykrix.plugincommon.PluginCommon; -import com.github.xcykrix.plugincommon.api.helper.configuration.LanguageFile; -import com.github.xcykrix.plugincommon.extendables.Stateful; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.inventory.EquipmentSlot; - -public class PlayerHandlerEvent extends Stateful implements Listener { - - private final LightManager lightManager; - private final LanguageFile languageFile; - private final boolean defaultState; - - public PlayerHandlerEvent(PluginCommon pluginCommon, LightManager lightManager) { - super(pluginCommon); - this.lightManager = lightManager; - this.languageFile = this.pluginCommon.configurationAPI.getLanguageFile(); - this.defaultState = this.pluginCommon.configurationAPI.get("config.yml") - .getOptionalBoolean("default-lock-state").orElse(false); - } - - @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) - public void playerBlockPlaceEvent(BlockPlaceEvent event) { - if (event.getPlayer().isSneaking()) { - return; - } - - if (event.getHand() == EquipmentSlot.OFF_HAND) { - if (!this.lightManager.lightSources.isProtectedLight(event.getItemInHand().getType())) { - return; - } - if (this.lightManager.lightLockStatus.getOrDefault( - event.getPlayer().getUniqueId().toString(), - defaultState)) { - pluginCommon.adventureAPI.getAudiences().player(event.getPlayer()).sendMessage( - this.languageFile.getComponentFromID("prevent-block-place", true)); - event.setCancelled(true); - } - } - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void PlayerJoinEvent(PlayerJoinEvent event) { - this.lightManager.addPlayer(event.getPlayer()); - } - - @EventHandler(priority = EventPriority.MONITOR) - public void PlayerQuitEvent(PlayerQuitEvent event) { - this.lightManager.removePlayer(event.getPlayer().getUniqueId()); - } -} diff --git a/src/main/java/com/github/xcykrix/dynamiclights/util/LightManager.java b/src/main/java/com/github/xcykrix/dynamiclights/util/LightManager.java deleted file mode 100644 index 74c529f..0000000 --- a/src/main/java/com/github/xcykrix/dynamiclights/util/LightManager.java +++ /dev/null @@ -1,221 +0,0 @@ -package com.github.xcykrix.dynamiclights.util; - -import com.github.xcykrix.plugincommon.PluginCommon; -import com.github.xcykrix.plugincommon.extendables.Stateful; -import com.github.xcykrix.plugincommon.extendables.implement.Shutdown; -import com.shaded._100.org.h2.mvstore.MVMap; -import java.util.HashMap; -import java.util.UUID; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.World; -import org.bukkit.block.Block; -import org.bukkit.block.data.Waterlogged; -import org.bukkit.block.data.type.Light; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.scheduler.BukkitTask; - -public class LightManager extends Stateful implements Shutdown { - - public LightSources lightSources; - private final HashMap lastLightLocation = new HashMap<>(); - private final HashMap tasks = new HashMap<>(); - - // Local Database Map - public final MVMap lightToggleStatus; - public final MVMap lightLockStatus; - - // Configuration - private long refresh = 5L; - private int distance = 64; - public boolean toggle = true; - - public LightManager(PluginCommon pluginCommon, LightSources lightSources) { - super(pluginCommon); - this.lightToggleStatus = this.pluginCommon.h2MVStoreAPI.getStore() - .openMap("lightToggleStatus"); - this.lightLockStatus = this.pluginCommon.h2MVStoreAPI.getStore().openMap("lightLockStatus"); - this.lightSources = lightSources; - - this.refresh = this.pluginCommon.configurationAPI.get("config.yml").getLong("update-rate"); - this.distance = this.pluginCommon.configurationAPI.get("config.yml") - .getInt("light-culling-distance"); - this.toggle = this.pluginCommon.configurationAPI.get("config.yml") - .getBoolean("default-toggle-state"); - } - - @Override - public void shutdown() { - synchronized (this.tasks) { - for (UUID uuid : this.tasks.keySet()) { - this.tasks.get(uuid).cancel(); - } - this.tasks.clear(); - } - } - - public void updateLightSources(LightSources lightSources) { - this.lightSources = lightSources; - } - - public void addPlayer(Player player) { - synchronized (this.tasks) { - if (this.tasks.containsKey(player.getUniqueId())) { - return; - } - this.tasks.put(player.getUniqueId(), - this.pluginCommon.getServer().getScheduler() - .runTaskTimerAsynchronously(this.pluginCommon, () -> { - ItemStack mainHand = player.getInventory().getItemInMainHand(); - ItemStack offHand = player.getInventory().getItemInOffHand(); - - // Check Light Source Validity - boolean valid = this.valid(player, mainHand, offHand); - int lightLevel = 0; - if (valid) { - lightLevel = lightSources.getLightLevel(offHand.getType(), - mainHand.getType()); - } - - // Deploy Lighting - for (Player targetPlayer : Bukkit.getOnlinePlayers()) { - // Pull Last Location - String locationId = - player.getUniqueId() + "/" + targetPlayer.getUniqueId(); - Location lastLocation = this.getLastLocation(locationId); - - // Test and Remove Old Lights - if (!valid) { - if (lastLocation != null) { - this.removeLight(targetPlayer, lastLocation); - this.removeLastLocation(locationId); - } - continue; - } - - // Get the Next Location - Location nextLocation = player.getEyeLocation(); - - // Add Light Sources - if (this.lightToggleStatus.getOrDefault( - targetPlayer.getUniqueId().toString(), - this.toggle)) { - if (lightLevel > 0 && differentLocations(lastLocation, - nextLocation)) { - if (player.getWorld().getName() - .equals(targetPlayer.getWorld().getName())) { - if (player.getLocation() - .distance(targetPlayer.getLocation()) - <= this.distance) { - this.addLight(targetPlayer, nextLocation, lightLevel); - this.setLastLocation(locationId, nextLocation); - } - } - } - } - - // Remove Last Locations - if (lastLocation != null && differentLocations(lastLocation, - nextLocation)) { - this.removeLight(targetPlayer, lastLocation); - } - } - }, 50L, refresh)); - } - } - - public void removePlayer(UUID uid) { - synchronized (this.tasks) { - if (this.tasks.containsKey(uid)) { - this.tasks.get(uid).cancel(); - this.tasks.remove(uid); - } - } - } - - public void addLight(Player player, Location location, int lightLevel) { - if (lightLevel == 0) { - return; - } - Light light = (Light) Material.LIGHT.createBlockData(); - if (location.getWorld() == null) { - location.setWorld(player.getWorld()); - } - World world = location.getWorld(); - switch (world.getBlockAt(location).getType()) { - case AIR, CAVE_AIR -> { - light.setWaterlogged(false); - light.setLevel(lightLevel); - } - case WATER -> { - light.setWaterlogged(true); - light.setLevel(lightLevel - 2); - } - default -> { - // NO OP - } - } - player.sendBlockChange(location, light); - } - - public void removeLight(Player player, Location location) { - if (location.getWorld() == null) { - location.setWorld(player.getWorld()); - } - player.sendBlockChange(location, location.getWorld().getBlockAt(location).getBlockData()); - } - - public boolean valid(Player player, ItemStack mainHand, ItemStack offHand) { - Material main = mainHand.getType(); - Material off = offHand.getType(); - boolean hasLightLevel = lightSources.hasLightLevel(off); - if (!hasLightLevel) { - hasLightLevel = lightSources.hasLightLevel(main); - } - if (!hasLightLevel) { - return false; - } - - Block currentLocation = player.getEyeLocation().getBlock(); - if (currentLocation.getType() == Material.AIR - || currentLocation.getType() == Material.CAVE_AIR) { - return true; - } - if (currentLocation instanceof Waterlogged - && ((Waterlogged) currentLocation).isWaterlogged()) { - return false; - } - if (currentLocation.getType() == Material.WATER) { - return lightSources.isSubmersible(off, main); - } - return false; - } - - public Location getLastLocation(String uuid) { - return lastLightLocation.getOrDefault(uuid, null); - } - - public void setLastLocation(String uuid, Location location) { - lastLightLocation.put(uuid, location); - } - - public void removeLastLocation(String uuid) { - lastLightLocation.remove(uuid); - } - - private boolean differentLocations(Location l1, Location l2) { - if (l1 == null || l2 == null) { - return true; - } - if (l1.getWorld() == null || l2.getWorld() == null) { - return true; - } - if (!l1.getWorld().getName().equals(l2.getWorld().getName())) { - return true; - } - return l1.getBlockX() != l2.getBlockX() || l1.getBlockY() != l2.getBlockY() - || l1.getBlockZ() != l2.getBlockZ(); - } -} diff --git a/src/main/java/com/github/xcykrix/dynamiclights/util/LightSources.java b/src/main/java/com/github/xcykrix/dynamiclights/util/LightSources.java deleted file mode 100644 index cbedbb0..0000000 --- a/src/main/java/com/github/xcykrix/dynamiclights/util/LightSources.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.github.xcykrix.dynamiclights.util; - -import com.github.xcykrix.plugincommon.PluginCommon; -import com.github.xcykrix.plugincommon.extendables.Stateful; -import com.shaded._100.dev.dejvokep.boostedyaml.YamlDocument; -import com.shaded._100.dev.dejvokep.boostedyaml.block.Block; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import org.bukkit.Material; - -public class LightSources extends Stateful { - - private final HashMap levelOfLights = new HashMap<>(); - private final HashSet submersibleLights = new HashSet<>(); - private final HashSet protectedLights = new HashSet<>(); - - public LightSources(PluginCommon pluginCommon) { - super(pluginCommon); - YamlDocument lights = this.pluginCommon.configurationAPI.get("lights.yml"); - - // Load Light Levels - Map> levels = lights.getSection("levels").getStoredValue(); - for (Object material : levels.keySet()) { - try { - int level = Integer.parseInt(levels.get(material).getStoredValue().toString()); - this.levelOfLights.put(Material.valueOf((String) material), level); - } catch (Exception exception) { - this.pluginCommon.getLogger() - .warning("Unable to register level for '" + material + "'. " - + exception.getMessage()); - } - } - this.pluginCommon.getLogger() - .info("Registered " + this.levelOfLights.size() + " items for Dynamic Lights."); - - // Load Submersible Status - List submersibles = lights.getStringList("submersibles"); - for (String material : submersibles) { - try { - this.submersibleLights.add(Material.valueOf(material)); - } catch (Exception exception) { - this.pluginCommon.getLogger() - .warning("Unable to register submersible for '" + material + "'. " - + exception.getMessage()); - } - } - this.pluginCommon.getLogger() - .info("Registered " + this.submersibleLights.size() - + " items for Dynamic Submersible Lights."); - - // Load Lockable Status - List lockables = lights.getStringList("lockables"); - for (String material : lockables) { - try { - this.protectedLights.add(Material.valueOf(material)); - } catch (Exception exception) { - this.pluginCommon.getLogger() - .warning("Unable to register lockable for '" + material + "'. " - + exception.getMessage()); - } - } - this.pluginCommon.getLogger() - .info("Registered " + this.protectedLights.size() - + " items for Dynamic Lockable Lights."); - } - - public boolean hasLightLevel(Material material) { - return levelOfLights.containsKey(material); - } - - public Integer getLightLevel(Material material, Material fallback) { - return levelOfLights.getOrDefault(material, levelOfLights.getOrDefault(fallback, 0)); - } - - public boolean isSubmersible(Material offHand, Material mainHand) { - return submersibleLights.contains(offHand) || submersibleLights.contains(mainHand); - } - - public boolean isProtectedLight(Material offHand) { - return protectedLights.contains(offHand); - } -} diff --git a/src/main/java/github/xCykrix/dynamicLights/DynamicLights.java b/src/main/java/github/xCykrix/dynamicLights/DynamicLights.java new file mode 100644 index 0000000..d658101 --- /dev/null +++ b/src/main/java/github/xCykrix/dynamicLights/DynamicLights.java @@ -0,0 +1,37 @@ +package github.xCykrix.dynamicLights; + +import github.xCykrix.DevkitPlugin; +import github.xCykrix.plugin.AdventurePlugin; +import github.xCykrix.plugin.ConfigurationPlugin; +import github.xCykrix.plugin.H2MVStorePlugin; +import github.xCykrix.plugin.ProtocolLibPlugin; +import github.xCykrix.records.Resource; + +@SuppressWarnings({"unused", "Called by Spigot API."}) +public final class DynamicLights extends DevkitPlugin { + public static ConfigurationPlugin configuration; + public static AdventurePlugin adventure; + public static ProtocolLibPlugin protocol; + public static H2MVStorePlugin h2; + + @Override + protected void pre() { + configuration = this.register(new ConfigurationPlugin(this)); + adventure = this.register(new AdventurePlugin(this)); + protocol = this.register(new ProtocolLibPlugin(this)); + h2 = this.register(new H2MVStorePlugin(this)); + } + + @Override + public void initialize() { + configuration + .register(new Resource("config.yml", null, this.getResource("config.yml"))) + .register(new Resource("lights.yml", null, this.getResource("lights.yml"))) + .registerLanguageFile(this.getResource("language.yml")); + } + + @Override + public void shutdown() { + + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index dcbd3a8..8f606d5 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -12,4 +12,4 @@ default-lock-state: true # DO NOT EDIT THE VERSION. Manual edits may corrupt or reset configuration files. # -version: 3 +version: 3 \ No newline at end of file diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index f89151c..cfdaa60 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -16,14 +16,14 @@ chat-prefix: "[DynamicLights] Light locking mode is currently enabled. You must sneak to place light sources from your Off Hand. This can be toggled with \"/dl lock\"." - enable-lock: " Enabled light lock mode." - disable-lock: " Disabled light lock mode." - toggle-on: " Light rendering enabled for client." - toggle-off: " Light rendering disabled for client." - reload: " Reloaded lights.yml configuration." - reload-error: " Failed to reload lights.yml configuration. Check Console.." + prevent-block-place: " Light locking mode is currently enabled. You must sneak to place light sources from your Off Hand. This can be toggled with \"/dl lock\"." + enable-lock: " Enabled light lock mode." + disable-lock: " Disabled light lock mode." + toggle-on: " Light rendering enabled for client." + toggle-off: " Light rendering disabled for client." + reload: " Reloaded lights.yml configuration." + reload-error: " Failed to reload lights.yml configuration. Check Console.." # DO NOT EDIT THE VERSION. Manual edits may corrupt or reset configuration files. # -version: 2 +version: 2 \ No newline at end of file diff --git a/src/main/resources/lights.yml b/src/main/resources/lights.yml index 21f3fca..641916e 100644 --- a/src/main/resources/lights.yml +++ b/src/main/resources/lights.yml @@ -4,34 +4,34 @@ # Map List of Light Levels levels: - LANTERN: 13 - SOUL_LANTERN: 13 - TORCH: 11 - SOUL_TORCH: 11 - REDSTONE_TORCH: 7 - GLOWSTONE: 15 - SHROOMLIGHT: 15 - SEA_LANTERN: 15 - OCHRE_FROGLIGHT: 15 - PEARLESCENT_FROGLIGHT: 15 - VERDANT_FROGLIGHT: 15 + LANTERN: 13 + SOUL_LANTERN: 13 + TORCH: 11 + SOUL_TORCH: 11 + REDSTONE_TORCH: 7 + GLOWSTONE: 15 + SHROOMLIGHT: 15 + SEA_LANTERN: 15 + OCHRE_FROGLIGHT: 15 + PEARLESCENT_FROGLIGHT: 15 + VERDANT_FROGLIGHT: 15 # String List of Submersible Materials submersibles: - - "GLOWSTONE" - - "SHROOMLIGHT" - - "SEA_LANTERN" - - "OCHRE_FROGLIGHT" - - "PEARLESCENT_FROGLIGHT" - - "VERDANT_FROGLIGHT" + - "GLOWSTONE" + - "SHROOMLIGHT" + - "SEA_LANTERN" + - "OCHRE_FROGLIGHT" + - "PEARLESCENT_FROGLIGHT" + - "VERDANT_FROGLIGHT" # String List of Lockable Materials lockables: - - "TORCH" - - "SOUL_TORCH" - - "LANTERN" - - "SOUL_LANTERN" + - "TORCH" + - "SOUL_TORCH" + - "LANTERN" + - "SOUL_LANTERN" # DO NOT EDIT THE VERSION. Manual edits may corrupt or reset configuration files. # -version: 1 +version: 1 \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 711ded0..e669a24 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,22 +2,22 @@ name: 'DynamicLights' description: 'Emit Light from Held Items using the 1.17 Light Blocks.' website: 'https://www.spigotmc.org/resources/dynamiclights.110707/' author: 'xCykrix' -version: '${project.version}' +version: '1.0-SNAPSHOT' -main: com.github.xcykrix.dynamiclights.DynamicLights -api-version: '1.18' +main: github.xCykrix.dynamicLights.DynamicLights +api-version: '1.17' load: 'POSTWORLD' depend: - - 'ProtocolLib' + - 'ProtocolLib' permissions: - dynamiclights.lock: - description: "Toggle placing light sources from your off hand." - default: true - dynamiclights.toggle: - description: "Toggle rendering of light sources for your client." - default: true - dynamiclights.reload: - description: "Reload the lights.yml configuration file." - default: false + dynamiclights.lock: + description: "Toggle placing light sources from your off hand." + default: true + dynamiclights.toggle: + description: "Toggle rendering of light sources for your client." + default: true + dynamiclights.reload: + description: "Reload the lights.yml configuration file." + default: false \ No newline at end of file From c8ac336ee319bac8afa1f1930bec1cb99588bebf Mon Sep 17 00:00:00 2001 From: Samuel Voeller <12182390+xCykrix@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:17:30 -0400 Subject: [PATCH 2/4] feat: add shading support and update ref --- build.gradle | 47 --------------------------------------------- build.gradle.kts | 46 ++++++++++++++++++++++++++++++++++++++++++++ gradle.properties | 0 settings.gradle | 1 - settings.gradle.kts | 2 ++ 5 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 gradle.properties delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 5f9feae..0000000 --- a/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -plugins { - id 'com.gradleup.shadow' version '8.3.0' - id 'java' -} - -group = 'github.xCykrix' -version = '1.0-SNAPSHOT' - -repositories { - mavenCentral() - maven { - name = "spigotmc-repo" - url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/groups/public/" - } - flatDir { - dirs("../SpigotDevkit/build/libs") - } -} - -dependencies { - compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") - implementation("github.xCykrix:SpigotDevkit:1.0-0-SNAPSHOT-all") -} - -// Target Java Build (Java 17, Minecraft 1.17.x) -def targetJavaVersion = 17 -java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - sourceCompatibility = javaVersion - targetCompatibility = javaVersion - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } -} - -processResources { - def props = [version: version] - inputs.properties props - filteringCharset 'UTF-8' - filesMatching('plugin.yml') { - expand props - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..5babef2 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,46 @@ +plugins { + id("io.github.goooler.shadow") version "8.1.8" + id("java") + id("java-library") +} + +group = "github.xCykrix" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() + + // Core Repositories + maven { + url = uri("https://jitpack.io/") + } + maven { + url = uri("https://oss.sonatype.org/content/groups/public/") + } + + // Spigot Repository + maven { + url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + } + + // Flatdir + flatDir { + dirs("../SpigotDevkit/build/libs") + } +} + +dependencies { + compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") + implementation("github.xCykrix:SpigotDevkit:1.0-0-SNAPSHOT-all") +} + +// Target Java Build (Java 17 - Minecraft 1.17.x) +val targetJavaVersion = 17 +java { + val javaVersion = JavaVersion.toVersion(targetJavaVersion) + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } +} diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index e69de29..0000000 diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 073a543..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'DynamicLights' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..e4b6fb4 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,2 @@ +rootProject.name = "DynamicLights" + From ac0c1d057a48ed4f1316e50c832f0ba3df43c283 Mon Sep 17 00:00:00 2001 From: Samuel Voeller <12182390+xCykrix@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:19:40 -0400 Subject: [PATCH 3/4] feat: update source --- build.gradle.kts | 12 +- .../xCykrix/dynamicLights/DynamicLights.java | 35 +++- .../dynamicLights/command/BaseCommand.java | 148 ++++++++++++++ .../dynamicLights/event/PlayerHandler.java | 45 +++++ .../dynamicLights/util/LightManager.java | 190 ++++++++++++++++++ .../dynamicLights/util/LightSource.java | 90 +++++++++ src/main/resources/plugin.yml | 2 +- 7 files changed, 516 insertions(+), 6 deletions(-) create mode 100644 src/main/java/github/xCykrix/dynamicLights/command/BaseCommand.java create mode 100644 src/main/java/github/xCykrix/dynamicLights/event/PlayerHandler.java create mode 100644 src/main/java/github/xCykrix/dynamicLights/util/LightManager.java create mode 100644 src/main/java/github/xCykrix/dynamicLights/util/LightSource.java diff --git a/build.gradle.kts b/build.gradle.kts index 5babef2..b126972 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,15 +23,19 @@ repositories { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") } - // Flatdir - flatDir { - dirs("../SpigotDevkit/build/libs") + // Upstream GitHub Packages + maven { + url = uri("https://maven.pkg.github.com/xCykrix/SpigotDevkit") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } } } dependencies { compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") - implementation("github.xCykrix:SpigotDevkit:1.0-0-SNAPSHOT-all") + implementation("github.xCykrix:spigotdevkit:1.0.0") } // Target Java Build (Java 17 - Minecraft 1.17.x) diff --git a/src/main/java/github/xCykrix/dynamicLights/DynamicLights.java b/src/main/java/github/xCykrix/dynamicLights/DynamicLights.java index d658101..0f5b288 100644 --- a/src/main/java/github/xCykrix/dynamicLights/DynamicLights.java +++ b/src/main/java/github/xCykrix/dynamicLights/DynamicLights.java @@ -1,7 +1,13 @@ package github.xCykrix.dynamicLights; import github.xCykrix.DevkitPlugin; +import github.xCykrix.dynamicLights.command.BaseCommand; +import github.xCykrix.dynamicLights.event.PlayerHandler; +import github.xCykrix.dynamicLights.util.LightManager; +import github.xCykrix.dynamicLights.util.LightSource; +import github.xCykrix.helper.LanguageFile; import github.xCykrix.plugin.AdventurePlugin; +import github.xCykrix.plugin.CommandPlugin; import github.xCykrix.plugin.ConfigurationPlugin; import github.xCykrix.plugin.H2MVStorePlugin; import github.xCykrix.plugin.ProtocolLibPlugin; @@ -9,29 +15,56 @@ @SuppressWarnings({"unused", "Called by Spigot API."}) public final class DynamicLights extends DevkitPlugin { + + // Core APIs. public static ConfigurationPlugin configuration; public static AdventurePlugin adventure; + public static CommandPlugin command; + + // Third Party APIs. public static ProtocolLibPlugin protocol; public static H2MVStorePlugin h2; + // Internal APIs. + public static LanguageFile language; + public static LightSource source; + public static LightManager manager; + @Override protected void pre() { configuration = this.register(new ConfigurationPlugin(this)); adventure = this.register(new AdventurePlugin(this)); + command = this.register(new CommandPlugin(this)); + protocol = this.register(new ProtocolLibPlugin(this)); h2 = this.register(new H2MVStorePlugin(this)); } @Override public void initialize() { + // Register Configurations configuration .register(new Resource("config.yml", null, this.getResource("config.yml"))) .register(new Resource("lights.yml", null, this.getResource("lights.yml"))) .registerLanguageFile(this.getResource("language.yml")); + language = configuration.getLanguageFile(); + + // Register Internal APIs. + source = new LightSource(this); + source.initialize(); + manager = new LightManager(this); + manager.initialize(); + + // Register Events + this.getServer().getPluginManager().registerEvents(new PlayerHandler(this), this); + + // Register Commands + BaseCommand.getOrCreate(this).generate(command); } @Override public void shutdown() { - + manager.shutdown(); + source.shutdown(); } } diff --git a/src/main/java/github/xCykrix/dynamicLights/command/BaseCommand.java b/src/main/java/github/xCykrix/dynamicLights/command/BaseCommand.java new file mode 100644 index 0000000..0c16402 --- /dev/null +++ b/src/main/java/github/xCykrix/dynamicLights/command/BaseCommand.java @@ -0,0 +1,148 @@ +package github.xCykrix.dynamicLights.command; + +import github.xCykrix.DevkitPlugin; +import github.xCykrix.dynamicLights.DynamicLights; +import github.xCykrix.extendable.DevkitSimpleState; +import github.xCykrix.plugin.CommandPlugin; +import github.xCykrix.shade.dev.jorel.commandapi.CommandAPICommand; +import github.xCykrix.shade.org.apache.commons.lang3.exception.ExceptionUtils; +import java.io.IOException; +import java.util.Objects; + +public class BaseCommand extends DevkitSimpleState { + + public static BaseCommand core; + + public static BaseCommand getOrCreate(DevkitPlugin plugin) { + if (core == null) { + core = new BaseCommand(plugin); + } + return core; + } + + public BaseCommand(DevkitPlugin plugin) { + super(plugin); + } + + public void generate(CommandPlugin commandPlugin) { + new CommandAPICommand("dynamiclights") + .withAliases("dynamiclight", "dl") + .withSubcommand( + new CommandAPICommand("toggle") + .withPermission("dynamiclights.toggle") + .executesPlayer(info -> { + String uuid = info.sender().getUniqueId().toString(); + boolean current = DynamicLights.manager.toggles.getOrDefault(uuid, DynamicLights.manager.toggle); + if (!current) { + DynamicLights.adventure.get().player(info.sender()).sendMessage( + DynamicLights.language.getComponentFromID("toggle-on", true) + ); + DynamicLights.manager.toggles.put(uuid, true); + } else { + DynamicLights.adventure.get().player(info.sender()).sendMessage( + DynamicLights.language.getComponentFromID("toggle-off", true) + ); + DynamicLights.manager.toggles.put(uuid, false); + } + }) + ) + .withSubcommand( + new CommandAPICommand("lock") + .withPermission("dynamiclights.lock") + .executesPlayer(info -> { + String uuid = info.sender().getUniqueId().toString(); + boolean current = DynamicLights.manager.locks.getOrDefault(uuid, true); + if (!current) { + DynamicLights.adventure.get().player(info.sender()).sendMessage( + DynamicLights.language.getComponentFromID("enable-lock", true) + ); + DynamicLights.manager.locks.put(uuid, true); + } else { + DynamicLights.adventure.get().player(info.sender()).sendMessage( + DynamicLights.language.getComponentFromID("disable-lock", true) + ); + DynamicLights.manager.locks.put(uuid, false); + } + }) + ) + .withSubcommand( + new CommandAPICommand("reload") + .withPermission("dynamiclights.reload") + .executes(info -> { + try { + Objects.requireNonNull(DynamicLights.configuration.getYAMLFile("lights.yml")).reload(); + DynamicLights.source.initialize(); + DynamicLights.adventure.get().sender(info.sender()).sendMessage( + DynamicLights.language.getComponentFromID("reload", true) + ); + } catch (IOException | NullPointerException ex) { + DynamicLights.adventure.get().sender(info.sender()).sendMessage( + DynamicLights.language.getComponentFromID("reload-error", true) + ); + this.plugin.getLogger().severe("Failed to reload lights.yml."); + this.plugin.getLogger().severe(ExceptionUtils.getStackTrace(ex)); + } + }) + ).register(this.plugin); + } +} + + +// commandPlugin.register( +// commandPlugin.create("dynamiclights") +// .withAliases("dynamiclight", "dl") +// .withSubcommand( +// commandPlugin.create("toggle") +// .withPermission("dynamiclights.toggle") +// .executesPlayer(info -> { +// String uuid = info.sender().getUniqueId().toString(); +// boolean current = DynamicLights.manager.toggles.getOrDefault(uuid, DynamicLights.manager.toggle); +// if (!current) { +// DynamicLights.adventure.get().player(info.sender()).sendMessage( +// DynamicLights.language.getComponentFromID("toggle-on", true) +// ); +// DynamicLights.manager.toggles.put(uuid, true); +// } else { +// DynamicLights.adventure.get().player(info.sender()).sendMessage( +// DynamicLights.language.getComponentFromID("toggle-off", true) +// ); +// DynamicLights.manager.toggles.put(uuid, false); +// } +// }) +// ) +// .withSubcommand( +// commandPlugin.create("lock") +// .withPermission("dynamiclights.lock") +// .executesPlayer(info -> { +// String uuid = info.sender().getUniqueId().toString(); +// boolean current = DynamicLights.manager.locks.getOrDefault(uuid, true); +// if (!current) { +// DynamicLights.adventure.get().player(info.sender()).sendMessage( +// DynamicLights.language.getComponentFromID("enable-lock", true) +// ); +// DynamicLights.manager.locks.put(uuid, true); +// } else { +// DynamicLights.adventure.get().player(info.sender()).sendMessage( +// DynamicLights.language.getComponentFromID("disable-lock", true) +// ); +// DynamicLights.manager.locks.put(uuid, false); +// } +// }) +// ) +// .withSubcommand( +// commandPlugin.create("update_lights") +// .withPermission("dynamiclights.reload") +// .executesPlayer(info -> { +// try { +// Objects.requireNonNull(DynamicLights.configuration.getYAMLFile("lights.yml")).reload(); +// DynamicLights.source.initialize(); +// } catch (IOException | NullPointerException ex) { +// DynamicLights.adventure.get().sender(info.sender()).sendMessage( +// DynamicLights.language.getComponentFromID("reload-error", true) +// ); +// this.plugin.getLogger().severe("Failed to reload lights.yml."); +// this.plugin.getLogger().severe(ExceptionUtils.getStackTrace(ex)); +// } +// }) +// ) +// ); \ No newline at end of file diff --git a/src/main/java/github/xCykrix/dynamicLights/event/PlayerHandler.java b/src/main/java/github/xCykrix/dynamicLights/event/PlayerHandler.java new file mode 100644 index 0000000..8b91d0c --- /dev/null +++ b/src/main/java/github/xCykrix/dynamicLights/event/PlayerHandler.java @@ -0,0 +1,45 @@ +package github.xCykrix.dynamicLights.event; + +import github.xCykrix.DevkitPlugin; +import github.xCykrix.dynamicLights.DynamicLights; +import github.xCykrix.extendable.DevkitSimpleState; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.inventory.EquipmentSlot; + +public class PlayerHandler extends DevkitSimpleState implements Listener { + public PlayerHandler(DevkitPlugin plugin) { + super(plugin); + } + + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) + public void playerBlockPlaceEvent(BlockPlaceEvent event) { + if (event.getPlayer().isSneaking()) { + return; + } + + if (event.getHand() == EquipmentSlot.OFF_HAND) { + if (!DynamicLights.source.isProtectedLight(event.getItemInHand().getType())) { + return; + } + if (DynamicLights.manager.locks.getOrDefault(event.getPlayer().getUniqueId().toString(), DynamicLights.manager.toggle)) { + DynamicLights.adventure.get().player(event.getPlayer()).sendMessage(DynamicLights.language.getComponentFromID("prevent-block-place", true)); + event.setCancelled(true); + } + } + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onPlayerJoinEvent(PlayerJoinEvent event) { + DynamicLights.manager.addPlayer(event.getPlayer()); + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerQuitEvent(PlayerQuitEvent event) { + DynamicLights.manager.removePlayer(event.getPlayer().getUniqueId()); + } +} diff --git a/src/main/java/github/xCykrix/dynamicLights/util/LightManager.java b/src/main/java/github/xCykrix/dynamicLights/util/LightManager.java new file mode 100644 index 0000000..c313b24 --- /dev/null +++ b/src/main/java/github/xCykrix/dynamicLights/util/LightManager.java @@ -0,0 +1,190 @@ +package github.xCykrix.dynamicLights.util; + +import github.xCykrix.DevkitPlugin; +import github.xCykrix.dynamicLights.DynamicLights; +import github.xCykrix.extendable.DevkitFullState; +import github.xCykrix.shade.dev.dejvokep.boostedyaml.YamlDocument; +import github.xCykrix.shade.org.h2.mvstore.MVMap; +import java.util.HashMap; +import java.util.UUID; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.block.data.Waterlogged; +import org.bukkit.block.data.type.Light; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.scheduler.BukkitTask; + +public class LightManager extends DevkitFullState { + private final LightSource source; + private final HashMap tasks = new HashMap<>(); + private final HashMap lastLightLocation = new HashMap<>(); + + public final MVMap toggles; + public final MVMap locks; + private final long refresh; + private final int distance; + public final boolean toggle; + + public LightManager(DevkitPlugin plugin) { + super(plugin); + YamlDocument config = DynamicLights.configuration.getYAMLFile("config.yml"); + if (config == null) { + throw new RuntimeException("config.yml is corrupted or contains invalid formatting. Failed to load plugin."); + } + + this.source = DynamicLights.source; + this.toggles = DynamicLights.h2.get().openMap("lightToggleStatus"); + this.locks = DynamicLights.h2.get().openMap("lightLockStatus"); + this.refresh = config.getLong("update-rate"); + this.distance = config.getInt("light-culling-distance"); + this.toggle = config.getBoolean("default-toggle-state"); + } + + @Override + public void initialize() { + } + + @Override + public void shutdown() { + synchronized (this.tasks) { + for (UUID uuid : this.tasks.keySet()) { + this.tasks.get(uuid).cancel(); + } + this.tasks.clear(); + } + } + + public void addPlayer(Player player) { + synchronized (this.tasks) { + if (this.tasks.containsKey(player.getUniqueId())) { + return; + } + this.tasks.put(player.getUniqueId(), this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(this.plugin, () -> { + ItemStack mainHand = player.getInventory().getItemInMainHand(); + ItemStack offHand = player.getInventory().getItemInOffHand(); + boolean valid = this.valid(player, mainHand, offHand); + int lightLevel = 0; + if (valid) { + lightLevel = source.getLightLevel(offHand.getType(), mainHand.getType()); + } + for (Player targetPlayer : Bukkit.getOnlinePlayers()) { + String locationId = player.getUniqueId() + "/" + targetPlayer.getUniqueId(); + Location lastLocation = this.getLastLocation(locationId); + if (!valid) { + if (lastLocation != null) { + this.removeLight(targetPlayer, lastLocation); + this.removeLastLocation(locationId); + } + continue; + } + Location nextLocation = player.getEyeLocation(); + if (this.toggles.getOrDefault(targetPlayer.getUniqueId().toString(), this.toggle)) { + if (lightLevel > 0 && differentLocations(lastLocation, nextLocation)) { + if (player.getWorld().getName().equals(targetPlayer.getWorld().getName())) { + if (player.getLocation().distance(targetPlayer.getLocation()) <= this.distance) { + this.addLight(targetPlayer, nextLocation, lightLevel); + this.setLastLocation(locationId, nextLocation); + } + } + } + } + if (lastLocation != null && differentLocations(lastLocation, nextLocation)) { + this.removeLight(targetPlayer, lastLocation); + } + } + }, 50L, refresh)); + } + } + + public void removePlayer(UUID uid) { + synchronized (this.tasks) { + if (this.tasks.containsKey(uid)) { + this.tasks.get(uid).cancel(); + this.tasks.remove(uid); + } + } + } + + public void addLight(Player player, Location location, int lightLevel) { + if (lightLevel == 0) { + return; + } + Light light = (Light) Material.LIGHT.createBlockData(); + if (location.getWorld() == null) { + location.setWorld(player.getWorld()); + } + World world = location.getWorld(); + switch (world.getBlockAt(location).getType()) { + case AIR, CAVE_AIR -> { + light.setWaterlogged(false); + light.setLevel(lightLevel); + } + case WATER -> { + light.setWaterlogged(true); + light.setLevel(lightLevel - 2); + } + default -> { + } + } + player.sendBlockChange(location, light); + } + + public void removeLight(Player player, Location location) { + if (location.getWorld() == null) { + location.setWorld(player.getWorld()); + } + player.sendBlockChange(location, location.getWorld().getBlockAt(location).getBlockData()); + } + + public boolean valid(Player player, ItemStack mainHand, ItemStack offHand) { + Material main = mainHand.getType(); + Material off = offHand.getType(); + boolean hasLightLevel = source.hasLightLevel(off); + if (!hasLightLevel) { + hasLightLevel = source.hasLightLevel(main); + } + if (!hasLightLevel) { + return false; + } + Block currentLocation = player.getEyeLocation().getBlock(); + if (currentLocation.getType() == Material.AIR || currentLocation.getType() == Material.CAVE_AIR) { + return true; + } + if (currentLocation instanceof Waterlogged && ((Waterlogged) currentLocation).isWaterlogged()) { + return false; + } + if (currentLocation.getType() == Material.WATER) { + return source.isSubmersible(off, main); + } + return false; + } + + public Location getLastLocation(String uuid) { + return lastLightLocation.getOrDefault(uuid, null); + } + + public void setLastLocation(String uuid, Location location) { + lastLightLocation.put(uuid, location); + } + + public void removeLastLocation(String uuid) { + lastLightLocation.remove(uuid); + } + + private boolean differentLocations(Location l1, Location l2) { + if (l1 == null || l2 == null) { + return true; + } + if (l1.getWorld() == null || l2.getWorld() == null) { + return true; + } + if (!l1.getWorld().getName().equals(l2.getWorld().getName())) { + return true; + } + return l1.getBlockX() != l2.getBlockX() || l1.getBlockY() != l2.getBlockY() || l1.getBlockZ() != l2.getBlockZ(); + } +} diff --git a/src/main/java/github/xCykrix/dynamicLights/util/LightSource.java b/src/main/java/github/xCykrix/dynamicLights/util/LightSource.java new file mode 100644 index 0000000..62eee30 --- /dev/null +++ b/src/main/java/github/xCykrix/dynamicLights/util/LightSource.java @@ -0,0 +1,90 @@ +package github.xCykrix.dynamicLights.util; + +import github.xCykrix.DevkitPlugin; +import github.xCykrix.dynamicLights.DynamicLights; +import github.xCykrix.extendable.DevkitFullState; +import github.xCykrix.shade.dev.dejvokep.boostedyaml.YamlDocument; +import github.xCykrix.shade.dev.dejvokep.boostedyaml.block.Block; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import org.bukkit.Material; + +public class LightSource extends DevkitFullState { + private final HashMap levelOfLights = new HashMap<>(); + private final HashSet submersibleLights = new HashSet<>(); + private final HashSet lockedLights = new HashSet<>(); + + public LightSource(DevkitPlugin plugin) { + super(plugin); + } + + @Override + public void initialize() { + YamlDocument lights = DynamicLights.configuration.getYAMLFile("lights.yml"); + if (lights == null) { + throw new RuntimeException("lights.yml is corrupted or contains invalid formatting. Failed to load plugin."); + } + + // Register Light Levels + this.levelOfLights.clear(); + Map> levels = lights.getSection("levels").getStoredValue(); + for (Object material : levels.keySet()) { + try { + int level = Integer.parseInt(levels.get(material).getStoredValue().toString()); + this.levelOfLights.put(Material.valueOf((String) material), level); + } catch (Exception exception) { + this.plugin.getLogger().warning("Unable to register level for '" + material + "'. " + exception.getMessage()); + } + } + this.plugin.getLogger().info("Registered " + this.levelOfLights.size() + " items for Dynamic Lights."); + + // Register Submersible Lights + this.submersibleLights.clear(); + List submersibles = lights.getStringList("submersibles"); + for (String material : submersibles) { + try { + this.submersibleLights.add(Material.valueOf(material)); + } catch (Exception exception) { + this.plugin.getLogger().warning("Unable to register submersible for '" + material + "'. " + exception.getMessage()); + } + } + this.plugin.getLogger().info("Registered " + this.submersibleLights.size() + " items for Dynamic Submersible Lights."); + + // Register Lockable Lights + this.lockedLights.clear(); + List lockables = lights.getStringList("lockables"); + for (String material : lockables) { + try { + this.lockedLights.add(Material.valueOf(material)); + } catch (Exception exception) { + this.plugin.getLogger().warning("Unable to register lockable for '" + material + "'. " + exception.getMessage()); + } + } + this.plugin.getLogger().info("Registered " + this.lockedLights.size() + " items for Dynamic Locked Lights."); + } + + @Override + public void shutdown() { + this.lockedLights.clear(); + this.submersibleLights.clear(); + this.levelOfLights.clear(); + } + + public boolean hasLightLevel(Material material) { + return levelOfLights.containsKey(material); + } + + public Integer getLightLevel(Material material, Material fallback) { + return levelOfLights.getOrDefault(material, levelOfLights.getOrDefault(fallback, 0)); + } + + public boolean isSubmersible(Material offHand, Material mainHand) { + return submersibleLights.contains(offHand) || submersibleLights.contains(mainHand); + } + + public boolean isProtectedLight(Material offHand) { + return lockedLights.contains(offHand); + } +} \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e669a24..a577130 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -20,4 +20,4 @@ permissions: default: true dynamiclights.reload: description: "Reload the lights.yml configuration file." - default: false \ No newline at end of file + default: op \ No newline at end of file From 53c4ddb5bd62da80184ffc500730b6aa1a634ecc Mon Sep 17 00:00:00 2001 From: Samuel Voeller <12182390+xCykrix@users.noreply.github.com> Date: Thu, 15 Aug 2024 18:20:15 -0400 Subject: [PATCH 4/4] feat: update deps, set ver 1.1.0, and add workflows --- .github/workflows/compile.yml | 25 +++++++++++++++++++++++++ build.gradle.kts | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/compile.yml diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml new file mode 100644 index 0000000..409033b --- /dev/null +++ b/.github/workflows/compile.yml @@ -0,0 +1,25 @@ +name: "Java Continuous Integration" + +on: + push: + branches: [main, staging] + pull_request: + branches: [main, staging] + +jobs: + validate: + runs-on: ubuntu-latest + + name: Java Gradle Build + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'adopt' + architecture: x64 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Compile + run: ./gradlew shadowJar \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b126972..f2f83d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "github.xCykrix" -version = "1.0-SNAPSHOT" +version = "1.1.0" repositories { mavenCentral() @@ -35,7 +35,7 @@ repositories { dependencies { compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") - implementation("github.xCykrix:spigotdevkit:1.0.0") + implementation("github.xCykrix:spigotdevkit:1.0.1") } // Target Java Build (Java 17 - Minecraft 1.17.x)