From ea7e42f8a567ab86a20fc7a66555b8c3bb98771b Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+Oth3r@users.noreply.github.com> Date: Sat, 14 Jun 2025 19:13:19 -0500 Subject: [PATCH 1/3] changelog clarification --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 2b7e70c..cb30a6d 100644 --- a/changelog.md +++ b/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 From 7a1f058f6c07c19ddfbb72276fc1c3c211d0c9b0 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+Oth3r@users.noreply.github.com> Date: Tue, 17 Jun 2025 10:34:23 -0500 Subject: [PATCH 2/3] 1.21.6 port --- src/main/java/one/oth3r/sit/utl/Events.java | 2 +- src/main/java/one/oth3r/sit/utl/Logic.java | 8 ++++---- src/main/java/one/oth3r/sit/utl/Utl.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/one/oth3r/sit/utl/Events.java b/src/main/java/one/oth3r/sit/utl/Events.java index 0b5c5e6..9e2be60 100644 --- a/src/main/java/one/oth3r/sit/utl/Events.java +++ b/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") diff --git a/src/main/java/one/oth3r/sit/utl/Logic.java b/src/main/java/one/oth3r/sit/utl/Logic.java index b128b94..d465de0 100644 --- a/src/main/java/one/oth3r/sit/utl/Logic.java +++ b/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); diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java index ea2fc19..00be53a 100644 --- a/src/main/java/one/oth3r/sit/utl/Utl.java +++ b/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 list = player.getServerWorld() + List list = player.getWorld() .getEntitiesByType(TypeFilter.instanceOf(DisplayEntity.TextDisplayEntity.class), entity -> entity.getName().getString().equals(Data.ENTITY_NAME)); From 3f9517a1f092b6fe12879199e4957f714a56419f Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+Oth3r@users.noreply.github.com> Date: Tue, 17 Jun 2025 10:34:33 -0500 Subject: [PATCH 3/3] 1.21.6 update --- gradle.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2c59928..19808a0 100644 --- a/gradle.properties +++ b/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