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

[NO-ORBIT] Unified Porting Branch

Browse Source
This commit is contained in:
HypherionSA
2024-05-19 19:08:42 +02:00
parent f64efbd228
commit be3fc20246
277 changed files with 8174 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
@@ -12,7 +12,7 @@
import com.hypherionmc.craterlib.nojang.commands.CommandsRegistry;
import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
public class CraterLibInitializer implements ModInitializer {
@@ -20,7 +20,7 @@
@Override
public void onInitialize() {
new CraterPacketNetwork(new CraterFabricNetworkHandler(PacketSide.SERVER));
- CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
+ CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent());
CommandsRegistry.INSTANCE.registerCommands(dispatcher);
});

36
patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch Normal file
View File

@@ -0,0 +1,36 @@
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -5,10 +5,10 @@
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import com.hypherionmc.craterlib.utils.ChatUtils;
import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.PlayerChatMessage;
+import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.FilteredText;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.server.network.TextFilter;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
@@ -22,12 +22,16 @@
public ServerPlayer player;
@Inject(
- method = "lambda$handleChat$5",
- at = @At("HEAD"),
+ method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V",
+ at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/TextFilter$FilteredText;getFiltered()Ljava/lang/String;"),
cancellable = true
)
- private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
- CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+ private void injectChatEvent(TextFilter.FilteredText arg, CallbackInfo ci) {
+ Component message = new TextComponent(arg.getRaw());
+ if (message.getString().startsWith("/"))
+ return;
+
+ CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.getFiltered(), ChatUtils.mojangToAdventure(message));
CraterEventBus.INSTANCE.postEvent(event);
if (event.wasCancelled())
ci.cancel();

119
patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch Normal file
View File

@@ -0,0 +1,119 @@
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java
@@ -1,46 +1,57 @@
package com.hypherionmc.craterlib.network;
-import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
+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 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.PayloadTypeRegistry;
+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) {
- 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))));
+ if (CHANNELS.get(holder.messageType()) == null) {
+ CHANNELS.put(holder.messageType(), new Message<>(holder.type(), holder.encoder()));
+
+ if (PacketSide.CLIENT.equals(this.side)) {
+ ClientPlayNetworking.registerGlobalReceiver(holder.type().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.type().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());
+ }
}
public <T> void sendToServer(T packet) {
@@ -48,21 +59,25 @@
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
- PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
+ Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
- if (container != null) {
- if (ignoreCheck || ClientPlayNetworking.canSend(container.type().id())) {
- ClientPlayNetworking.send(new CommonPacketWrapper<>(container, packet));
- }
+ 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);
}
}
public <T> void sendToClient(T packet, BridgedPlayer player) {
- 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));
- }
+ 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);
}
}
+
+ public record Message<T>(ResourceIdentifier id, BiConsumer<T, BridgedFriendlyByteBuf> encoder) { }
}

12
patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch Normal file
View File

@@ -0,0 +1,12 @@
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -33,7 +33,7 @@
"depends": {
"fabricloader": ">=0.15.0",
"fabric-api": "*",
- "minecraft": ">=1.20.6",
- "java": ">=21"
+ "minecraft": "1.18.2",
+ "java": ">=17"
}
}