Merge branch '1.20.1' of https://github.com/code-onigiri/GregTech-Modern into 1.20.1

Author: code-onigiri

.devcontainer/devcontainer.json

@@ -0,0 +1,47 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+  "name": "Docs Codespace",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/modern,type=bind",
+  "workspaceFolder": "/modern/docs",
+  "features": {
+    "ghcr.io/devcontainers/features/python:1": {
+      "installTools": true,
+      "version": "3.11"
+    }
+  },
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "forwardPorts": [8000],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "pip3 install --user -r requirements.txt",
+
+  // Configure tool-specific properties.
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "yaml.schemas": {
+          "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml"
+        },
+        "yaml.customTags": [
+          "!ENV scalar",
+          "!ENV sequence",
+          "tag:yaml.org,2002:python/name:material.extensions.emoji.to_svg",
+          "tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji",
+          "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format"
+        ],
+        "git.openRepositoryInParentFolders": "always",
+        "git.autofetch": "all",
+        "git.autoStash": true
+      },
+      "extensions": ["redhat.vscode-yaml"]
+    }
+  }
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}
+

.github/ISSUE_TEMPLATE/000-bug-report.yml

@@ -22,36 +22,40 @@ body:
     id: gtceu-version
     attributes:
       label: GregTech CEu Version
-      description: The version of Gregtech CEu you were using when this bug was encountered. If you do not know where to find this, look for the mod jar file in the mods folder, or in the mods viewer in-game.
+      description: The version of GregTech CEu you were using when this bug was encountered. If you do not know where to find this, look for the mod jar file in the mods folder, or in the mods viewer in-game.
       placeholder: "Example: v2.3.4"
     validations:
       required: true
-  - type: input
+  - type: dropdown
     id: mc-version
     attributes:
       label: Minecraft Version
-      description: The version of Minecraft you were using when this bug was encountered. If you do not know where to find this, in the main menu at the bottom left.
-      placeholder: "Example: 1.20.1"
+      description: The version of Minecraft you were using when this bug was encountered. If you do not know where to find this, it is in the bottom left of the main menu. Any version not listed is not supported.
+      options:
+        - "1.20.1 Forge"
+        - "1.21.1 NeoForge"
     validations:
       required: true
   - type: dropdown
     id: recipe-viewer
     attributes:
       label: Recipe Viewer Installed
-      description: The recipe viewer installed. If you were not using addons, please leave this field blank.
+      description: The recipe viewer installed.
       options:
         - "JEI"
         - "REI"
         - "EMI"
-        - "No Recipe Viewer"
     validations:
       required: false
-  - type: input
+  - type: dropdown
     id: environment
     attributes:
       label: Environment
-      description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Dedicated Server."
-      placeholder: "Example: Singleplayer"
+      description: How you were playing on the world. Hybrid servers are unsupported.
+      options:
+        - "Singleplayer"
+        - "Multiplayer - Open to LAN"
+        - "Multiplayer - Dedicated Server"
     validations:
       required: true
   - type: dropdown
@@ -69,8 +73,8 @@ body:
     id: other-mods
     attributes:
       label: Other Installed Mods
-      description: List all mods you have installed here, or the name of the modpack you're playing.
-      placeholder: "Example: ATM9, Embeddium, NuclearCraft Neoteric, AE2..."
+      description: Enter the name of the modpack you're playing, or list all mods you have installed here.
+      placeholder: "Example: Cosmic Frontiers, Monifactory, Embeddium, NuclearCraft Neoteric, AE2,..."
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: GregTech CEu Discord
+    url: https://discord.gg/bWSWuYvURP
+    about: Join us on Discord to discuss questions, bugs, and more.

.github/workflows/auto-build.yml

@@ -3,7 +3,7 @@ name: Latest Build
 on:
   push:
     branches: ['1.20.1', '1.21']
-    paths-ignore: ['.github/**', '**/*.md']
+    paths: ['src/**', '**/*.gradle', 'gradle.properties']
 
 concurrency:
   group: auto-build-${{ github.ref }}
@@ -13,24 +13,31 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
+      GITHUB_TOKEN: ${{ github.token }}
       MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
       MAVEN_USER: ${{ secrets.MAVEN_USER }}
       SNAPSHOT: true
-      GITHUB_TOKEN: ${{ github.token }}
+      CI: true
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v4
       - name: Setup Build
         uses: ./.github/actions/build_setup
-      - name: Get Version
+      - name: Get Mod Version
         id: ver
         run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT
