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

Author: iouter

.editorconfig

@@ -19,13 +19,21 @@ body:
         - label: "I have checked that this occurs on the latest version."
           required: true
   - type: input
-    id: version
+    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.
       placeholder: "Example: v2.3.4"
     validations:
       required: true
+  - type: input
+    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"
+    validations:
+      required: true
   - type: dropdown
     id: recipe-viewer
     attributes:

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

@@ -0,0 +1,40 @@
+name: Build Setup
+description: Setup for standard Java builds
+
+inputs:
+  update-cache:
+    description: If cache should be updated
+    required: false
+    default: true
+
+runs:
+  using: 'composite'
+
+  steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: adopt
+        java-version: 17
+
+    - name: Validate Gradle wrapper
+      uses: gradle/actions/wrapper-validation@v3
+
+    - name: Grant execute permission for gradlew
+      shell: bash
+      run: chmod +x gradlew
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+      with:
+        cache-write-only: ${{ inputs.update-cache }}
+        generate-job-summary: false
+        gradle-home-cache-includes: |
+          caches
+          notifications
+          jdks
+          wrapper

.github/actions/build_setup/action.yml

@@ -11,37 +11,38 @@ jobs:
     env:
       GITHUB_ACTION_NUMBER: ${{ vars.GITHUB_RUN_NUMBER }}
       GITHUB_RUN_NUMBER: ${{ vars.GITHUB_RUN_NUMBER }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Setup Build
+        uses: ./.github/actions/build_setup
 
       - name: Build
-        uses: gradle/gradle-build-action@v2.4.2
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: build
 
       - name: Get Version
         id: var
         run: |
           MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F 'gtceu-|.jar' '{print $2}')
-          echo version=$MESSAGE >> $GITHUB_OUTPUT
+          echo "version=$MESSAGE" >> $GITHUB_OUTPUT
 
