Skip to content

Commit

Permalink
fix: Allow passing type in network packet registration directly
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlayTheNinth
BlayTheNinth committed May 19, 2024
1 parent bc87c5f commit 6cdb4f2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 23 deletions.
4 changes: 2 additions & 2 deletions common/src/main/java/net/blay09/mods/balm/api/network/BalmNetworking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ default void allowClientAndServerOnly(String modId) {

<T extends CustomPacketPayload> void sendToServer(T message);

<T extends CustomPacketPayload> void registerClientboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler);
<T extends CustomPacketPayload> void registerClientboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler);

<T extends CustomPacketPayload> void registerServerboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler);
<T extends CustomPacketPayload> void registerServerboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler);
}
4 changes: 2 additions & 2 deletions common/src/main/java/net/blay09/mods/balm/api/network/SyncConfigMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ private static <TData> void writeValue(FriendlyByteBuf buf, TData data, Field fi
}
}

public static <TMessage extends SyncConfigMessage<TData>, TData extends BalmConfigData> void register(ResourceLocation resourceLocation,
public static <TMessage extends SyncConfigMessage<TData>, TData extends BalmConfigData> void register(CustomPacketPayload.Type<TMessage> type,
Class<TMessage> messageClass,
Function<TData, TMessage> messageFactory,
Class<TData> dataClass,
Supplier<TData> dataFactory) {
Supplier<TData> copyFactory = SyncConfigMessage.createDeepCopyFactory(() -> Balm.getConfig().getBackingConfig(dataClass), dataFactory);
Balm.getNetworking().registerClientboundPacket(resourceLocation, messageClass, (RegistryFriendlyByteBuf buf, TMessage message) -> {
Balm.getNetworking().registerClientboundPacket(type, messageClass, (RegistryFriendlyByteBuf buf, TMessage message) -> {
TData data = message.getData();
writeSyncedFields(buf, data, false);
}, buf -> {
Expand Down
7 changes: 2 additions & 5 deletions fabric/src/main/java/net/blay09/mods/balm/fabric/network/FabricBalmNetworking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
Expand Down Expand Up @@ -110,15 +109,13 @@ public <T extends CustomPacketPayload> void sendToServer(T message) {
}

@Override
public <T extends CustomPacketPayload> void registerClientboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler) {
final var type = new CustomPacketPayload.Type<T>(identifier);
public <T extends CustomPacketPayload> void registerClientboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler) {
final var messageRegistration = new ClientboundMessageRegistration<>(type, clazz, encodeFunc, decodeFunc, handler);
messagesByType.put(type, messageRegistration);
}

@Override
public <T extends CustomPacketPayload> void registerServerboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler) {
final var type = new CustomPacketPayload.Type<T>(identifier);
public <T extends CustomPacketPayload> void registerServerboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler) {
final var messageRegistration = new ServerboundMessageRegistration<>(type, clazz, encodeFunc, decodeFunc, handler);
messagesByType.put(type, messageRegistration);

Expand Down
15 changes: 6 additions & 9 deletions forge/src/main/java/net/blay09/mods/balm/forge/network/ForgeBalmNetworking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import net.minecraft.core.BlockPos;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
Expand Down Expand Up @@ -130,31 +129,29 @@ private <T extends CustomPacketPayload> MessageRegistration<RegistryFriendlyByte
}

@Override
public <T extends CustomPacketPayload> void registerClientboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler) {
final var type = new CustomPacketPayload.Type<T>(identifier);
public <T extends CustomPacketPayload> void registerClientboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler) {
final var messageRegistration = new ClientboundMessageRegistration<>(type, clazz, encodeFunc, decodeFunc, handler);

messagesByClass.put(clazz, messageRegistration);
messagesByType.put(type, messageRegistration);

SimpleChannel channel = NetworkChannels.get(identifier.getNamespace());
channel.messageBuilder(clazz, nextDiscriminator(identifier.getNamespace()), NetworkDirection.PLAY_TO_CLIENT)
SimpleChannel channel = NetworkChannels.get(type.id().getNamespace());
channel.messageBuilder(clazz, nextDiscriminator(type.id().getNamespace()), NetworkDirection.PLAY_TO_CLIENT)
.decoder(decodeFunc)
.encoder((payload, buffer) -> encodeFunc.accept(buffer, payload))
.consumerMainThread((packet, context) -> handler.accept(Balm.getProxy().getClientPlayer(), packet))
.add();
}

@Override
public <T extends CustomPacketPayload> void registerServerboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler) {
final var type = new CustomPacketPayload.Type<T>(identifier);
public <T extends CustomPacketPayload> void registerServerboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler) {
final var messageRegistration = new ServerboundMessageRegistration<>(type, clazz, encodeFunc, decodeFunc, handler);

messagesByClass.put(clazz, messageRegistration);
messagesByType.put(type, messageRegistration);

final var channel = NetworkChannels.get(identifier.getNamespace());
channel.messageBuilder(clazz, nextDiscriminator(identifier.getNamespace()), NetworkDirection.PLAY_TO_SERVER)
final var channel = NetworkChannels.get(type.id().getNamespace());
channel.messageBuilder(clazz, nextDiscriminator(type.id().getNamespace()), NetworkDirection.PLAY_TO_SERVER)
.decoder(decodeFunc)
.encoder((payload, buffer) -> encodeFunc.accept(buffer, payload))
.consumerMainThread((packet, context) -> {
Expand Down
7 changes: 2 additions & 5 deletions neoforge/src/main/java/net/blay09/mods/balm/neoforge/network/NeoForgeBalmNetworking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
Expand Down Expand Up @@ -168,16 +167,14 @@ public <T extends CustomPacketPayload> void sendToServer(T message) {
}

@Override
public <T extends CustomPacketPayload> void registerClientboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler) {
final var type = new CustomPacketPayload.Type<T>(identifier);
public <T extends CustomPacketPayload> void registerClientboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<Player, T> handler) {
final var messageRegistration = new ClientboundMessageRegistration<>(type, clazz, encodeFunc, decodeFunc, handler);
final var registrations = getActiveRegistrations();
registrations.playMessagesByType.put(type, messageRegistration);
}

@Override
public <T extends CustomPacketPayload> void registerServerboundPacket(ResourceLocation identifier, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler) {
final var type = new CustomPacketPayload.Type<T>(identifier);
public <T extends CustomPacketPayload> void registerServerboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, BiConsumer<RegistryFriendlyByteBuf, T> encodeFunc, Function<RegistryFriendlyByteBuf, T> decodeFunc, BiConsumer<ServerPlayer, T> handler) {
final var messageRegistration = new ServerboundMessageRegistration<>(type, clazz, encodeFunc, decodeFunc, handler);
final var registrations = getActiveRegistrations();
registrations.playMessagesByType.put(type, messageRegistration);
Expand Down

0 comments on commit 6cdb4f2

Please sign in to comment.