firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

New network system

Browse Source
This commit is contained in:
HypherionSA
2024-01-02 15:16:13 +02:00
parent 1dad912ec1
commit 0813bc416c
30 changed files with 517 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Common/src/main/java/com/hypherionmc/craterlib/api/networking/CraterNetworkHandler.java Normal file
View File

@@ -0,0 +1,28 @@
package com.hypherionmc.craterlib.api.networking;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import java.util.List;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public interface CraterNetworkHandler {
<T> void sendToServer(T packet);
<T> void sendToServer(T packet, boolean ignoreCheck);
<T> void sendToClient(T packet, ServerPlayer player);
default <T> void sendToClients(T packet, List<ServerPlayer> players) {
for (ServerPlayer player : players) {
sendToClient(packet, player);
}
}
default <T> void sendToAllClients(T packet, MinecraftServer server) {
sendToClients(packet, server.getPlayerList().getPlayers());
}
}

1
Common/src/main/java/com/hypherionmc/craterlib/core/network/CraterNetworkHandler.java
View File

@@ -10,6 +10,7 @@ import java.util.function.Supplier;
/**
* @author HypherionSA
*/
@Deprecated(forRemoval = true)
public interface CraterNetworkHandler {
<T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection);

1
Common/src/main/java/com/hypherionmc/craterlib/core/network/CraterPacket.java
View File

@@ -6,6 +6,7 @@ import net.minecraft.world.entity.player.Player;
/**
* @author HypherionSA
*/
@Deprecated(forRemoval = true)
public interface CraterPacket<T extends CraterPacket<T>> {
void write(final FriendlyByteBuf buf);

1
Common/src/main/java/com/hypherionmc/craterlib/core/network/PacketDirection.java
View File

@@ -3,6 +3,7 @@ package com.hypherionmc.craterlib.core.network;
/**
* @author HypherionSA
*/
@Deprecated(forRemoval = true)
public enum PacketDirection {
TO_SERVER,
TO_CLIENT

31
Common/src/main/java/com/hypherionmc/craterlib/core/networking/CraterPacketNetwork.java Normal file
View File

@@ -0,0 +1,31 @@
package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterPacketNetwork {
private final PacketRegistry packetRegistry;
public static CraterPacketNetwork INSTANCE;
public CraterPacketNetwork(PacketRegistry registry) {
INSTANCE = this;
this.packetRegistry = registry;
}
public static <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
return INSTANCE.packetRegistry.registerPacket(id, messageType, encoder, decoder, handler);
}
public PacketRegistry getPacketRegistry() {
return packetRegistry;
}
}

21
Common/src/main/java/com/hypherionmc/craterlib/core/networking/PacketRegistrar.java Normal file
View File

@@ -0,0 +1,21 @@
package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public interface PacketRegistrar {
PacketSide side();
<T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler);
}

41
Common/src/main/java/com/hypherionmc/craterlib/core/networking/PacketRegistry.java Normal file
View File

@@ -0,0 +1,41 @@
package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.api.networking.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public abstract class PacketRegistry implements CraterNetworkHandler, PacketRegistrar {
final Map<Class<?>, PacketHolder<?>> PACKET_MAP = new HashMap<>();
protected final PacketSide side;
public PacketRegistry(PacketSide side) {
this.side = side;
}
public <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
PacketHolder<T> holder = new PacketHolder<>(id, messageType, encoder, decoder, handler);
PACKET_MAP.put(messageType, holder);
registerPacket(holder);
return this;
}
public PacketSide side() {
return side;
}
protected abstract <T> void registerPacket(PacketHolder<T> packetHolder);
}

15
Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketContext.java Normal file
View File

@@ -0,0 +1,15 @@
package com.hypherionmc.craterlib.core.networking.data;
import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.Nullable;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record PacketContext<T>(@Nullable Player sender, T message, PacketSide side) {
public PacketContext(T message, PacketSide side) {
this(null, message, side);
}
}

18
Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java Normal file
View File

@@ -0,0 +1,18 @@
package com.hypherionmc.craterlib.core.networking.data;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record PacketHolder<T>(ResourceLocation packetId,
Class<T> messageType,
BiConsumer<T, FriendlyByteBuf> encoder,
Function<FriendlyByteBuf, T> decoder,
Consumer<PacketContext<T>> handler) {
}

