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

Merge branch '1.21.4' into 1.21.1

Browse source 
# Conflicts:
#	gradle.properties
This commit is contained in:
Oth3r 2025-04-27 19:33:47 -05:00
commit b32efd0296
7 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,7 +155,7 @@ public class Logic {
// get the poses to check above the block
BlockPos pos1 = new BlockPos(pos).add(0,1,0), pos2 = new BlockPos(pos).add(0,2,0), posBelow = new BlockPos(pos);
// doesn't check 2 blocks above if not sitting above .80 of the block
if (pos.getY() > entity.getY() - .80) {
if (pos.getY() > (entity.getY()-Utl.Entity.Y_ADJUSTMENT) - .80) {
pos2 = pos2.add(0,-1,0);
posBelow = posBelow.add(0,-1,0);
}

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

@ -207,7 +207,7 @@ public class Utl {
/**
* the customizable y height of the entity, as some versions have different sitting heights on the entity
*/
private static final double Y_ADJUSTMENT = 0;
public static final double Y_ADJUSTMENT = 0;
/**
* checks if the entity's block is still there, & is valid
@ -226,9 +226,9 @@ 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.getBlockY() + (Y_ADJUSTMENT*-1);
int entityBlockY = (int) (Math.floor(entity.getY() + (Y_ADJUSTMENT*-1)));
// get the block pos
BlockPos pos = new BlockPos(entity.getBlockX(),(int)entityY,entity.getBlockZ());
BlockPos pos = new BlockPos(entity.getBlockX(),entityBlockY,entity.getBlockZ());
// if above the block, subtract 1
if (isAboveBlockHeight(entity)) {
pos = pos.add(0,-1,0);
@ -368,7 +368,8 @@ public class Utl {
* sends the settings packets to the server, if client & in game
*/
public static void sendSettingsPackets() {
if (Data.isClient() && Data.isInGame()) {
if (Data.isClient() && Data.isInGame() &&
ClientPlayNetworking.canSend(SitPayloads.SettingsPayload.ID)) {
ClientPlayNetworking.send(new SitPayloads.SettingsPayload(Utl.getGson().toJson(FileData.getSittingConfig())));
}
}

2
src/main/resources/fabric.mod.json
View file

@ -27,7 +27,7 @@
},
"depends": {
"fabricloader": ">=0.14.21",
"minecraft": ">=${min_minecraft_version} <=${minecraft_version}",
"minecraft": ">=${min_minecraft_version} <=${max_minecraft_version}",
"fabric": "*"
},
"suggests": {