[NO-ORBIT] Unified Porting Branch

2024-05-19 19:08:42 +02:00
parent f64efbd228
commit be3fc20246
277 changed files with 8174 additions and 128 deletions
--- a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch
+++ b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch
@@ -0,0 +1,29 @@
+--- a/.jenkins/Jenkinsfile.deploy
+++ b/.jenkins/Jenkinsfile.deploy
+@@ -1,7 +1,7 @@
+ pipeline {
+     agent {
+         docker {
+-            image "registry.firstdark.dev/java21:latest"
+            image "registry.firstdark.dev/java17:latest"
+             alwaysPull true
+         }
+     }
+@@ -10,7 +10,7 @@
+         stage("Notify Discord") {
+             steps {
+                 discordSend webhookURL: env.FDD_WH_ADMIN,
+-                        title: "Deploy Started: CraterLib Port 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})"
+@@ -39,7 +39,7 @@
+             deleteDir()
+ 
+             discordSend webhookURL: env.FDD_WH_ADMIN,
+-                    title: "CraterLib Port 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}"
--- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -0,0 +1,52 @@
+--- a/.jenkins/Jenkinsfile.snapshot
+++ b/.jenkins/Jenkinsfile.snapshot
+@@ -1,10 +1,11 @@
+ def projectName = "CraterLib";
+ def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
+def relType = "snapshot"
+ 
+ pipeline {
+     agent {
+         docker {
+-            image "registry.firstdark.dev/java21:latest"
+            image "registry.firstdark.dev/java17:latest"
+             alwaysPull true
+         }
+     }
+@@ -13,7 +14,7 @@
+         stage("Notify Discord") {
+             steps {
+                 discordSend webhookURL: env.SSS_WEBHOOK,
+-                        title: "Deploy Started: ${projectName} Port 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})"
+@@ -29,14 +30,14 @@
+ 
+         stage("Build") {
+             steps {
+-                sh "./gradlew build -PreleaseType=port"
+                sh "./gradlew build -PreleaseType=${relType}"
+             }
+         }
+ 
+         stage("Publish to Maven") {
+             steps {
+                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+-                    sh "./gradlew publish -PreleaseType=port"
+                    sh "./gradlew publish -PreleaseType=${relType}"
+                 }
+             }
+         }
+@@ -51,8 +52,8 @@
+                 projectSlug: "craterlib",
+                 projectName: "${projectName}",
+                 projectIcon: "${projectIcon}",
+-                modLoaders: "forge|neoforge|fabric|quilt",
+-                minecraftVersions: "1.20.6",
+                modLoaders: "forge|fabric|quilt",
+                minecraftVersions: "1.20.2",
+                 failWebhook: env.SSS_WEBHOOK,
+                 publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
+ 
--- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/networking/CommonPacketWrapper.java.patch
+++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/networking/CommonPacketWrapper.java.patch
@@ -0,0 +1,22 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/api/networking/CommonPacketWrapper.java
+++ /dev/null
+@@ -1,19 +1,0 @@
+-package com.hypherionmc.craterlib.api.networking;
+-
+-import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
+-import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+-
+-public record CommonPacketWrapper<T>(PacketHolder<T> container, T packet) implements CustomPacketPayload
+-{
+-    public void encode(BridgedFriendlyByteBuf buf)
+-    {
+-        container().encoder().accept(packet(), buf);
+-    }
+-
+-    @Override
+-    public Type<? extends CustomPacketPayload> type()
+-    {
+-        return container.type();
+-    }
+-}
--- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
+++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
@@ -0,0 +1,11 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
+@@ -269,7 +269,7 @@
+         Tesselator tesselator = Tesselator.getInstance();
+         BufferBuilder buffer = tesselator.getBuilder();
+         RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+-        RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+        RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
+         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+         buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+         buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
--- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java.patch
+++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java.patch
@@ -0,0 +1,43 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java
+@@ -1,11 +1,7 @@
+ package com.hypherionmc.craterlib.core.networking.data;
+ 
+-import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
+ import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
+-import net.minecraft.network.FriendlyByteBuf;
+-import net.minecraft.network.codec.StreamCodec;
+-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+ 
+ import java.util.function.BiConsumer;
+ import java.util.function.Consumer;
+@@ -14,27 +10,9 @@
+ /**
+  * Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
+  */
+-public record PacketHolder<T>(CustomPacketPayload.Type<? extends CustomPacketPayload> type,
+public record PacketHolder<T>(ResourceIdentifier type,
+                               Class<T> messageType,
+                               BiConsumer<T, BridgedFriendlyByteBuf> encoder,
+                               Function<BridgedFriendlyByteBuf, T> decoder,
+                               Consumer<PacketContext<T>> handler) {
+-
+-    public PacketHolder(ResourceIdentifier packetId, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
+-        this(new CustomPacketPayload.Type<>(packetId.toMojang()), messageType, encoder, decoder, handler);
+-    }
+-
+-    @SuppressWarnings("unchecked")
+-    public <K extends CustomPacketPayload> CustomPacketPayload.Type<K> getType()
+-    {
+-        return (CustomPacketPayload.Type<K>) type();
+-    }
+-
+-    public StreamCodec<FriendlyByteBuf, CommonPacketWrapper> getCodec()
+-    {
+-        return CustomPacketPayload.codec(
+-                (packet, buf) -> this.encoder().accept((T)packet.packet(), BridgedFriendlyByteBuf.of(buf)),
+-                (buf) -> new CommonPacketWrapper<>(this, this.decoder().apply(BridgedFriendlyByteBuf.of(buf))));
+-    }
+-
+ }
--- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java.patch
+++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java.patch
@@ -0,0 +1,36 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
+@@ -9,28 +9,28 @@
+ 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 = CraterCommandEvent.of(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);
+         }
+     }
+ 
--- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java.patch
+++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java.patch
@@ -0,0 +1,13 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/RealmsMainScreenMixin.java
+@@ -14,8 +14,8 @@
+ @Mixin(RealmsMainScreen.class)
+ public class RealmsMainScreenMixin {
+ 
+-    @Inject(at = @At("HEAD"), method = "play(Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/client/gui/screens/Screen;Z)V")
+-    private static void play(RealmsServer serverData, Screen arg2, boolean bl, CallbackInfo ci) {
+    @Inject(at = @At("HEAD"), method = "play")
+    private static void play(RealmsServer serverData, Screen arg2, CallbackInfo ci) {
+         PlayerJoinRealmEvent playerJoinRealm = new PlayerJoinRealmEvent(BridgedRealmsServer.of(serverData));
+         CraterEventBus.INSTANCE.postEvent(playerJoinRealm);
+     }
--- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java.patch
+++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java.patch
@@ -0,0 +1,14 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java
+@@ -24,9 +24,9 @@
+     }
+ 
+     public int getMaxPlayers() {
+-        if (internal.players == null) {
+        if (!internal.pinged || internal.players == null) {
+             try {
+-                new ServerStatusPinger().pingServer(internal, () -> {}, () -> {});
+                new ServerStatusPinger().pingServer(internal, () -> {});
+             } catch (Exception ignored) {}
+         }
+ 
--- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
+++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
@@ -0,0 +1,37 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
+@@ -5,22 +5,29 @@
+ import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
+ import net.kyori.adventure.text.format.NamedTextColor;
+ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.adventure.text.serializer.json.JSONOptions;
+import net.kyori.option.OptionState;
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.Util;
+-import net.minecraft.core.RegistryAccess;
+ import net.minecraft.network.chat.Component;
+ import net.minecraft.network.chat.Style;
+ 
+ public class ChatUtils {
+ 
+    private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options(
+            OptionState.optionState()
+                .value(JSONOptions.EMIT_HOVER_SHOW_ENTITY_ID_AS_INT_ARRAY, false)
+                .value(JSONOptions.EMIT_HOVER_EVENT_TYPE, JSONOptions.HoverEventValueMode.MODERN_ONLY).build()
+   ).build();
+
+     public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
+-        final String serialised = GsonComponentSerializer.gson().serialize(inComponent);
+-        return Component.Serializer.fromJson(serialised, RegistryAccess.EMPTY);
+        final String serialised = adventureSerializer.serialize(inComponent);
+        return Component.Serializer.fromJson(serialised);
+     }
+ 
+     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
+-        final String serialised = Component.Serializer.toJson(inComponent, RegistryAccess.EMPTY);
+-        return GsonComponentSerializer.gson().deserialize(serialised);
+        final String serialised = Component.Serializer.toJson(inComponent);
+        return adventureSerializer.deserialize(serialised);
+     }
+ 
+     // Some text components contain duplicate text, resulting in duplicate messages
--- a/patches/1.20.2/Fabric/build.gradle.patch
+++ b/patches/1.20.2/Fabric/build.gradle.patch
@@ -0,0 +1,13 @@
+--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
+@@ -110,8 +110,8 @@
+     setVersionType("release")
+     setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
+     setProjectVersion("${minecraft_version}-${project.version}")
+-    setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}")
+-    setGameVersions("1.20.6")
+    setDisplayName("[FABRIC/QUILT 1.20.2] CraterLib - ${project.version}")
+    setGameVersions("1.20.2")
+     setLoaders("fabric", "quilt")
+     setArtifact(remapJar)
+     setCurseEnvironment("both")
--- a/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -0,0 +1,11 @@
+--- a/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+@@ -22,7 +22,7 @@
+     public ServerPlayer player;
+ 
+     @Inject(
+-            method = "lambda$handleChat$5",
+            method = "lambda$handleChat$6",
+             at = @At("HEAD"),
+             cancellable = true
+     )
--- a/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch
+++ b/patches/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java.patch
@@ -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) { }
+ }
--- a/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch
+++ b/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch
@@ -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.20.2",
+    "java": ">=17"
+   }
+ }
--- a/patches/1.20.2/Forge/build.gradle.patch
+++ b/patches/1.20.2/Forge/build.gradle.patch
@@ -0,0 +1,22 @@
+--- a/Forge/build.gradle
+++ b/Forge/build.gradle
+@@ -3,7 +3,7 @@
+ 
+ dependencies {
+     // Compat
+-    // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+    modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ 
+     // Do not edit or remove
+     implementation project(":Common")
+@@ -104,8 +104,8 @@
+     setVersionType("release")
+     setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
+     setProjectVersion("${minecraft_version}-${project.version}")
+-    setDisplayName("[Forge 1.20.6] CraterLib - ${project.version}")
+-    setGameVersions("1.20.6")
+    setDisplayName("[Forge 1.20.2] CraterLib - ${project.version}")
+    setGameVersions("1.20.2")
+     setLoaders("forge")
+     setArtifact(remapJar)
+     setCurseEnvironment("both")
--- a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch
+++ b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch
@@ -0,0 +1,20 @@
+--- a/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
+@@ -3,6 +3,7 @@
+ import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
+ import com.hypherionmc.craterlib.common.ForgeServerEvents;
+ import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import com.hypherionmc.craterlib.compat.Vanish;
+ import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
+ import com.hypherionmc.craterlib.core.networking.data.PacketSide;
+ import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
+@@ -32,5 +33,9 @@
+             LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
+             CraterEventBus.INSTANCE.postEvent(event);
+         });
+
+        if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
+            MinecraftForge.EVENT_BUS.register(new Vanish());
+        }
+     }
+ }
--- a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java.patch
+++ b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java.patch
@@ -0,0 +1,28 @@
+--- /dev/null
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java
+@@ -1,0 +1,25 @@
+package com.hypherionmc.craterlib.compat;
+
+import com.hypherionmc.craterlib.api.events.server.CraterPlayerEvent;
+import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import net.minecraft.world.entity.player.Player;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import redstonedubstep.mods.vanishmod.api.PlayerVanishEvent;
+
+public class Vanish {
+
+    public Vanish() {
+
+    }
+
+    @SubscribeEvent
+    public void vanishevent(PlayerVanishEvent event) {
+        if (event.isVanished()) {
+            CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(event.getEntity())));
+        } else {
+            CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(event.getEntity())));
+        }
+    }
+
+}
--- a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -0,0 +1,11 @@
+--- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+@@ -22,7 +22,7 @@
+     public ServerPlayer player;
+ 
+     @Inject(
+-            method = "lambda$handleChat$5",
+            method = "lambda$handleChat$6",
+             at = @At("HEAD"),
+             cancellable = true
+     )
--- a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java.patch
+++ b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java.patch
@@ -0,0 +1,11 @@
+--- a/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java
+@@ -36,7 +36,7 @@
+     protected <T> void registerPacket(PacketHolder<T> holder) {
+         if (CHANNELS.get(holder.messageType()) == null) {
+             SimpleChannel channel = ChannelBuilder
+-                    .named(holder.type().id())
+                    .named(holder.type().toMojang())
+                     .clientAcceptedVersions((a, b) -> true)
+                     .serverAcceptedVersions((a, b) -> true)
+                     .networkProtocolVersion(1)
--- a/patches/1.20.2/Forge/src/main/resources/META-INF/mods.toml.patch
+++ b/patches/1.20.2/Forge/src/main/resources/META-INF/mods.toml.patch
@@ -0,0 +1,25 @@
+--- a/Forge/src/main/resources/META-INF/mods.toml
+++ b/Forge/src/main/resources/META-INF/mods.toml
+@@ -1,5 +1,5 @@
+ modLoader = "javafml"
+-loaderVersion = "[50,)"
+loaderVersion = "[48,)"
+ license = "MIT"
+ issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
+ 
+@@ -19,13 +19,13 @@
+ [[dependencies.${ mod_id }]]
+     modId = "forge"
+     mandatory = true
+-    versionRange = "[50,)"
+    versionRange = "[48,)"
+     ordering = "NONE"
+     side = "BOTH"
+ 
+ [[dependencies.${ mod_id }]]
+     modId = "minecraft"
+     mandatory = true
+-    versionRange = "[1.20.6,1.21)"
+    versionRange = "[1.20.2,1.20.3)"
+     ordering = "NONE"
+     side = "BOTH"
--- a/patches/1.20.2/NeoForge/build.gradle.patch
+++ b/patches/1.20.2/NeoForge/build.gradle.patch
@@ -0,0 +1,114 @@
+--- a/NeoForge/build.gradle
+++ /dev/null
+@@ -1,111 +1,0 @@
+-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
+-
+-dependencies {
+-    // Compat
+-    modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
+-
+-    // Do not edit or remove
+-    implementation project(":Common")
+-}
+-
+-shadowJar {
+-    from sourceSets.main.output
+-    configurations = [project.configurations.shade]
+-
+-    dependencies {
+-        exclude(dependency('com.google.code.gson:.*'))
+-
+-        relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
+-        relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
+-        relocate 'net.kyori', 'shadow.kyori'
+-    }
+-
+-    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/neoforge.mods.toml") {
+-        expand buildProps
+-    }
+-}
+-
+-compileTestJava.enabled = false
+-
+-tasks.withType(JavaCompile).configureEach {
+-    source(project(":Common").sourceSets.main.allSource)
+-}
+-
+-/**
+- * Publishing Config
+- */
+-publishing {
+-    publications {
+-        mavenJava(MavenPublication) {
+-            artifactId project.archivesBaseName
+-            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 rootProject.orion.getPublishingMaven()
+-    }
+-}
+-
+-publisher {
+-    apiKeys {
+-        modrinth(System.getenv("MODRINTH_TOKEN"))
+-        curseforge(System.getenv("CURSE_TOKEN"))
+-    }
+-
+-    setCurseID(curse_id)
+-    setModrinthID(modrinth_id)
+-    setVersionType("release")
+-    setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
+-    setProjectVersion("${minecraft_version}-${project.version}")
+-    setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}")
+-    setGameVersions("1.20.6")
+-    setLoaders("neoforge")
+-    setArtifact(remapJar)
+-    setCurseEnvironment("both")
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch
@@ -0,0 +1,62 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
+++ /dev/null
+@@ -1,59 +1,0 @@
+-package com.hypherionmc.craterlib;
+-
+-import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
+-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
+-import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
+-import com.hypherionmc.craterlib.compat.Vanish;
+-import com.hypherionmc.craterlib.core.config.ConfigController;
+-import com.hypherionmc.craterlib.core.config.ModuleConfig;
+-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
+-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.core.platform.ModloaderEnvironment;
+-import com.hypherionmc.craterlib.network.CraterNeoForgeNetworkHandler;
+-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
+-import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
+-import net.minecraft.client.Minecraft;
+-import net.neoforged.bus.api.IEventBus;
+-import net.neoforged.fml.ModList;
+-import net.neoforged.fml.common.Mod;
+-import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+-import net.neoforged.fml.loading.FMLEnvironment;
+-import net.neoforged.fml.loading.FMLLoader;
+-import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+-import net.neoforged.neoforge.common.NeoForge;
+-
+-import java.util.Optional;
+-
+-@Mod(CraterConstants.MOD_ID)
+-public class CraterLib {
+-
+-    private final PacketRegistry handler;
+-
+-    public CraterLib(IEventBus eventBus) {
+-        NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
+-        eventBus.addListener(this::commonSetup);
+-        handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER);
+-
+-        if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
+-            eventBus.register(new Vanish());
+-        }
+-    }
+-
+-    public void commonSetup(FMLCommonSetupEvent evt) {
+-        new CraterPacketNetwork(handler);
+-        if (FMLEnvironment.dist.isClient()) {
+-            LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
+-            CraterEventBus.INSTANCE.postEvent(event);
+-
+-            ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+-                if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
+-                    ModuleConfig config = (ModuleConfig) conf;
+-                    ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
+-                }
+-            });
+-        }
+-    }
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java.patch
@@ -0,0 +1,28 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java
+++ /dev/null
+@@ -1,25 +1,0 @@
+-package com.hypherionmc.craterlib.client;
+-
+-import com.hypherionmc.craterlib.CraterConstants;
+-import com.hypherionmc.craterlib.api.events.client.CraterClientTickEvent;
+-import com.hypherionmc.craterlib.core.event.CraterEventBus;
+-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
+-import net.minecraft.client.Minecraft;
+-import net.neoforged.api.distmarker.Dist;
+-import net.neoforged.bus.api.SubscribeEvent;
+-import net.neoforged.fml.common.EventBusSubscriber;
+-import net.neoforged.neoforge.event.tick.LevelTickEvent;
+-
+-@EventBusSubscriber(modid = CraterConstants.MOD_ID, value = Dist.CLIENT)
+-public class NeoForgeClientEvents {
+-
+-    @SubscribeEvent
+-    public static void clientTick(LevelTickEvent.Pre event) {
+-        if (Minecraft.getInstance().level == null)
+-            return;
+-
+-        CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(BridgedClientLevel.of(Minecraft.getInstance().level));
+-        CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
+-    }
+-
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -0,0 +1,43 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null
+@@ -1,40 +1,0 @@
+-package com.hypherionmc.craterlib.client;
+-
+-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
+-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
+-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
+-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+-import net.minecraft.client.Minecraft;
+-import net.minecraft.network.Connection;
+-
+-import java.util.Objects;
+-
+-/**
+- * @author HypherionSA
+- */
+-public class NeoForgeClientHelper implements ClientPlatform {
+-
+-    public NeoForgeClientHelper() {
+-    }
+-
+-    @Override
+-    public BridgedMinecraft getClientInstance() {
+-        return new BridgedMinecraft();
+-    }
+-
+-    @Override
+-    public BridgedPlayer getClientPlayer() {
+-        return BridgedPlayer.of(Minecraft.getInstance().player);
+-    }
+-
+-    @Override
+-    public BridgedClientLevel getClientLevel() {
+-        return BridgedClientLevel.of(Minecraft.getInstance().level);
+-    }
+-
+-    @Override
+-    public Connection getClientConnection() {
+-        Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
+-        return Minecraft.getInstance().getConnection().getConnection();
+-    }
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java.patch
@@ -0,0 +1,22 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java
+++ /dev/null
+@@ -1,19 +1,0 @@
+-package com.hypherionmc.craterlib.common;
+-
+-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
+-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
+-import net.neoforged.neoforge.server.ServerLifecycleHooks;
+-
+-/**
+- * @author HypherionSA
+- */
+-public class NeoForgeCommonHelper implements CommonPlatform {
+-
+-    public NeoForgeCommonHelper() {
+-    }
+-
+-    @Override
+-    public BridgedMinecraftServer getMCServer() {
+-        return BridgedMinecraftServer.of(ServerLifecycleHooks.getCurrentServer());
+-    }
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch
@@ -0,0 +1,25 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java
+++ /dev/null
+@@ -1,22 +1,0 @@
+-package com.hypherionmc.craterlib.common;
+-
+-import com.hypherionmc.craterlib.core.platform.CompatUtils;
+-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
+-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+-import redstonedubstep.mods.vanishmod.VanishUtil;
+-
+-public class NeoForgeCompatHelper implements CompatUtils {
+-
+-    @Override
+-    public boolean isPlayerActive(BridgedPlayer player) {
+-        if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+-            return true;
+-
+-        return VanishUtil.isVanished(player.toMojangServerPlayer());
+-    }
+-
+-    @Override
+-    public String getSkinUUID(BridgedPlayer player) {
+-        return player.getStringUUID();
+-    }
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeLoaderHelper.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeLoaderHelper.java.patch
@@ -0,0 +1,76 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeLoaderHelper.java
+++ /dev/null
+@@ -1,73 +1,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();
+-    }
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java.patch
@@ -0,0 +1,46 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java
+++ /dev/null
+@@ -1,43 +1,0 @@
+-package com.hypherionmc.craterlib.common;
+-
+-import com.hypherionmc.craterlib.api.events.server.CraterRegisterCommandEvent;
+-import com.hypherionmc.craterlib.api.events.server.CraterServerLifecycleEvent;
+-import com.hypherionmc.craterlib.core.event.CraterEventBus;
+-import com.hypherionmc.craterlib.nojang.commands.CommandsRegistry;
+-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
+-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(BridgedMinecraftServer.of(event.getServer())));
+-    }
+-
+-    @SubscribeEvent
+-    public void serverStarted(ServerStartedEvent event) {
+-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started(BridgedMinecraftServer.of(event.getServer())));
+-    }
+-
+-    @SubscribeEvent
+-    public void serverStopping(ServerStoppingEvent event) {
+-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping(BridgedMinecraftServer.of(event.getServer())));
+-    }
+-
+-    @SubscribeEvent
+-    public void serverStopped(ServerStoppedEvent event) {
+-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped(BridgedMinecraftServer.of(event.getServer())));
+-    }
+-
+-    @SubscribeEvent
+-    public void onCommandRegister(RegisterCommandsEvent event) {
+-        CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent());
+-        CommandsRegistry.INSTANCE.registerCommands(event.getDispatcher());
+-    }
+-
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java.patch
@@ -0,0 +1,27 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java
+++ /dev/null
+@@ -1,24 +1,0 @@
+-package com.hypherionmc.craterlib.compat;
+-
+-import com.hypherionmc.craterlib.api.events.server.CraterPlayerEvent;
+-import com.hypherionmc.craterlib.core.event.CraterEventBus;
+-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+-import net.neoforged.bus.api.SubscribeEvent;
+-import redstonedubstep.mods.vanishmod.api.PlayerVanishEvent;
+-
+-public class Vanish {
+-
+-    public Vanish() {
+-
+-    }
+-
+-    @SubscribeEvent
+-    public void vanishevent(PlayerVanishEvent event) {
+-        if (event.isVanished()) {
+-            CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(event.getEntity())));
+-        } else {
+-            CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(event.getEntity())));
+-        }
+-    }
+-
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -0,0 +1,39 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ /dev/null
+@@ -1,36 +1,0 @@
+-package com.hypherionmc.craterlib.mixin;
+-
+-import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
+-import com.hypherionmc.craterlib.core.event.CraterEventBus;
+-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.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;
+-import org.spongepowered.asm.mixin.injection.At;
+-import org.spongepowered.asm.mixin.injection.Inject;
+-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+-
+-@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
+-public class ServerGamePacketListenerImplMixin {
+-
+-    @Shadow
+-    public ServerPlayer player;
+-
+-    @Inject(
+-            method = "lambda$handleChat$5",
+-            at = @At("HEAD"),
+-            cancellable = true
+-    )
+-    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        CraterEventBus.INSTANCE.postEvent(event);
+-        if (event.wasCancelled())
+-            ci.cancel();
+-    }
+-
+-}
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java.patch
@@ -0,0 +1,80 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java
+++ /dev/null
+@@ -1,77 +1,0 @@
+-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.world.entity.player.BridgedPlayer;
+-import net.neoforged.bus.api.SubscribeEvent;
+-import net.neoforged.fml.LogicalSide;
+-import net.neoforged.neoforge.network.PacketDistributor;
+-import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
+-import net.neoforged.neoforge.network.handling.IPayloadHandler;
+-
+-import java.util.function.Consumer;
+-
+-/**
+- * Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
+- */
+-public class CraterNeoForgeNetworkHandler extends PacketRegistry {
+-
+-    public CraterNeoForgeNetworkHandler(PacketSide side) {
+-        super(side);
+-    }
+-
+-    @SubscribeEvent
+-    public void register(final RegisterPayloadHandlersEvent event) {
+-        if (!PACKET_MAP.isEmpty()) {
+-            PACKET_MAP.forEach((type, container) -> event.registrar(container.getType().id().getNamespace())
+-                    .optional().commonBidirectional(container.getType(), container.getCodec(), buildHandler(container.handler())));
+-        }
+-    }
+-
+-    @Override
+-    protected <T> void registerPacket(PacketHolder<T> container) {
+-
+-    }
+-
+-    public <T> void sendToServer(T packet) {
+-        this.sendToServer(packet, false);
+-    }
+-
+-    public <T> void sendToServer(T packet, boolean ignoreCheck) {
+-        PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
+-        if (container != null) {
+-            PacketDistributor.sendToServer(new CommonPacketWrapper<>(container, packet));
+-        }
+-    }
+-
+-    public <T> void sendToClient(T packet, BridgedPlayer player) {
+-        PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
+-        if (container != null) {
+-            if (player.getConnection().hasChannel(container.type())) {
+-                PacketDistributor.sendToPlayer(player.toMojangServerPlayer(), new CommonPacketWrapper<>(container, packet));
+-            }
+-        }
+-    }
+-
+-    private <T, K extends CommonPacketWrapper<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T>> handler) {
+-        return (payload, ctx) -> {
+-            try
+-            {
+-                PacketSide side = ctx.flow().getReceptionSide().equals(LogicalSide.SERVER) ? PacketSide.SERVER : PacketSide.CLIENT;
+-                if (PacketSide.SERVER.equals(side)) {
+-                    handler.accept(new PacketContext<>(BridgedPlayer.of(ctx.player()), payload.packet(), side));
+-                } else {
+-                    handler.accept(new PacketContext<>(payload.packet(), side));
+-                }
+-
+-            }
+-            catch (Throwable t) {
+-                CraterConstants.LOG.error("Error handling packet: {} -> ", payload.packet().getClass(), t);
+-            }
+-        };
+-    }
+-}
--- a/patches/1.20.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
+++ b/patches/1.20.2/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch
@@ -0,0 +1,34 @@
+--- a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml
+++ /dev/null
+@@ -1,31 +1,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 = "NONE"
+-
+-[[dependencies.${ mod_id }]]
+-    modId = "neoforge"
+-    type="required"
+-    versionRange = "[20.6,)"
+-    ordering = "NONE"
+-    side = "BOTH"
+-
+-[[dependencies.${ mod_id }]]
+-    modId = "minecraft"
+-    type="required"
+-    versionRange = "[1.20.6,1.21)"
+-    ordering = "NONE"
+-    side = "BOTH"
--- a/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform.patch
+++ b/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform.patch
@@ -0,0 +1,4 @@
+--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform
+++ /dev/null
+@@ -1,1 +1,0 @@
+-com.hypherionmc.craterlib.client.NeoForgeClientHelper
--- a/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform.patch
+++ b/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform.patch
@@ -0,0 +1,4 @@
+--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform
+++ /dev/null
+@@ -1,1 +1,0 @@
+-com.hypherionmc.craterlib.common.NeoForgeCommonHelper
--- a/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CompatUtils.patch
+++ b/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CompatUtils.patch
@@ -0,0 +1,4 @@
+--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CompatUtils
+++ /dev/null
+@@ -1,1 +1,0 @@
+-com.hypherionmc.craterlib.common.NeoForgeCompatHelper
--- a/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment.patch
+++ b/patches/1.20.2/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment.patch
@@ -0,0 +1,4 @@
+--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment
+++ /dev/null
+@@ -1,1 +1,0 @@
+-com.hypherionmc.craterlib.common.NeoForgeLoaderHelper
--- a/patches/1.20.2/NeoForge/src/main/resources/craterlib.neoforge.mixins.json.patch
+++ b/patches/1.20.2/NeoForge/src/main/resources/craterlib.neoforge.mixins.json.patch
@@ -0,0 +1,18 @@
+--- a/NeoForge/src/main/resources/craterlib.neoforge.mixins.json
+++ /dev/null
+@@ -1,15 +1,0 @@
+-{
+-  "required": true,
+-  "minVersion": "0.8",
+-  "package": "com.hypherionmc.craterlib.mixin",
+-  "compatibilityLevel": "JAVA_17",
+-  "mixins": [
+-  ],
+-  "client": [],
+-  "server": [
+-    "ServerGamePacketListenerImplMixin"
+-  ],
+-  "injectors": {
+-    "defaultRequire": 1
+-  }
+-}
--- a/patches/1.20.2/gradle.properties.patch
+++ b/patches/1.20.2/gradle.properties.patch
@@ -0,0 +1,40 @@
+--- a/gradle.properties
+++ b/gradle.properties
+@@ -9,18 +9,15 @@
+ mod_name=CraterLib
+ 
+ # Shared
+-minecraft_version=1.20.6
+minecraft_version=1.20.2
+ project_group=com.hypherionmc.craterlib
+ 
+ # Fabric
+ fabric_loader=0.15.0
+-fabric_api=0.97.8+1.20.6
+fabric_api=0.91.6+1.20.2
+ 
+ # Forge
+-forge_version=50.0.6
+-
+-# NeoForged
+-neoforge_version=41-beta
+forge_version=48.1.0
+ 
+ # Dependencies
+ moon_config=1.0.9
+@@ -30,11 +27,10 @@
+ discord_formatter=2.0.0
+ 
+ # Mod Dependencies
+-fabrictailor=2.3.1
+-vanish=1.5.4+1.20.5
+-mod_menu_version=10.0.0-beta.1
+-vanishmod=1.1.12.1
+-vanishmod_neo=puxrKAMr
+fabrictailor=2.2.1
+vanish=1.5.0+1.20.2
+mod_menu_version=8.0.1
+vanishmod=1.1.15
+ 
+ # Publishing
+ curse_id=867099
--- a/patches/1.20.2/settings.gradle.patch
+++ b/patches/1.20.2/settings.gradle.patch
@@ -0,0 +1,8 @@
+--- a/settings.gradle
+++ b/settings.gradle
+@@ -11,4 +11,4 @@
+ }
+ 
+ rootProject.name = 'CraterLib'
+-include("Common", "Fabric", "NeoForge", "Forge")
+include("Common", "Fabric", "Forge")