13
Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketSide.java Normal file
View File

@@ -0,0 +1,13 @@
package com.hypherionmc.craterlib.core.networking.data;
public enum PacketSide {
CLIENT,
SERVER;
public PacketSide flipped() {
if (CLIENT.equals(this))
return SERVER;
return CLIENT;
}
}

4
Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
View File

@@ -4,6 +4,9 @@ import com.hypherionmc.craterlib.api.event.server.CraterRegisterCommandEvent;
import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent;
import com.hypherionmc.craterlib.common.FabricCommonPlatform;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.network.CraterFabricNetworkHandler;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
@@ -12,6 +15,7 @@ public class CraterLibInitializer implements ModInitializer {
@Override
public void onInitialize() {
new CraterPacketNetwork(new CraterFabricNetworkHandler(PacketSide.SERVER));
CommandRegistrationCallback.EVENT.register(
(dispatcher, registryAccess, environment) -> CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(dispatcher)));

4
Fabric/src/main/java/com/hypherionmc/craterlib/client/CraterLibClientInitializer.java
View File

@@ -2,6 +2,9 @@ package com.hypherionmc.craterlib.client;
import com.hypherionmc.craterlib.api.event.client.CraterClientTickEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.network.CraterFabricNetworkHandler;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -9,6 +12,7 @@ public class CraterLibClientInitializer implements ClientModInitializer {
@Override
public void onInitializeClient() {
new CraterPacketNetwork(new CraterFabricNetworkHandler(PacketSide.CLIENT));
ClientTickEvents.START_CLIENT_TICK.register((listener) -> {
CraterClientTickEvent event = new CraterClientTickEvent(listener.level);
CraterEventBus.INSTANCE.postEvent(event);

81
Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java Normal file
View File

@@ -0,0 +1,81 @@
package com.hypherionmc.craterlib.network;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterFabricNetworkHandler extends PacketRegistry {
private final Map<Class<?>, Message<?>> CHANNELS = new HashMap();
public CraterFabricNetworkHandler(PacketSide side) {
super(side);
}
protected <T> void registerPacket(PacketHolder<T> holder) {
if (CHANNELS.get(holder.messageType()) == null) {
CHANNELS.put(holder.messageType(), new Message<>(holder.packetId(), holder.encoder()));
if (PacketSide.CLIENT.equals(this.side)) {
ClientPlayNetworking.registerGlobalReceiver(holder.packetId(), ((client, listener, buf, responseSender) -> {
buf.readByte();
T message = holder.decoder().apply(buf);
client.execute(() -> holder.handler().accept(new PacketContext<>(message, PacketSide.CLIENT)));
}));
} else {
ServerPlayNetworking.registerGlobalReceiver(holder.packetId(), ((server, player, listener, buf, responseSender) -> {
buf.readByte();
T message = holder.decoder().apply(buf);
server.execute(() -> holder.handler().accept(new PacketContext<>(player, message, PacketSide.SERVER)));
}));
}
} else {
CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
}
}
public <T> void sendToServer(T packet) {
this.sendToServer(packet, false);
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
if (ClientPlayNetworking.canSend(message.id()) || ignoreCheck) {
FriendlyByteBuf buf = PacketByteBufs.create();
buf.writeByte(0);
message.encoder().accept(packet, buf);
ClientPlayNetworking.send(message.id(), buf);
}
}
public <T> void sendToClient(T packet, ServerPlayer player) {
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
if (ServerPlayNetworking.canSend(player, message.id()))
{
FriendlyByteBuf buf = PacketByteBufs.create();
buf.writeByte(0);
message.encoder().accept(packet, buf);
ServerPlayNetworking.send(player, message.id(), buf);
}
}
public record Message<T>(ResourceLocation id, BiConsumer<T, FriendlyByteBuf> encoder) { }
}

1
Fabric/src/main/java/com/hypherionmc/craterlib/network/FabricNetworkHandler.java
View File

@@ -23,6 +23,7 @@ import java.util.function.Supplier;
* @author HypherionSA
* @date 24/09/2022
*/
@Deprecated(forRemoval = true)
public class FabricNetworkHandler implements CraterNetworkHandler {
private static final Map<String, FabricNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();

1
Fabric/src/main/java/com/hypherionmc/craterlib/network/FabricNetworkHelper.java
View File

@@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.function.Function;
@Deprecated(forRemoval = true)
public interface FabricNetworkHelper {
public static FabricNetworkHelper getForDist(EnvType dist) {

1
Fabric/src/main/java/com/hypherionmc/craterlib/network/impl/FabricClientNetworkHelper.java
View File

@@ -11,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.function.Function;
@Deprecated(forRemoval = true)
public class FabricClientNetworkHelper extends FabricServerNetworkHelper {
@Override

1
Fabric/src/main/java/com/hypherionmc/craterlib/network/impl/FabricServerNetworkHelper.java
View File

@@ -13,6 +13,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.function.Function;
@Deprecated(forRemoval = true)
public class FabricServerNetworkHelper implements FabricNetworkHelper {
@Override
public void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull Function<FriendlyByteBuf, @NotNull CraterPacket<?>> factory) {

2
Fabric/src/main/resources/fabric.mod.json
View File

@@ -33,7 +33,7 @@
"depends": {
"fabricloader": ">=0.14.21",
"fabric-api": "*",
"minecraft": ">=1.20.3",
"minecraft": ">=1.20.4",
"java": ">=17"
}
}

5
Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
View File

@@ -3,6 +3,9 @@ package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.api.event.client.LateInitEvent;
import com.hypherionmc.craterlib.common.ForgeServerEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.network.CraterForgeNetworkHandler;
import net.minecraft.client.Minecraft;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.MinecraftForge;
@@ -10,6 +13,7 @@ import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLLoader;
@Mod(CraterConstants.MOD_ID)
public class CraterLib {
@@ -20,6 +24,7 @@ public class CraterLib {
}
public void commonSetup(FMLCommonSetupEvent evt) {
new CraterPacketNetwork(new CraterForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER));
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options);
CraterEventBus.INSTANCE.postEvent(event);

83
Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java Normal file
View File

@@ -0,0 +1,83 @@
package com.hypherionmc.craterlib.network;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.minecraft.client.Minecraft;
import net.minecraft.network.Connection;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.event.network.CustomPayloadEvent;
import net.minecraftforge.network.ChannelBuilder;
import net.minecraftforge.network.PacketDistributor;
import net.minecraftforge.network.SimpleChannel;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterForgeNetworkHandler extends PacketRegistry {
private final Map<Class<?>, SimpleChannel> CHANNELS = new HashMap<>();
public CraterForgeNetworkHandler(PacketSide side) {
super(side);
}
protected <T> void registerPacket(PacketHolder<T> holder) {
if (CHANNELS.get(holder.messageType()) == null) {
SimpleChannel channel = ChannelBuilder
.named(holder.packetId())
.clientAcceptedVersions((a, b) -> true)
.serverAcceptedVersions((a, b) -> true)
.networkProtocolVersion(1)
.simpleChannel();
channel.messageBuilder(holder.messageType())
.decoder(holder.decoder())
.encoder(holder.encoder())
.consumerNetworkThread(buildHandler(holder.handler()))
.add();
CHANNELS.put(holder.messageType(), channel);
} else {
CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
}
}
public <T> void sendToServer(T packet) {
this.sendToServer(packet, false);
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
SimpleChannel channel = CHANNELS.get(packet.getClass());
Connection connection = Minecraft.getInstance().getConnection().getConnection();
if (channel.isRemotePresent(connection) || ignoreCheck) {
channel.send(packet, PacketDistributor.SERVER.noArg());
}
}
public <T> void sendToClient(T packet, ServerPlayer player) {
SimpleChannel channel = CHANNELS.get(packet.getClass());
Connection connection = player.connection.getConnection();
if (channel.isRemotePresent(connection)) {
channel.send(packet, PacketDistributor.PLAYER.with(player));
}
}
private <T> BiConsumer<T, CustomPayloadEvent.Context> buildHandler(Consumer<PacketContext<T>> handler) {
return (message, ctx) -> {
ctx.enqueueWork(() -> {
PacketSide side = ctx.getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
ServerPlayer player = ctx.getSender();
handler.accept(new PacketContext<>(player, message, side));
});
ctx.setPacketHandled(true);
};
}
}

1
Forge/src/main/java/com/hypherionmc/craterlib/network/ForgeNetworkHandler.java
View File

@@ -29,6 +29,7 @@ import java.util.function.Supplier;
* @author HypherionSA
* Partly inspired by and based on <a href="https://github.com/Fuzss/puzzleslib/blob/1.19/Forge/src/main/java/fuzs/puzzleslib/network/ForgeNetworkHandler.java">...</a>
*/
@Deprecated(forRemoval = true)
public class ForgeNetworkHandler implements CraterNetworkHandler {
private static final Map<String, ForgeNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();

2
Forge/src/main/resources/META-INF/mods.toml
View File

@@ -26,6 +26,6 @@ side = "BOTH"
[[dependencies.${ mod_id }]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.3,1.21)"
versionRange = "[1.20.4,1.21)"
ordering = "NONE"
side = "BOTH"

9
NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
View File

@@ -3,23 +3,32 @@ package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.api.event.client.LateInitEvent;
import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.network.CraterNeoForgeNetworkHandler;
import net.minecraft.client.Minecraft;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
import net.neoforged.fml.loading.FMLEnvironment;
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.neoforge.common.NeoForge;
@Mod(CraterConstants.MOD_ID)
public class CraterLib {
private final PacketRegistry handler;
public CraterLib(IEventBus eventBus) {
NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER);
}
public void commonSetup(FMLCommonSetupEvent evt) {
new CraterPacketNetwork(handler);
if (FMLEnvironment.dist.isClient()) {
LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options);
CraterEventBus.INSTANCE.postEvent(event);

3
NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java
View File

@@ -23,7 +23,8 @@ public class NeoForgeCommonHelper implements CommonPlatform {
@Override
public CraterNetworkHandler createPacketHandler(String modid, boolean requiredClient, boolean requiredServer) {
return NeoForgeNetworkHandler.of(modid, requiredClient, requiredServer);
return new NeoForgeNetworkHandler(modid, requiredClient, requiredServer);
//return NeoForgeNetworkHandler.of(modid, requiredClient, requiredServer);
}
@Override

103
NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java Normal file
View File

@@ -0,0 +1,103 @@
package com.hypherionmc.craterlib.network;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.LogicalSide;
import net.neoforged.neoforge.network.PacketDistributor;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
import net.neoforged.neoforge.network.handling.IPayloadHandler;
import net.neoforged.neoforge.network.registration.IPayloadRegistrar;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterNeoForgeNetworkHandler extends PacketRegistry {
private final Map<Class<?>, NeoForgePacketContainer> PACKETS = new HashMap<>();
public CraterNeoForgeNetworkHandler(PacketSide side) {
super(side);
}
@SubscribeEvent
public void register(final RegisterPayloadHandlerEvent event) {
if (!PACKETS.isEmpty()) {
PACKETS.forEach((type, container) -> {
final IPayloadRegistrar registrar = event.registrar(container.packetId().getNamespace());
registrar.common(
container.packetId(),
container.decoder(),
container.handler());
});
}
}
protected <T> void registerPacket(PacketHolder<T> container) {
if (PACKETS.get(container.messageType()) == null) {
var packetContainer = new NeoForgePacketContainer<>(
container.messageType(),
container.packetId(),
container.encoder(),
decoder(container.decoder()),
buildHandler(container.handler())
);
PACKETS.put(container.messageType(), packetContainer);
}
}
private <T> FriendlyByteBuf.Reader<NeoForgePacket<T>> decoder(Function<FriendlyByteBuf, T> decoder) {
return (buf -> {
T packet = decoder.apply(buf);
return new NeoForgePacket<T>(PACKETS.get(packet.getClass()), packet);
});
}
public <T> void sendToServer(T packet) {
this.sendToServer(packet, false);
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
NeoForgePacketContainer<T> container = PACKETS.get(packet.getClass());
try {
PacketDistributor.SERVER.noArg().send(new NeoForgePacket<>(container, packet));
} catch (Throwable t) {
CraterConstants.LOG.error("{} packet not registered on the client, this is needed.", packet.getClass(), t);
}
}
public <T> void sendToClient(T packet, ServerPlayer player) {
NeoForgePacketContainer<T> container = PACKETS.get(packet.getClass());
try {
if (player.connection.isConnected(container.packetId())) {
PacketDistributor.PLAYER.with(player).send(new NeoForgePacket<>(container, packet));
}
} catch (Throwable t) {
CraterConstants.LOG.error("{} packet not registered on the server, this is needed.", packet.getClass(), t);
}
}
private <T, K extends NeoForgePacket<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T>> handler) {
return (payload, ctx) -> {
try {
PacketSide side = ctx.flow().getReceptionSide().equals(LogicalSide.SERVER) ? PacketSide.SERVER : PacketSide.CLIENT;
Player player = ctx.player().orElse(null);
handler.accept(new PacketContext<>(player, payload.packet(), side));
} catch (Throwable t) {
CraterConstants.LOG.error("Error handling packet: {} -> ", payload.packet().getClass(), t);
}
};
}
}

102
NeoForge/src/main/java/com/hypherionmc/craterlib/network/NeoForgeNetworkHandler.java
View File

@@ -1,129 +1,35 @@
package com.hypherionmc.craterlib.network;
import com.google.common.collect.Maps;
import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.network.CraterPacket;
import com.hypherionmc.craterlib.core.network.PacketDirection;
import com.hypherionmc.craterlib.core.platform.ClientPlatform;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.Packet;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
import net.neoforged.fml.LogicalSide;
import net.neoforged.neoforge.common.util.LogicalSidedProvider;
import net.neoforged.neoforge.network.NetworkEvent;
import net.neoforged.neoforge.network.NetworkRegistry;
import net.neoforged.neoforge.network.PlayNetworkDirection;
import net.neoforged.neoforge.network.simple.MessageFunctions;
import net.neoforged.neoforge.network.simple.SimpleChannel;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.Supplier;
/**
* @author HypherionSA
* Partly inspired by and based on <a href="https://github.com/Fuzss/puzzleslib/blob/1.19/Forge/src/main/java/fuzs/puzzleslib/network/ForgeNetworkHandler.java">...</a>
*/
@Deprecated(forRemoval = true)
public class NeoForgeNetworkHandler implements CraterNetworkHandler {
private static final Map<String, NeoForgeNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
private static final String PROTOCOL = Integer.toString(1);
private final SimpleChannel channel;
private final boolean clientRequired;
private final boolean serverRequired;
private final AtomicInteger packetID = new AtomicInteger();
private NeoForgeNetworkHandler(SimpleChannel channel, boolean clientRequired, boolean serverRequired) {
this.channel = channel;
this.clientRequired = clientRequired;
this.serverRequired = serverRequired;
}
public synchronized static CraterNetworkHandler of(String modId, boolean clientRequired, boolean serverRequired) {
NeoForgeNetworkHandler handler = NETWORK_HANDLERS.computeIfAbsent(modId, modId1 -> new NeoForgeNetworkHandler(buildSimpleChannel(modId1, clientRequired, serverRequired), clientRequired, serverRequired));
if (handler.clientRequired != clientRequired)
throw new IllegalArgumentException("client channel settings mismatch, expected %s, but was %s".formatted(handler.clientRequired, clientRequired));
if (handler.serverRequired != serverRequired)
throw new IllegalArgumentException("server channel settings mismatch, expected %s, but was %s".formatted(handler.serverRequired, serverRequired));
return handler;
}
private static SimpleChannel buildSimpleChannel(String modId, boolean clientAcceptsVanillaOrMissing, boolean serverAcceptsVanillaOrMissing) {
return NetworkRegistry.ChannelBuilder
.named(new ResourceLocation(modId, "crater_network"))
.networkProtocolVersion(() -> PROTOCOL)
.clientAcceptedVersions(clientAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
.serverAcceptedVersions(serverAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
.simpleChannel();
public NeoForgeNetworkHandler(String modid, boolean requiredClient, boolean requiredServer) {
}
@Override
public <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
BiConsumer<T, FriendlyByteBuf> encoder = CraterPacket::write;
Function<FriendlyByteBuf, T> decoder = buf -> {
T packet = supplier.get();
packet.read(buf);
return packet;
};
BiConsumer<T, NetworkEvent.Context> handler = (packet, ctx) -> {
LogicalSide expectedSide = getSideFromDirection(packetDirection);
LogicalSide currentSide = ctx.getDirection().getReceptionSide();
if (expectedSide != currentSide) {
throw new IllegalStateException(String.format("Received message on wrong side, expected %s, was %s", expectedSide, currentSide));
}
ctx.enqueueWork(() -> {
Player player;
if (packetDirection == PacketDirection.TO_CLIENT) {
player = ClientPlatform.INSTANCE.getClientPlayer();
} else {
player = ctx.getSender();
}
packet.handle(player, LogicalSidedProvider.WORKQUEUE.get(expectedSide));
});
ctx.setPacketHandled(true);
};
this.channel.registerMessage(this.packetID.getAndIncrement(), clazz, encoder(encoder), decoder(decoder), buildHandler(handler));
}
@Override
public Packet<?> toServerBound(CraterPacket<?> packet) {
return this.channel.toVanillaPacket(packet, PlayNetworkDirection.PLAY_TO_SERVER);
return null;
}
@Override
public Packet<?> toClientBound(CraterPacket<?> packet) {
return this.channel.toVanillaPacket(packet, PlayNetworkDirection.PLAY_TO_CLIENT);
}
@Override
public void sendToServer(CraterPacket<?> packet) {
CraterNetworkHandler.super.sendToServer(packet);
}
private LogicalSide getSideFromDirection(PacketDirection direction) {
return direction == PacketDirection.TO_CLIENT ? LogicalSide.CLIENT : LogicalSide.SERVER;
}
private <T> MessageFunctions.MessageEncoder<T> encoder(BiConsumer<T, FriendlyByteBuf> encoder) {
return encoder::accept;
}
private <T> MessageFunctions.MessageDecoder<T> decoder(Function<FriendlyByteBuf, T> decoder) {
return decoder::apply;
}
private <T> MessageFunctions.MessageConsumer<T> buildHandler(BiConsumer<T, NetworkEvent.Context> handler) {
return (message, ctx) -> handler.accept(message, ctx);
return null;
}
}

23
NeoForge/src/main/java/com/hypherionmc/craterlib/network/NeoForgePacket.java Normal file
View File

@@ -0,0 +1,23 @@
package com.hypherionmc.craterlib.network;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record NeoForgePacket<T>(NeoForgePacketContainer<T> container, T packet) implements CustomPacketPayload {
@Override
public void write(FriendlyByteBuf buff)
{
container().encoder().accept(packet(), buff);
}
@Override
public ResourceLocation id()
{
return container().packetId();
}
}

16
NeoForge/src/main/java/com/hypherionmc/craterlib/network/NeoForgePacketContainer.java Normal file
View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.network;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.neoforge.network.handling.IPayloadHandler;
import java.util.function.BiConsumer;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record NeoForgePacketContainer<T>(Class<T> messageType,
ResourceLocation packetId,
BiConsumer<T, FriendlyByteBuf> encoder,
FriendlyByteBuf.Reader<NeoForgePacket<T>> decoder,
IPayloadHandler<NeoForgePacket<T>> handler) { }

4
NeoForge/src/main/resources/META-INF/mods.toml
View File

@@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION"
[[dependencies.${ mod_id }]]
modId = "neoforge"
mandatory = true
versionRange = "[20.3,)"
versionRange = "[20.4,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.${ mod_id }]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.3,1.21)"
versionRange = "[1.20.4,1.21)"
ordering = "NONE"
side = "BOTH"

8
gradle.properties
View File

@@ -8,14 +8,14 @@ mod_author=HypherionSA
mod_id=craterlib
mod_name=CraterLib
# Shared
minecraft_version=1.20.3
minecraft_version=1.20.4
# Fabric
fabric_loader=0.15.0
fabric_api=0.91.1+1.20.3
fabric_api=0.92.0+1.20.4
# Forge
forge_version=49.0.2
forge_version=49.0.13
# NeoForged
neoforge_version=8-beta
neoforge_version=73-beta
# Dependencies
mod_menu_version=8.0.0-beta.2
moon_config=1.0.9