Merge upstream

.editorconfig

@@ -0,0 +1,23 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.java]
+end_of_line=lf
+
+[*.json]
+indent_size = 2
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.sh]
+end_of_line = lf

ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
 _Please paste the output from `/usb version` below_
 ```
 paste it here please (replace this text)
@@ -10,5 +19,3 @@ _What steps will reproduce the problem?_
 
 _If you have any log-files, please paste them to [pastebin.com](http://pastebin.com)_
 * server-log: link-to-pastebin
-
-(Not following the template will result in closing the issue.)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/deploy-release.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+echo -e "Running release script...\n"
+echo -e "Publishing javadocs and artifacts...\n"
+cd $HOME
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+echo -e "Publishing javadocs...\n"
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/po-utils/
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-API/
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-APIv2/
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-Core/
+
+echo -e "Publishing final plugin release...\n"
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/uSkyBlock-*.jar \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/downloads/release/uSkyBlock/
+
+rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/classes/version.json \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/versions/release.json

.github/deploy-staging.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+echo -e "Running staging script...\n"
+echo -e "Publishing javadocs and artifacts...\n"
+cd $HOME
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
+
+echo -e "Publishing javadocs...\n"
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/po-utils/
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-API/
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-APIv2/
+
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/site/apidocs/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-Core/
+
+echo -e "Publishing final plugin release...\n"
+
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/uSkyBlock-*.jar \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/downloads/master/uSkyBlock/
+
+rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/classes/version.json \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/versions/staging.json

.github/workflows/build.yml

@@ -0,0 +1,58 @@
+name: Maven build
+
+on:
+  push:
+    branches: [ master ]
+    tags: [ 'v*' ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build_and_test:
+    if: github.repository_owner == 'uskyblock'
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Checkout submodules
+        run: |
+          sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
+          git submodule update --init --recursive
+      - name: Generate additional language files
+        run: |
+          cd uSkyBlock-Core/src/main/po && perl en2pirate.pl && cd -
+          cd uSkyBlock-Core/src/main/po && perl en2kitteh.pl && cd -
+      - name: JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Install gettext
+        run: sudo apt-get install -y gettext
+      - name: Build with Maven
+        run: gradle build
+
+      # Install our SSH key:
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        if: ${{ github.event_name == 'push' }}
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          known_hosts: ${{ secrets.SSH_KNOWN_HOST }}
+
+      # Mark our scripts runnable:
+      - name: Mark deploy scripts runnable
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          chmod +x "${GITHUB_WORKSPACE}/.github/deploy-staging.sh"
+          chmod +x "${GITHUB_WORKSPACE}/.github/deploy-release.sh"
+
+      # Deploy from master branch (staging release):
+      - name: Run deploy script for staging release
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        run: "${GITHUB_WORKSPACE}/.github/deploy-staging.sh"
+
+      # Deploy from tag create (plugin release):
+      - name: Run deploy script for plugin release
+        if: ${{ github.event_name == 'push' && startsWith( github.ref, 'refs/tags/') }}
+        run: "${GITHUB_WORKSPACE}/.github/deploy-release.sh"

.gitignore

@@ -2,7 +2,6 @@
 .settings
 .classpath
 bin
-/dependency-reduced-pom.xml
 # Package Files #
 *.jar
 *.war
@@ -14,5 +13,9 @@ bin
 **/*.iml
 **/*~
 .idea
-**/target
-**/*.mo
+**/*.mo
+
+*.DS_Store
+
+dependency-reduced-pom.xml
+deploy_rsa

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "bukkit-utils"]
 	path = bukkit-utils
-	url = git@github.com:rlf/bukkit-utils.git
+	url = git@github.com:uskyblock/bukkit-utils.git

README.md

@@ -8,20 +8,44 @@ We are on [Spigot](https://www.spigotmc.org/resources/uskyblock-revived.66795/).
 
 This version depends on the following plugins:
 
-* Bukkit/Spigot 1.15.1-R0.1-SNAPSHOT
+* Spigot/Paper 1.19-R0.1-SNAPSHOT
 * Vault 1.7.x
-* WorldEdit 7.1.0-SNAPSHOT
-* WorldGuard 7.0.2-SNAPSHOT
-
-## Releases 
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/rlf/uSkyBlock.svg)](http://isitmaintained.com/project/rlf/uSkyBlock "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/rlf/uSkyBlock.svg)](http://isitmaintained.com/project/rlf/uSkyBlock "Percentage of issues still open")
+* WorldEdit 7.2.13
+* WorldGuard 7.0.8-SNAPSHOT
 
+## Releases
 https://www.spigotmc.org/resources/uskyblock-revived.66795/history
 
 Pre-releases will end in -SNAPSHOT, and is considered **unsafe** for production servers.
 
 Releases have a clean version number, has been tested, and should be safe for production servers.
 
+# New Maven group/artifactId
+Starting with version 3.0.0-SNAPSHOT, we've changed our Maven groupId's for all submodules except uSkyBlock-API.
+If you're using uSkyBlock-Core or po-utils as dependency in your project, update your
+dependencies to:
+
+```xml
+<dependency>
+    <groupId>ovh.uskyblock</groupId>
+    <artifactId>uSkyBlock-Core</artifactId>
+    <version>3.0.0</version>
+</dependency>
+```
+
+We're moving new API features towards APIv2, which is available as:
+
+```xml
+<dependency>
+    <groupId>ovh.uskyblock</groupId>
+    <artifactId>uSkyBlock-APIv2</artifactId>
+    <version>3.0.0</version>
+</dependency>
+```
+
+Feel free to use any of the new APIv2 functions on servers running uSkyBlock 3.0.0+. The old API-methods will
+be deprecated and removed in the upcoming plugin releases.
+
 ### Bukkit/Spigot 1.7.9/10 Releases
 
 We provide pre-compiled versions (no support) [here](http://rlf.github.io/uSkyBlock):