-      - name: release
+      - name: Release
+        id: release
         uses: Kir-Antipov/[email protected]
         with:
           github-tag: ${{ steps.var.outputs.version }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           files: |
-            build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
+            build/libs/!(*-@(dev|sources|javadoc)).jar
+
+      - name: Print Output
+        run: |
+          echo "Release tag: ${{ steps.release.outputs.github-tag }}"
+          echo "Release URL: ${{ steps.release.outputs.github-url }}"
+          echo "Released files: ${{ steps.release.outputs.github-files }}"

.github/workflows/auto-build.yml

@@ -18,7 +18,7 @@ on:
         type: boolean
         default: true
       publishCurseForgeAndModrinth:
-        description: 'whether publish to the curseforge and modrinth'
+        description: 'whether to publish to curseforge and modrinth'
         required: true
         type: boolean
         default: true
@@ -30,29 +30,26 @@ jobs:
       MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
       MAVEN_USER: ${{ secrets.MAVEN_USER }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'adopt'
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Setup Build
+        uses: ./.github/actions/build_setup
 
       - name: Build
-        uses: gradle/gradle-build-action@v2.4.2
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: build
 
       - if: ${{ inputs.publishMaven }}
         name: Publish to Maven
-        uses: gradle/gradle-build-action@v2.4.2
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: publish
 

.github/workflows/auto-publish.yml

@@ -2,7 +2,7 @@ name: build-on-push
 
 on:
   pull_request:
-    paths: ['src/**', '**.gradle', 'gradle.properties', 'gradlew**', 'gradle/**']
+    paths: ['**']
 
 jobs:
   build:
@@ -11,27 +11,34 @@ jobs:
       GITHUB_ACTION_NUMBER: ${{ vars.GITHUB_RUN_NUMBER }}
       GITHUB_RUN_NUMBER: ${{ vars.GITHUB_RUN_NUMBER }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - uses: actions/setup-java@v3
+      - name: Check Path Filter
+        uses: dorny/paths-filter@v3
+        id: filter
         with:
-          java-version: '17'
-          distribution: 'adopt'
+          filters: |
+            code:
+              - 'src/**'
+              - '**.gradle'
+              - 'gradle.properties'
+              - 'gradlew**'
+              - 'gradle/**'
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Setup Build
+        if: steps.filter.outputs.code == 'true'
+        uses: ./.github/actions/build_setup
 
       - name: Build
-        uses: gradle/[email protected]
+        if: steps.filter.outputs.code == 'true'
+        uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: assemble
 
       - name: Upload Artifact
+        if: steps.filter.outputs.code == 'true'
         uses: actions/[email protected]
         with:
           name: build output

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

@@ -0,0 +1,40 @@
+# Runs formatting requirements
+name: Java Formatting
+
+on:
+  push:
+    branches:
+      - 1.20.1
+    paths: ['src/main/java/**', 'src/test/**']
+  pull_request:
+    paths: ['**']
+
+concurrency:
+  group: formatting-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  formatting:
+    name: Formatting
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Check Path Filter
+        uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            code:
+              - 'src/main/java/**'
+              - 'src/test/**'
+
+      - name: Setup Build
+        if: steps.filter.outputs.code == 'true'
+        uses: ./.github/actions/build_setup
+
+      - name: Run Spotless Formatting Check with Gradle
+        if: steps.filter.outputs.code == 'true'
+        run: ./gradlew spotlessCheck --warning-mode all --build-cache

.github/workflows/format-java.yml

@@ -1,6 +1,24 @@
 # ChangeLog
 
-Version: 1.1.3.b
+Version: 1.3.1
+
+### ADDITIONS:
+- Ordered Assembly Lines
+- Integration of Monazite: providing lots of additional functionality to jade
+- Ghost Circuits for fluid hatches
+- Overclocking beyond MAX voltage
+- Much more lamp variants, with bloom support
+- Subtick parallels, if a recipe oc's past 1 tick it does parallels instead
+
+### CHANGES:
+- In world multiblock preview now properly works with rotated multiblocks
+- Updated jp and tw lang
+- Fusion Reactors now show a bloom ring when running a recipe
+- Pipes of any kind can be water logged
 
 ### FIXES:
-- fixed processing array being unable to form
+- Disabling hazard config now properly disables everything hazard related
+- Rubber trees spawn chance config now works
+- Singleblock machines can no longer run a recipe beyond its tier
+- Fluid Hatch locking properly saves between world loads
+- Color-changing tooltip now changes colors properly

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 GregTech based on Architectury for performing on Forge, Fabric, and Quilt, simultaneously.
 
+
 ## Download
 [`Github Releases`](https://github.com/GregTechCEu/GregTechCEu-1.19/releases).
 [`Curseforge`](https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern/files)
@@ -18,6 +19,13 @@ GregTech based on Architectury for performing on Forge, Fabric, and Quilt, simul
 * [Todo List](https://github.com/GregTechCEu/GregTechCEu-1.19/issues/125) for potential contributors who are interested in this project
 * [Dev Q&A](https://github.com/GregTechCEu/GregTechCEu-1.19/wiki/Dev-Q&A) illustrates common questions and answers related to development.
 
+
+## IDE Requirements (when using IntelliJ IDEA)
+
+For developing this mod, the [Lombok plugin](https://plugins.jetbrains.com/plugin/6317-lombok) for IntelliJ IDEA is strictly required.  
+Additionally, the [Minecraft Development plugin](https://plugins.jetbrains.com/plugin/8327-minecraft-development) is recommended.
+
+
 ## Credited Works
 - Most textures are originally from the **[ZedTech GTCEu Resourcepack](https://github.com/brachy84/zedtech-ceu)**, with some changes made by the community.
 - New material item textures by @TTFTCUTS and @Rosethorns.

README.md

@@ -6,6 +6,7 @@ plugins {
     alias libs.plugins.vineFlower // VineFlower, a better decompiler
     alias libs.plugins.machete // automatic jar compressing on build
     alias libs.plugins.shadow
+    alias libs.plugins.spotless
 }
 
 apply plugin: "dev.architectury.loom"
@@ -33,10 +34,11 @@ version = "${mod_version}" + (buildNumber != null ? "-build_${System.getenv("GIT
 apply from: "$rootDir/gradle/scripts/architectury_loom.gradle"
 apply from: "$rootDir/gradle/scripts/capabilities.gradle"
 apply from: "$rootDir/gradle/scripts/repositories.gradle"
-apply from: "$rootDir/gradle/scripts/dependencies.gradle"
+apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/gradle/scripts/resources.gradle"
 apply from: "$rootDir/gradle/scripts/jars.gradle"
 apply from: "$rootDir/gradle/scripts/publishing.gradle"
+apply from: "$rootDir/gradle/scripts/spotless.gradle"
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"