Skip to content

Commit 05b9167

Browse files
committed
Updated to 1.21.2
1 parent 5d52697 commit 05b9167

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=1.21.1
7-
yarn_mappings=1.21.1+build.3
8-
loader_version=0.16.2
6+
minecraft_version=1.21.2
7+
yarn_mappings=1.21.2+build.1
8+
loader_version=0.16.10
99

1010
# Mod Properties
11-
mod_version = 1.0.3+1.21
11+
mod_version = 1.0.3+1.21.2
1212
maven_group = com.minenash
1313
archives_base_name = monsters-in-the-closet

src/main/java/com/minenash/monsters_in_the_closet/mixin/BedBlockMixin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.block.BlockState;
77
import net.minecraft.entity.mob.HostileEntity;
88
import net.minecraft.entity.player.PlayerEntity;
9+
import net.minecraft.server.network.ServerPlayerEntity;
910
import net.minecraft.util.ActionResult;
1011
import net.minecraft.util.Hand;
1112
import net.minecraft.util.hit.BlockHitResult;
@@ -36,13 +37,13 @@ private static void thingy(PlayerEntity player, PlayerEntity.SleepFailureReason
3637
return;
3738

3839

39-
if (blockPos != null) {
40+
if (blockPos != null && player instanceof ServerPlayerEntity spe) {
4041
Vec3d vec3d = Vec3d.ofBottomCenter(blockPos);
4142
List<HostileEntity> list = player.getWorld().getEntitiesByClass(
4243
HostileEntity.class,
4344
new Box(vec3d.getX() - 8.0D, vec3d.getY() - 5.0D, vec3d.getZ() - 8.0D, vec3d.getX() + 8.0D, vec3d.getY() + 5.0D,
4445
vec3d.getZ() + 8.0D),
45-
(hostileEntity) -> hostileEntity.isAngryAt(player)
46+
(hostileEntity) -> hostileEntity.isAngryAt(spe.getServerWorld(), spe)
4647
);
4748

4849
if (!list.isEmpty()) {

src/main/java/com/minenash/monsters_in_the_closet/mixin/MessageHandlerMixin.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ private void interceptDangerousSleepMessage(Text message, boolean overlay, Callb
3333
return;
3434

3535
Vec3d vec3d = Vec3d.ofBottomCenter(client.player.getBlockPos());
36-
List<HostileEntity> list = client.world.getEntitiesByClass(
36+
List<HostileEntity> list = client.world.getNonSpectatingEntities(
3737
HostileEntity.class,
3838
new Box(vec3d.getX() - 8.0D, vec3d.getY() - 5.0D, vec3d.getZ() - 8.0D, vec3d.getX() + 8.0D, vec3d.getY() + 5.0D,
39-
vec3d.getZ() + 8.0D),
40-
hostileEntity -> hostileEntity.isAngryAt(client.player));
39+
vec3d.getZ() + 8.0D));
4140

4241
if (!list.isEmpty()) {
4342
MonstersInTheCloset.duration = 60;

src/main/java/com/minenash/monsters_in_the_closet/mixin/ServerPlayerEntityMixin.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,16 @@ public ServerPlayerEntityMixin(EntityType<?> type, World world) {
3535
@Inject(method = "trySleep", at = @At("RETURN"))
3636
public void highlightMobs(BlockPos pos, CallbackInfoReturnable<Either<PlayerEntity.SleepFailureReason, Unit>> info) {
3737
Optional<PlayerEntity.SleepFailureReason> reason = info.getReturnValue().left();
38-
if (getWorld() != null && reason.isPresent() && reason.get() == PlayerEntity.SleepFailureReason.NOT_SAFE) {
38+
ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
39+
40+
if (player.getServerWorld() != null && reason.isPresent() && reason.get() == PlayerEntity.SleepFailureReason.NOT_SAFE) {
3941

4042
Vec3d vec3d = Vec3d.ofBottomCenter(pos);
41-
List<HostileEntity> list = getWorld().getEntitiesByClass(
43+
List<HostileEntity> list = player.getServerWorld().getEntitiesByClass(
4244
HostileEntity.class,
4345
new Box(vec3d.getX() - 8.0D, vec3d.getY() - 5.0D, vec3d.getZ() - 8.0D, vec3d.getX() + 8.0D, vec3d.getY() + 5.0D,
4446
vec3d.getZ() + 8.0D),
45-
(hostileEntity) -> hostileEntity.isAngryAt((PlayerEntity) (Object) this)
47+
(hostileEntity) -> hostileEntity.isAngryAt(player.getServerWorld(), player)
4648
);
4749

4850
for (HostileEntity entity : list)

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222

2323
"depends": {
2424
"fabricloader": ">=0.11.3",
25-
"minecraft": ">=1.20.5-"
25+
"minecraft": ">=1.21.2<=1.21.4"
2626
}
2727
}

0 commit comments

Comments
 (0)