+      - name: Version Suffix
+        id: suffix
+        run: echo "VERSION_SUFFIX=$(echo "${{ github.sha }}" | cut -c 1-7)" >> $GITHUB_ENV
+      - run: git fetch origin 1.20.1
       - name: Build
         run: ./gradlew build --build-cache
       - name: Publish to Maven
         if: github.repository_owner == 'GregTechCEu'
         run: ./gradlew publish --build-cache
+      - name: Rename Jars
+        run: for file in build/libs/*; do mv "$file" "${file/SHOT/SHOT-$(date --utc '+%Y%m%d-%H%M%S')-${{ env.VERSION_SUFFIX }}}"; done;
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -51,10 +58,10 @@ jobs:
         uses: andelf/nightly-release@46e2d5f80828ecc5c2c3c819eb31186a7cf2156c
         with:
           tag_name: latest-${{ github.ref_name }}
-          name: '${{ github.ref_name }}-${{ steps.ver.outputs.version}} SNAPSHOT $$'
+          name: '${{ github.ref_name }}-${{ steps.ver.outputs.version}} SNAPSHOT ${{ env.VERSION_SUFFIX }}'
           prerelease: true
           body: |
             The latest build of GTM for Minecraft ${{ github.ref_name }}.
             Please report any [issues](https://github.com/GregTechCEu/GregTech-Modern/issues).
             ${{ steps.changelog.outputs.changelog }}
-          files: build/libs/*.jar
+          files: build/libs/*.jar

.github/workflows/auto-publish.yml

@@ -12,6 +12,8 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      VERSION_SUFFIX: "PR-${{ github.event.number }}"
     steps:
       - uses: actions/checkout@v4
       - name: Check Path Filter
@@ -31,10 +33,20 @@ jobs:
       - name: Build
         if: steps.filter.outputs.code == 'true'
         run: ./gradlew assemble --build-cache
-      - name: Upload Artifact
+      - name: Rename Jars
+        if: steps.filter.outputs.code == 'true'
+        run: for file in build/libs/*; do mv "$file" "${file/.jar/-${{ env.VERSION_SUFFIX }}.jar}"; done;
+      - name: Upload All Artifacts
         if: steps.filter.outputs.code == 'true'
         uses: actions/[email protected]
         with:
-          name: build output
+          name: Full Package
           path: build/libs/*
           retention-days: 15
+      - name: Upload Main Jar
+        if: steps.filter.outputs.code == 'true'
+        uses: actions/[email protected]
+        with:
+          name: Main Jar
+          path: build/libs/*[0-9]-PR-*.jar
+          retention-days: 15

.github/workflows/build-on-push.yml

@@ -0,0 +1,56 @@
+name: Publish docs via GitHub Pages
+on:
+  workflow_dispatch:
+  push:
+    branches: [1.20.1]
+    paths: ['docs/**']
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: 'pages'
+  cancel-in-progress: false
+
+jobs:
+  build:
+    name: build docs
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './docs'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: '1.20.1'
+          sparse-checkout: './docs'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+      - run: pip install -r ./requirements.txt
+      - uses: actions/cache@v4
+        with:
+          key: 'mkdocs-cache'
+          path: './docs/.cache'
+      - name: Build static files
+        id: mkdocs
+        run: mkdocs build
+      - name: Upload pages as artifact
+        id: artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: './docs/site/'
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Deploy Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/deploy-pages.yml

@@ -29,6 +29,8 @@ jobs:
             code:
               - 'src/main/java/**'
               - 'src/test/**'
+      - run: git fetch origin 1.20.1
+        if: steps.filter.outputs.code == 'true'
       - name: Setup Build
         if: steps.filter.outputs.code == 'true'
         uses: ./.github/actions/build_setup

.github/workflows/format-java.yml

@@ -3,19 +3,16 @@ name: Pull Request Labels
 
 # Checks for label once PR has been reviewed or label is applied
 on:
-  pull_request_review:
-    types: [submitted]
   pull_request:
-    types: [labeled]
+    types: [opened, labeled, unlabeled]
 
 concurrency:
   group: pr-labels-${{ github.head_ref }}
   cancel-in-progress: true
 
 jobs:
-  Labels:
-    name: On Approval
-    if: github.event_name == 'pull_request' || github.event.review.state == 'approved'
+  labels:
+    name: Label Check
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read # needed to utilize required-labels

.github/workflows/manage-pr-labels.yml

@@ -29,6 +29,8 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
+    env:
+      CI: 'true'
     outputs:
       ver: ${{ steps.ver.outputs.version }}
     steps: