Merge branch 'master' into chat-rules-fixes

Author: kevinthegreat1

.editorconfig

@@ -8,11 +8,16 @@ tab_width = 4
 
 [*.gradle]
 indent_style = tab
+ij_continuation_indent_size = 8
 
 [*.java]
 indent_style = tab
 max_line_length = off
 ij_continuation_indent_size = 8 # IntelliJ default
+# Imports
+ij_java_names_count_to_use_import_on_demand = 999
+ij_java_class_count_to_use_import_on_demand = 999
+ij_java_packages_to_use_import_on_demand = unset
 # Wrapping and Braces
 ij_java_keep_simple_blocks_in_one_line = true
 ij_java_keep_simple_classes_in_one_line = true

.gitattributes

@@ -0,0 +1,7 @@
+* text=auto eol=lf
+
+# Requires crlf
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.csv text eol=crlf
+*.ps1 text eol=crlf

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,17 +35,18 @@ body:
       label: Minecraft Version
       description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game.
       options:
-        - "1.21.0/1.21.1"
-        - "1.21.2/1.21.3"
-        - "1.21.4"
+        - "1.21.11"
+        - "1.21.9/1.21.10"
+        - "1.21.6-1.21.8"
+        - "1.21.5"
     validations:
       required: true
   - type: input
     id: skyblocker-version
     attributes:
       label: Skyblocker Version
       description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder.
-      placeholder: ex. skyblocker-5.0.0+1.21.4.jar
+      placeholder: ex. skyblocker-5.0.0+1.21.11.jar
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/crash_report.yml

@@ -16,17 +16,18 @@ body:
       label: Minecraft Version
       description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game.
       options:
-        - "1.21.0/1.21.1"
-        - "1.21.2/1.21.3"
-        - "1.21.4"
+        - "1.21.11"
+        - "1.21.9/1.21.10"
+        - "1.21.6-1.21.8"
+        - "1.21.5"
     validations:
       required: true
   - type: input
     id: skyblocker-version
     attributes:
       label: Skyblocker Version
       description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder.
-      placeholder: ex. skyblocker-5.0.0+1.21.4.jar
+      placeholder: ex. skyblocker-5.0.0+1.21.11.jar
     validations:
       required: true
   - type: textarea

.github/workflows/beta.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - master
       - bleeding-edge
+      - '**-backport'
     paths-ignore:
       - 'src/main/resources/assets/skyblocker/lang/**'
       - 'CHANGELOG.md'
@@ -62,9 +63,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          validate-wrappers: true
+        uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
         run: ./gradlew build
 
@@ -104,9 +103,7 @@ jobs:
           distribution: 'microsoft'
           java-version: '21'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          validate-wrappers: true
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run client gametest with Xvfb
         uses: modmuss50/xvfb-action@v1
@@ -117,4 +114,4 @@ jobs:
         if: always()
         with:
           name: Test Screenshots
-          path: run/screenshots
+          path: build/run/clientGameTest/screenshots

.github/workflows/buildrelease.yml

@@ -1,38 +1,38 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Build Release
 
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+# Controls when the action will run.
+# Releases should be created manually by running this workflow.
 on:
-  release:
-    types: [created]
   workflow_dispatch:
 
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'microsoft'
           java-version: '21'
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
         run: ./gradlew build
 
+      - name: Process artifacts
+        uses: actions/github-script@v7
+        id: fname
+        with:
+          result-encoding: string
+          script: |
+            const fs = require("fs")
+            return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0].replace(".jar", "");
+
       - uses: actions/upload-artifact@v4
         with:
-          name: Artifacts
+          name: ${{ steps.fname.outputs.result }}
           path: build/libs/
 
       - name: Read Changelog
@@ -70,26 +70,13 @@ jobs:
             echo "${delimiter}"
           } >> $GITHUB_OUTPUT
 
-      - uses: actions/github-script@v7
-        id: fname
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs")
-            return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0]
-
-      - name: Release
-        id: uploadrelease
-        uses: softprops/action-gh-release@v1
-        with:
-          body: ${{ steps.read_changelog.outputs.changelog }}
-          token: ${{ secrets.GH_RELEASE }}
-          files: build/libs/${{ steps.fname.outputs.result }}
-
       - name: Publish using mod-publish-plugin
         run: ./gradlew build publishMods
         env:
-          CHANGELOG: ${{ steps.read_changelog.outputs.changelog_highlight }}
+          CHANGELOG: ${{ steps.read_changelog.outputs.changelog }}
+          CHANGELOG_HIGHLIGHT: ${{ steps.read_changelog.outputs.changelog_highlight }}
+          REF_NAME: ${{ github.ref_name }}
+          GITHUB_TOKEN: ${{ secrets.GH_RELEASE }}
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}

.github/workflows/webhook_translate.yml

@@ -63,8 +63,6 @@ jobs:
               fi
           fi
           
-          OUTPUT+="..."
-          
           OUTPUT="\`\`\`diff
           $OUTPUT
           \`\`\`"
@@ -90,4 +88,4 @@ jobs:
           else
             echo "Error:"
             echo "$JSON_PAYLOAD"
-          fi
+          fi