FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-22 23:58:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Networking: fix type of created packet (#2712)

Browse source
This commit is contained in:
apple502j 2022-11-30 03:11:22 +09:00 committed by GitHub
parent 422b77fbfd
commit d9ac3c39e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientPlayNetworking.java
View file

@ -25,6 +25,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.listener.ServerPlayPacketListener;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
@ -189,7 +190,7 @@ public final class ClientPlayNetworking {
* @param buf the packet byte buf which represents the payload of the packet * @param buf the packet byte buf which represents the payload of the packet
* @return a new packet * @return a new packet
*/ */
public static Packet<?> createC2SPacket(Identifier channelName, PacketByteBuf buf) { public static Packet<ServerPlayPacketListener> createC2SPacket(Identifier channelName, PacketByteBuf buf) {
Objects.requireNonNull(channelName, "Channel name cannot be null"); Objects.requireNonNull(channelName, "Channel name cannot be null");
Objects.requireNonNull(buf, "Buf cannot be null"); Objects.requireNonNull(buf, "Buf cannot be null");

3
fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientNetworkingImpl.java
View file

@ -30,6 +30,7 @@ import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.ClientConnection; import net.minecraft.network.ClientConnection;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.listener.ServerPlayPacketListener;
import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket; import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -60,7 +61,7 @@ public final class ClientNetworkingImpl {
return (ClientLoginNetworkAddon) ((NetworkHandlerExtensions) handler).getAddon(); return (ClientLoginNetworkAddon) ((NetworkHandlerExtensions) handler).getAddon();
} }
public static Packet<?> createPlayC2SPacket(Identifier channelName, PacketByteBuf buf) { public static Packet<ServerPlayPacketListener> createPlayC2SPacket(Identifier channelName, PacketByteBuf buf) {
return new CustomPayloadC2SPacket(channelName, buf); return new CustomPayloadC2SPacket(channelName, buf);
} }

3
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerPlayNetworking.java
View file

@ -23,6 +23,7 @@ import org.jetbrains.annotations.Nullable;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.listener.ClientPlayPacketListener;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
@ -203,7 +204,7 @@ public final class ServerPlayNetworking {
* @param buf the packet byte buf which represents the payload of the packet * @param buf the packet byte buf which represents the payload of the packet
* @return a new packet * @return a new packet
*/ */
public static Packet<?> createS2CPacket(Identifier channelName, PacketByteBuf buf) { public static Packet<ClientPlayPacketListener> createS2CPacket(Identifier channelName, PacketByteBuf buf) {
Objects.requireNonNull(channelName, "Channel cannot be null"); Objects.requireNonNull(channelName, "Channel cannot be null");
Objects.requireNonNull(buf, "Buf cannot be null"); Objects.requireNonNull(buf, "Buf cannot be null");

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

@ -18,6 +18,7 @@ package net.fabricmc.fabric.impl.networking.server;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.listener.ClientPlayPacketListener;
import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
import net.minecraft.server.network.ServerLoginNetworkHandler; import net.minecraft.server.network.ServerLoginNetworkHandler;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayNetworkHandler;
@ -40,7 +41,7 @@ public final class ServerNetworkingImpl {
return (ServerLoginNetworkAddon) ((NetworkHandlerExtensions) handler).getAddon(); return (ServerLoginNetworkAddon) ((NetworkHandlerExtensions) handler).getAddon();
} }
public static Packet<?> createPlayC2SPacket(Identifier channel, PacketByteBuf buf) { public static Packet<ClientPlayPacketListener> createPlayC2SPacket(Identifier channel, PacketByteBuf buf) {
return new CustomPayloadS2CPacket(channel, buf); return new CustomPayloadS2CPacket(channel, buf);
} }
} }