Merge pull request #4239 from GregTechCEu/re/1.21-with-love

Give 1.21 love

Author: TechLord22

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

@@ -0,0 +1,60 @@
+name: Test pull request on push
+
+on:
+  pull_request:
+    paths: ['**']
+
+# Cancel previous jobs if PR gets another push
+concurrency:
+  group: PR-test-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      VERSION_SUFFIX: "PR-${{ github.event.number }}"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check Path Filter
+        uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            code:
+              - 'src/**'
+              - '*.gradle'
+              - 'gradle.properties'
+              - 'gradlew*'
+              - 'gradle/**'
+      - name: Setup Build
+        if: steps.filter.outputs.code == 'true'
+        uses: ./.github/actions/build_setup
+      - name: Run GameTests
+        if: steps.filter.outputs.code == 'true'
+        id: gametest
+        continue-on-error: true
+        run: ./gradlew runGameTestServer
+      - name: Update “Tests Passed” / “Tests Failed” labels
+        if: steps.filter.outputs.code == 'true' && github.event.pull_request.head.repo.full_name == github.repository
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const [add, remove] = {
+              success: ['Tests: Passed','Tests: Failed'],
+              failure: ['Tests: Failed','Tests: Passed']
+            }['${{ steps.gametest.outcome }}'];
+
+            const { owner, repo }    = context.repo;
+            const issue_number       = context.payload.pull_request.number;
+
+            await github.rest.issues
+              .addLabels({ owner, repo, issue_number, labels: [add] })
+              .catch(() => {});
+
+            await github.rest.issues
+              .removeLabel({ owner, repo, issue_number, name: remove })
+              .catch(() => {});
+      - name: Fail on GameTest failures
+        if: steps.filter.outputs.code == 'true' && steps.gametest.outcome == 'failure'
+        run: exit 1

CHANGELOG.md

@@ -4,4 +4,4 @@
 # Specific files requiring admin approval
 CODEOWNERS @GregTechCEu/admin
 LICENSE @GregTechCEu/admin
-README.md @GregTechCEu/admin
+/README.md @GregTechCEu/admin

CODEOWNERS

@@ -32,10 +32,7 @@ sourceSets {
     }
 
     test {
-        kotlin {
-            srcDirs += 'src/test/java'
-        }
-        compileClasspath += main.output
+        compileClasspath += main.output + main.compileClasspath
         runtimeClasspath += main.output + main.runtimeClasspath
     }
 
@@ -55,11 +52,17 @@ configurations {
     clientRuntimeOnly.canBeResolved = false
     extraRuntimeOnly.canBeResolved = false
     clientExtraRuntimeOnly.canBeResolved = false
+    testImplementation.canBeResolved = false
+    testRuntimeOnly.canBeResolved = false
 
     runtimeClasspath.extendsFrom localRuntime
     extraRuntimeClasspath.extendsFrom extraLocalRuntime
     clientRuntimeClasspath.extendsFrom clientLocalRuntime
     extraClientRuntimeClasspath.extendsFrom clientExtraLocalRuntime
+
+    renderNurseCfg {
+        canBeConsumed = false
+    }
 }
 
 apply from: "$rootDir/gradle/scripts/jars.gradle"
@@ -69,6 +72,7 @@ apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/gradle/scripts/resources.gradle"
 apply from: "$rootDir/gradle/scripts/publishing.gradle"
 apply from: "$rootDir/gradle/scripts/spotless.gradle"
