waytone generate fix

Author: Gollorum

gradle.properties

@@ -9,7 +9,7 @@ package_group=gollorum.signpost
 mc_version=1.19.2
 forge_version=43.1.43
 
-mod_version=2.00.5
+mod_version=2.01.0
 
 balm_project_id=531761
 balm_file_id=3914527

src/main/java/gollorum/signpost/minecraft/block/WaystoneGeneratorBlock.java

@@ -94,7 +94,14 @@ private static boolean tryPlace(BlockState state, BlockPos pos, ServerLevel serv
             return false;
         }
         String name = optionalName.get();
-        serverLevel.setBlock(pos, waystone.defaultBlockState().setValue(WaystoneBlock.FACING, facing), 18);
+        boolean isWater = serverLevel.isWaterAt(pos.above());
+        serverLevel.setBlock(
+            pos,
+            waystone.defaultBlockState()
+                .setValue(WaystoneBlock.FACING, facing)
+                .setValue(ModelWaystone.Waterlogged, isWater),
+            18
+        );
         WaystoneLibrary.getInstance().update(
             name,
             locationDataFor(pos, serverLevel, facing),
@@ -132,18 +139,22 @@ private static Vector3 spawnPosFor(ServerLevel world, BlockPos waystonePos, Dire
 		BlockPos spawnBlockPos = waystonePos.relative(facing, -2);
 		int maxOffset = 10;
 		int offset = 0;
-		while(world.getBlockState(spawnBlockPos).isAir() && offset <= maxOffset) {
+		while(isFree(world.getBlockState(spawnBlockPos), world, spawnBlockPos) && offset <= maxOffset) {
 			spawnBlockPos = spawnBlockPos.below();
 			offset++;
 		}
 		offset = 0;
-		while(!world.getBlockState(spawnBlockPos).isAir() && offset <= maxOffset) {
+		while(!isFree(world.getBlockState(spawnBlockPos), world, spawnBlockPos) && offset <= maxOffset) {
 			spawnBlockPos = spawnBlockPos.above();
 			offset++;
 		}
 		return Vector3.fromBlockPos(spawnBlockPos).add(0.5f, 0, 0.5f);
 	}
 
+    private static boolean isFree(BlockState state, ServerLevel world, BlockPos waystonePos) {
+        return state.getCollisionShape(world, waystonePos).isEmpty();
+    }
+
     private static ModelWaystone getWaystoneType(Random random, List<ModelWaystone> allowedWaystones) {
 		return allowedWaystones.get(random.nextInt(allowedWaystones.size()));
 	}

src/main/java/gollorum/signpost/minecraft/worldgen/VillageSignpost.java

@@ -47,7 +47,7 @@ public static boolean populate(PostTile tile, SignBlockPart<?> generatorPart, UU
 
 		Collection<WaystoneHandle.Vanilla> freshlyUsedWaystones = populateSignPostGeneration(
 			tile, generatorPart, height,
-			tile.getBlockState().getValue(PostBlock.Facing), pieceLocation, level, random, possibleTargets
+			tile.getBlockState().getValue(PostBlock.Facing).getOpposite(), pieceLocation, level, random, possibleTargets
 		);
 		waystonesTargetedByVillage.computeIfAbsent(villageLocation, k -> new ArrayList<>())
 			.addAll(freshlyUsedWaystones);