Merge branch '1.19.2' into 1.19.3

* 1.19.2: 2.0.13 rascal spawn improvements # Conflicts: # common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java
Faboslav · Jul 13, 2024 · 1c703ea · 1c703ea
2 parents 5c8a381 + d43c899
commit 1c703ea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -46,7 +46,7 @@ jobs:
 
         steps:
             -   name: "Checkout repository"
-                uses: actions/checkout@v4.1.1
+                uses: actions/checkout@v4
                 with:
                     ref: ${{ matrix.branch }}
                     fetch-depth: 0
@@ -117,7 +117,7 @@ jobs:
 
             -   name: "Setup gradle and run build"
                 if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
-                uses: gradle/gradle-build-action@v2.11.1
+                uses: gradle/gradle-build-action@v3
                 with:
                     cache-read-only: true
                     generate-job-summary: false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.13
+
+- Rascal spawn condition improvements
+- NeoForge beta breaking change fix
+
 ## 2.0.12
 
 - Fixed oak beehive crafting recipe

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java b/common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java
@@ -32,6 +32,7 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.StructureTags;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
@@ -94,6 +95,15 @@ public static boolean canSpawn(
 			if (
 				blockPos.getY() > 63
 				|| serverWorldAccess.isSkyVisible(blockPos)
+				|| serverWorldAccess.getLightLevel(blockPos, 0) == 0
+				|| (
+					!serverWorldAccess.getBlockState(blockPos.down()).isIn(BlockTags.PLANKS)
+					&& !serverWorldAccess.getBlockState(blockPos.up()).isIn(BlockTags.PLANKS)
+					&& !serverWorldAccess.getBlockState(blockPos.north()).isIn(BlockTags.PLANKS)
+					&& !serverWorldAccess.getBlockState(blockPos.west()).isIn(BlockTags.PLANKS)
+					&& !serverWorldAccess.getBlockState(blockPos.south()).isIn(BlockTags.PLANKS)
+					&& !serverWorldAccess.getBlockState(blockPos.east()).isIn(BlockTags.PLANKS)
+				)
 			) {
 				return false;
 			}
@@ -412,7 +422,7 @@ public void addToCaughtCount() {
 	}
 
 	public boolean shouldGiveReward() {
-		return this.getCaughtCount() >= 3;
+		return this.getCaughtCount() == 3;
 	}
 
 	public boolean disableAmbientSounds() {

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.caching=true
 # Mod
 mod_name=Friends&Foes
 mod_id=friendsandfoes
-mod_version=2.0.12
+mod_version=2.0.13
 mod_author=Faboslav
 mod_description=Adds outvoted and forgotten mobs from the mob votes in a believable vanilla plus style.
 maven_group=com.faboslav.friendsandfoes