🍄变成了参天大🌳

Author: wdog5

patches/net/minecraft/server/level/ServerPlayer.java.patch

@@ -1,7 +1,10 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -204,8 +_,9 @@
+@@ -202,10 +_,12 @@
+ import net.minecraft.world.scores.Team;
+ import net.minecraft.world.scores.TeamColor;
  import net.minecraft.world.scores.criteria.ObjectiveCriteria;
++import org.bukkit.craftbukkit.entity.CraftPlayer;
  import org.jspecify.annotations.Nullable;
  import org.slf4j.Logger;
 +import org.teneted.neotenet.injection.server.level.ServerPlayerInjection;
@@ -55,7 +58,7 @@
              ServerPlayer.this.connection.send(new ClientboundContainerSetDataPacket(container.containerId, id, value));
          }
 
-@@ -362,10 +_,17 @@
+@@ -362,10 +_,32 @@
          public void sendSystemMessage(Component message) {
              ServerPlayer.this.sendSystemMessage(message);
          }
@@ -70,6 +73,21 @@
      public boolean wonGame;
 +    // Neo: Used to track partial TIME_SINCE_REST increases for dimensions in which clocks move at different speeds. No need to persist, at most Phantoms will spawn one tick too early for each save/load cycle.
 +    private float partialTimeSinceRestTick;
