Merge branch 'master' into feature/avg-and-low-timings-flags

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -101,8 +101,6 @@ body:
     options:
       - Spigot
       - Paper
-      - Tuinity
-      - Yatopia
       - Purpur
       - Airplane
       - Other (please specify in your description)
@@ -115,10 +113,11 @@ body:
     label: '🎮 Minecraft Version'
     description: 'Please select the Minecraft version of the server'
     options:
+      - 1.20.x
+      - 1.19.x
+      - 1.18.x
       - 1.17.x
       - 1.16.x
-      - 1.15.x
-      - 1.14.x
       - (Older versions are not supported)
 
 - id: slimefun-version

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,6 +17,7 @@
 <!-- Don't worry, these are not requirements. They only serve as guidance. -->
 - [ ] I have fully tested the proposed changes and promise that they will not break everything into chaos.
 - [ ] I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
+- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.20.*).
 - [ ] I followed the existing code standards and didn't mess up the formatting.
 - [ ] I did my best to add documentation to any public classes or methods I added.
 - [ ] I have added `Nonnull` and `Nullable` annotations to my methods to indicate their behaviour for null values

.github/workflows/auto-approve.yml

@@ -2,18 +2,25 @@ name: Auto approve
 
 on: pull_request
 
+permissions:
+  contents: read
+
 jobs:
   auto-approve:
 
     name: Auto approve Pull Request
     runs-on: ubuntu-latest
 
-    ## Only run this on the main repo
+    # for hmarr/auto-approve-action to approve PRs
+    permissions:
+      pull-requests: write
+
+    # Only run this on the main repo
     if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4'
 
     steps:
     - name: Approve via actions
-      uses: hmarr/auto-approve-action@v2.1.0
+      uses: hmarr/auto-approve-action@v3.2.1
       if: github.actor == 'TheBusyBot' || github.actor == 'renovate[bot]'
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/auto-squash.yml

@@ -1,4 +1,4 @@
-name: Auto squash Crowdin updates
+name: Auto squash pull requests
 
 on:
   pull_request_review:
@@ -12,17 +12,17 @@ on:
   status: {}
 
 jobs:
-  autosquash:
+  autosquash-crowdin:
 
-    name: Auto squash
+    name: Auto squash (Crowdin)
     runs-on: ubuntu-latest
 
     ## Only run this on the main repo
     if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4'
 
     steps:
     - name: Auto squash
-      uses: pascalgn/automerge-action@v0.14.3
+      uses: pascalgn/automerge-action@v0.15.6
       env:
         GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         UPDATE_RETRIES: 0
@@ -31,3 +31,23 @@ jobs:
         MERGE_DELETE_BRANCH: true
         MERGE_LABELS: '📄 Translations Update'
         MERGE_COMMIT_MESSAGE: '[CI skip] New locale updates from Crowdin'
+
+  autosquash-renovate:
+
+    name: Auto squash (Renovate)
+    runs-on: ubuntu-latest
+
+    ## Only run this on the main repo
+    if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4'
+
+    steps:
+    - name: Auto squash
+      uses: pascalgn/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+        UPDATE_RETRIES: 0
+        MERGE_METHOD: squash
+        MERGE_FORKS: false
+        MERGE_DELETE_BRANCH: true
+        MERGE_LABELS: '🚨 Dependency Update'
+        MERGE_COMMIT_MESSAGE: '[CI skip] ${{ github.event.pull_request.title }}'

.github/workflows/discord-webhook.yml

@@ -7,6 +7,9 @@ on:
     - '!src/main/resources/languages/**'
     - 'pom.xml'
 
+permissions:
+  contents: read
+
 jobs:
   report:
 
@@ -18,18 +21,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v3.5.3
 
-    - name: Set up Java JDK 11
-      uses: actions/setup-java@v2.3.0
+    - name: Set up Java JDK 17
+      uses: actions/setup-java@v3.11.0
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
         java-package: jdk
         architecture: x64
 
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/duplicates.yml

@@ -4,6 +4,10 @@ on:
   issue_comment:
     types: [created]
 
+permissions:
+  contents: read
+  issues: write
+
 jobs:
   comment:
 

.github/workflows/json-validator.yml

@@ -8,6 +8,9 @@ on:
     paths:
     - 'src/main/resources/wiki.json'
 
+permissions:
+  contents: read
+
 jobs:
   validate:
 
@@ -16,8 +19,8 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v2
-    - name: Validate JSON
+      uses: actions/checkout@v3
+    - name: Validate wiki.json
       uses: docker://orrosenblatt/validate-json-action:latest@sha256:02370758b8b199e0477da11ecfdd498c75c561685056b5c31b925a4ab95df7f4
       env:
         INPUT_SCHEMA: '.github/configs/wiki-schema.json'

.github/workflows/label-resolved-issues.yml

@@ -0,0 +1,32 @@
+name: Label resolved issues
+
+on:
+  issues:
+    types: [closed]
+
+permissions:
+  contents: read
+  issues: write
+
+jobs:
+  label:
+
+    name: Label Issue
+    runs-on: ubuntu-latest
+    if: contains(github.event.issue.labels.*.name, '🐞 Bug Report')
+
+    steps:
+      - name: Query recent commits
+        uses: TheBusyBiscuit/[email protected]
+        id: resolved
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          max_commits: 20
+
+      - name: Add label
+        if: contains(steps.resolved.outputs.issues, github.event.issue.number)
+        uses: maxkomarychev/octions/octions/issues/add-labels@master
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          issue_number: ${{ github.event.issue.number }}
+          labels: '✔ Resolved'

.github/workflows/maven-compiler.yml

@@ -12,6 +12,10 @@ on:
     - '.github/workflows/**'
     - 'src/**'
     - 'pom.xml'
+    - 'CHANGELOG.md'
+
+permissions:
+  contents: read
 
 jobs:
   build:
@@ -21,16 +25,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v2.3.0
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3.11.0
       with:
         distribution: 'adopt'
-        java-version: '8'
+        java-version: '17'
+        java-package: jdk
+        architecture: x64
 
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/merge-conflicts.yml

@@ -5,6 +5,10 @@ on:
     branches:
     - master
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   validate:
 

.github/workflows/pr-labels.yml

@@ -1,10 +1,14 @@
 name: Pull Request Labels
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - opened
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   pr-labeler:
 
@@ -27,7 +31,7 @@ jobs:
           api: '🔧 API'
           compatibility: '🤝 Compatibility'
 
-      - uses: thollander/actions-comment-pull-request@1.0.3
+      - uses: thollander/actions-comment-pull-request@v2.4.0
         name: Leave a comment about the applied label
         if: ${{ steps.labeller.outputs.applied != 0 }}
         with:
@@ -36,7 +40,7 @@ jobs:
             Your Pull Request was automatically labelled as: "${{ steps.labeller.outputs.applied }}"
             Thank you for contributing to this project! ❤️
 
-      - uses: thollander/actions-comment-pull-request@1.0.3
+      - uses: thollander/actions-comment-pull-request@v2.4.0
         name: Leave a comment about our branch naming convention
         if: ${{ steps.labeller.outputs.applied == 0 }}
         with: