[CORE] ArmorStandEditor 1.19-35 (#40)

* [CORE] Version Bump to 1.18.2-35 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [MVN] Introduce WorldGuard, Plotsquared, GriefPrevention Addons Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] Introduce WorldGuard Protection Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] PlotSquared and Towny Implementations Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] PlotSquared Added to SoftDepend List Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] Fix Towny Protection not returning correctly and implement protection checks in Edit Class Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Comments added to explain the changes to CanEdit Function Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Add GriefPreventionProtection - Closes Wolfieheart/ArmorStandEditor-Issues#24 in FULL Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Code Review Remarks from Sonar. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Code Review Remarks from Sonar. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Bump PlotSquared to 6.6.0 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] Bump WorldGuard to 7.0.7 and Towny to 0.98.0.3 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * Create ru_RU.yml * Update ru_RU.yml * Update ru_RU.yml * [CORE] Update CanEdit with Protections Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Fix Metrics - English not a language, which was bizzare. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Fix Metrics - English not a language, which was bizzare. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Revert "Update CanEdit with Protections" Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.1 (#42) Co-authored-by: Renovate Bot <[email protected]> * [CORE] Merge ItemFrame and ArmorStand canEdit Checks to 1 consolodated if Statement Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CI] Bump Towny to v0.98.1.0 (#45) Co-authored-by: Renovate Bot <[email protected]> * [CORE] Reimplement Protection Fix and Split ItemFrame and ArmorStand CanEdit. Potential Fix for: Wolfieheart/ArmorStandEditor-Issues#28 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CI] Update actions/cache action to v3 (#48) Co-authored-by: Renovate Bot <[email protected]> * [CI] Update dependency com.palmergames.bukkit.towny:towny to v0.98.1.2 (#47) Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Larry (Wolfieheart) <[email protected]> * [CORE] Fix for Invisible ArmorStands being unable to be moved. Fix Wolfieheart/ArmorStandEditor-Issues#28 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CI] Update Towny from 0.98.1.2 -> 0.98.1.3 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CI] Update maven-shade-plugin to v3.3.0 (#52) Co-authored-by: Renovate Bot <[email protected]> * [CI] Bump towny to v0.98.1.4 (#56) Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Larry (Wolfieheart) <[email protected]> * [CI] Dependancy Updates: Towny, Plotsquared etc. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] Update Protections to have Permission to IgnoreProtection + Implement asedit.* Ignore Protection Perms are defauled to false, ASEdit.* is ONLY FOR OP USE! Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [ci-skip] Fix Spacing Issues in plugin.yml Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] Add List of Developers and Small Improvement to Calculations in Util - Thanks Havens-Edge-MC / Gyztor! Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> Signed-off-by: Wolfieheart <[email protected]> * [CORE] Correct Spelling in Util - FULLCIRCLE to fullCircle - #JustIDEComplaints Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> Signed-off-by: Wolfieheart <[email protected]> * [CI-SKIP] Add Havens-Edge-MC to authors list - Fantastic Repo with good ideas for improvements. Will keep an eye on ;) Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> Signed-off-by: Wolfieheart <[email protected]> * [CORE] Revert and continue rework of WorldGuard Protection to introduce custom flag. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> Signed-off-by: Wolfieheart <[email protected]> * [CORE] Revert WorldGuard Custom Flag Implementation to 1.18.2-35pre2 Base. Fixes and Tested for Wolfieheart/ArmorStandEditor-Issues#32 # This reverts commit d7ebdb6. * [CI-SKIP] Add Placeholder TODO for Metrics RE: Invisibilty Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Laurence Somers <[email protected]> * [CORE] Optimize Imports for Language Signed-off-by: Wolfieheart <[email protected]> * [CORE] Fix apparent typo for InvisibleItemFrames in Config and Add Metrics to check Config Usage Signed-off-by: Wolfieheart <[email protected]> * [CORE] Protections & Debug Logging - Introduce One of the Many Skyblock Plugins to the Protection List. - Introduce more Debug Logging: Need to think on what and where. - Optimize Protection Import - Reorder Finals for SpigotResourceId and PluginID for Bstats and Updater etc. etc. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Fix the Build - Could not find NMSVersion Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Version Bump to 1.18.2-35 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Github <[email protected]> * [CORE] Re-commit permissions to ignore Protections Signed-off-by: Wolfieheart <[email protected]> * [CORE] Better GriefPrevention Implementation for Wolfieheart/ArmorStandEditor-Issues#36 Has to be tested in full later on. Signed-off-by: Wolfieheart <[email protected]> * [CORE] Code Review Remarks from Sonar + Add Event that we cant getEnabledClaimsForWorld in GriefPrevention Has to be tested in full later on. Signed-off-by: Wolfieheart <[email protected]> * [CORE] Code Review Remarks from Sonar + Add Event that we cant getEnabledClaimsForWorld in GriefPrevention Has to be tested in full later on. Signed-off-by: Wolfieheart <[email protected]> * [CORE] Remove TODO in ArmorStandEditorPlugin - Made it a ? for 1.19 Signed-off-by: Wolfieheart <[email protected]> * [CORE] CustomModelData Support on EditTool Functionality ONLY! To be Tested Throughly later. Signed-off-by: Wolfieheart <[email protected]> * [CORE] CR Remarks + Add TODO to add to Lang File for Failure. Signed-off-by: Wolfieheart <[email protected]> * [CI-SKIP] Fix comment RE: EditTool and commandGive Signed-off-by: Wolfieheart <[email protected]> * [CORE] Add GiveCommand Language Message on Success. Still to be added to Lang Files Signed-off-by: Wolfieheart <[email protected]> * [CORE] Fix Crash in relation SkyblockProtection - Not Initialized in PlayerEditorManager Signed-off-by: Wolfieheart <[email protected]> * [CORE] Fix Bug Per Sonar Remarks Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CI] Update actions/upload-artifact action to v3.1.0 (#71) Co-authored-by: Renovate Bot <[email protected]> * [CI] Introduce Stale System Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CI] Move Issue Templates over to this Repository Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * Update dependency com.palmergames.bukkit.towny:towny to v0.98.1.13 (#75) [CI] Update dependency com.palmergames.bukkit.towny:towny to v0.98.1.13 (#75) * [CI] Move Dependabot over to a Weekly Schedule Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Update Language to include messages RE: Give Command. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Update All Language Files to Match. - Run NL Translations through Miknes123 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Add Debug Output for Commands. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Add Alternate Chat Color Support and Better Checks in Skyblock Protection for Bypass Mode Signed-off-by: Wolfieheart <[email protected]> * [CORE] FIX Check for CustomModelData Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Prep Move to 1.19.x Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Prep Move to 1.19.x - Fix after fact. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Prep Move to 1.19.x part 3 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Fix Tab Spaces to be 4 Standard for all files. Update License to GNU v3, Add Java 11 Build. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Prep 1.19.x Part 4 - Wolfie keeps missing things Update :P Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Fix Java Failure, Drop 11 Build and only support 17 and 18 for now. Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CI] Introduction of CONTRIBUTING.MD and pull_request_templates Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * Delete LICENSE.md * Create LICENSE.md * [CI] Update CONTRIBUTING.MD and PR Template to follow the standard we are now using for Major Versions Signed-off-by: Wolfieheart <[email protected]> * [CI] Fix up CONTRIBUTING.MD Signed-off-by: Wolfieheart <[email protected]> * [CI] Fix up Dependencies: - Bump PlotSquared-Bukkit and PlotSquared-Core to 6.7.0 - Bump Towny to 0.98.2.2 Signed-off-by: Wolfieheart <[email protected]> * [CORE] Add in 1.19 Version Notes and info RE Contributions Signed-off-by: Wolfieheart <[email protected]> * [CORE] Version Bump - Spigot 1.19 Support as base API Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Fix to remove the Additional Message if Give Fails Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] POM Builds still 1.19.x-35 instead of 1.19-35 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CORE] Bump PS to 6.9.0 Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: [email protected] <ParamoreFan1994$> * Update dependency com.palmergames.bukkit.towny:towny to v0.98.2.4 (#79) * [CI] Introduce Stale System Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * [CI] Move Issue Templates over to this Repository Signed-off-by: Wolfieheart <[email protected]> Signed-off-by: Wolfstorm <[email protected]> * Update dependency com.palmergames.bukkit.towny:towny to v0.98.2.4 Co-authored-by: Wolfstorm <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [CORE] Introduce GriefDefender Protection - Fixes #81 Signed-off-by: [email protected] <ParamoreFan1994$> * [CORE] Add IgnoreProtections to Plugin.yml -> Basically I forgot to do this Signed-off-by: Wolfieheart <[email protected]> * [CI SKIP] Add in Info RE: GriefPrevention no longer being active Signed-off-by: Wolfieheart <[email protected]> * [CORE] Fix issue with UpdateChecker post Relocation Signed-off-by: Wolfieheart <[email protected]> * [CORE] Fix issue with UpdateChecker post Relocation Signed-off-by: Wolfieheart <[email protected]> * [CORE] Fix Debug Output being active by default. Signed-off-by: Wolfieheart <[email protected]> * [CI] Update Towny to 0.98.2.6 - Closes #82 Signed-off-by: Wolfieheart <[email protected]> * [CI-SKIP] Fix Description for GriefDefender Ignore Protection Perms. #CopyPasteError Signed-off-by: Wolfieheart <[email protected]> Co-authored-by: KPidS <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Laurence Somers <[email protected]>
Wolfieheart · Jun 22, 2022 · 51d476c · 51d476c
1 parent ac34c26
commit 51d476c
Show file tree

