Merge remote-tracking branch 'concealed/mc1.20.1/fabric/feature-dev' into mc1.20.1/fabric/dev

# Conflicts:
#	.editorconfig
#	src/generated/resources/.cache/08785d2602593b8339c92b292c17771037bbb1c3
#	src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9
#	src/generated/resources/.cache/528ac2e8644db78e56272a28e1f653f416709616
#	src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0
#	src/generated/resources/.cache/8ede8fad2f9d17f80679e3b4a06e7ce5921f134f
#	src/generated/resources/.cache/a76509380f1db986fe6ec9b45cfec8ecffb3c2ef

Author: TropheusJ

.editorconfig

@@ -1,5 +1,5 @@
 # http://editorconfig.org
-root = true
+#root = true
 
 [*]
 indent_style = space
@@ -25,5 +25,5 @@ ij_java_blank_lines_before_method_body = 0
 ij_java_else_on_new_line = false
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_names_count_to_use_import_on_demand = 999
-ij_java_imports_layout = $*,|,io.github.fabricators_of_create.**,net.fabricmc.**,|,java.**,|,javax.**,|,org.**,|,com.**,|,*
-ij_java_insert_inner_class_imports = true
+ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,com.**,|,*,|,net.fabricmc.**,|,io.github.fabricators_of_create.**
+ij_java_insert_inner_class_imports = true

.github/ISSUE_TEMPLATE/bug.yml

@@ -2,40 +2,37 @@ name: I found a bug!
 description: "Report some other kind of issue. You should ask in the Discord first to make sure it's actually a bug with Create."
 labels: [ "type: bug", "status: needs testing" ]
 body:
-    -   type: textarea
-        attributes:
-            label: Description
-            description: "
-            Please describe the issue with as much detail as possible.
-            Explain what happened, and what should have happened instead.
-            Add images, screenshots, or videos if they could be useful."
-        validations:
-            required: true
+  - type: textarea
+    attributes:
+      label: Description
+      description: >
+        Please describe the issue with as much detail as possible.
+        Explain what happened, and what should have happened instead.
+        Add images, screenshots, or videos if they could be useful.
+    validations:
+      required: true
 
-    -   type: input
-        attributes:
-            label: Game Log
-            description: "
-            We need the game log for additional information about the bug.
-            This file can be found in the \"logs\" folder of your Minecraft folder as \"latest.log\".
-            Please upload the file to https://mclo.gs/ and put the link here.
-            Do **not** paste the *contents* of the file here, because that will make this issue very hard to read.
-            "
-        validations:
-            required: true
+  - type: input
+    attributes:
+      label: Game Log
+      description: >
+        We need the game log for additional information about the bug.
+        This file can be found in the \"logs\" folder of your Minecraft folder as \"latest.log\".
+        Please upload the file to https://mclo.gs/ and put the link here.
+        Do **not** paste the *contents* of the file here, because that will make this issue very hard to read.
+    validations:
+      required: true
 
-    -   type: textarea
-        attributes:
-            label: Debug Information
-            description: "
-            Please run the \"/create debuginfo\" command in-game.
-            This will copy useful information to your clipboard that will greatly help with debugging.
-            Please paste this information here.
-            If this command does not exist, you can skip this part.
-            "
-        validations:
-            required: false
+  - type: textarea
+    attributes:
+      label: Debug Information
+      description: >
+        Please run the \"/create debuginfo\" command in-game.
+        This will copy useful information to your clipboard that will greatly help with debugging.
+        Please paste this information here.
+    validations:
+      required: true
 
-    -   type: markdown
-        attributes:
-            value: "Thank you for taking the time to make a report and help improve Create!"
+  - type: markdown
+    attributes:
+      value: "Thank you for taking the time to make a report and help improve Create!"

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
 blank_issues_enabled: true
 contact_links:
-    - name: I have a question!
-      url: https://discord.gg/hmaD7Se
-      about: Join us on Discord and ask the community.
-    - name: I have a suggestion or idea!
-      url: https://discord.gg/hmaD7Se
-      about: These are best discussed with the community and submitted on Discord.
-    - name: Talk to us on Discord.
-      url: https://discord.gg/hmaD7Se
-      about: Ask questions and get help from the community.
+  - name: I have a question!
+    url: https://discord.gg/hmaD7Se
+    about: Join us on Discord and ask the community.
+  - name: I have a suggestion or idea!
+    url: https://discord.gg/hmaD7Se
+    about: These are best discussed with the community and submitted on Discord.
+  - name: Talk to us on Discord.
+    url: https://discord.gg/hmaD7Se
+    about: Ask questions and get help from the community.

.github/ISSUE_TEMPLATE/crash.yml

@@ -2,26 +2,25 @@ name: My game crashed!
 description: Report an issue that crashes the game.
 labels: [ "type: crash" ]
 body:
-    -   type: textarea
-        attributes:
-            label: Context
-            description: What were you doing when the game crashed? Add images, screenshots, or videos if they could be useful.
-        validations:
-            required: true
+  - type: textarea
+    attributes:
+      label: Context
+      description: What were you doing when the game crashed? Add images, screenshots, or videos if they could be useful.
+    validations:
+      required: true
 
