virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

1.21.6 port

Browse source
This commit is contained in:
Oth3r 2025-06-17 10:34:23 -05:00
commit 7a1f058f6c
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/one/oth3r/sit/utl/Events.java
View file

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

8
src/main/java/one/oth3r/sit/utl/Logic.java
View file

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

4
src/main/java/one/oth3r/sit/utl/Utl.java
View file

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