[CHANGE] Change hook in point for ChatEvent to fix compat with chat modification mods

.jenkins/Jenkinsfile.deploy

@@ -9,7 +9,7 @@ pipeline {
         stage("Notify Discord") {
             steps {
                 discordSend webhookURL: env.FDD_WH_ADMIN,
-                        title: "Deploy Started: CraterLib 1.20.3 Deploy #${BUILD_NUMBER}",
+                        title: "Deploy Started: CraterLib 1.20.2 Deploy #${BUILD_NUMBER}",
                         link: env.BUILD_URL,
                         result: 'SUCCESS',
                         description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -38,7 +38,7 @@ pipeline {
             deleteDir()
 
             discordSend webhookURL: env.FDD_WH_ADMIN,
-                    title: "CraterLib 1.20.3 Deploy #${BUILD_NUMBER}",
+                    title: "CraterLib 1.20.2 Deploy #${BUILD_NUMBER}",
                     link: env.BUILD_URL,
                     result: currentBuild.currentResult,
                     description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"

.jenkins/Jenkinsfile.snapshot

@@ -13,7 +13,7 @@ pipeline {
         stage("Notify Discord") {
             steps {
                 discordSend webhookURL: env.SSS_WEBHOOK,
-                        title: "Deploy Started: ${projectName} 1.20.3 Deploy #${BUILD_NUMBER}",
+                        title: "Deploy Started: ${projectName} 1.20.2 Deploy #${BUILD_NUMBER}",
                         link: env.BUILD_URL,
                         result: 'SUCCESS',
                         description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -51,10 +51,10 @@ pipeline {
                 projectSlug: "craterlib",
                 projectName: "${projectName}",
                 projectIcon: "${projectIcon}",
-                versionName: "Snapshot 1.0.${BUILD_NUMBER}",
-                version: "1.0.${BUILD_NUMBER}",
+                versionName: "Snapshot 1.1.${BUILD_NUMBER}",
+                version: "1.1.${BUILD_NUMBER}",
                 modLoaders: "forge|neoforge|fabric|quilt",
-                minecraftVersions: "1.20.3",
+                minecraftVersions: "1.20.2",
                 failWebhook: env.SSS_WEBHOOK,
                 publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 

Common/build.gradle

@@ -2,7 +2,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
 
 dependencies {
     implementation "com.hypherionmc:rpcsdk:1.0"
-    implementation("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
+    implementation("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
 }
 
 shadowJar {
@@ -10,7 +10,7 @@ shadowJar {
     dependencies {
         include(dependency("me.hypherionmc.moon-config:core:${moon_config}"))
         include(dependency("me.hypherionmc.moon-config:toml:${moon_config}"))
-        include(dependency("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0"))
+        include(dependency("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0"))
 
         relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
         relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'

Common/src/main/java/com/hypherionmc/craterlib/api/event/server/MessageBroadcastEvent.java

@@ -11,11 +11,13 @@ public class MessageBroadcastEvent extends CraterEvent {
     private final Component component;
     private final Function<ServerPlayer, Component> function;
     private final boolean bl;
+    private final String threadName;
 
-    public MessageBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl) {
+    public MessageBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl, String threadName) {
         this.component = component;
         this.function = function;
         this.bl = bl;
+        this.threadName = threadName;
     }
 
     public Component getComponent() {
@@ -30,6 +32,10 @@ public class MessageBroadcastEvent extends CraterEvent {
         return function;
     }
 
+    public String getThreadName() {
+        return threadName;
+    }
+
     @Override
     public boolean canCancel() {
         return false;

Common/src/main/java/com/hypherionmc/craterlib/api/networking/CraterNetworkHandler.java

@@ -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());
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java

@@ -6,6 +6,7 @@ import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author HypherionSA
@@ -22,7 +23,7 @@ public class InternalConfigButton extends AbstractButton {
     }
 
     @Override
-    protected void renderWidget(GuiGraphics arg, int i, int j, float f) {
+    public void render(@NotNull GuiGraphics poseStack, int i, int j, float f) {
         if (cancel) {
             setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
         } else {
@@ -30,7 +31,7 @@ public class InternalConfigButton extends AbstractButton {
             active = screen.isEdited() && !hasErrors;
             setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
         }
-        super.renderWidget(arg, i, j, f);
+        super.render(poseStack, i, j, f);
     }
 
     @Override

Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/server/AbstractServer.java

@@ -1,5 +1,6 @@
 package com.hypherionmc.craterlib.core.abstraction.server;
 
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.MinecraftServer;
 
@@ -9,4 +10,7 @@ public class AbstractServer {
         server.getPlayerList().broadcastSystemMessage(message, false);
     }
 
+    public static void executeCommand(MinecraftServer server, CommandSourceStack stack, String command) {
+        server.getCommands().performPrefixedCommand(stack, command);
+    }
 }

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

@@ -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);

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

@@ -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);

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

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

Common/src/main/java/com/hypherionmc/craterlib/core/networking/CraterPacketNetwork.java

@@ -0,0 +1,44 @@
+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;
+    private static DeferredPacketRegistrar delayedHandler;
+
+    public CraterPacketNetwork(PacketRegistry registry) {
+        INSTANCE = this;
+        this.packetRegistry = registry;
+        getDelayedHandler().registerQueuedPackets(registry);
+    }
+
+    private static DeferredPacketRegistrar getDelayedHandler() {
+        if (delayedHandler == null) {
+            delayedHandler = new DeferredPacketRegistrar();
+        }
+        return delayedHandler;
+    }
+
+    public static <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
+        if (INSTANCE != null) {
+            return INSTANCE.packetRegistry.registerPacket(id, messageType, encoder, decoder, handler);
+        } else {
+            return getDelayedHandler().registerPacket(id, messageType, encoder, decoder, handler);
+        }
+    }
+
+    public PacketRegistry getPacketRegistry() {
+        return packetRegistry;
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/core/networking/DeferredPacketRegistrar.java

@@ -0,0 +1,41 @@
+package com.hypherionmc.craterlib.core.networking;
+
+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 class DeferredPacketRegistrar implements PacketRegistrar {
+
+    private static final Map<Class<?>, PacketHolder<?>> QUEUED_PACKET_MAP = new HashMap<>();
+
+    @Override
+    public PacketSide side() {
+        return PacketSide.CLIENT;
+    }
+
+    @Override
+    public <T> PacketRegistrar registerPacket(ResourceLocation packetIdentifier, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
+        PacketHolder<T> container = new PacketHolder<>(packetIdentifier, messageType, encoder, decoder, handler);
+        QUEUED_PACKET_MAP.put(messageType, container);
+        return this;
+    }
+
+
+    public void registerQueuedPackets(PacketRegistry packetRegistration) {
+        if (!QUEUED_PACKET_MAP.isEmpty()) {
+            packetRegistration.PACKET_MAP.putAll(QUEUED_PACKET_MAP);
+            QUEUED_PACKET_MAP.forEach((aClass, container) -> packetRegistration.registerPacket(container));
+        }
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/core/networking/PacketRegistrar.java

@@ -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);
+
+}

Common/src/main/java/com/hypherionmc/craterlib/core/networking/PacketRegistry.java

@@ -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);
+}

Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketContext.java

@@ -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);
+    }
+
+}

Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java

@@ -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) {
+}

Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketSide.java

@@ -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;
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java

@@ -9,28 +9,28 @@ import net.minecraft.commands.Commands;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Commands.class)
 public class CommandMixin {
 
     @Inject(method = "performCommand",
             at = @At(value = "INVOKE",
-                    target = "Lnet/minecraft/commands/Commands;finishParsing(Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;Lnet/minecraft/commands/CommandSourceStack;)Lcom/mojang/brigadier/context/ContextChain;",
+                    target = "Lcom/mojang/brigadier/CommandDispatcher;execute(Lcom/mojang/brigadier/ParseResults;)I",
                     shift = At.Shift.BEFORE
             ), cancellable = true
     )
-    private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfo ci) {
+    private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfoReturnable<Integer> cir) {
         CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command);
         CraterEventBus.INSTANCE.postEvent(commandEvent);
         if (commandEvent.wasCancelled()) {
-            ci.cancel();
+            cir.setReturnValue(1);
             return;
         }
 
         if (commandEvent.getException() != null) {
             Throwables.throwIfUnchecked(commandEvent.getException());
-            ci.cancel();
+            cir.setReturnValue(1);
         }
     }
 

Common/src/main/java/com/hypherionmc/craterlib/mixin/events/PlayerListMixin.java

@@ -24,7 +24,8 @@ public class PlayerListMixin {
 
     @Inject(method = "broadcastSystemMessage(Lnet/minecraft/network/chat/Component;Ljava/util/function/Function;Z)V", at = @At("HEAD"))
     private void injectBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl, CallbackInfo ci) {
-        MessageBroadcastEvent event = new MessageBroadcastEvent(component, function, bl);
+        String thread = Thread.currentThread().getStackTrace()[3].getClassName();
+        MessageBroadcastEvent event = new MessageBroadcastEvent(component, function, bl, thread);
         CraterEventBus.INSTANCE.postEvent(event);
     }
 

Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerGamePacketListenerImplMixin.java

@@ -2,8 +2,10 @@ package com.hypherionmc.craterlib.mixin.events;
 
 import com.hypherionmc.craterlib.api.event.server.CraterServerChatEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.PlayerChatMessage;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.FilteredText;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -11,15 +13,19 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ServerGamePacketListenerImpl.class)
+@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
 public class ServerGamePacketListenerImplMixin {
 
     @Shadow
     public ServerPlayer player;
 
-    @Inject(method = "broadcastChatMessage", at = @At("HEAD"), cancellable = true)
-    private void injectChatEvent(PlayerChatMessage chatMessage, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(this.player, chatMessage.decoratedContent().getString(), chatMessage.decoratedContent());
+    @Inject(
+            method = "lambda$handleChat$6",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
+        CraterServerChatEvent event = new CraterServerChatEvent(this.player, arg.decoratedContent().getString(), arg.decoratedContent());
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();

Fabric/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     shade "me.hypherionmc.moon-config:core:${moon_config}"
     shade "me.hypherionmc.moon-config:toml:${moon_config}"
     shade "com.hypherionmc:rpcsdk:1.0"
-    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
+    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
 
     modImplementation("com.terraformersmc:modmenu:${mod_menu_version}") {
         exclude(group: "net.fabricmc.fabric-api")

Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java

@@ -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)));
 

Fabric/src/main/java/com/hypherionmc/craterlib/client/CraterLibClientInitializer.java

@@ -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);

Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java

@@ -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) { }
+}

Fabric/src/main/java/com/hypherionmc/craterlib/network/FabricNetworkHandler.java

@@ -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();

Fabric/src/main/java/com/hypherionmc/craterlib/network/FabricNetworkHelper.java

@@ -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) {

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

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

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

@@ -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) {

Fabric/src/main/resources/fabric.mod.json

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

Forge/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     shade "me.hypherionmc.moon-config:core:${moon_config}"
     shade "me.hypherionmc.moon-config:toml:${moon_config}"
     shade "com.hypherionmc:rpcsdk:1.0"
-    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
+    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
 
     // Do not edit or remove
     implementation project(":Common")

Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java

@@ -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);

Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java

@@ -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);
+        };
+    }
+}

