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

[PORT] 1.20.6 port

Browse Source
This commit is contained in:
HypherionSA
2024-05-05 23:07:50 +02:00
parent 6dabc7e441
commit 6b6c53265b
29 changed files with 204 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
View File

@@ -22,7 +22,7 @@ public class ServerGamePacketListenerImplMixin {
public ServerPlayer player;
@Inject(
method = "lambda$handleChat$6",
method = "lambda$handleChat$5",
at = @At("HEAD"),
cancellable = true
)

78
Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java
View File

@@ -1,55 +1,46 @@
package com.hypherionmc.craterlib.network;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
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 com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.FriendlyByteBuf;
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().toMojang(), ((client, listener, buf, responseSender) -> {
buf.readByte();
T message = holder.decoder().apply(BridgedFriendlyByteBuf.of(buf));
client.execute(() -> holder.handler().accept(new PacketContext<>(message, PacketSide.CLIENT)));
}));
} else {
ServerPlayNetworking.registerGlobalReceiver(holder.packetId().toMojang(), ((server, player, listener, buf, responseSender) -> {
buf.readByte();
T message = holder.decoder().apply(BridgedFriendlyByteBuf.of(buf));
server.execute(() -> holder.handler().accept(new PacketContext<>(BridgedPlayer.of(player), message, PacketSide.SERVER)));
}));
}
} else {
CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
try
{
PayloadTypeRegistry.playC2S().register(holder.getType(), holder.getCodec());
PayloadTypeRegistry.playS2C().register(holder.getType(), holder.getCodec());
}
catch (IllegalArgumentException e)
{
// do nothing
}
if (PacketSide.CLIENT.equals(this.side)) {
ClientPlayNetworking.registerGlobalReceiver(holder.getType(),
(ClientPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.client().execute(() ->
holder.handler().accept(
new PacketContext<>(payload.packet(), side))));
}
ServerPlayNetworking.registerGlobalReceiver(holder.getType(),
(ServerPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.player().server.execute(() ->
holder.handler().accept(
new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side))));
}
public <T> void sendToServer(T packet) {
@@ -57,26 +48,21 @@ public class CraterFabricNetworkHandler extends PacketRegistry {
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
if (ClientPlayNetworking.canSend(message.id().toMojang()) || ignoreCheck) {
FriendlyByteBuf buf = PacketByteBufs.create();
buf.writeByte(0);
message.encoder().accept(packet, BridgedFriendlyByteBuf.of(buf));
ClientPlayNetworking.send(message.id().toMojang(), buf);
if (container != null) {
if (ignoreCheck || ClientPlayNetworking.canSend(container.type().id())) {
ClientPlayNetworking.send(new CommonPacketWrapper<>(container, packet));
}
}
}
public <T> void sendToClient(T packet, BridgedPlayer player) {
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
if (ServerPlayNetworking.canSend(player.toMojangServerPlayer(), message.id().toMojang()))
{
FriendlyByteBuf buf = PacketByteBufs.create();
buf.writeByte(0);
message.encoder().accept(packet, BridgedFriendlyByteBuf.of(buf));
ServerPlayNetworking.send(player.toMojangServerPlayer(), message.id().toMojang(), buf);
PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
if (container != null) {
if (ServerPlayNetworking.canSend(player.toMojangServerPlayer(), container.type().id())) {
ServerPlayNetworking.send(player.toMojangServerPlayer(), new CommonPacketWrapper<>(container, packet));
}
}
}
public record Message<T>(ResourceIdentifier id, BiConsumer<T, BridgedFriendlyByteBuf> encoder) { }
}

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

@@ -31,9 +31,9 @@
"${mod_id}.fabric.mixins.json"
],
"depends": {
"fabricloader": ">=0.14.21",
"fabricloader": ">=0.15.0",
"fabric-api": "*",
"minecraft": ">=1.20.4",
"java": ">=17"
"minecraft": ">=1.20.6",
"java": ">=21"
}
}