雨屏雨屏❤️玩饥荒不理我呜呜呜😔

Author: wdog5

patches/net/minecraft/ChatFormatting.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/ChatFormatting.java
++++ b/net/minecraft/ChatFormatting.java
+@@ -30,7 +_,7 @@
+ 
+     public static final char PREFIX_CODE = '\u00a7';
+     private static final Pattern STRIP_FORMATTING_PATTERN = Pattern.compile("(?i)\u00a7[0-9A-FK-OR]");
+-    private final char code;
++    public final char code;
+     private final String toString;
+ 
+     ChatFormatting(char code) {

patches/net/minecraft/nbt/ListTag.java.patch

@@ -1,9 +1,10 @@
 --- a/net/minecraft/nbt/ListTag.java
 +++ b/net/minecraft/nbt/ListTag.java
-@@ -146,6 +_,15 @@
+@@ -146,7 +_,16 @@
          this(new ArrayList<>());
      }
 
+-    ListTag(List<Tag> list) {
 +    /**
 +     * Neo: create a list tag with the given initial capacity.
 +     *
@@ -13,6 +14,16 @@
 +        this(new ArrayList<>(initialCapacity));
 +    }
 +
-     public ListTag(List<Tag> list) {
++    public ListTag(List<Tag> list) {
          this.list = list;
      }
+ 
+@@ -189,7 +_,7 @@
+     }
+ 
+     @VisibleForTesting
+-    byte identifyRawElementType() {
++    public byte identifyRawElementType() {
+         byte homogenousType = 0;
+ 
+         for (Tag element : this.list) {

patches/net/minecraft/network/Connection.java.patch

@@ -1,5 +1,16 @@
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
+@@ -66,8 +_,8 @@
+     private final PacketFlow receiving;
+     private volatile boolean sendLoginDisconnect = true;
+     private final Queue<Consumer<Connection>> pendingActions = Queues.newConcurrentLinkedQueue();
+-    private Channel channel;
+-    private SocketAddress address;
++    public Channel channel;
++    public SocketAddress address;
+     private volatile @Nullable PacketListener disconnectListener;
+     private volatile @Nullable PacketListener packetListener;
+     private @Nullable DisconnectionDetails disconnectionDetails;
 @@ -81,6 +_,9 @@
      private volatile @Nullable DisconnectionDetails delayedDisconnect;
      private @Nullable BandwidthDebugMonitor bandwidthDebugMonitor;

patches/net/minecraft/network/chat/TextColor.java.patch

@@ -11,10 +11,12 @@
      private static final String CUSTOM_COLOR_PREFIX = "#";
      public static final Codec<TextColor> CODEC = Codec.STRING.comapFlatMap(TextColor::parseColor, TextColor::serialize);
      private static final Map<String, TextColor> NAMED_COLORS = new HashMap<>();
-@@ -32,15 +_,26 @@
+@@ -31,16 +_,27 @@
+     public static final TextColor YELLOW = named("yellow", 16777045);
      public static final TextColor WHITE = named("white", 16777215);
      private final int value;
-     public final @Nullable String name;
+-    private final @Nullable String name;
++    public final @Nullable String name;
 +    // CraftBukkit start
 +    @Nullable
 +    public final ChatFormatting format;

patches/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
++++ b/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+@@ -36,7 +_,7 @@
+         return create(blockEntity, BlockEntity::getUpdateTag);
+     }
+ 
+-    private ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType<?> type, CompoundTag tag) {
++    public ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType<?> type, CompoundTag tag) {
+         this.pos = pos;
+         this.type = type;
+         this.tag = tag;

patches/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java
++++ b/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java
+@@ -19,7 +_,7 @@
+         ClientboundBlockUpdatePacket::new
+     );
+     private final BlockPos pos;
+-    private final BlockState blockState;
++    public final BlockState blockState;
+ 
+     public ClientboundBlockUpdatePacket(BlockPos pos, BlockState state) {
+         this.pos = pos;

patches/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.java.patch

@@ -0,0 +1,25 @@
+--- a/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.java
++++ b/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.java
+@@ -9,15 +_,15 @@
+ public abstract class ServerboundMovePlayerPacket implements Packet<ServerGamePacketListener> {
+     private static final int FLAG_ON_GROUND = 1;
+     private static final int FLAG_HORIZONTAL_COLLISION = 2;
+-    protected final double x;
+-    protected final double y;
+-    protected final double z;
+-    protected final float yRot;
+-    protected final float xRot;
++    public final double x;
++    public final double y;
++    public final double z;
++    public final float yRot;
++    public final float xRot;
+     protected final boolean onGround;
+     protected final boolean horizontalCollision;
+-    protected final boolean hasPos;
+-    protected final boolean hasRot;
++    public final boolean hasPos;
++    public final boolean hasRot;
+ 
+     private static int packFlags(boolean onGround, boolean horizontalCollision) {
+         int flags = 0;

patches/net/minecraft/server/Main.java.patch

@@ -64,3 +64,12 @@
          WorldDimensions.Complete finalDimensions = dimensions.bake(datapackDimensions);
          Lifecycle lifecycle = finalDimensions.lifecycle().add(context.datapackWorldgen().allRegistriesLifecycle());
          PrimaryLevelData primaryLevelData = new PrimaryLevelData(createLevelSettings, finalDimensions.specialWorldProperty(), lifecycle);
+@@ -301,7 +_,7 @@
+         return new WorldLoader.InitConfig(packConfig, Commands.CommandSelection.DEDICATED, properties.functionPermissions);
+     }
+ 
+-    private static void forceUpgrade(
++    public static void forceUpgrade(
+         LevelStorageSource.LevelStorageAccess storageSource,
+         DataFixer fixerUpper,
+         boolean eraseCache,

patches/net/minecraft/server/MinecraftServer.java.patch

@@ -9,7 +9,7 @@
  import net.minecraft.CrashReport;
  import net.minecraft.CrashReportCategory;
  import net.minecraft.ReportType;
-@@ -186,10 +_,15 @@
+@@ -186,11 +_,16 @@
  import net.minecraft.world.phys.Vec2;
  import net.minecraft.world.phys.Vec3;
  import net.minecraft.world.scores.ScoreboardSaveData;
@@ -22,10 +22,70 @@
 +import org.teneted.neotenet.injection.server.MinecraftServerInjection;
 
 -public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, ServerInfo, ChunkIOErrorReporter {
+-    private static final Logger LOGGER = LogUtils.getLogger();
 +public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, ServerInfo, ChunkIOErrorReporter, MinecraftServerInjection {
-     public static final Logger LOGGER = LogUtils.getLogger();
++    public static final Logger LOGGER = LogUtils.getLogger();
      public static final String VANILLA_BRAND = "vanilla";
      private static final float AVERAGE_TICK_TIME_SMOOTHING = 0.8F;
+     private static final int TICK_STATS_SPAN = 100;
+@@ -214,8 +_,8 @@
+     public static final Supplier<GameRules> DEFAULT_GAME_RULES = () -> new GameRules(WorldDataConfiguration.DEFAULT.enabledFeatures());
+     public static final NameAndId ANONYMOUS_PLAYER_PROFILE = new NameAndId(Util.NIL_UUID, "Anonymous Player");
+     public static final String SERVER_THREAD_NAME = "Server thread";
+-    protected final LevelStorageSource.LevelStorageAccess storageSource;
+-    protected final PlayerDataStorage playerDataStorage;
++    public LevelStorageSource.LevelStorageAccess storageSource;
++    public final PlayerDataStorage playerDataStorage;
+     private final SavedDataStorage savedDataStorage;
+     private final List<Runnable> tickables = Lists.newArrayList();
+     private final GameRules gameRules;
+@@ -225,16 +_,16 @@
+     private boolean willStartRecordingMetrics;
+     private MinecraftServer.@Nullable TimeProfiler debugCommandProfiler;
+     private boolean debugCommandProfilerDelayStart;
+-    private final ServerConnectionListener connection;
+-    private final LevelLoadListener levelLoadListener;
++    private ServerConnectionListener connection;
++    public final LevelLoadListener levelLoadListener;
+     private @Nullable ServerStatus status;
+     private ServerStatus.@Nullable Favicon statusIcon;
+     private final RandomSource random = RandomSource.create();
+-    private final DataFixer fixerUpper;
++    public final DataFixer fixerUpper;
+     private String localIp;
+     private int port = -1;
+     private final LayeredRegistryAccess<RegistryLayer> registries;
+-    private final Map<ResourceKey<Level>, ServerLevel> levels = Maps.newLinkedHashMap();
++    private Map<ResourceKey<Level>, ServerLevel> levels = Maps.newLinkedHashMap();
+     private PlayerList playerList;
+     private volatile boolean running = true;
+     private boolean stopped;
+@@ -256,7 +_,7 @@
+     private final NotificationManager notificationManager;
+     private final ServerActivityMonitor serverActivityMonitor;
+     private long lastServerStatus;
+-    private final Thread serverThread;
++    public final Thread serverThread;
+     private long lastTickNanos = Util.getNanos();
+     private long taskExecutionStartNanos = Util.getNanos();
+     private long idleTimeNanos;
+@@ -276,13 +_,13 @@
+     private boolean enforceWhitelist;
+     private boolean usingWhitelist;
+     private float smoothedTickTimeMillis;
+-    private final Executor executor;
++    public final Executor executor;
+     private @Nullable String serverId;
+-    private MinecraftServer.ReloadableResources resources;
++    public MinecraftServer.ReloadableResources resources;
+     private final StructureTemplateManager structureTemplateManager;
+     private final ServerTickRateManager tickRateManager;
+     private final ServerDebugSubscribers debugSubscribers = new ServerDebugSubscribers(this);
+-    protected final WorldData worldData;
++    protected WorldData worldData;
+     private LevelData.RespawnData effectiveRespawnData = LevelData.RespawnData.DEFAULT;
+     private final PotionBrewing potionBrewing;
+     private FuelValues fuelValues;
 @@ -293,10 +_,21 @@
      private final PacketProcessor packetProcessor;
      private final TimerQueue<MinecraftServer> scheduledEvents;
@@ -85,6 +145,15 @@
              ChunkPos spawnChunk = ChunkPos.containing(chunkSource.randomState().sampler().findSpawnPosition());
              levelLoadListener.start(LevelLoadListener.Stage.PREPARE_GLOBAL_SPAWN, 0);
              levelLoadListener.updateFocus(level.dimension(), spawnChunk);
+@@ -542,7 +_,7 @@
+         levelData.setGameType(GameType.SPECTATOR);
+     }
+ 
+-    private void prepareLevels() {
++    public void prepareLevels() {
+         ChunkLoadCounter chunkLoadCounter = new ChunkLoadCounter();
+ 
+         for (ServerLevel level : this.levels.values()) {
 @@ -550,6 +_,7 @@
                  TicketStorage savedTickets = level.getDataStorage().get(TicketStorage.TYPE);
                  if (savedTickets != null) {

patches/net/minecraft/server/ReloadableServerResources.java.patch

@@ -1,6 +1,13 @@
 --- a/net/minecraft/server/ReloadableServerResources.java
 +++ b/net/minecraft/server/ReloadableServerResources.java
-@@ -30,6 +_,11 @@
+@@ -24,12 +_,17 @@
+     private static final Logger LOGGER = LogUtils.getLogger();
+     private static final CompletableFuture<Unit> DATA_RELOAD_INITIAL_TASK = CompletableFuture.completedFuture(Unit.INSTANCE);
+     private final ReloadableServerRegistries.Holder fullRegistryHolder;
+-    private final Commands commands;
++    public Commands commands;
+     private final RecipeManager recipes;
+     private final ServerAdvancementManager advancements;
      private final ServerFunctionLibrary functionLibrary;
      private final List<Registry.PendingTags<?>> postponedTags;
      private final List<DataComponentInitializers.PendingComponents<?>> newComponents;