ReinforcedAssembly/fabric
1
0
Fork 0
mirror of https://github.com/FabricMC/fabric.git synced 2025-09-06 19:36:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

23w32a

Browse Source
This commit is contained in:
modmuss50
2023-08-09 18:04:04 +01:00
parent 0b2eb405dc
commit 0ba8e9ce03
50 changed files with 88 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PlayerLookup.java
View File

@@ -25,7 +25,7 @@ import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.EntityTrackingListener;
import net.minecraft.server.network.PlayerAssociatedNetworkHandler;
import net.minecraft.server.world.ServerChunkManager;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.server.world.ThreadedAnvilChunkStorage;
@@ -118,7 +118,7 @@ public final class PlayerLookup {
// return an immutable collection to guard against accidental removals.
if (tracker != null) {
return Collections.unmodifiableCollection(tracker.getPlayersTracking()
.stream().map(EntityTrackingListener::getPlayer).collect(Collectors.toSet()));
.stream().map(PlayerAssociatedNetworkHandler::getPlayer).collect(Collectors.toSet()));
}
return Collections.emptySet();

4
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/PacketByteBufLoginQueryResponse.java
View File

@@ -17,9 +17,9 @@
package net.fabricmc.fabric.impl.networking.payload;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.c2s.login.LoginQueryResponse;
import net.minecraft.network.packet.c2s.login.LoginQueryResponsePayload;
public record PacketByteBufLoginQueryResponse(PacketByteBuf data) implements LoginQueryResponse {
public record PacketByteBufLoginQueryResponse(PacketByteBuf data) implements LoginQueryResponsePayload {
@Override
public void write(PacketByteBuf buf) {
PayloadHelper.write(buf, data());

3
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerConfigurationNetworkAddon.java
View File

@@ -188,8 +188,7 @@ public final class ServerConfigurationNetworkAddon extends AbstractChanneledNetw
@Override
public void sendPacket(Packet<?> packet, PacketCallbacks callback) {
// Ensure we flush the packet.
handler.send(packet, callback, true);
handler.send(packet, callback);
}
private enum RegisterState {

6
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/LoginQueryResponseC2SPacketMixin.java
View File

@@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.c2s.login.LoginQueryResponse;
import net.minecraft.network.packet.c2s.login.LoginQueryResponsePayload;
import net.minecraft.network.packet.c2s.login.LoginQueryResponseC2SPacket;
import net.fabricmc.fabric.impl.networking.payload.PacketByteBufLoginQueryResponse;
@@ -30,8 +30,8 @@ import net.fabricmc.fabric.impl.networking.payload.PayloadHelper;
@Mixin(LoginQueryResponseC2SPacket.class)
public class LoginQueryResponseC2SPacketMixin {
@Inject(method = "readResponse", at = @At("HEAD"), cancellable = true)
private static void readResponse(int queryId, PacketByteBuf buf, CallbackInfoReturnable<LoginQueryResponse> cir) {
@Inject(method = "readPayload", at = @At("HEAD"), cancellable = true)
private static void readResponse(int queryId, PacketByteBuf buf, CallbackInfoReturnable<LoginQueryResponsePayload> cir) {
boolean hasPayload = buf.readBoolean();
if (!hasPayload) {

4
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/EntityTrackerAccessor.java
View File

@@ -21,10 +21,10 @@ import java.util.Set;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import net.minecraft.server.world.EntityTrackingListener;
import net.minecraft.server.network.PlayerAssociatedNetworkHandler;
@Mixin(targets = "net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker")
public interface EntityTrackerAccessor {
@Accessor("listeners")
Set<EntityTrackingListener> getPlayersTracking();
Set<PlayerAssociatedNetworkHandler> getPlayersTracking();
}