[WIP] barnacle/crab/peenguin?/infra

.github/workflows/build.yml

@@ -31,30 +31,24 @@ jobs:
                         value=$(echo $value | awk '{$1=$1;print}')
 
                         case "$key" in
+                          mod_java_version) echo "JAVA_VERSION=$value" >> $GITHUB_OUTPUT ;;
                           minecraft_version) echo "MINECRAFT_VERSION=$value" >> $GITHUB_OUTPUT ;;
                           mod_name) echo "MOD_NAME=$value" >> $GITHUB_OUTPUT ;;
                           mod_version) echo "MOD_VERSION=$value" >> $GITHUB_OUTPUT ;;
                           enabled_platforms) echo "ENABLED_PLATFORMS=$value" >> $GITHUB_OUTPUT ;;
                         esac
                     done < gradle.properties
 
-            -   name: "Set up JDK 17"
-                if: steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.20.6' && steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.21'
+            -   name: "Set up JDK"
                 uses: actions/setup-java@v4
                 with:
-                    java-version: 17
-                    distribution: temurin
-
-            -   name: "Set up JDK 21"
-                if: steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.20.6' || steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.21'
-                uses: actions/setup-java@v4
-                with:
-                    java-version: 21
+                    java-version: ${{ steps.gradle-properties.outputs.JAVA_VERSION }}
                     distribution: temurin
 
             -   name: "Run gradle build"
-                uses: gradle/gradle-build-action@v3
+                uses: gradle/actions/setup-gradle@v3
                 with:
+                    cache-read-only: false
                     generate-job-summary: false
                     gradle-version: wrapper
                     arguments: build
@@ -78,26 +72,29 @@ jobs:
                 with:
                     fetch-depth: 0
 
-            -   name: "Set up JDK 17"
-                if: matrix.mod_loader.version != '1.20.6' && matrix.mod_loader.version != '1.21'
-                uses: actions/setup-java@v4
-                with:
-                    java-version: 17
-                    distribution: temurin
+            -   name: "Parse gradle properties"
+                id: gradle-properties
+                run: |
+                    while IFS='=' read -r key value; do
+                      key=$(echo $key | awk '{$1=$1;print}')
+                        value=$(echo $value | awk '{$1=$1;print}')
+
+                        case "$key" in
+                          mod_java_version) echo "JAVA_VERSION=$value" >> $GITHUB_OUTPUT ;;
+                        esac
+                    done < gradle.properties
 
-            -   name: "Set up JDK 21"
-                if: matrix.version == '1.20.6' || matrix.version == '1.21'
+            -   name: "Set up JDK"
                 uses: actions/setup-java@v4
                 with:
-                    java-version: 21
+                    java-version: ${{ steps.gradle-properties.outputs.JAVA_VERSION }}
                     distribution: temurin
 
-            -   name: "Setup Gradle and run build"
-                uses: gradle/gradle-build-action@v3
+            -   name: "Setup Gradle"
+                uses: gradle/actions/setup-gradle@v3
                 with:
                     cache-read-only: true
                     gradle-version: wrapper
-                    arguments: ${{ matrix.mod_loader }}:build
 
             -   name: "Accept eula"
                 run: mkdir -p ${{ matrix.mod_loader }}/run && echo "eula=true" > ${{ matrix.mod_loader }}/run/eula.txt
@@ -106,4 +103,4 @@ jobs:
                 uses: modmuss50/xvfb-action@v1
                 with:
                     run: ./.github/scripts/run-${{ matrix.script }}.sh ${{ matrix.mod_loader }}
-                    shell: bash
+                    shell: bash

.github/workflows/publish.yml

@@ -28,21 +28,12 @@ jobs:
                 include:
                     -   mod_loader: "fabric"
                         supported_mod_loaders: [ "fabric", "quilt" ]
-                        secondary_game_version: ""
-                        curseforge_id: ${{ vars.CURSEFORGE_FABRIC_PROJECT_ID }}
-                        modrinth_id: ${{ vars.MODRINTH_FABRIC_PROJECT_ID }}
 
                     -   mod_loader: "forge"
                         supported_mod_loaders: [ "forge" ]
-                        secondary_game_version: ""
-                        curseforge_id: ${{ vars.CURSEFORGE_FORGE_PROJECT_ID }}
-                        modrinth_id: ${{ vars.MODRINTH_FORGE_PROJECT_ID }}
 
                     -   mod_loader: "neoforge"
                         supported_mod_loaders: [ "neoforge" ]
-                        secondary_game_version: ""
-                        curseforge_id: ${{ vars.CURSEFORGE_FORGE_PROJECT_ID }}
-                        modrinth_id: ${{ vars.MODRINTH_FORGE_PROJECT_ID }}
 
         steps:
             -   name: "Checkout repository"
@@ -71,7 +62,9 @@ jobs:
                         value=$(echo $value | awk '{$1=$1;print}')
 
                         case "$key" in
