Backport to Minecraft 1.19.4 (#20)

Hantonik · Jun 17, 2024 · 2ef53e0 · 2ef53e0
1 parent 0f3bce4
commit 2ef53e0
Show file tree

Hide file tree

Showing 152 changed files with 6,558 additions and 8,795 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,9 +1,8 @@
 name: 'Bug report'
 description: 'If you notice any bugs or problems with FBP, report them here!'
 
-title: '[Bug] <title>'
+title: '[Bug] '
 labels: [ 'bug' ]
-assignees: [ 'Hantonik' ]
 
 body:
   - type: markdown
@@ -17,7 +16,7 @@ body:
       label: 'Issue description:'
       description: |
         "It doesn't work" is not really helpful.
-      placeholder: 'Description'
+      placeholder: 'Description...'
     validations:
       required: true
   - type: textarea
@@ -35,7 +34,7 @@ body:
   - type: input
     attributes:
       label: 'FBP version:'
-      placeholder: '1.0.0.0'
+      placeholder: 'e.g. 1.0.0.0'
     validations:
       required: true
   - type: dropdown
@@ -44,30 +43,23 @@ body:
       description: |
         Older versions are **not** supported!
       options:
+        - '1.20.6'
         - '1.20.4'
+        - '1.20.1'
         - '1.19.4'
+        - '1.19.2'
         - '1.18.2'
         - '1.17.1'
         - '1.16.5'
       multiple: true
     validations:
       required: true
-  - type: dropdown
-    attributes:
-      label: 'Modloader:'
-      description: |
-        What modloader does the bug occur on?
-      multiple: true
-      options:
-        - 'Forge'
-        - 'NeoForge'
-        - 'Fabric'
-    validations:
-      required: true
   - type: input
     attributes:
       label: 'Modloader version:'
-      placeholder: 'Forge / NeoForge / Fabric'
+      description: |
+        What modloader does the bug occur on?
+      placeholder: 'e.g. Forge 47.2.0'
     validations:
       required: true
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,9 +1,8 @@
 name: 'Feature request'
 description: 'Have any suggestions? Let me know about them here!'
 
-title: '[Feature] <title>'
+title: '[Feature] '
 labels: [ 'enhancement' ]
-assignees: [ 'Hantonik' ]
 
 body:
   - type: markdown
@@ -16,32 +15,36 @@ body:
       label: 'Feature description:'
       description: |
         Please describe your idea as clearly as you can.
-      placeholder: 'Description, context, etc...'
+      placeholder: 'Description...'
     validations:
       required: true
   - type: dropdown
     attributes:
       label: 'Minecraft version:'
       description: |
         What version of Minecraft would you like this on?
-        You can skip this if your request is not tied to any version.
-        
         Older versions are **not** supported!
+        
+        **You can skip this if your request is not tied to any version.**
       multiple: true
       options:
-        - '1.16.5'
-        - '1.17.1'
-        - '1.18.2'
-        - '1.19.4'
-        - '1.20.4'
-        - '1.21'
         - 'Newer'
+        - '1.21'
+        - '1.20.6'
+        - '1.20.4'
+        - '1.20.1'
+        - '1.19.4'
+        - '1.19.2'
+        - '1.18.2'
+        - '1.17.1'
+        - '1.16.5'
   - type: dropdown
     attributes:
       label: 'Modloader:'
       description: |
         What modloader would you like this on?
-        You can skip this if your request is not tied to any modloader (or select both).
+        
+        **You can skip this if your request is not tied to any modloader.**
       multiple: true
       options:
         - 'Forge'

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -10,15 +10,17 @@ on:
 
   push:
     branches:
-      - 'feature/**'
-      - 'dev/**'
+      - '*/**'
 
   workflow_dispatch:
 
 jobs:
   build:
     name: 'Build PR'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        loader: [ 'Forge', 'Fabric' ]
 
     steps:
       - name: 'Checkout repository'
@@ -33,22 +35,15 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: 'Build with Gradle'
+      - name: 'Build ${{ matrix.loader }} with Gradle'
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: :${{ matrix.loader }}:build
           cache-read-only: false
 
-      - name: 'Move artifacts'
-        shell: bash
-        run: |
-          mkdir artifacts
-          cp Fabric/build/libs/*.jar artifacts
-          cp Forge/build/libs/*.jar artifacts
-
-      - name: 'Upload artifacts'
-        uses: actions/upload-artifact@v3
+      - name: 'Upload ${{ matrix.loader }} artifacts'
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
-          name: 'Artifacts'
-          path: artifacts/*
+          name: 'Artifacts-${{ matrix.loader }}'
+          path: ${{ matrix.loader }}/build/libs/*.jar
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,6 +14,9 @@ jobs:
   build:
     name: 'Build'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        loader: [ 'Forge', 'Fabric' ]
 
     steps:
       - name: 'Checkout repository'
@@ -28,22 +31,15 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: 'Build with Gradle'
+      - name: 'Build ${{ matrix.loader }} with Gradle'
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: :${{ matrix.loader }}:build
           cache-read-only: false
 
-      - name: 'Move artifacts'
-        shell: bash
-        run: |
-          mkdir artifacts
-          cp Fabric/build/libs/*.jar artifacts
-          cp Forge/build/libs/*.jar artifacts
-
-      - name: 'Upload artifacts'
-        uses: actions/upload-artifact@v3
+      - name: 'Upload ${{ matrix.loader }} artifacts'
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
-          name: 'Artifacts'
-          path: artifacts/*
+          name: 'Artifacts-${{ matrix.loader }}'
+          path: ${{ matrix.loader }}/build/libs/*.jar
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,11 +3,14 @@ name: 'Publish'
 on:
   workflow_dispatch:
     inputs:
-      suffix:
-        type: string
-        required: false
+      label:
+        type: choice
+        description: 'Version label'
+        options:
+          - -beta
+          - -alpha
         default: ''
-        description: 'Suffix/Release type'
+        required: false
 
 permissions:
   contents: write
@@ -17,6 +20,9 @@ jobs:
   build:
     name: 'Build'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        loader: [ 'Forge', 'Fabric' ]
 
     steps:
       - name: 'Checkout repository'
@@ -31,25 +37,18 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: 'Build with Gradle'
+      - name: 'Build ${{ matrix.loader }} with Gradle'
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: :${{ matrix.loader }}:build
           cache-read-only: false
 
-      - name: 'Move artifacts'
-        shell: bash
-        run: |
-          mkdir artifacts
-          cp Fabric/build/libs/*.jar artifacts
-          cp Forge/build/libs/*.jar artifacts
-
-      - name: 'Upload artifacts'
-        uses: actions/upload-artifact@v3
+      - name: 'Upload ${{ matrix.loader }} artifacts'
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
-          name: 'Artifacts'
-          path: artifacts/*
+          name: 'Artifacts-${{ matrix.loader }}'
+          path: ${{ matrix.loader }}/build/libs/*.jar
 
   changelog:
     name: 'Generate changelog'
@@ -75,7 +74,7 @@ jobs:
           cache-read-only: false
 
       - name: 'Upload changelog'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
           name: 'Changelog'
@@ -103,7 +102,7 @@ jobs:
           distribution: 'temurin'
 
       - name: 'Download changelog'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: 'Changelog'
           path: Changelog/
@@ -139,7 +138,7 @@ jobs:
           fallback: '0.0.0.0'
 
       - name: 'Download changelog'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: 'Changelog'
           path: Changelog/
@@ -149,27 +148,31 @@ jobs:
         with:
           include: Changelog/**
           find: "${version}"
-          replace: "`${{ steps.latest-tag.outputs.tag }}${{ inputs.suffix }}`"
+          replace: "`${{ steps.latest-tag.outputs.tag }}${{ inputs.label }}`"
           regex: false
 
-      - name: 'Download artifacts'
-        uses: actions/download-artifact@v3
+      - name: 'Download ${{ matrix.loader }} artifacts'
+        uses: actions/download-artifact@v4
         with:
-          name: 'Artifacts'
+          pattern: 'Artifacts-*'
           path: artifacts/
+          merge-multiple: true
 
       - name: 'Create release'
         uses: softprops/action-gh-release@v1
         with:
-          name: "${{ github.event.repository.name }}-${{ github.ref_name }}-${{ steps.latest-tag.outputs.tag }}${{ inputs.suffix }}"
+          name: "${{ github.event.repository.name }}-${{ github.ref_name }}-${{ steps.latest-tag.outputs.tag }}${{ inputs.label }}"
           tag_name: ${{ steps.latest-tag.outputs.tag }}
           target_commitish: ${{ github.ref }}
           body_path: Changelog/changelog.md
-          files: artifacts/*
+          files: |
+            'artifacts/*'
+            '!artifacts/*-slim.*'
 
       - name: 'Upload changelog'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
           name: Changelog
-          path: Changelog/changelog.**
+          path: Changelog/changelog.**
+          overwrite: true
diff --git a/.gitignore b/.gitignore
@@ -39,9 +39,11 @@ replay_*.log
 /setup.bat
 /.idea/
 /.gradle/
+/Common/src/test/
 /Forge/src/test/
 /NeoForge/src/test/
 /Fabric/src/test/
+/Common/run/
 /Forge/run/
 /NeoForge/run/
 /Fabric/run/

diff --git a/Changelog/templates/changelog-html.mustache b/Changelog/templates/changelog-html.mustache
@@ -1,6 +1,16 @@
 <p><span style="font-size: 18px;"><strong>Release ${version}:</strong></span></p>
 <ul>
 {{#commits}}
-    <li>{{messageTitle}}</li>
+    <li>
+    {{messageTitle}}
+
+        <ul>
+        {{#messageBodyItems}}
+            <li>
+            {{.}}
+            </li>
+        {{/messageBodyItems}}
+        </ul>
+    </li>
 {{/commits}}
 </ul>
diff --git a/Changelog/templates/changelog-markdown.mustache b/Changelog/templates/changelog-markdown.mustache
@@ -1,4 +1,7 @@
 # Release ${version}:
 {{#commits}}
  - {{messageTitle}}
+ {{#messageBodyItems}}
+    * {{.}}
+ {{/messageBodyItems}}
 {{/commits}}