+apply from: "$rootDir/gradle/scripts/docs.gradle"
 
 
 tasks.withType(JavaCompile).configureEach {
@@ -78,5 +82,5 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 lombok {
-    version = "1.18.36"
+    version = "1.18.38"
 }

build.gradle

@@ -1,7 +1,8 @@
 dependencies {
     compileOnly(libs.jetbrains.annotations)
 
-    // LDLib
+    testJarJar(testApi(libs.testframework.get()))
+
     jarJar(api(forge.ldlib.get()))
 
     // Registrate
@@ -26,11 +27,16 @@ dependencies {
     compileOnly(forge.ae2)
     compileOnly(forge.ae2wtlib)
 
+    // Create
+    compileOnly(forge.ponder)
+    compileOnly(variantOf(forge.create) { classifier("slim") })
+    compileOnly(forge.flywheel.forge.api)
+
     // KJS
     compileOnly(forge.bundles.kjs)
 
     // Shimmer
-    compileOnly(forge.shimmer)
+    // compileOnly(forge.shimmer)
     compileOnly(forge.sodium)
     compileOnly(forge.iris)
     compileOnly(forge.modernfix)
@@ -40,8 +46,8 @@ dependencies {
     compileOnly(forge.ftbteams)
     compileOnly(forge.ftbquests)
     compileOnly(forge.resourcefullib)
-    compileOnly(forge.argonauts)
-    compileOnly(forge.heracles)
+    // compileOnly(forge.argonauts)
+    // compileOnly(forge.heracles)
 
     // Maps
     compileOnly(forge.ftbchunks)
@@ -51,26 +57,34 @@ dependencies {
     compileOnly(forge.journeymap.forge)
 
     // GameStages
-    compileOnly(forge.gamestages)
+    // compileOnly(forge.gamestages)
 
     // CC: Tweaked
     compileOnly(forge.cc.tweaked.core.api)
     compileOnly(forge.cc.tweaked.forge.api)
 
     // Standard runtime mods //
+    localRuntime(libs.testframework)
+
     localRuntime(forge.jade)
     localRuntime(forge.ae2)
     localRuntime(forge.spark)
     localRuntime(forge.modernfix)
+    localRuntime(forge.create) {
+        // Needed to prevent game-test crashes
+        exclude group: "maven.modrinth", module: "journeymap"
+        exclude group: "info.journeymap", module: "journeymap-api-neoforge"
+    }
 
     // Runtime Recipe Viewers - uncomment whichever one you want to use //
     localRuntime(forge.emi)
-//    localRuntime(forge.jei.forge.impl)
+    localRuntime(forge.jei.neoforge.impl)
 //    localRuntime(forge.bundles.rei.runtime)
 
     // Client-only runtime mods //
     clientLocalRuntime(forge.sodium)
     clientLocalRuntime(forge.iris)
+    renderNurseCfg(libs.renderNurse)
 
     //////////////////////////////////////////////////////
     // Runtime mods for dev testing with unclean client //
@@ -79,9 +93,9 @@ dependencies {
     extraLocalRuntime(forge.trenzalore)
     extraLocalRuntime(forge.curios)
 //    extraLocalRuntime(forge.worldstripper)
-    extraLocalRuntime(forge.cc.tweaked.forge.impl)
+    localRuntime(forge.cc.tweaked.forge.impl)
 
-    extraLocalRuntime(forge.bundles.kjs)
+    localRuntime(forge.bundles.kjs)
 
     extraLocalRuntime(forge.ftblibrary)
     extraLocalRuntime(forge.ftbteams)
@@ -106,5 +120,4 @@ dependencies {
     extraLocalRuntime(forge.observable)
     //////////////////////////
 
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 }

dependencies.gradle

@@ -26,9 +26,53 @@ Once you're happy, commit these changes and make a pull request for us to review
 If you come back to work on the docs, you can use a codespace again. You might need to `pull` to bring your codespace up to date, which you can do by pressing this button in the `Source Control` tab.
 
 ![image](https://github.com/user-attachments/assets/7d1246d2-f091-4452-bdb3-edf221902503)
-## Installing Required Dependencies
 
-To install the required dependencies, please run `pip install -r requirements.txt`
+## Running in Gradle
+
+To run mkdocs locally, run the mkdocsServe task in gradle.  
+
+Either in the gradle sidebar, click documentation/mkdocsServe, or run .`/gradlew mkdocsServe`.  
+
+Click on the link it gives you at the bottom to open the local copy, and pages will automatically update with content as you save your files.
+
+You can also run documentation/mkdocsBuild. This will build the documentation in `docs/site`, which you can either host yourself or just open in a browser.
+
+## Installing Required Dependencies & Run Locally
+
+If you want to manually install and go through the steps to run locally, you can follow the steps below.
+
+Please run all commands from this section inside the `docs` folder!
+
+**First, setup a venv for python:**
+
+```bash
+python -m venv .venv
+```
+or:
+```bash
+python3 -m venv .venv
+```
+
+**Now activate the venv:**
+
+Windows:
+```cmd
+.venv\Scripts\activate
+```
+Linux / MacOS:
+```bash
+source .venv/bin/activate
+```
+
+**Install the required dependencies:**
+```bash
+pip install -r requirements.txt
+```
+
+**Run locally**:
+```bash
+mkdocs serve
+```
 
 ## MkDocs Plugins
 

docs/README.md

@@ -16,9 +16,6 @@ as other resources you might find helpful.
     - [Forge-Wiki](https://docs.minecraftforge.net/en/1.20.x/)  
     - [NeoForge-Wiki](https://docs.neoforged.net/)
 
-!!! link "Official Fabric Docs"
-    [Fabric-Wiki :material-arrow-right: Mod Developer Docs](https://fabricmc.net/wiki/tutorial:start)
-
 !!! link "Other Modding Docs"
     - [Forge Community-Wiki](https://forge.gemwire.uk/wiki/Main_Page)
     - [MCJty's Modding Wiki](https://www.mcjty.eu/docs/intro)

docs/content/Development/External-Resources.md

@@ -0,0 +1,6 @@
+nav:
+  - Recipe-Logic.md
+  - Recipe-Searching.md
+  - Recipe-Execution.md
+  - Custom-Ingredient.md
+  - ...