[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 Deploy #${BUILD_NUMBER}",
+                        title: "Deploy Started: CraterLib 1.19.3/4 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 Deploy #${BUILD_NUMBER}",
+                    title: "CraterLib 1.19.3/4 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.1/2 Deploy #${BUILD_NUMBER}",
+                        title: "Deploy Started: ${projectName} 1.19.3/4 Deploy #${BUILD_NUMBER}",
                         link: env.BUILD_URL,
                         result: 'SUCCESS',
                         description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -54,7 +54,7 @@ pipeline {
                 versionName: "Snapshot 1.1.${BUILD_NUMBER}",
                 version: "1.1.${BUILD_NUMBER}",
                 modLoaders: "forge|fabric|quilt",
-                minecraftVersions: "1.20|1.20.1",
+                minecraftVersions: "1.19.3|1.19.4",
                 failWebhook: env.SSS_WEBHOOK,
                 publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 

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

@@ -1,28 +0,0 @@
-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/CraterConfigScreen.java

@@ -11,7 +11,6 @@ import com.mojang.blaze3d.vertex.*;
 import me.hypherionmc.moonconfig.core.conversion.SpecComment;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.ConfirmScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.GameRenderer;
@@ -177,19 +176,19 @@ public class CraterConfigScreen extends Screen {
     }
 
     @Override
-    public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
-        overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
+    public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
+        overlayBackground(matrices, TOP, height - BOTTOM, 32);
 
         renderScrollBar();
 
-        matrices.pose().pushPose();
-        matrices.pose().translate(0, 0, 500.0);
-        overlayBackground(matrices.pose(), 0, TOP, 64);
-        overlayBackground(matrices.pose(), height - BOTTOM, height, 64);
-        renderShadow(matrices.pose());
-        matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF);
+        matrices.pushPose();
+        matrices.translate(0, 0, 500.0);
+        overlayBackground(matrices, 0, TOP, 64);
+        overlayBackground(matrices, height - BOTTOM, height, 64);
+        renderShadow(matrices);
+        drawCenteredString(matrices, font, getTitle(), width / 2, 9, 0xFFFFFF);
         super.render(matrices, mouseX, mouseY, delta);
-        matrices.pose().popPose();
+        matrices.popPose();
 
         int y = (int) (TOP + 4 - Math.round(scrollerAmount));
         for (Option<?> option : options) {
@@ -379,7 +378,7 @@ public class CraterConfigScreen extends Screen {
         }
     }
 
-    private void renderConfigTooltip(GuiGraphics stack, Font font, int mouseX, int mouseY, int startX, int startY, int sizeX, int sizeY, String title, String... description) {
+    private void renderConfigTooltip(PoseStack stack, Font font, int mouseX, int mouseY, int startX, int startY, int sizeX, int sizeY, String title, String... description) {
         if (mouseX > startX && mouseX < startX + sizeX) {
             if (mouseY > startY && mouseY < startY + sizeY) {
                 List<Component> list = new ArrayList<>();
@@ -387,7 +386,7 @@ public class CraterConfigScreen extends Screen {
                 for (String desc : description) {
                     list.add(Component.translatable(desc));
                 }
-                stack.renderComponentTooltip(font, list, mouseX, mouseY);
+                renderComponentTooltip(stack, list, mouseX, mouseY);
             }
         }
     }

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

@@ -1,8 +1,8 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.EditBox;
 
@@ -17,7 +17,7 @@ public class AbstractConfigWidget<T, W extends AbstractWidget> extends BaseWidge
     public W widget;
 
     @Override
-    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
+    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
         super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
         int i = (widget instanceof EditBox ? 1 : 0);
         widget.setX(x + width - 200 - resetButtonOffset + i);

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

@@ -1,9 +1,9 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -39,7 +39,7 @@ public class BaseWidget<T> extends Option<T> {
     }
 
     @Override
-    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
+    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
         MutableComponent text = Component.literal(this.text.getString());
         boolean edited = isEdited() || hasErrors;
         if (edited) {
@@ -50,7 +50,7 @@ public class BaseWidget<T> extends Option<T> {
         } else {
             text.withStyle(ChatFormatting.GRAY);
         }
-        matrices.drawString(font, text, x, y, 0xFFFFFF);
+        font.draw(matrices, text, x, y, 0xFFFFFF);
         resetButton.setX(x + width - 46);
         resetButton.setY(y + 1);
         resetButton.active = isNotDefault();

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

@@ -1,7 +1,7 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
 import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import net.minecraft.client.gui.GuiGraphics;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
@@ -23,7 +23,7 @@ public class InternalConfigButton extends AbstractButton {
     }
 
     @Override
-    public void render(@NotNull GuiGraphics poseStack, int i, int j, float f) {
+    public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
         if (cancel) {
             setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
         } else {

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

@@ -1,8 +1,8 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.network.chat.Component;
@@ -38,7 +38,7 @@ public abstract class Option<T> extends AbstractContainerEventHandler {
         this.langKeys = langKeys;
     }
 
-    public abstract void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta);
+    public abstract void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta);
 
     public int height() {
         return 22;

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

@@ -2,9 +2,9 @@ package com.hypherionmc.craterlib.client.gui.config.widgets;
 
 import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
 import com.hypherionmc.craterlib.core.config.ModuleConfig;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -27,7 +27,7 @@ public class SubConfigWidget<T> extends AbstractConfigWidget<T, Button> {
     }
 
     @Override
-    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
+    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
         this.text = Component.literal(subConfig.getClass().getSimpleName().toLowerCase());
         this.hideReset();
         super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);

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

@@ -1,8 +1,8 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 
 import java.util.function.Function;
 
@@ -29,7 +29,7 @@ public class TextConfigOption<T> extends AbstractConfigWidget<T, WrappedEditBox>
     }
 
     @Override
-    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta) {
+    public void render(Minecraft minecraft, Font font, int x, int y, int width, int height, PoseStack matrices, int mouseX, int mouseY, float delta) {
         widget.setTextColor(hasErrors ? 16733525 : 14737632);
         super.render(minecraft, font, x, y, width, height, matrices, mouseX, mouseY, delta);
     }

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

@@ -21,7 +21,7 @@ public class WrappedEditBox extends EditBox {
         for (GuiEventListener child : Minecraft.getInstance().screen.children()) {
             if (child instanceof TextConfigOption<?> option) {
                 WrappedEditBox box = option.widget;
-                super.setFocused(box == this);
+                box.setFocused(box == this);
             }
         }
         super.setFocused(bl);

Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/commands/AbstractCommand.java

@@ -7,7 +7,7 @@ import net.minecraft.network.chat.MutableComponent;
 public class AbstractCommand {
 
     public static void replySuccess(CommandContext<CommandSourceStack> stack, MutableComponent message) {
-        stack.getSource().sendSuccess(() -> message, false);
+        stack.getSource().sendSuccess(message, false);
     }
 
     public static void replyFailure(CommandContext<CommandSourceStack> stack, MutableComponent message) {

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

@@ -25,13 +25,13 @@ public class AbstractFakePlayer extends CommandSourceStack {
     }
 
     @Override
-    public void sendSuccess(Supplier<Component> component, boolean bl) {
-        this.onSuccess(component.get(), bl);
+    public void sendSuccess(Component component, boolean bl) {
+        this.onSuccess(component, bl);
     }
 
     @Override
     public void sendFailure(Component component) {
-        sendSuccess(() -> component, false);
+        sendSuccess(component, false);
     }
 
     public UUID getUuid() {

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

@@ -1,6 +1,5 @@
 package com.hypherionmc.craterlib.core.abstraction.server;
 
-import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.MinecraftServer;
 
@@ -10,7 +9,4 @@ 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,7 +10,6 @@ import java.util.function.Supplier;
 /**
  * @author HypherionSA
  */
-@Deprecated(forRemoval = true)
 public interface CraterNetworkHandler {
 
     <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection);

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

@@ -6,7 +6,6 @@ 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,7 +3,6 @@ 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

@@ -1,44 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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/client/MinecraftMixin.java

@@ -4,19 +4,18 @@ import com.hypherionmc.craterlib.api.event.client.ScreenEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
-import org.jetbrains.annotations.Nullable;
 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;
 
+import org.jetbrains.annotations.Nullable;
+
 @Mixin(Minecraft.class)
 public class MinecraftMixin {
 
-    @Shadow
-    @Nullable
-    public Screen screen;
+    @Shadow @Nullable public Screen screen;
 
     @Inject(method = "setScreen", at = @At(value = "TAIL"))
     private void injectScreenOpeningEvent(Screen screen, CallbackInfo ci) {

Common/src/main/java/com/hypherionmc/craterlib/util/RenderUtils.java

@@ -42,7 +42,7 @@ public class RenderUtils {
     }
 
     public static int renderColorFromDye(DyeColor color) {
-        return color.getMapColor().col | 0xFF000000;
+        return color.getMaterialColor().col | 0xFF000000;
     }
 
     public static int alphaColorFromDye(DyeColor color, float alpha) {

Fabric/build.gradle

@@ -116,8 +116,8 @@ publisher {
     versionType = "release"
     changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md"
     version = "${minecraft_version}-${project.version}"
-    displayName = "[FABRIC/QUILT 1.20.1/2] CraterLib - ${project.version}"
-    gameVersions = ["1.20", "1.20.1"]
+    displayName = "[FABRIC/QUILT 1.19.3/4] CraterLib - ${project.version}"
+    gameVersions = ["1.19.3", "1.19.4"]
     loaders = ["fabric", "quilt"]
     artifact = remapJar
 

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

@@ -4,9 +4,6 @@ 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;
@@ -15,7 +12,6 @@ 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,9 +2,6 @@ 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;
 
@@ -12,7 +9,6 @@ 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

@@ -1,81 +0,0 @@
-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,7 +23,6 @@ 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,7 +10,6 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Function;
 
-@Deprecated(forRemoval = true)
 public interface FabricNetworkHelper {
 
     /* FABRIC ONLY */

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

@@ -11,7 +11,6 @@ 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,7 +13,6 @@ 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",
+    "minecraft": ">=1.19.3",
     "java": ">=17"
   }
 }

Forge/build.gradle

@@ -111,8 +111,8 @@ publisher {
     versionType = "release"
     changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md"
     version = "${minecraft_version}-${project.version}"
-    displayName = "[FORGE 1.20.1/2] CraterLib - ${project.version}"
-    gameVersions = ["1.20", "1.20.1"]
+    displayName = "[FORGE 1.19.3/4] CraterLib - ${project.version}"
+    gameVersions = ["1.19.3", "1.19.4"]
     loaders = ["forge"]
     artifact = remapJar
 }

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

@@ -3,9 +3,6 @@ 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;
@@ -13,7 +10,6 @@ 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 {
@@ -24,7 +20,6 @@ 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

@@ -1,87 +0,0 @@
-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.network.NetworkEvent;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.simple.SimpleChannel;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import static net.minecraftforge.network.NetworkDirection.PLAY_TO_CLIENT;
-
-/**
- * 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 = NetworkRegistry.ChannelBuilder
-                    .named(holder.packetId())
-                    .clientAcceptedVersions((a) -> true)
-                    .serverAcceptedVersions((a) -> true)
-                    .networkProtocolVersion(() -> "1")
-                    .simpleChannel();
-
-            channel.registerMessage(
-                    0,
-                    holder.messageType(),
-                    holder.encoder(),
-                    holder.decoder(),
-                    buildHandler(holder.handler())
-            );
-
-            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.sendToServer(packet);
-        }
-    }
-
-    public <T> void sendToClient(T packet, ServerPlayer player) {
-        SimpleChannel channel = CHANNELS.get(packet.getClass());
-        Connection connection = player.connection.connection;
-        if (channel.isRemotePresent(connection)) {
-            channel.sendTo(packet, player.connection.connection, PLAY_TO_CLIENT);
-        }
-    }
-
-
-    private <T> BiConsumer<T, Supplier<NetworkEvent.Context>> buildHandler(Consumer<PacketContext<T>> handler) {
-        return (message, ctx) -> {
-            ctx.get().enqueueWork(() -> {
-                PacketSide side = ctx.get().getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
-                ServerPlayer player = ctx.get().getSender();
-                handler.accept(new PacketContext<>(player, message, side));
-            });
-            ctx.get().setPacketHandled(true);
-        };
-    }
-}

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

@@ -26,7 +26,6 @@ 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 = "[46,)"
+loaderVersion = "[44,)"
 license = "MIT"
 issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
 
@@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION"
 [[dependencies.${mod_id}]]
 modId = "forge"
 mandatory = true
-versionRange = "[46,)"
+versionRange = "[44,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20,1.20.2)"
+versionRange = "[1.19.3,1.20)"
 ordering = "NONE"
 side = "BOTH"

gradle.properties

@@ -1,7 +1,7 @@
 #Project
 version_major=1
 version_minor=1
-version_patch=2
+version_patch=1
 project_group=com.hypherionmc.craterlib
 
 #Mod
@@ -10,17 +10,17 @@ mod_id=craterlib
 mod_name=CraterLib
 
 # Shared
-minecraft_version=1.20
+minecraft_version=1.19.3
 
 # Fabric
 fabric_loader=0.14.21
-fabric_api=0.83.0+1.20
+fabric_api=0.76.1+1.19.3
 
 # Forge
-forge_version=46.0.1
+forge_version=44.1.0
 
 # Dependencies
-mod_menu_version=7.0.0-beta.2
+mod_menu_version=5.1.0-beta.4
 moon_config=1.0.9
 
 # Publishing