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

Initial Network System implementation

Browse Source
This commit is contained in:
HypherionSA
2022-09-24 21:21:01 +02:00
parent ab33e57245
commit 570321b274
25 changed files with 625 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,8 @@
package me.hypherionmc.craterlib;
import me.hypherionmc.craterlib.common.FabricCommonHelper;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
public class CraterLibInitializer implements ModInitializer, PreLaunchEntrypoint {
@@ -12,6 +14,6 @@ public class CraterLibInitializer implements ModInitializer, PreLaunchEntrypoint
@Override
public void onInitialize() {
ServerLifecycleEvents.SERVER_STARTING.register(server -> FabricCommonHelper.server = server);
}
}

76
Fabric/src/main/java/me/hypherionmc/craterlib/common/FabricCommonHelper.java Normal file
View File

@@ -0,0 +1,76 @@
package me.hypherionmc.craterlib.common;
import me.hypherionmc.craterlib.network.CraterNetworkHandler;
import me.hypherionmc.craterlib.network.CraterPacket;
import me.hypherionmc.craterlib.network.FabricNetworkHandler;
import me.hypherionmc.craterlib.platform.services.LibCommonHelper;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.network.Connection;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import java.util.function.Function;
/**
* @author HypherionSA
* @date 24/09/2022
*/
public class FabricCommonHelper implements LibCommonHelper {
public static MinecraftServer server;
@Override
public CraterNetworkHandler createPacketHandler(String modid) {
return FabricNetworkHandler.of(modid);
}
@Override
public Minecraft getClientInstance() {
return Minecraft.getInstance();
}
@Override
public Player getClientPlayer() {
return Minecraft.getInstance().player;
}
@Override
public Level getClientLevel() {
return Minecraft.getInstance().level;
}
@Override
public Connection getClientConnection() {
return Minecraft.getInstance().getConnection().getConnection();
}
@Override
public MinecraftServer getMCServer() {
return server;
}
@Override
public void registerClientReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory) {
ClientPlayNetworking.registerGlobalReceiver(channelName, (Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf, PacketSender responseSender) -> {
CraterPacket<?> packet = factory.apply(buf);
client.execute(() -> packet.handle(client.player, client));
});
}
@Override
public void registerServerReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory) {
ServerPlayNetworking.registerGlobalReceiver(channelName, (MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf, PacketSender responseSender) -> {
CraterPacket<?> packet = factory.apply(buf);
server.execute(() -> packet.handle(player, server));
});
}
}

71
Fabric/src/main/java/me/hypherionmc/craterlib/common/FabricLoaderHelper.java Normal file
View File

@@ -0,0 +1,71 @@
package me.hypherionmc.craterlib.common;
import me.hypherionmc.craterlib.platform.services.Environment;
import me.hypherionmc.craterlib.platform.services.ILoaderHelper;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.SharedConstants;
import net.minecraft.client.Minecraft;
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
/**
* @author HypherionSA
* @date 07/08/2022
*/
public class FabricLoaderHelper implements ILoaderHelper {
@Override
public boolean isFabric() {
return true;
}
@Override
public boolean isForge() {
return false;
}
@Override
public String getGameVersion() {
return SharedConstants.VERSION_STRING;
}
@Override
public File getGameFolder() {
return Minecraft.getInstance().gameDirectory;
}
@Override
public File getConfigFolder() {
return FabricLoader.getInstance().getConfigDir().toFile();
}
@Override
public File getModsFolder() {
return new File(FabricLoader.getInstance().getGameDir().toString() + File.separator + "mods");
}
@Override
public Environment getEnvironment() {
switch (FabricLoader.getInstance().getEnvironmentType()) {
case SERVER -> {
return Environment.SERVER;
}
case CLIENT -> {
return Environment.CLIENT;
}
}
return Environment.UNKNOWN;
}
@Override
public boolean isModLoaded(String modid) {
return FabricLoader.getInstance().isModLoaded(modid);
}
@Override
public boolean isDevEnv() {
return FabricLoader.getInstance().isDevelopmentEnvironment();
}
}