++    // CraftBukkit start
++    public CraftPlayer.TransferCookieConnection transferCookieConnection;
++    public String displayName;
++    public Component listName;
++    public int listOrder = 0;
++    public org.bukkit.Location compassTarget;
++    public int newExp = 0;
++    public int newLevel = 0;
++    public int newTotalExp = 0;
++    public boolean keepLevel = false;
++    public double maxHealthCache;
++    public boolean joining = true;
++    public boolean sentListPacket = false;
++    public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
++    // CraftBukkit end
 
      public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) {
          super(level, gameProfile);

patches/net/minecraft/world/Container.java.patch

@@ -0,0 +1,13 @@
+--- a/net/minecraft/world/Container.java
++++ b/net/minecraft/world/Container.java
+@@ -17,8 +_,9 @@
+ import org.jspecify.annotations.Nullable;
+ 
+ import net.neoforged.neoforge.common.extensions.ContainerExtension;
++import org.teneted.neotenet.injection.world.ContainerInjection;
+ 
+-public interface Container extends Clearable, Iterable<ItemStack>, SlotProvider, ContainerExtension {
++public interface Container extends Clearable, Iterable<ItemStack>, SlotProvider, ContainerExtension, ContainerInjection {
+     float DEFAULT_DISTANCE_BUFFER = 4.0F;
+ 
+     int getContainerSize();

patches/net/minecraft/world/entity/LivingEntity.java.patch

@@ -13,6 +13,17 @@
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
+@@ -139,8 +_,9 @@
+ import org.slf4j.Logger;
+ 
+ import net.neoforged.neoforge.common.extensions.ILivingEntityExtension;
++import org.teneted.neotenet.injection.world.entity.LivingEntityInjection;
+ 
+-public abstract class LivingEntity extends Entity implements Attackable, WaypointTransmitter, ILivingEntityExtension {
++public abstract class LivingEntity extends Entity implements Attackable, WaypointTransmitter, ILivingEntityExtension, LivingEntityInjection {
+     private static final Logger LOGGER = LogUtils.getLogger();
+     private static final String TAG_ACTIVE_EFFECTS = "active_effects";
+     public static final String TAG_ATTRIBUTES = "attributes";
 @@ -177,14 +_,14 @@
      private static final double MAX_LINE_OF_SIGHT_TEST_RANGE = 128.0;
      protected static final int LIVING_ENTITY_FLAG_IS_USING = 1;
@@ -218,7 +229,12 @@
          return true;
      }
 
-@@ -1014,12 +_,13 @@
+@@ -1010,16 +_,17 @@
+     }
+ 
+     public final boolean addEffect(MobEffectInstance newEffect) {
+-        return this.addEffect(newEffect, null);
++        return this.addEffect(newEffect, (Entity) null);
      }
 
      public boolean addEffect(MobEffectInstance newEffect, @Nullable Entity source) {

patches/net/minecraft/world/entity/Mob.java.patch

@@ -1,5 +1,16 @@
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
+@@ -95,8 +_,9 @@
+ import net.minecraft.world.phys.Vec3;
+ import net.minecraft.world.ticks.ContainerSingleItem;
+ import org.jspecify.annotations.Nullable;
++import org.teneted.neotenet.injection.world.entity.MobInjection;
+ 
+-public abstract class Mob extends LivingEntity implements Targeting, EquipmentUser, Leashable {
++public abstract class Mob extends LivingEntity implements Targeting, EquipmentUser, Leashable, MobInjection {
+     private static final EntityDataAccessor<Byte> DATA_MOB_FLAGS_ID = SynchedEntityData.defineId(Mob.class, EntityDataSerializers.BYTE);
+     private static final int MOB_FLAG_NO_AI = 1;
+     private static final int MOB_FLAG_LEFTHANDED = 2;
 @@ -131,19 +_,25 @@
      protected JumpControl jumpControl;
      private final BodyRotationControl bodyRotationControl;

patches/net/minecraft/world/entity/player/Player.java.patch

@@ -1,9 +1,13 @@
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -126,6 +_,7 @@
+@@ -124,8 +_,10 @@
+ import org.jspecify.annotations.Nullable;
+ 
  import net.neoforged.neoforge.common.extensions.IPlayerExtension;
++import org.teneted.neotenet.injection.world.entity.player.PlayerInjection;
 
- public abstract class Player extends Avatar implements ContainerUser, IPlayerExtension {
+-public abstract class Player extends Avatar implements ContainerUser, IPlayerExtension {
++public abstract class Player extends Avatar implements ContainerUser, IPlayerExtension, PlayerInjection {
 +    public static final String PERSISTED_NBT_TAG = "PlayerPersisted";
      public static final int MAX_HEALTH = 20;
      public static final int SLEEP_DURATION = 100;
@@ -24,14 +28,17 @@
      protected final float defaultFlySpeed = 0.02F;
      private int lastLevelUpTime;
      private final GameProfile gameProfile;
-@@ -173,6 +_,10 @@
+@@ -173,6 +_,13 @@
      private Optional<GlobalPos> lastDeathLocation = Optional.empty();
      public @Nullable FishingHook fishing;
      protected float hurtDir;
 +    private final java.util.Collection<MutableComponent> prefixes = new java.util.LinkedList<>();
 +    private final java.util.Collection<MutableComponent> suffixes = new java.util.LinkedList<>();
 +    @Nullable
 +    private Pose forcedPose = null;
++    // CraftBukkit start
++    public boolean fauxSleeping;
++    public int oldLevel = -1;
 
      public Player(Level level, GameProfile gameProfile) {
          super(EntityTypes.PLAYER, level);

patches/net/minecraft/world/level/BlockGetter.java.patch

@@ -1,5 +1,16 @@
 --- a/net/minecraft/world/level/BlockGetter.java
 +++ b/net/minecraft/world/level/BlockGetter.java
+@@ -22,8 +_,9 @@
+ import org.jspecify.annotations.Nullable;
+ 
+ import net.neoforged.neoforge.common.extensions.IBlockGetterExtension;
++import org.teneted.neotenet.injection.world.level.BlockGetterInjection;
+ 
+-public interface BlockGetter extends LevelHeightAccessor, IBlockGetterExtension {
++public interface BlockGetter extends LevelHeightAccessor, IBlockGetterExtension, BlockGetterInjection {
+     @Nullable BlockEntity getBlockEntity(BlockPos pos);
+ 
+     default <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos pos, BlockEntityType<T> type) {
 @@ -36,7 +_,7 @@
      FluidState getFluidState(BlockPos pos);
 

patches/net/minecraft/world/level/Level.java.patch

@@ -20,7 +20,7 @@
  import net.minecraft.world.entity.player.Player;
  import net.minecraft.world.item.ItemStack;
  import net.minecraft.world.item.alchemy.PotionBrewing;
-@@ -88,11 +_,13 @@
+@@ -88,11 +_,14 @@
  import net.minecraft.world.phys.Vec3;
  import net.minecraft.world.scores.Scoreboard;
  import org.apache.commons.lang3.mutable.MutableBoolean;
@@ -29,9 +29,10 @@
  import org.jspecify.annotations.Nullable;
 
  import net.neoforged.neoforge.common.extensions.ILevelExtension;
++import org.teneted.neotenet.injection.world.level.LevelInjection;
 
 -public abstract class Level implements LevelAccessor, AutoCloseable, ILevelExtension {
-+public abstract class Level extends net.neoforged.neoforge.attachment.AttachmentHolder implements LevelAccessor, AutoCloseable, ILevelExtension {
++public abstract class Level extends net.neoforged.neoforge.attachment.AttachmentHolder implements LevelAccessor, AutoCloseable, ILevelExtension, LevelInjection {
      public static final Codec<ResourceKey<Level>> RESOURCE_KEY_CODEC = ResourceKey.codec(Registries.DIMENSION);
      public static final ResourceKey<Level> OVERWORLD = ResourceKey.create(Registries.DIMENSION, Identifier.withDefaultNamespace("overworld"));
      public static final ResourceKey<Level> NETHER = ResourceKey.create(Registries.DIMENSION, Identifier.withDefaultNamespace("the_nether"));

patches/net/minecraft/world/level/LevelAccessor.java.patch

@@ -0,0 +1,13 @@
+--- a/net/minecraft/world/level/LevelAccessor.java
++++ b/net/minecraft/world/level/LevelAccessor.java
+@@ -22,8 +_,9 @@
+ import net.minecraft.world.ticks.ScheduledTick;
+ import net.minecraft.world.ticks.TickPriority;
+ import org.jspecify.annotations.Nullable;
++import org.teneted.neotenet.injection.world.level.LevelAccessorInjection;
+ 
+-public interface LevelAccessor extends CommonLevelAccessor, ScheduledTickAccess {
++public interface LevelAccessor extends CommonLevelAccessor, ScheduledTickAccess, LevelAccessorInjection {
+     long nextSubTickCount();
+ 
+     @Override

patches/net/minecraft/world/level/LevelWriter.java.patch

@@ -0,0 +1,13 @@
+--- a/net/minecraft/world/level/LevelWriter.java
++++ b/net/minecraft/world/level/LevelWriter.java
+@@ -5,8 +_,9 @@
+ import net.minecraft.world.level.block.Block;
+ import net.minecraft.world.level.block.state.BlockState;
+ import org.jspecify.annotations.Nullable;
++import org.teneted.neotenet.injection.world.level.LevelWriterInjection;
+ 
+-public interface LevelWriter {
++public interface LevelWriter extends LevelWriterInjection {
+     boolean setBlock(BlockPos pos, BlockState blockState, @Block.UpdateFlags int updateFlags, int updateLimit);
+ 
+     default boolean setBlock(BlockPos pos, BlockState blockState, @Block.UpdateFlags int updateFlags) {

patches/net/minecraft/world/level/ServerLevelAccessor.java.patch

@@ -0,0 +1,13 @@
+--- a/net/minecraft/world/level/ServerLevelAccessor.java
++++ b/net/minecraft/world/level/ServerLevelAccessor.java
+@@ -4,8 +_,9 @@
+ import net.minecraft.server.level.ServerLevel;
+ import net.minecraft.world.DifficultyInstance;
+ import net.minecraft.world.entity.Entity;
++import org.teneted.neotenet.injection.world.level.ServerLevelAccessorInjection;
+ 
+-public interface ServerLevelAccessor extends LevelAccessor {
++public interface ServerLevelAccessor extends LevelAccessor, ServerLevelAccessorInjection {
+     ServerLevel getLevel();
+ 
+     DifficultyInstance getCurrentDifficultyAt(BlockPos pos);