Compare commits

..

No commits in common. "3f9517a1f092b6fe12879199e4957f714a56419f" and "82c4b375d53d105ff79b80b6823aa9ce62954551" have entirely different histories.

5 changed files with 18 additions and 18 deletions

View file

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

View file

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

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.sendChatCommand("sit"); player.networkHandler.sendCommand("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")

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.getWorld(); ServerWorld serverWorld = player.getServerWorld();
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.getWorld(); ServerWorld serverWorld = player.getServerWorld();
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.getWorld(),player, return sit(player, Utl.getBlockPosPlayerIsLookingAt(player.getServerWorld(),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.getWorld().spawnEntity(sitEntity); player.getServerWorld().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);

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.getWorld(); ServerWorld serverWorld = player.getServerWorld();
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.getWorld() List<? extends DisplayEntity.TextDisplayEntity> list = player.getServerWorld()
.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));