feat: player patch

Author: moemoli

nms-patches/net/minecraft/server/level/EntityPlayer.patch

@@ -3,68 +3,6 @@
 
  public class EntityPlayer extends EntityHuman {
 
-@@ -1002,19 +1307,17 @@
-         this.containerMenu.broadcastChanges();
-     }
- 
--    @Override
--    public Either<EntityHuman.EnumBedResult, Unit> startSleepInBed(BlockPosition blockposition) {
--        EnumDirection enumdirection = (EnumDirection) this.level().getBlockState(blockposition).getValue(BlockFacingHorizontal.FACING);
--
-+    // CraftBukkit start - moved bed result checks from below into separate method
-+    private Either<EntityHuman.EnumBedResult, Unit> getBedResult(BlockPosition blockposition, EnumDirection enumdirection) {
-         if (!this.isSleeping() && this.isAlive()) {
--            if (!this.level().dimensionType().natural()) {
-+            if (!this.level().dimensionType().natural() || !this.level().dimensionType().bedWorks()) {
-                 return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE);
-             } else if (!this.bedInRange(blockposition, enumdirection)) {
-                 return Either.left(EntityHuman.EnumBedResult.TOO_FAR_AWAY);
-             } else if (this.bedBlocked(blockposition, enumdirection)) {
-                 return Either.left(EntityHuman.EnumBedResult.OBSTRUCTED);
-             } else {
--                this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true);
-+                this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, PlayerSpawnChangeEvent.Cause.BED); // CraftBukkit
-                 if (this.level().isDay()) {
-                     return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
-                 } else {
-@@ -1031,7 +1334,36 @@
-                         }
-                     }
- 
--                    Either<EntityHuman.EnumBedResult, Unit> either = super.startSleepInBed(blockposition).ifRight((unit) -> {
-+                    return Either.right(Unit.INSTANCE);
-+                }
-+            }
-+        } else {
-+            return Either.left(EntityHuman.EnumBedResult.OTHER_PROBLEM);
-+        }
-+    }
-+
-+    @Override
-+    public Either<EntityHuman.EnumBedResult, Unit> startSleepInBed(BlockPosition blockposition, boolean force) {
-+        EnumDirection enumdirection = (EnumDirection) this.level().getBlockState(blockposition).getValue(BlockFacingHorizontal.FACING);
-+        Either<EntityHuman.EnumBedResult, Unit> bedResult = this.getBedResult(blockposition, enumdirection);
-+
-+        if (bedResult.left().orElse(null) == EntityHuman.EnumBedResult.OTHER_PROBLEM) {
-+            return bedResult; // return immediately if the result is not bypassable by plugins
-+        }
-+
-+        if (force) {
-+            bedResult = Either.right(Unit.INSTANCE);
-+        }
-+
-+        bedResult = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerBedEnterEvent(this, blockposition, bedResult);
-+        if (bedResult.left().isPresent()) {
-+            return bedResult;
-+        }
-+
-+        {
-+            {
-+                {
-+                    Either<EntityHuman.EnumBedResult, Unit> either = super.startSleepInBed(blockposition, force).ifRight((unit) -> {
-                         this.awardStat(StatisticList.SLEEP_IN_BED);
-                         CriterionTriggers.SLEPT_IN_BED.trigger(this);
-                     });
 @@ -1044,9 +1376,8 @@
                      return either;
                  }

src/main/java/org/teneted/neotenet/injection/server/level/InjectionServerPlayer.java

@@ -3,6 +3,7 @@
 import net.minecraft.world.level.portal.DimensionTransition;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.event.CraftPortalEvent;
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.teneted.neotenet.injection.world.entity.player.InjectionPlayer;
 import com.mojang.datafixers.util.Either;
@@ -119,4 +120,8 @@ default DimensionTransition findRespawnPositionAndUseSpawnBlock(boolean p_348590
     default CraftPortalEvent callPortalEvent(Entity entity, Location exit, PlayerTeleportEvent.TeleportCause cause, int searchRadius, int creationRadius) {
         throw new IllegalStateException("Not implemented");
     }
+
+    default Either<Player.BedSleepingProblem, Unit> startSleepInBed(BlockPos blockposition, boolean force) {
+        throw new IllegalStateException("Not implemented");
+    }
 }

src/main/java/org/teneted/neotenet/mixin/server/level/MixinServerPlayer.java

@@ -37,6 +37,7 @@
 import net.minecraft.server.players.PlayerList;
 import net.minecraft.stats.RecipeBook;
 import net.minecraft.stats.ServerRecipeBook;
+import net.minecraft.stats.Stats;
 import net.minecraft.util.Mth;
 import net.minecraft.util.RandomSource;
 import net.minecraft.util.Unit;
@@ -60,6 +61,8 @@
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.CampfireBlock;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.border.WorldBorder;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.portal.DimensionTransition;
@@ -452,7 +455,6 @@ public DimensionTransition findRespawnPositionAndUseSpawnBlock(boolean p_348590_
     }
 
 
-
     @Redirect(method = "adjustSpawnLocation", at = @At(value = "INVOKE",
             target = "Lnet/minecraft/world/level/storage/ServerLevelData;getGameType()Lnet/minecraft/world/level/GameType;"))
     private GameType neotenet$useWorldGameType(ServerLevelData instance, @Local(argsOnly = true) ServerLevel p_352206_) {
@@ -656,6 +658,40 @@ public Either<BedSleepingProblem, Unit> getBedResult(BlockPos blockposition, Dir
         return Either.left(BedSleepingProblem.OTHER_PROBLEM);
     }
 
+    @Override
+    public Either<Player.BedSleepingProblem, Unit> startSleepInBed(BlockPos blockposition, boolean force) {
+        Direction enumdirection = (Direction) this.level().getBlockState(blockposition).getValue(BlockStateProperties.HORIZONTAL_FACING);
+        Either<Player.BedSleepingProblem, Unit> bedResult = this.getBedResult(blockposition, enumdirection);
+
+        if (bedResult.left().orElse(null) == Player.BedSleepingProblem.OTHER_PROBLEM) {
+            return bedResult; // return immediately if the result is not bypassable by plugins
+        }
+
+        if (force) {
+            bedResult = Either.right(Unit.INSTANCE);
+        }
+
+        bedResult = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerBedEnterEvent(this, blockposition, bedResult);
+        if (bedResult.left().isPresent()) {
+            return bedResult;
+        }
+        {
+            {
+                // Start vanilla code
+                Either<Player.BedSleepingProblem, Unit> either = super.startSleepInBed(blockposition).ifRight(p_9029_ -> {
+                    this.awardStat(Stats.SLEEP_IN_BED);
+                    CriteriaTriggers.SLEPT_IN_BED.trigger((ServerPlayer) (Object) this);
+                });
+                if (!this.serverLevel().canSleepThroughNights()) {
+                    this.displayClientMessage(Component.translatable("sleep.not_possible"), true);
+                }
+
+                ((ServerLevel) this.level()).updateSleepingPlayerList();
+                return either;
+            }
+        }
+    }
+
     @Override
     public Scoreboard getScoreboard() {
         return this.getBukkitEntity().getScoreboard().getHandle();