Merge branch 'sc/intermediary-1.20.5-port' into yo-recipe-schema-clea…

…nup2

.github/actions/build_setup/action.yml

@@ -0,0 +1,36 @@
+name: Build Setup
+description: Setup for standard Java builds
+
+inputs:
+  update-cache:
+    description: If cache should be updated
+    required: false
+    default: false
+
+runs:
+  using: 'composite'
+
+  steps:
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        distribution: adopt
+        java-version: 21
+
+    - 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/workflows/auto-build.yml

@@ -3,7 +3,7 @@ name: auto-build
 on:
   push:
     branches:
-      - '1.20.5'
+      - 'sc/intermediary-1.20.5-port'
 
 jobs:
   build:
@@ -12,30 +12,20 @@ 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
-        with:
-          java-version: '21'
-          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/[email protected]
-        with:
-          arguments: build
+        run: ./gradlew 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}')
+          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep dev.jar -v | grep slim.jar -v | grep all.jar -v | awk -F 'gtceu-|.jar' '{print $2}')
           echo version=$MESSAGE >> $GITHUB_OUTPUT
 
       - name: release

.github/workflows/auto-publish.yml

@@ -18,7 +18,7 @@ on:
         type: boolean
         default: true
       publishCurseForgeAndModrinth:
-        description: 'whether publish to the curseforge and modrinth'
+        description: 'whether publish to curseforge and modrinth'
         required: true
         type: boolean
         default: true
@@ -30,31 +30,24 @@ 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: '21'
           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/[email protected]
-        with:
-          arguments: build
+        run: ./gradlew build
 
       - if: ${{ inputs.publishMaven }}
         name: Publish to Maven
-        uses: gradle/[email protected]
-        with:
-          arguments: publish
+        run: ./gradlew publish
 
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
         name: Get Version
@@ -92,7 +85,7 @@ jobs:
             ${{ github.ref_name }}
           game-version-filter: none
           java: |
-            17
+            21
           retry-attempts: 2
           retry-delay: 10000
           fail-mode: fail

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

@@ -11,25 +11,15 @@ 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
-        with:
-          java-version: '21'
-          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/[email protected]
-        with:
-          arguments: build
+        run: ./gradlew build
 
       - name: Upload Artifact
         uses: actions/[email protected]

.github/workflows/format_java.yml

@@ -0,0 +1,29 @@
+# Runs formatting requirements
+name: Java Formatting
+
+on:
+  push:
+    branches:
+      - master
+    paths: ['src/main/java/**', 'src/test/**']
+  pull_request:
+    paths: ['src/main/java/**', 'src/test/**']
+
+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: Setup Build
+        uses: ./.github/actions/build_setup
+
+      - name: Run Spotless Formatting Check with Gradle
+        run: ./gradlew spotlessCheck --warning-mode all --build-cache

.gitignore

@@ -22,3 +22,4 @@ src/generated/resources/.cache/
 *.patch
 *.DS_Store
 
+qodana.yaml

CHANGELOG.md

@@ -1,44 +1,15 @@
 # ChangeLog
 
-Version: 1.2.1
+Version: 1.2.2.a
 
 ### ADDITIONS:
-- Ported decorative blocks from 1.12
-- Added filtering to Output Hatches
-- Added several utility functions to KJS
-- Added more ore generator types (Classic & Cuboid)
-- Added partial NBT support for recipe inputs
-- Added Wood Cutter recipes
+- added NO_ORE_SMELTING material flag for stopping ore/raw ore -> dust/ingot/gem smelting
 
 ### CHANGES:
-- Reworked Bedrock Ores
-  - Note that it is now entirely up to pack developers to register Bedrock Ore Veins!
-- Added certain fluid blocks to the minecraft:replaceable tag
-- Updated Russian translation
 
 ### FIXES:
-- Fixed some Multiblock builders not working in KJS
-- Fixed Turbine Rotors not being damaged
-- Fixed Shutter Covers not being registered
-- Fixed missing Multiblock Tank recipes
-- Fixed GCyM Multiblocks using Perfect Overclocking
-- Fixed crash related to the Network Switch Multiblock
-- Fixed Data Bank chaining
-- Fixed HPCA energy consumption for energy that wasn't input recently
-- Fixed Kinetic Output Boxes never stopping
-- Fixed World Accelerators using too much energy and always accelerating Block Entities
-- Fixed connectivity for Long Distance Pipes
-- Fixed Item Collector (now works after reload, no longer requires KJS, fixed tooltip)
-- Fixed Research items not rendering in JEI when playing on a server
-- Fixed recipes randomly not working after server restarts
-- Fixed recipes for ABS & Large Electrolyzer using the wrong wires
-- Fixed sounds for Arc Furnace & Boilers not being registered properly
-- Fixed Parallel Control Hatch behavior when the recipe voltage matches the machine voltage
-- Fixed Wrench interactions in certain situations
-- Fixed recipe for Treated Wood
-- Fixed KJS Research recipes not registering
-- Fixed machines and pipes causing excessive updates to neighboring blocks
-- Fixed language entry for Iron III Chloride
-- Fixed recycling recipe for Titanium Fluid Cells
-- Fixed recipe for Engine Intake Casing
-- Fixed any custom recipe capabilities being removed when KJS is installed
+- Fixed raw diamonds not being smeltable into diamonds, raw coal not being smeltable into coal
+- fixed rubber & treated wood slab tags
+- fixed addon turbine rotors using the wrong material
+- fixed hardWoodRecipes not applying to bamboo
+- fixed transformers not having enough input storage

