Reminder for stack size limit with Ring of Loki

.builds/linux.yml

@@ -1,4 +1,4 @@
-image: debian/bullseye
+image: debian/bookworm
 packages:
   - openjdk-17-jdk-headless
   - jq

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,7 +5,7 @@ body:
     attributes:
       value: |
         Please do not use GitHub issues to post ideas.
-        Ideas should be posted on the Botania subreddit [/r/Botania](https://www.reddit.com/r/botania/), or discussed on the [Violet Moon discord](https://discord.gg/SFrYxxD).
+        Ideas should be posted on the [Botania forums](https://forum.violetmoon.org/t/botania), or discussed on the [Violet Moon discord](https://discord.gg/SFrYxxD).
   - type: dropdown
     id: modloader
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -3,6 +3,6 @@ contact_links:
   - name: Vazkii's Mods Discord
     url: https://discord.com/invite/SFrYxxD
     about: Join our Discord for support, questions, discussion.
-  - name: /r/Botania
-    url: https://www.reddit.com/r/botania/
-    about: Visit the Botania subreddit for suggestions.
+  - name: Botania Forums
+    url: https://forum.violetmoon.org/t/botania
+    about: Visit the Botania forum for suggestions.

.github/workflows/gradle.yml

@@ -4,16 +4,16 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
         java-version: '17'
+    - name: Validate gradlew integrity
+      uses: gradle/wrapper-validation-action@v1
     - name: Cache
       uses: actions/cache@v2
       with:
@@ -24,10 +24,29 @@ jobs:
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties') }}
     - name: Check lang files
       run: ./scripts/check_lang.sh
+    - name: Calculate artifact names
+      id: calculate_artifact_names
+      run: |
+        # Check is backwards because "" is falsey, which wouldn't work for boolean punning
+        SNAPSHOT_SUFFIX=${{ !startsWith(github.ref, 'refs/tags/release-') && '-SNAPSHOT' || '' }}
+        MC=$(awk -F '=' '/minecraft_version/ { print $2; }' gradle.properties)
+        BUILD=$(awk -F '=' '/build_number/ { print $2; }' gradle.properties)
+        echo "forge=Forge/build/libs/Botania-${MC}-${BUILD}-FORGE${SNAPSHOT_SUFFIX}.jar" >> "$GITHUB_OUTPUT"
+        echo "fabric=Fabric/build/libs/Botania-${MC}-${BUILD}-FABRIC${SNAPSHOT_SUFFIX}.jar" >> "$GITHUB_OUTPUT"
+
+        GOG_VER=$(awk -F '=' '/VERSION/ { print $2; }' garden_of_glass/Makefile)
+        echo "gog=garden_of_glass/gardenofglass-${GOG_VER}.jar" >> "$GITHUB_OUTPUT"
     - name: Build GoG
-      run: make -C garden_of_glass jar
+      run: |
+        make -C garden_of_glass jar
+
+        # This makes the jar file have uniform order and timestamps for reproducibility
+        sudo apt-get install strip-nondeterminism
+        strip-nondeterminism ${{ steps.calculate_artifact_names.outputs.gog }}
     - name: Build with Gradle
-      run: ./gradlew pmdMain spotlessJavaCheck build
+      run: |
+        RELEASE_MODE=${{ startsWith(github.ref, 'refs/tags/release-') && '1' || '0' }} \
+        ./gradlew pmdMain spotlessJavaCheck build
     - name: PMD report
       uses: jwgmeligmeyling/pmd-github-action@v1
       if: failure()
@@ -37,20 +56,32 @@ jobs:
       run: ./scripts/check_datagen.sh
     - name: Run GameTests (Fabric)
       run: ./gradlew :Fabric:runGameTest
-    - name: Archive Fabric Binaries
+    - name: Stop Gradle
+      run: ./gradlew --stop
+    - name: Sign jars
+      env:
+        SIGNING_KEY: ${{ secrets.VIOLET_MOON_SIGNING_KEY }}
+      if: ${{ env.SIGNING_KEY != '' }}
+      run: |
+        echo "${SIGNING_KEY}" | gpg --import -
+        gpg --local-user "Violet Moon Signing Key" --armor \
+          --detach-sign ${{ steps.calculate_artifact_names.outputs.forge }}
+        gpg --local-user "Violet Moon Signing Key" --armor \
+          --detach-sign ${{ steps.calculate_artifact_names.outputs.fabric }}
+        gpg --local-user "Violet Moon Signing Key" --armor \
+          --detach-sign ${{ steps.calculate_artifact_names.outputs.gog }}
+    - name: Archive Fabric Jar
       uses: actions/upload-artifact@v2
       with:
         name: Fabric
-        path: Fabric/build/libs/*.jar
-    - name: Archive Forge Binaries
+        path: ${{ steps.calculate_artifact_names.outputs.fabric }}
+    - name: Archive Forge Jar
       uses: actions/upload-artifact@v2
       with:
         name: Forge
-        path: Forge/build/libs/*.jar
+        path: ${{ steps.calculate_artifact_names.outputs.forge }}
     - name: Archive GoG Binary
       uses: actions/upload-artifact@v2
       with:
         name: GoG
-        path: garden_of_glass/*.jar
-    - name: Cleanup
-      run: ./gradlew --stop
+        path: ${{ steps.calculate_artifact_names.outputs.gog }}

.github/workflows/pushweb.yml

@@ -7,8 +7,24 @@ on:
       - 'web/**'
 
 jobs:
+  determinator:
+    runs-on: ubuntu-latest
+    outputs:
+      default_branch: ${{ steps.determinate.outputs.default_branch }}
+    steps:
+    - id: determinate
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        DEFAULT_BRANCH=$(gh api \
+          -H "Accept: application/vnd.github+json" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          /repos/VazkiiMods/Botania | jq -r .default_branch)
+        # Add refs/heads/ for easier comparison with github.ref below
+        echo "default_branch=refs/heads/$DEFAULT_BRANCH" >> "$GITHUB_OUTPUT"
   main:
     runs-on: ubuntu-latest
+    needs: determinator
     steps:
     - uses: actions/checkout@v3
     - name: Cache
@@ -25,11 +41,17 @@ jobs:
     - name: Build website
       working-directory: web
       run: bundle exec jekyll build
+    - name: Print branch names for debugging
+      run: |
+        echo 'Current branch: ${{ github.ref }}'
+        echo 'Default branch: ${{ needs.determinator.outputs.default_branch }}'
     - name: Import ssh keys
+      if: ${{ github.ref == needs.determinator.outputs.default_branch }}
       run: |
         umask go=
         mkdir -p ~/.ssh
         echo '${{ secrets.VIOLET_MOON_WEBSERVER_SSH_KEY }}' > ~/.ssh/id_ed25519
         echo '${{ vars.BOTANIAWEB_KNOWN_HOST }}' >> ~/.ssh/known_hosts
     - name: Push
-      run: rsync -av web/_site/ [email protected]:/var/www/botaniamod_net
+      if: ${{ github.ref == needs.determinator.outputs.default_branch }}
+      run: rsync -rl web/_site/ [email protected]:/var/www/botaniamod_net

Fabric/build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'fabric-loom' version '1.1.10'
+    id 'fabric-loom' version '1.3.8'
     id 'io.github.juuxel.loom-quiltflower' version '1.7.1'
 }
 
 version = "${minecraft_version}-${build_number}-FABRIC"
-if (System.getenv().RELEASE_MODE == null) {
+if (System.getenv().RELEASE_MODE != "1") {
     version += '-SNAPSHOT'
 }
 
@@ -46,24 +46,20 @@ sourceSets.main.resources {
 }
 
 repositories {
-    maven {
-        name = "JEI"
-        url "https://dvs1.progwml6.com/files/maven/"
-    }
     maven {
         name = "Modmuss"
         url = "https://maven.modmuss50.me/"
     }
     maven {
         name = "Jared"
-        url = "https://maven.blamejared.com/"
+        url = "https://maven.blamejared.com/" // for JEI and Patchouli
     }
     maven {
         url = "https://maven.terraformersmc.com/" // for trinkets and emi
     }
     maven {
           name = "Ladysnake Libs"
-          url = 'https://ladysnake.jfrog.io/artifactory/mods'
+          url = 'https://maven.ladysnake.org/releases'
     }
     maven {
         name = "BuildCraft" // for LBA
@@ -103,47 +99,46 @@ dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
     mappings loom.layered() {
         officialMojangMappings()
-        // parchment("org.parchmentmc.data:parchment-1.19.3:2023.03.12@zip")
+        parchment("org.parchmentmc.data:parchment-1.19.3:2023.03.12@zip")
     }
 
-    modImplementation "net.fabricmc:fabric-loader:0.14.19"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:0.81.1+1.19.4"
+    modImplementation "net.fabricmc:fabric-loader:0.14.21"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:0.83.1+1.20.1"
 
     compileOnly project(":Xplat")
 
-    modImplementation "vazkii.patchouli:Patchouli:${minecraft_version}-79-FABRIC"
+    modImplementation "vazkii.patchouli:Patchouli:${minecraft_version}-81-FABRIC"
 
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:10.0.596"
+    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:12.0.625"
 
-    modImplementation("dev.emi:emi-fabric:1.0.1+1.19.4") { transitive = false }
+    modImplementation("dev.emi:emi-fabric:1.0.4+1.20.1") { transitive = false }
 
-    modImplementation "me.zeroeightsix:fiber:0.23.0-2"
+    modImplementation "me.zeroeightsix:fiber:0.23.0-2"  
     include "me.zeroeightsix:fiber:0.23.0-2"
 
     // Don't include base and entity as Trinkets includes it already
-    modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.0.0-beta.1"
-    modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.0.0-beta.1"
+    modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1"
+    modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1"
 
     compileOnly "com.demonwav.mcdev:annotations:1.0" // only to shut up compile warnings from CCA's usage of CheckEnv and Env
 
-    modImplementation("dev.emi:trinkets:3.6.0") { transitive = false }
+    modImplementation("dev.emi:trinkets:3.7.0") { transitive = false }
 
-    modImplementation "com.jamieswhiteshirt:reach-entity-attributes:2.3.2"
-    include "com.jamieswhiteshirt:reach-entity-attributes:2.3.2"
+    modImplementation "com.jamieswhiteshirt:reach-entity-attributes:2.4.0"
+    include "com.jamieswhiteshirt:reach-entity-attributes:2.4.0"
 
     modImplementation "com.github.emilyploszaj:step-height-entity-attribute:v1.2.0"
     include "com.github.emilyploszaj:step-height-entity-attribute:v1.2.0"
 
-    modCompileOnly 'teamreborn:energy:2.1.0'
+    modCompileOnly 'teamreborn:energy:3.0.0'
 
     // modCompileOnly 'com.blamejared.crafttweaker:CraftTweaker-fabric-1.18.2:9.1.123'
 
     modCompileOnly 'com.unascribed:ears-api:1.4.5'
 
-    modCompileOnly "mezz.jei:jei-1.19.3-common-api:12.3.0.21"
+    compileOnly "mezz.jei:jei-1.20.1-common-api:15.0.0.14"
 
     modRuntimeOnly "maven.modrinth:here-be-no-dragons:1.0.0"
-    modRuntimeOnly "maven.modrinth:lazydfu:0.1.3"
 }
 
 compileJava {