26
Fabric/src/main/java/me/hypherionmc/craterlib/common/FabricPlatformHelper.java
View File

@@ -1,26 +0,0 @@
package me.hypherionmc.craterlib.common;
import me.hypherionmc.craterlib.platform.services.IPlatformHelper;
import net.fabricmc.loader.api.FabricLoader;
/**
* @author HypherionSA
* @date 07/08/2022
*/
public class FabricPlatformHelper implements IPlatformHelper {
@Override
public String getPlatformName() {
return "Fabric";
}
@Override
public boolean isModLoaded(String modId) {
return FabricLoader.getInstance().isModLoaded(modId);
}
@Override
public boolean isDevelopmentEnvironment() {
return FabricLoader.getInstance().isDevelopmentEnvironment();
}
}

78
Fabric/src/main/java/me/hypherionmc/craterlib/network/FabricNetworkHandler.java Normal file
View File

@@ -0,0 +1,78 @@
package me.hypherionmc.craterlib.network;
import com.google.common.collect.Maps;
import me.hypherionmc.craterlib.platform.Platform;
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.Util;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.Packet;
import net.minecraft.resources.ResourceLocation;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Supplier;
/**
* @author HypherionSA
* @date 24/09/2022
*/
public class FabricNetworkHandler implements CraterNetworkHandler {
private static final Map<String, FabricNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
private final Map<Class<? extends CraterPacket<?>>, PacketData> packets = Maps.newIdentityHashMap();
private final String modid;
private final AtomicInteger packetID = new AtomicInteger();
private FabricNetworkHandler(String modid) {
this.modid = modid;
}
@Override
public <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
ResourceLocation channelName = this.nextId();
this.packets.put(clazz, new PacketData(clazz, channelName, packetDirection));
final Function<FriendlyByteBuf, CraterPacket<?>> decoder = buf -> Util.make(supplier.get(), message -> message.read(buf));
switch (packetDirection) {
case TO_CLIENT -> Platform.COMMON_HELPER.registerClientReceiver(channelName, decoder);
case TO_SERVER -> Platform.COMMON_HELPER.registerServerReceiver(channelName, decoder);
}
}
private ResourceLocation nextId() {
return new ResourceLocation(this.modid, "play/" + this.packetID.getAndIncrement());
}
@Override
public Packet<?> toServerBound(CraterPacket<?> packet) {
if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_SERVER) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_SERVER, PacketDirection.TO_CLIENT));
return this.toPacket(ClientPlayNetworking::createC2SPacket, packet);
}
@Override
public Packet<?> toClientBound(CraterPacket<?> packet) {
if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_CLIENT) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_CLIENT, PacketDirection.TO_SERVER));
return this.toPacket(ServerPlayNetworking::createS2CPacket, packet);
}
private Packet<?> toPacket(BiFunction<ResourceLocation, FriendlyByteBuf, Packet<?>> packetFactory, CraterPacket<?> message) {
ResourceLocation identifier = this.packets.get(message.getClass()).identifier();
FriendlyByteBuf byteBuf = PacketByteBufs.create();
message.write(byteBuf);
return packetFactory.apply(identifier, byteBuf);
}
public synchronized static CraterNetworkHandler of(String modId) {
return NETWORK_HANDLERS.computeIfAbsent(modId, FabricNetworkHandler::new);
}
private record PacketData(Class<? extends CraterPacket<?>> clazz, ResourceLocation identifier, PacketDirection direction) {
}
}

1
Fabric/src/main/resources/META-INF/services/me.hypherionmc.craterlib.platform.services.ILoaderHelper Normal file
View File

@@ -0,0 +1 @@
me.hypherionmc.craterlib.common.FabricLoaderHelper

1
Fabric/src/main/resources/META-INF/services/me.hypherionmc.craterlib.platform.services.IPlatformHelper
View File

@@ -1 +0,0 @@
me.hypherionmc.craterlib.common.FabricPlatformHelper

1
Fabric/src/main/resources/META-INF/services/me.hypherionmc.craterlib.platform.services.LibCommonHelper Normal file
View File

@@ -0,0 +1 @@
me.hypherionmc.craterlib.common.FabricCommonHelper