Hide file tree

Showing 40 changed files with 3,557 additions and 2,341 deletions.
diff --git a/.github/CONTRIBUTING.MD b/.github/CONTRIBUTING.MD
@@ -0,0 +1,49 @@
+## Contributing to ArmorStandEditor
+
+We are happy that you are willing to contribute. Usually, we are very lenient with all PRs, but there are still some guidelines you can follow to make the approval process go smoother.
+
+- Do you run a server and have experience in Development? Take a look at our ["Help Wanted"](https://github.com/Wolfieheart/ArmorStandEditor/labels/help%20wanted) and ["BUG-0: Pending Investigation"](https://github.com/Wolfieheart/ArmorStandEditor/labels/BUG-0%3A%20Pending%20Investigation) Issues,  where you can find issues that need extra testing and investigation.
+- Do you speak multiple languages? If so, we always welcome contributions for our Language Files/Translations
+
+## Contributing Code?
+Code Contributions are always welcomed and are made via GitHub's Pull Request System. Make a Personal Fork of the ArmorStandEditor repository (this) and open it in your IDE of Choice.
+You can ask for any information/help on your idea/contribution to the [ASE Discord](https://discord.com/invite/aUf4AWAKmr) in the #development channel.
+
+- Please make sure to read our [License](https://github.com/Wolfieheart/ArmorStandEditor/blob/master/LICENSE.md) before contributing.  If you do not agree with the terms and conditions of our license, please do not contribute any code.
+- By making a pull request, you represent that you have the right to waive copyright and related rights to your contribution, and agree that all copyright and related rights in your contributions are waived, and you acknowledge that we have the copyright to use and modify your contribution under our [License](https://github.com/Wolfieheart/ArmorStandEditor/blob/master/LICENSE.md) for perpetuity.
+
+## Making Any Changes
+- Create a personal fork (not an org fork) of the ArmorStandEditor repository (this).
+    - Name your branch something relevant (i.e: /dev/\<Version Here>/\<Feature Name Here>)
+    - Work off the Development Branch unless already Merged into Main - This will therefore allow Developments to be merged together to 1 big branch
+    - To create a branch in Git;
+        - `git branch relevantBranchName`
+        - Then checkout the new branch with `git checkout relevantBranchName`
+    - Check for unnecessary whitespace with `git diff --check` before committing.
+    - Please follow the below for Commits:
+      - `[CORE]` annotation for New Features, Bug Fixes, Performance Improvements etc.
+      - `[CI]` annotation for changes related to Continuous Integration
+      - `[DOC]` annotation for Documenting - Either code or fixing the wiki
+      - `[LANG]` annotation for new languages/updated translations
+      - `[MISC]` annotation for anything that does not fit the above requirements
+
+## Code requirements
+- You must use Tabs (Size 4 Spaces).
+- Keep your environment in Java 17. GitHub handles building all of this into Java 17 and 18, but keep in mind that, while you will be able to use modern language features that way (like patterns), some standard library methods added after jdk 11 (the minimum supported version: 55.0 for certain plugins) will not work and cause "cannot find symbol" errors when building (like String.isBlank).
+- Avoid Wildcard Imports (Preferred, but is allowed. Let me know if this can't be avoided on Discord.)
+- Don't run IDE Formatters over entire class files, unless it's a new class-file you're implementing
+    - This is done to avoid us changing the lines everytime, each IDE is different, so we don't have a constant here and there.
+    - This also keeps file compares on GitHub simple.
+- Reflection should be a last resort.
+- Do not use NMS or CraftBukkit Code. Bukkit/Spigot API calls only.
+
+
+## Contributing translations
+Translations of ArmorStandEditor's Base Language File [English (US)](https://github.com/Wolfieheart/ArmorStandEditor/blob/master/src/main/resources/lang/en_US.yml) are welcomed and can be done following the Code Guidelines outlined above.
+
+- Do not work on the en_US.yml base file, this gets overwritten when the plugin gets enabled. Please create a new language file
+- Language files are stored in `resources/lang/<name_Here>.yml` 
+  - Usually Name_Here points to Language Code and Land Code (ex: nl_BE.yml). 
+  - Examples can be found [here](https://www.fincher.org/Utilities/CountryLanguageList.shtml).
+- Change the formatting codes at the start of a file as desired.
+- Please add your language/translation on the Discord, so we know that you added it. We will handle the rest by working off your branch such as adding it to the Metrics tool and adding it to the update routine.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,10 +9,10 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   # Maintain dependencies for maven
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,32 @@
+<!--- Welcome! It looks like you're opening a pull request for the ArmorStandEditor project, we think that's great. This form is pre-populated with a Contributor License Agreement, which is required if you want to contribute your code. It is there to protect your copyright over the code but also to protect ArmorStandEditor, making your code available to us to use indefinitely. --->
+#### Description:
+<!--- Describe your Pull Request's purpose here please. --->
+
+----
+### [CORE] Changes
+*Changes to the core of the plugin - Performance Fixes, Bug Fixes, New Features, New Permission Nodes, New Config Options etc.* 
+<!---- List your changes under this in a bullet point list --->
+
+
+
+----
+### [CI] Changes
+*Changes relating to the Continuous Integration of other Plugin APIs, Github Workflows, Issue Templates etc.*
+<!---- List your changes under this in a bullet point list --->
+
+----
+### [DOC] Changes
+*Changes relating to plugin Documentation - See the Wiki for more info*
+<!---- List your changes under this in a bullet point list --->
+
+----
+### [MISC] Changes
+*Changes that does not fit in the above list*
+<!---- List your changes under this in a bullet point list --->
+
+
+____
+- [ ] I have tested this pull request for defects on a server.
+<!--- Place x between [ ] if you have tested this code on a server. --->
+
+By making this pull request, I represent that I have the right to waive copyright and related rights to my contribution, and agree that all copyright and related rights in my contributions are waived, and I acknowledge that the ArmorStandEditor Project Owners have the copyright to use and modify my contribution under the ArmorStandEditor [License](https://github.com/Wolfieheart/ArmorStandEditor/blob/master/LICENSE.md) for perpetuity.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -8,30 +8,33 @@ jobs:
   compile:
     if: "!contains(github.event.head_commit.message, 'ci-skip') || !contains(github.event.head_commit.message, 'CI-SKIP') || !contains(github.event.head_commit.message, 'CI SKIP') || !contains(github.event.head_commit.message, 'ci skip') "
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ['17', '18']
     steps:
       # 1. Check out the current working tree
       - name: Checkout ArmorStandEditor Repository
         uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      # 2. Setup Java 17 JDK
-      - name: Set up JDK 17 Environment
+      # 2. Setup Java JDK
+      - name: Set up JDK Environments
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: ${{ matrix.java }}
           distribution: 'zulu'
 
       # 3. Setup local Maven package cache to speed up building
       - name: Cache SonarCloud packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -53,7 +56,7 @@ jobs:
 
       #6 Upload Artifacts (Debug Purposes)
       - name: Upload Artifact for Debugging
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: artifact
           path: /home/runner/work/ArmorStandEditor/ArmorStandEditor/target/armorstandeditor-*-*.jar

diff --git a/.whitesource b/.whitesource