Forge/src/main/java/com/hypherionmc/craterlib/network/ForgeNetworkHandler.java

@@ -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();

Forge/src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[49,)"
+loaderVersion = "[48,)"
 license = "MIT"
 issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
 
@@ -16,16 +16,16 @@ A library mod used by First Dark Development and HypherionSA Mods
 '''
 displayTest = "MATCH_VERSION"
 
-[[dependencies.${ mod_id }]]
+[[dependencies.${mod_id}]]
 modId = "forge"
 mandatory = true
-versionRange = "[49,)"
+versionRange = "[48,)"
 ordering = "NONE"
 side = "BOTH"
 
-[[dependencies.${ mod_id }]]
+[[dependencies.${mod_id}]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.3,1.21)"
+versionRange = "[1.20.2,1.20.3)"
 ordering = "NONE"
 side = "BOTH"

NeoForge/build.gradle

@@ -1,121 +0,0 @@
-// Adjust the output jar name here
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
-
-dependencies {
-    shade "me.hypherionmc.moon-config:core:${moon_config}"
-    shade "me.hypherionmc.moon-config:toml:${moon_config}"
-    shade "com.hypherionmc:rpcsdk:1.0"
-    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
-
-    // Do not edit or remove
-    implementation project(":Common")
-}
-
-shadowJar {
-    from sourceSets.main.output
-    configurations = [project.configurations.shade]
-
-    dependencies {
-        relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
-        relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
-    }
-
-    setArchiveClassifier('dev-shadow')
-}
-
-/**
- * ===============================================================================
- * =       DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING        =
- * ===============================================================================
- */
-
-unimined.minecraft {
-    neoForged {
-        loader neoforge_version
-        mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
-    }
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-}
-
-processResources {
-    from project(":Common").sourceSets.main.resources
-    def buildProps = project.properties.clone()
-
-    filesMatching("META-INF/mods.toml") {
-        expand buildProps
-    }
-}
-
-compileTestJava.enabled = false
-
-tasks.withType(JavaCompile).configureEach {
-    source(project(":Common").sourceSets.main.allSource)
-}
-
-/**
- * Publishing Config
- */
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            groupId project.group
-            artifactId project.archivesBaseName
-            version project.version
-            from components.java
-
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-
-            pom.withXml {
-                Node pomNode = asNode()
-                pomNode.dependencies.'*'.findAll() {
-                    it.artifactId.text() == 'regutils-joined-fabric' ||
-                            it.artifactId.text() == 'core' ||
-                            it.artifactId.text() == 'toml'
-                }.each() {
-                    it.parent().remove(it)
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            url "https://maven.firstdark.dev/" + (project.release ? "releases" : "snapshots")
-            credentials {
-                username System.getenv("MAVEN_USER")
-                password System.getenv("MAVEN_PASS")
-            }
-        }
-    }
-}
-
-/*publisher {
-    apiKeys {
-        modrinth = System.getenv("MODRINTH_TOKEN")
-        curseforge = System.getenv("CURSE_TOKEN")
-    }
-
-    curseID = curse_id
-    modrinthID = modrinth_id
-    versionType = "release"
-    changelog = rootProject.file("changelog-forge.md")
-    version = "${minecraft_version}-${project.version}"
-    displayName = "[NEOFORGE 1.20.2] CraterLib - ${project.version}"
-    gameVersions = ["1.20.2"]
-    loaders = ["neoforge"]
-    artifact = remapJar
-}
-
-publishCurseforge.dependsOn(remapJar)
-publishModrinth.dependsOn(remapJar)*/

NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java

@@ -1,28 +0,0 @@
-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 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.neoforge.common.NeoForge;
-
-@Mod(CraterConstants.MOD_ID)
-public class CraterLib {
-
-    public CraterLib(IEventBus eventBus) {
-        NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
-    }
-
-    public void commonSetup(FMLCommonSetupEvent evt) {
-        if (FMLEnvironment.dist.isClient()) {
-            LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options);
-            CraterEventBus.INSTANCE.postEvent(event);
-        }
-    }
-}

NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java

@@ -1,21 +0,0 @@
-package com.hypherionmc.craterlib.client;
-
-import com.hypherionmc.craterlib.CraterConstants;
-import com.hypherionmc.craterlib.api.event.client.CraterClientTickEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import net.minecraft.client.Minecraft;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.event.TickEvent;
-
-@Mod.EventBusSubscriber(modid = CraterConstants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
-public class NeoForgeClientEvents {
-
-    @SubscribeEvent
-    public static void clientTick(TickEvent.LevelTickEvent event) {
-        CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(Minecraft.getInstance().level);
-        CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
-    }
-
-}

NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java

@@ -1,40 +0,0 @@
-package com.hypherionmc.craterlib.client;
-
-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.Connection;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-
-import java.util.Objects;
-
-/**
- * @author HypherionSA
- * @date 16/06/2022
- */
-public class NeoForgeClientHelper implements ClientPlatform {
-
-    public NeoForgeClientHelper() {
-    }
-
-    @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() {
-        Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
-        return Minecraft.getInstance().getConnection().getConnection();
-    }
-}

NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java

@@ -1,33 +0,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
-import com.hypherionmc.craterlib.network.NeoForgeNetworkHandler;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.item.CreativeModeTab;
-import net.neoforged.neoforge.server.ServerLifecycleHooks;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author HypherionSA
- */
-public class NeoForgeCommonHelper implements CommonPlatform {
-
-    public static Map<ResourceLocation, CreativeModeTab> TABS = new HashMap<>();
-
-    public NeoForgeCommonHelper() {
-    }
-
-    @Override
-    public CraterNetworkHandler createPacketHandler(String modid, boolean requiredClient, boolean requiredServer) {
-        return NeoForgeNetworkHandler.of(modid, requiredClient, requiredServer);
-    }
-
-    @Override
-    public MinecraftServer getMCServer() {
-        return ServerLifecycleHooks.getCurrentServer();
-    }
-}

NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeLoaderHelper.java

@@ -1,73 +0,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.Environment;
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
-import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.loading.FMLLoader;
-import net.neoforged.fml.loading.FMLPaths;
-
-import java.io.File;
-
-/**
- * @author HypherionSA
- */
-public class NeoForgeLoaderHelper implements ModloaderEnvironment {
-
-    public NeoForgeLoaderHelper() {
-    }
-
-    @Override
-    public boolean isFabric() {
-        return false;
-    }
-
-    @Override
-    public String getGameVersion() {
-        return SharedConstants.VERSION_STRING;
-    }
-
-    @Override
-    public File getGameFolder() {
-        return Minecraft.getInstance().gameDirectory;
-    }
-
-    @Override
-    public File getConfigFolder() {
-        return FMLPaths.CONFIGDIR.get().toFile();
-    }
-
-    @Override
-    public File getModsFolder() {
-        return FMLPaths.MODSDIR.get().toFile();
-    }
-
-    @Override
-    public Environment getEnvironment() {
-        switch (FMLLoader.getDist()) {
-            case CLIENT -> {
-                return Environment.CLIENT;
-            }
-            case DEDICATED_SERVER -> {
-                return Environment.SERVER;
-            }
-        }
-        return Environment.UNKNOWN;
-    }
-
-    @Override
-    public boolean isModLoaded(String modid) {
-        return ModList.get().isLoaded(modid);
-    }
-
-    @Override
-    public boolean isDevEnv() {
-        return !FMLLoader.isProduction();
-    }
-
-    @Override
-    public int getModCount() {
-        return ModList.get().size();
-    }
-}

NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java

@@ -1,40 +0,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.api.event.server.CraterRegisterCommandEvent;
-import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.neoforge.event.RegisterCommandsEvent;
-import net.neoforged.neoforge.event.server.ServerStartedEvent;
-import net.neoforged.neoforge.event.server.ServerStartingEvent;
-import net.neoforged.neoforge.event.server.ServerStoppedEvent;
-import net.neoforged.neoforge.event.server.ServerStoppingEvent;
-
-public class NeoForgeServerEvents {
-
-    @SubscribeEvent
-    public void serverStarting(ServerStartingEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Starting(event.getServer()));
-    }
-
-    @SubscribeEvent
-    public void serverStarted(ServerStartedEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started());
-    }
-
-    @SubscribeEvent
-    public void serverStopping(ServerStoppingEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping());
-    }
-
-    @SubscribeEvent
-    public void serverStopped(ServerStoppedEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped());
-    }
-
-    @SubscribeEvent
-    public void onCommandRegister(RegisterCommandsEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(event.getDispatcher()));
-    }
-
-}

NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java

@@ -1,45 +0,0 @@
-package com.hypherionmc.craterlib.mixin;
-
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.ModuleConfig;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.neoforged.neoforge.client.ConfigScreenHandler;
-import net.neoforged.neoforgespi.language.IModInfo;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * @author HypherionSA
- */
-@Mixin(ConfigScreenHandler.class)
-public class ConfigScreenHandlerMixin {
-
-    /**
-     * Inject Auto Generated config Screens into forge
-     *
-     * @param selectedMod
-     * @param cir
-     */
-    @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
-    private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
-            if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
-                ModuleConfig config = (ModuleConfig) conf;
-                if (config.getModId().equals(selectedMod.getModId())) {
-                    cir.setReturnValue(
-                            Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))
-                    );
-                }
-            }
-        });
-    }
-
-}

NeoForge/src/main/java/com/hypherionmc/craterlib/network/NeoForgeNetworkHandler.java

@@ -1,129 +0,0 @@
-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>
- */
-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();
-    }
-
-    @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);
-    }
-
-    @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);
-    }
-}

NeoForge/src/main/resources/META-INF/mods.toml

@@ -1,31 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[1,)"
-license = "MIT"
-issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
-
-[[mods]]
-modId = "${mod_id}"
-version = "${version}"
-displayName = "${mod_name}"
-displayURL = "https://modrinth.com/mod/craterlib"
-logoFile = "craterlib_logo.png"
-#credits="Thanks for this example mod goes to Java"
-authors = "${mod_author}, Zenith"
-description = '''
-A library mod used by First Dark Development and HypherionSA Mods
-'''
-displayTest = "MATCH_VERSION"
-
-[[dependencies.${ mod_id }]]
-modId = "neoforge"
-mandatory = true
-versionRange = "[20.3,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.${ mod_id }]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.20.3,1.21)"
-ordering = "NONE"
-side = "BOTH"

NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform

@@ -1 +0,0 @@
-com.hypherionmc.craterlib.client.NeoForgeClientHelper

NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform

@@ -1 +0,0 @@
-com.hypherionmc.craterlib.common.NeoForgeCommonHelper

NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment

@@ -1 +0,0 @@
-com.hypherionmc.craterlib.common.NeoForgeLoaderHelper

NeoForge/src/main/resources/craterlib.neoforge.mixins.json

@@ -1,16 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.hypherionmc.craterlib.mixin",
-  "compatibilityLevel": "JAVA_17",
-  "mixins": [
-  ],
-  "client": [
-    "ConfigScreenHandlerMixin"
-  ],
-  "server": [
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

gradle.properties

@@ -1,27 +1,35 @@
 #Project
 version_major=1
 version_minor=1
-version_patch=0
+version_patch=2
 project_group=com.hypherionmc.craterlib
+
 #Mod
 mod_author=HypherionSA
 mod_id=craterlib
 mod_name=CraterLib
+
 # Shared
-minecraft_version=1.20.3
+minecraft_version=1.20.2
+
 # Fabric
-fabric_loader=0.15.0
-fabric_api=0.91.1+1.20.3
+fabric_loader=0.14.22
+fabric_api=0.89.0+1.20.2
+
 # Forge
-forge_version=49.0.2
+forge_version=48.0.6
+
 # NeoForged
-neoforge_version=8-beta
+neoforge_version=64-beta
+
 # Dependencies
 mod_menu_version=8.0.0-beta.2
 moon_config=1.0.9
+
 # Publishing
 curse_id=867099
 modrinth_id=Nn8Wasaq
+
 # Gradle
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false

settings.gradle

@@ -12,4 +12,3 @@ pluginManagement {
 
 rootProject.name = 'CraterLib'
 include("Common", "Fabric", "Forge")
-include 'NeoForge'