+                          mod_java_version) echo "JAVA_VERSION=$value" >> $GITHUB_OUTPUT ;;
                           minecraft_version) echo "MINECRAFT_VERSION=$value" >> $GITHUB_OUTPUT ;;
+                          min_minecraft_version) echo "MIN_MINECRAFT_VERSION=$value" >> $GITHUB_OUTPUT ;;
                           mod_name) echo "MOD_NAME=$value" >> $GITHUB_OUTPUT ;;
                           mod_version) echo "MOD_VERSION=$value" >> $GITHUB_OUTPUT ;;
                         esac
@@ -101,18 +94,11 @@ jobs:
                     name: ${{ steps.gradle-properties.outputs.MOD_NAME }} ${{ steps.gradle-properties.outputs.MOD_VERSION }} for Minecraft ${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}
                     bodyFile: RELEASE_CHANGELOG.md
 
-            -   name: "Set up JDK 17"
-                if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true' && steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.20.6' && steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.21'
-                uses: actions/setup-java@v4
-                with:
-                    java-version: 17
-                    distribution: temurin
-
-            -   name: "Set up JDK 21"
-                if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true' && steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.20.6' || steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.21'
+            -   name: "Set up JDK"
+                if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
                 uses: actions/setup-java@v4
                 with:
-                    java-version: 21
+                    java-version: ${{ steps.gradle-properties.outputs.JAVA_VERSION }}
                     distribution: temurin
 
             -   name: "Setup gradle and run build"
@@ -132,17 +118,17 @@ jobs:
                     github-tag: mc${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}-${{ steps.gradle-properties.outputs.MOD_VERSION }}
                     github-commitish: ${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}
 
-                    curseforge-id: ${{ matrix.curseforge_id }}
+                    curseforge-id: ${{ vars.CURSEFORGE_PROJECT_ID }}
                     curseforge-token: ${{ secrets.CURSEFORGE_RELEASE_TOKEN }}
 
-                    modrinth-id: ${{ matrix.modrinth_id }}
+                    modrinth-id: ${{ vars.MODRINTH_PROJECT_ID }}
                     modrinth-featured: true
-                    modrinth-token: ${{ secrets.MODRINTH_RELEASE_TOKEN }}
+                    modrinth-token: ${{ secrets.MODRINTH_RELEASE_TOKEN}}
 
                     name: ${{ steps.gradle-properties.outputs.MOD_NAME }} ${{ steps.gradle-properties.outputs.MOD_VERSION }}
                     version: ${{ matrix.mod_loader }}-mc${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}-${{ steps.gradle-properties.outputs.MOD_VERSION }}
                     loaders: ${{ join(matrix.supported_mod_loaders, ' ') }}
-                    game-versions: "${{ matrix.branch }}\n${{ matrix.secondary_game_version }}"
+                    game-versions: "${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}\n${{ steps.gradle-properties.outputs.MIN_MINECRAFT_VERSION }}"
                     changelog-file: RELEASE_CHANGELOG.md
                     files: |
                         ${{ matrix.mod_loader }}/build/libs/!(*-@(dev|dev-shadow|sources|javadoc)).jar

CHANGELOG.md

@@ -57,30 +57,37 @@
 - Updated translations
 
 ## 2.0.6
+
 - Fixed crash on forge dedicated servers related to Moobloom variants
 - Updated translations
 
 ## 2.0.5
+
 - Improved compatibility for certain mods with tweaks in datapack driven Moobloom variant system
 - Lowered fabric loader version requirement to 0.14.21
 
 ## 2.0.4
+
 - Improved Copper Golems sections in ancient city center pieces
 
 ## 2.0.3
+
 - Fixed Moobloom variants not working properly with dedicated servers
 - Fixed NeoForge (both client and server should now work)
 
 ## 2.0.2
+
 - Fixed crash related to Blaze/Wildfire/Illusioner (again)
 - Reworked Moobloom variants to use datapacks instead of internal api
 - Nerfed wildfire crown
 
 ## 2.0.1
+
 - Fixed crash related to Blaze
 - Fixed Mauler being immortal
 
 ## 2.0.0
+
 - Fixed compatibility problems leading to client/server crashes related to Illusioner and Blaze interactions
 - Fixed Mauler collider box scaling issues
 - Boosted Mauler scaling allowing significant growth when fed with enchanted items

README.md

@@ -35,6 +35,7 @@ the [textures directory] for the textures. Get inspired, but please don't just c
 
 This mod would not exist in the state as it is without the following people:
 
+- [Furti Two] - Made some of the models and most of the textures
 - [LlamaLad7] - Support with everything mixin related (conflicts, extending enums)
 - [TelepathicGrunt] - Support with structure generation related stuff and things (and also with Forge)
 
@@ -64,4 +65,4 @@ This mod would not exist in the state as it is without the following people:
 
 [LlamaLad7]: https://gist.github.com/LlamaLad7
 
-[TelepathicGrunt]: https://github.com/TelepathicGrunt
+[Furti Two]: https://www.curseforge.com/members/furti_two/projects