Merge branch '1.21.1'

* 1.21.1: Updated configs, CI
Faboslav · Sep 26, 2024 · 820ca8c · 820ca8c
2 parents 19cf9ff + d57c5f4
commit 820ca8c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/publish-branch.yml b/.github/workflows/publish-branch.yml
@@ -108,11 +108,11 @@ 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_project_id }}
-                    #curseforge-token: ${{ secrets.CURSEFORGE_RELEASE_TOKEN }}
+                    curseforge-id: ${{ matrix.curseforge_project_id }}
+                    curseforge-token: ${{ secrets.CURSEFORGE_RELEASE_TOKEN }}
 
-                    #modrinth-id: ${{ matrix.modrinth_project_id }}
-                    #modrinth-token: ${{ secrets.MODRINTH_RELEASE_TOKEN }}
+                    modrinth-id: ${{ matrix.modrinth_project_id }}
+                    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 }}

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/config/FriendsAndFoesConfig.java b/common/src/main/java/com/faboslav/friendsandfoes/common/config/FriendsAndFoesConfig.java
@@ -38,13 +38,13 @@ public final class FriendsAndFoesConfig implements Config
 	public int crabSpawnWeight = 14;
 
 	@Description("Minimal spawn group size")
-	public int crabSpawnMinGroupSize = 2;
+	public int crabSpawnMinGroupSize = 3;
 
 	@Description("Maximal spawn group size")
 	public int crabSpawnMaxGroupSize = 5;
 
-	@Description("Reaching status effect modifier")
-	public float reachingStatusEffectModifier = 1.0F;
+	@Description("Reach status effect modifier (range in blocks)")
+	public int reachingStatusEffectModifier = 1;
 
 	@Category("Glare")
 	@Description("Enable")

diff --git a/common/src/main/resources/data/friendsandfoes/tags/block/crab_burrow_spot_blocks.json b/common/src/main/resources/data/friendsandfoes/tags/block/crab_burrow_spot_blocks.json
@@ -1,5 +1,6 @@
 {
 	"values": [
+		"minecraft:grass_block",
 		"minecraft:mud",
 		"#minecraft:sand"
 	]