Merge branch '1.20.4' into 1.20.1

# Conflicts:
#	gradle.properties

src/main/java/one/oth3r/sit/utl/Utl.java

@@ -226,8 +226,7 @@ public class Utl {
         public static BlockPos getBlockPos(DisplayEntity.TextDisplayEntity entity) {
             // the entity Y level, adjusted
             // the adjustment - is the opposite of the offset applied in Entity.create()
-            double entityY = entity.getY() + (Y_ADJUSTMENT*-1);
-
+            double entityY = entity.getBlockY() + (Y_ADJUSTMENT*-1);
             // get the block pos
             BlockPos pos = new BlockPos(entity.getBlockX(),(int)entityY,entity.getBlockZ());
             // if above the block, subtract 1