Mojang translations

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

@@ -4,62 +4,62 @@ echo -e "Running release script...\n"
 echo -e "Publishing javadocs and artifacts...\n"
 cd $HOME
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/bukkit-utils/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-AWE370/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
-
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
 echo -e "Publishing javadocs...\n"
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/release/po-utils/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/build/docs/javadoc/ \
+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/bukkit-utils/build/docs/javadoc/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/bukkit-utils/
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/release/uSkyBlock-API/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/build/docs/javadoc/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-API/
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/release/uSkyBlock-APIv2/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/build/docs/javadoc/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-APIv2/
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/release/uSkyBlock-Core/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/build/docs/javadoc/ \
+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 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/uSkyBlock-*.jar \
-travis@travis.internetpolice.eu:WWW-USB/downloads/release/uSkyBlock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/build/libs/uSkyBlock-*.jar \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/downloads/release/uSkyBlock/
 
-rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/classes/version.json \
-travis@travis.internetpolice.eu:WWW-USB/versions/release.json
+rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/build/resources/main/version.json \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/versions/release.json

.github/deploy-staging.sh

@@ -4,62 +4,62 @@ echo -e "Running staging script...\n"
 echo -e "Publishing javadocs and artifacts...\n"
 cd $HOME
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/bukkit-utils/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-AWE370/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
-
-rsync -r --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/mvn-repo/ \
-travis@travis.internetpolice.eu:WWW-USB/maven/uskyblock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/build/mvn-repo/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
 
 echo -e "Publishing javadocs...\n"
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/master/po-utils/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/po-utils/build/docs/javadoc/ \
+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/bukkit-utils/build/docs/javadoc/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/bukkit-utils/
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/master/uSkyBlock-API/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/build/docs/javadoc/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-API/
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/master/uSkyBlock-APIv2/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/build/docs/javadoc/ \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-APIv2/
 
-rsync -r --delete --quiet -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/site/apidocs/ \
-travis@travis.internetpolice.eu:WWW-USB/javadocs/master/uSkyBlock-Core/
+rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/build/docs/javadoc/ \
+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 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/uSkyBlock-*.jar \
-travis@travis.internetpolice.eu:WWW-USB/downloads/master/uSkyBlock/
+rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/build/libs/uSkyBlock-*.jar \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/downloads/master/uSkyBlock/
 
-rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 2222 -o StrictHostKeyChecking=no" \
-$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/classes/version.json \
-travis@travis.internetpolice.eu:WWW-USB/versions/staging.json
+rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
+$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/build/resources/main/version.json \
+u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/versions/staging.json

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Maven build
+name: Gradle build
 
 on:
   push:
@@ -10,33 +10,28 @@ on:
 jobs:
   build_and_test:
     if: github.repository_owner == 'uskyblock'
-    runs-on: ubuntu-latest
+    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 17
-        uses: actions/setup-java@v3
+        uses: actions/checkout@v6
+      - name: JDK 21
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Install gettext
         run: sudo apt-get install -y gettext
-      - name: Cache Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build with Maven
-        run: mvn -U -Pi18n clean deploy
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Verify keys.pot is up to date (PR)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          ./gradlew :uSkyBlock-Core:extractTranslation --no-daemon --no-configuration-cache
+          git diff --exit-code -- uSkyBlock-Core/src/main/po/keys.pot
+
+      - name: Build with Gradle
+        run: ./gradlew build translation publishAllPublicationsToStagingRepository --no-daemon --no-configuration-cache
 
       # Install our SSH key:
       - name: Install SSH key

.gitignore

@@ -18,4 +18,16 @@ bin
 *.DS_Store
 
 dependency-reduced-pom.xml
-deploy_rsa
+deploy_rsa
+
+.output.txt
+
+
+# Gradle
+.gradle
+**/build
+**/.kotlin
+!gradle/wrapper/gradle-wrapper.jar
+.gradle-home
+
+run/