1.21.6 update

changelog.md

@@ -3,7 +3,7 @@
 
 # v1.2.4.2
 * fixed language file not loading (reverted uppercase locales)
-* fixed block checking having a hardcoded player reach - now uses player reach
+* fixed block checking having a hardcoded player reach - now uses player reach (1.20.6+)
 * fixed block and item tag check logic for cases with only not(!) tags
 
 # v1.2.4.1

gradle.properties

@@ -4,21 +4,21 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-min_minecraft_version=1.21.5
-max_minecraft_version=1.21.5
-minecraft_versions=1.21.5
+min_minecraft_version=1.21.6
+max_minecraft_version=1.21.6
+minecraft_versions=1.21.6
 
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.2.4.3+1.21.5
+mod_version=1.2.4.3+1.21.6
 maven_group=one.oth3r
 file_name=sit!
 
 # Dependencies
-fabric_version=0.124.0+1.21.5
-modmenu_version=14.0.0-rc.2
-otterlib_version=0.1.2.1+1.21.5-fabric
-otterlib_max_version=0.2.0.0+1.21.5-fabric
+fabric_version=0.127.0+1.21.6
+modmenu_version=15.0.0-beta.1
+otterlib_version=0.1.2.1+1.21.6-fabric
+otterlib_max_version=0.2.0.0+1.21.6-fabric

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

@@ -75,7 +75,7 @@ public class Events {
                 // just send the sit command
                 if (Data.isInGame()) {
                     if (Data.isSupportedServer()) {
-                        player.networkHandler.sendCommand("sit");
+                        player.networkHandler.sendChatCommand("sit");
                     } else {
                         // unsupported server message if not in a Sit! server
                         player.sendMessage(Utl.lang("sit!.chat.unsupported")

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

@@ -37,7 +37,7 @@ public class Logic {
         // check if the block is in the right y level limits from the config
         if (!checkYLimits(player, blockPos)) return false;
 
-        ServerWorld serverWorld = player.getServerWorld();
+        ServerWorld serverWorld = player.getWorld();
 
         Double sitHeight = Utl.getSittingHeight(player,blockPos,hitResult);
 
@@ -60,7 +60,7 @@ public class Logic {
     public static boolean sit(ServerPlayerEntity player, BlockPos blockPos, @Nullable BlockHitResult hitResult) {
         if (!canSit(player, blockPos, hitResult)) return false;
         // assets
-        ServerWorld serverWorld = player.getServerWorld();
+        ServerWorld serverWorld = player.getWorld();
         Double sitHeight = Utl.getSittingHeight(player,blockPos,hitResult);
         // shouldn't be null because we already checked, but do another check to clear IDE errors
         assert sitHeight != null;
@@ -77,7 +77,7 @@ public class Logic {
      * @return true if sitting was successful
      */
     public static boolean sitLooking(ServerPlayerEntity player) {
-        return sit(player, Utl.getBlockPosPlayerIsLookingAt(player.getServerWorld(),player,
+        return sit(player, Utl.getBlockPosPlayerIsLookingAt(player.getWorld(),player,
                 Utl.getPlayerReach(player)),null);
     }
 
@@ -151,7 +151,7 @@ public class Logic {
         // get the new entity
         DisplayEntity.TextDisplayEntity sitEntity = Data.getSpawnList().get(player);
         // spawn and ride the entity
-        player.getServerWorld().spawnEntity(sitEntity);
+        player.getWorld().spawnEntity(sitEntity);
         player.startRiding(sitEntity);
         // add the entity to the list
         Data.addSitEntity(player, sitEntity);

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

@@ -160,7 +160,7 @@ public class Utl {
      * @return null if not a valid block
      */
     public static Double getSittingHeight(ServerPlayerEntity player, BlockPos blockPos, @Nullable BlockHitResult hit) {
-        ServerWorld serverWorld = player.getServerWorld();
+        ServerWorld serverWorld = player.getWorld();
         ServerConfig config = FileData.getServerConfig();
         BlockState blockState = serverWorld.getBlockState(blockPos);
         Block block = blockState.getBlock();
@@ -306,7 +306,7 @@ public class Utl {
             /// FYI it cant purge an entity from a disconnected player or unloaded chunks
 
             // get a list of sit entities
-            List<? extends DisplayEntity.TextDisplayEntity> list = player.getServerWorld()
+            List<? extends DisplayEntity.TextDisplayEntity> list = player.getWorld()
                     .getEntitiesByType(TypeFilter.instanceOf(DisplayEntity.TextDisplayEntity.class),
                             entity -> entity.getName().getString().equals(Data.ENTITY_NAME));