-    -   type: input
-        attributes:
-            label: Crash Report
-            description: "
-            We need the crash report to figure out why the crash happened.
-            This file can be found in the \"crash-reports\" folder of your Minecraft folder.
-            It will be the newest file there.
-            Please upload the file to https://mclo.gs/ and put the link here.
-            Do **not** paste the *contents* of the file here, because that will make this issue very hard to read.
-            "
-        validations:
-            required: true
+  - type: input
+    attributes:
+      label: Crash Report
+      description: >
+        We need the crash report to figure out why the crash happened.
+        This file can be found in the \"crash-reports\" folder of your Minecraft folder.
+        It will be the newest file there.
+        Please upload the file to https://mclo.gs/ and put the link here.
+        Do **not** paste the *contents* of the file here, because that will make this issue very hard to read.
+    validations:
+      required: true
 
-    -   type: markdown
-        attributes:
-            value: "Thank you for taking the time to make a report and help improve Create!"
+  - type: markdown
+    attributes:
+      value: "Thank you for taking the time to make a report and help improve Create!"

.github/config/label-actions.yml

@@ -3,53 +3,53 @@
 # ----------------------------------- ISSUES ----------------------------------- #
 
 'env: fabric':
-    issues:
-        close: true
-        close-reason: 'not planned'
-        comment: >
-            **Fabric Loader**: This issue tracker is only for the Forge/NeoForge versions of Create. Since you mentioned using Fabric Loader, please reopen this issue on the [Create Fabric issue tracker](https://github.com/Fabricators-of-Create/Create/issues). Thanks!
+  issues:
+    close: true
+    close-reason: 'not planned'
+    comment: >
+      **Fabric Loader**: This issue tracker is only for the Forge/NeoForge versions of Create. Since you mentioned using Fabric Loader, please reopen this issue on the [Create Fabric issue tracker](https://github.com/Fabricators-of-Create/Create/issues). Thanks!
 
 'env: hybrid server':
-    issues:
-        close: true
-        close-reason: 'not planned'
-        comment: >
-            **Hybrid Server Software**: Create cannot reasonably support hybrid server software, such as [MohistMC](https://mohistmc.com/), as their changes under the hood make it difficult for larger mods to function properly. If you encounter this issue on official Forge/NeoForge server software, feel free to open a new issue. Otherwise, consider reporting this issue to the hybrid server software you are using. Thanks!
+  issues:
+    close: true
+    close-reason: 'not planned'
+    comment: >
+      **Hybrid Server Software**: Create cannot reasonably support hybrid server software, such as [MohistMC](https://mohistmc.com/), as their changes under the hood make it difficult for larger mods to function properly. If you encounter this issue on official Forge/NeoForge server software, feel free to open a new issue. Otherwise, consider reporting this issue to the hybrid server software you are using. Thanks!
 
 'env: outdated create version':
-    issues:
-        close: true
-        close-reason: 'not planned'
-        comment: >
-            **Outdated Create Version**: Since you are using an outdated Create version, please update to the latest version as it may resolve your issue. If this issue persists after updating Create, feel free to open a new issue. Thanks!
+  issues:
+    close: true
+    close-reason: 'not planned'
+    comment: >
+      **Outdated Create Version**: Since you are using an outdated Create version, please update to the latest version as it may resolve your issue. If this issue persists after updating Create, feel free to open a new issue. Thanks!
 
 'env: pojav':
-    issues:
-        close: true
-        close-reason: 'not planned'
-        comment: >
-            **Pojav**: Create does not support Pojav or other mobile launchers due to rendering limitations. If you encounter this issue on a PC, feel free to open a new issue. Thanks!
+  issues:
+    close: true
+    close-reason: 'not planned'
+    comment: >
+      **Pojav**: Create does not support Pojav or other mobile launchers due to rendering limitations. If you encounter this issue on a PC, feel free to open a new issue. Thanks!
 
 'env: unsupported minecraft version':
-    issues:
-        close: true
-        close-reason: 'not planned'
-        comment: >
-            **Unsupported Minecraft Version**: Unsupported Minecraft versions no longer receive Create updates. Please check the [supported Minecraft versions](https://github.com/Creators-of-Create/Create/wiki/dev.status). If you encounter this issue on a supported Minecraft version, feel free to open a new issue. Thanks!
+  issues:
+    close: true
+    close-reason: 'not planned'
+    comment: >
+      **Unsupported Minecraft Version**: Unsupported Minecraft versions no longer receive Create updates. Please check the [supported Minecraft versions](https://github.com/Creators-of-Create/Create/wiki/dev.status). If you encounter this issue on a supported Minecraft version, feel free to open a new issue. Thanks!
 
 # ----------------------------------- PULL REQUESTS ----------------------------------- #
 
 'pr status: conflicts':
-    prs:
-        comment: >
-            @{issue-author}, this pull request has merge conflicts with the target branch. Please merge the latest changes and leave a message here so we can continue with the process of reviewing and merging this pull request. Thanks!
+  prs:
+    comment: >
+      @{issue-author}, this pull request has merge conflicts with the target branch. Please merge the latest changes and leave a message here so we can continue with the process of reviewing and merging this pull request. Thanks!
 
 'pr status: waiting for author':
-    prs:
-        comment: >
-            @{issue-author}, a developer has left a review and requested changes. Please make the requested changes or further discuss them with the developer so this pull request can be merged. Thanks!
+  prs:
+    comment: >
+      @{issue-author}, a developer has left a review and requested changes. Please make the requested changes or further discuss them with the developer so this pull request can be merged. Thanks!
 
 'pr status: wrong target':
-    prs:
-        comment: >
-            @{issue-author}, this pull request is targeting the wrong branch. Pull requests should target the branch corresponding to the earliest supported Minecraft version unless the changes are specific to code that only exists for a newer Minecraft version. Please change the target branch, resolve any merge conflicts, and leave a message here so we can continue with the process of reviewing and merging this pull request. Thanks!
+  prs:
+    comment: >
+      @{issue-author}, this pull request is targeting the wrong branch. Pull requests should target the branch corresponding to the earliest supported Minecraft version unless the changes are specific to code that only exists for a newer Minecraft version. Please change the target branch, resolve any merge conflicts, and leave a message here so we can continue with the process of reviewing and merging this pull request. Thanks!

.github/workflows/build.yml

@@ -1,62 +1,53 @@
 name: Build
 on:
-    push:
-    pull_request:
-    workflow_dispatch:
-        inputs:
-            publish:
-                description: Publish to Modrinth and CurseForge
-                required: true
-                default: "false"
-            patch:
-                description: Patch number, 0 for first (ex. Create 1.19.2 v0.5.0.g Patch N)
-                required: true
+  push:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      release:
+        description: Is this a release build?
+        type: boolean
+        required: true
+        default: false
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        env:
-            PUBLISH_SUFFIX: snapshots
-            MAVEN_USER: ${{ secrets.MAVEN_USER }}
-            MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
-            MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-            CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
-            PATCH_NUMBER: ${{ github.event.inputs.patch }}
-            PUBLISHING: ${{ github.event.inputs.publish }}
-        steps:
-            -   name: Checkout Repository
-                uses: actions/checkout@v4
-
-            -   name: Setup Java
-                run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
-
-            -   name: Loom Cache
-                uses: actions/cache@v4
-                with:
-                    path: "**/.gradle/loom-cache"
-                    key: "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}"
-                    restore-keys: "${{ runner.os }}-gradle-"
-
-            -   name: Setup Gradle
-                uses: gradle/actions/setup-gradle@v4
-                with:
-                    gradle-home-cache-cleanup: true
-
-            -   name: Validate Gradle Wrapper Integrity
-                uses: gradle/wrapper-validation-action@v2
-
-            -   name: Run Gametests
-                run: ./gradlew runGametestServer --no-daemon
-
-            -   name: Build and/or Publish
-                run: ./gradlew buildOrPublish
-
-            -   name: Capture build artifacts
-                uses: actions/upload-artifact@v4
-                with:
-                    name: Artifacts
-                    path: build/libs/
-
-            -   name: Publish to Modrinth and CurseForge
-                if: ${{ github.event.inputs.publish }}
-                run: ./gradlew publishMod
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
+      - name: Validate Gradle Wrapper Integrity
+        uses: gradle/wrapper-validation-action@v2
+
+      - name: Build
+        run: ./gradlew build
+
+      - name: Run Gametests
+        run: ./gradlew runGametestServer
+
+      - name: Publish to Maven
+        if: ${{ github.event.inputs.release }}
+        run: >-
+          ./gradlew publishAllPublicationsToDevOsReleasesRepository
+          -PdevOsReleasesUsername="${{ secrets.MAVEN_USER }}"
+          -PdevOsReleasesPassword="${{ secrets.MAVEN_PASS }}"
+
+      # TODO: add back CF and MR publishing at some point
+
+      - name: Capture Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: build/libs/

.github/workflows/label-actions.yml

@@ -1,21 +1,21 @@
-name: "Label Actions"
+name: Label Actions
 on:
-    issues:
-        types: [labeled, unlabeled]
-    pull_request_target:
-        types: [labeled, unlabeled]
+  issues:
+    types: [ labeled, unlabeled ]
+  pull_request_target:
+    types: [ labeled, unlabeled ]
 
 permissions:
-    contents: read
-    issues: write
-    pull-requests: write
-    discussions: write
+  contents: read
+  issues: write
+  pull-requests: write
+  discussions: write
 
 jobs:
-    action:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # Depend on an exact commit
-              with:
-                github-token: ${{ secrets.GITHUB_TOKEN }}
-                config-path: '.github/config/label-actions.yml'
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # Depend on an exact commit
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          config-path: '.github/config/label-actions.yml'