build.gradle

@@ -3,9 +3,10 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.107'
+    id 'net.neoforged.gradle.userdev' version '7.0.124'
     alias libs.plugins.machete // automatic jar compressing on build
     alias libs.plugins.shadow
+    id "com.diffplug.spotless" version "6.25.0"
 }
 
 version = mod_version
@@ -25,6 +26,7 @@ apply from: "$rootDir/gradle/scripts/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"
 
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }

gradle.properties

@@ -7,7 +7,7 @@ loader_version = 2
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.2.1
+mod_version = 1.2.2.a
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

gradle/scripts/dependencies.gradle

@@ -25,7 +25,7 @@ dependencies {
 
     // EMI
     compileOnly("dev.emi:emi-neoforge:${forge.versions.emi.get()}:api")
-    compileOnly forge.emi
+    implementation forge.emi
 
     // TOP
     compileOnly(forge.theoneprobe) { transitive = false }

gradle/scripts/spotless.gradle

@@ -0,0 +1,26 @@
+// Spotless auto-formatter
+// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
+// Can be locally toggled via spotless:off/spotless:on comments
+spotless {
+    encoding 'UTF-8'
+
+    format 'misc', {
+        target '.gitignore'
+
+        trimTrailingWhitespace()
+        indentWithSpaces(4)
+        endWithNewline()
+    }
+    java {
+        target 'src/main/java/**/*.java', 'src/test/java/**/*.java' // exclude api as they are not our files
+
+        def orderFile = project.file('spotless/spotless.importorder')
+        def formatFile = project.file('spotless/spotless.eclipseformat.xml')
+
+        toggleOffOn()
+        importOrderFile(orderFile)
+        removeUnusedImports('cleanthat-javaparser-unnecessaryimport')
+        endWithNewline()
+        eclipse('4.31').configFile(formatFile)
+    }
+}

ignored_revs.txt

@@ -0,0 +1 @@
+f6b13a4afff1d018990f780ec630a0b01e2dcc28

settings.gradle

@@ -19,20 +19,21 @@ dependencyResolutionManagement {
         // Minecraft Version
         def minecraftVersionVeryOld = "1.20.1"
         def minecraftVersionOld = "1.20.4"
-        def minecraftVersion = "1.20.5"
+        def minecraftVersionOldish = "1.20.5"
+        def minecraftVersion = "1.20.6"
 
         // Mod Dependencies Versions
         // Common
         def jeiVersion = "17.3.0.49"
-        def reiVersion = "14.0.688"
-        def emiVersion = "1.1.0"
+        def reiVersion = "15.0.728"
+        def emiVersion = "1.1.6"
         def ae2Version = "17.0.6-beta"
         def kjsVersion = "2004.7.0-build.14"
         def auVersion = "1.20.1-0.6.0"
 
         // NeoForge
-        def neoForgeVersion = "20.6.12-beta"
-        def registrateForgeVersion = "MC1.20.5-1.3.0"
+        def neoForgeVersion = "20.6.62-beta"
+        def registrateForgeVersion = "MC1.20.6-1.3.0"
         def createForgeVersion = "0.5.1.d-9"
         def flywheelForgeVersion = "0.6.9-5"
         def topForgeVersion = "1.20.1-10.0.1-3"
@@ -75,11 +76,11 @@ dependencyResolutionManagement {
             library("jei-forge-impl", "mezz.jei", "jei-${minecraftVersionOld}-neoforge").versionRef(jei)
 
             def rei = version("rei", reiVersion)
-            library("rei-plugin", "me.shedaniel", "RoughlyEnoughItems-default-plugin-forge").versionRef(rei)
-            library("rei-api", "me.shedaniel", "RoughlyEnoughItems-api-forge").versionRef(rei)
-            library("rei-forge", "me.shedaniel", "RoughlyEnoughItems-forge").versionRef(rei)
+            library("rei-plugin", "me.shedaniel", "RoughlyEnoughItems-default-plugin-neoforge").versionRef(rei)
+            library("rei-api", "me.shedaniel", "RoughlyEnoughItems-api-neoforge").versionRef(rei)
+            library("rei-forge", "me.shedaniel", "RoughlyEnoughItems-neoforge").versionRef(rei)
 
-            def emi = version("emi", emiVersion + "+" + minecraftVersionOld)
+            def emi = version("emi", emiVersion + "+" + minecraftVersion)
             library("emi", "dev.emi", "emi-neoforge").versionRef(emi)
 
             def theoneprobe = version("theoneprobe", topForgeVersion)
@@ -92,7 +93,7 @@ dependencyResolutionManagement {
             library("kubejs", "dev.latvian.mods", "kubejs-neoforge").versionRef(kubejs)
 
             def configuration = version("configuration", configurationVersion)
-            library("configuration", "dev.toma", "configuration-neoforge-${minecraftVersion}").versionRef(configuration)
+            library("configuration", "dev.toma", "configuration-neoforge-${minecraftVersionOldish}").versionRef(configuration)
 
             def worldStripper = version("worldStripper", worldStripperForgeFile)
             library("worldStripper", "curse.maven", "worldStripper-250603").versionRef(worldStripper)