Merge branch '1.21.1' into 1.20.6

# Conflicts:
#	gradle.properties

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.modrinth.minotaur' version '2.+'
 	id 'net.darkhax.curseforgegradle' version '1.1.+'
@@ -14,8 +14,8 @@ base {
 }
 
 repositories {
-	maven { url "https://maven.terraformersmc.com/releases/" }
-	maven { url "https://maven.isxander.dev/releases" }
+	maven { url = "https://maven.terraformersmc.com/releases/" }
+	maven { url = "https://maven.isxander.dev/releases" }
 }
 
 loom {
@@ -33,7 +33,7 @@ dependencies {
 }
 
 processResources {
-	filteringCharset "UTF-8"
+	filteringCharset = "UTF-8"
 
 	var replaceProperties = [
 			version                : project.version,

changelog.md

@@ -1,15 +1,2 @@
-# v1.2.2
-more configuration!
-### height-difference-limit
-new server config for y difference limit for sitting
-
-limit how far above or below a block can compared to a player be to sit!
-
-**default**: 1 block above and below the player's y
-
-### fixes / changelog:
-* fixed interaction-blocks not getting copied correctly when updating the file
-* fixed actionbar text for toggling sitting ablity not displaying correctly
-* added `height-difference-limit` `server-config` option
-* added German localization (de_de)
-* added Simplified Chinese localization (zh_ch)
+# v1.2.3
+* fixed not being able to sit when the Y level was below 0

gradle.properties

@@ -10,7 +10,7 @@ yarn_mappings=1.20.6+build.3
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.2.2+1.20.6
+mod_version=1.2.3+1.20.6
 maven_group=one.oth3r
 file_name=sit!
 

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