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

.jenkins/Jenkinsfile.deploy

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

.jenkins/Jenkinsfile.snapshot

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

Common/build.gradle

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

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

@@ -19,15 +19,8 @@ public class CraterAdvancementEvent extends CraterEvent {
         this.player = player;
         this.advancement = advancement;
 
-        Optional<DisplayInfo> displayInfo = advancement.display();
+        this.title = advancement.getDisplay().getTitle();
-
+        this.description = advancement.getDisplay().getDescription();
-        if (displayInfo.isPresent()) {
-            this.title = displayInfo.get().getTitle();
-            this.description = displayInfo.get().getDescription();
-        } else {
-            this.title = Component.literal("Unknown");
-            this.description = Component.literal("Unknown");
-        }
     }
 
     public Advancement getAdvancement() {

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

@@ -1,33 +1,39 @@
 package com.hypherionmc.craterlib.api.event.server;
 
 import com.hypherionmc.craterlib.core.event.CraterEvent;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
 
-import java.util.function.Function;
+import java.util.UUID;
 
 public class MessageBroadcastEvent extends CraterEvent {
 
     private final Component component;
-    private final Function<ServerPlayer, Component> function;
+    private final UUID uuid;
-    private final boolean bl;
+    private final ChatType bl;
+    private final String threadName;
 
-    public MessageBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl) {
+    public MessageBroadcastEvent(Component component, UUID uuid, ChatType bl, String threadName) {
         this.component = component;
-        this.function = function;
+        this.uuid = uuid;
         this.bl = bl;
+        this.threadName = threadName;
     }
 
     public Component getComponent() {
         return component;
     }
 
-    public boolean isBl() {
+    public ChatType getChatType() {
-        return bl;
+        return this.bl;
     }
 
-    public Function<ServerPlayer, Component> getFunction() {
+    public UUID getUuid() {
-        return function;
+        return uuid;
+    }
+
+    public String getThreadName() {
+        return threadName;
     }
 
     @Override

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

@@ -2,16 +2,17 @@ package com.hypherionmc.craterlib.client.gui.config;
 
 import com.hypherionmc.craterlib.CraterConstants;
 import com.hypherionmc.craterlib.client.gui.config.widgets.*;
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
 import com.hypherionmc.craterlib.core.config.ModuleConfig;
 import com.hypherionmc.craterlib.core.config.annotations.HideFromScreen;
 import com.hypherionmc.craterlib.core.config.annotations.SubConfig;
 import com.hypherionmc.craterlib.core.config.annotations.Tooltip;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
+import com.mojang.math.Matrix4f;
 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;
@@ -20,7 +21,6 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix4f;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -49,7 +49,7 @@ public class CraterConfigScreen extends Screen {
     private boolean dragging;
 
     public CraterConfigScreen(ModuleConfig config, Screen parent, Object subConfig) {
-        super(Component.translatable("cl." + config.getClass().getSimpleName().toLowerCase() + ".title"));
+        super(AbstractComponent.translatable("cl." + config.getClass().getSimpleName().toLowerCase() + ".title"));
         this.parent = parent;
         this.config = config;
         if (subConfig != null) {
@@ -64,11 +64,11 @@ public class CraterConfigScreen extends Screen {
     }
 
     private static Component toText(Enum<?> val) {
-        return Component.translatable(val.toString());
+        return AbstractComponent.translatable(val.toString());
     }
 
     private static Component toText(Boolean bool) {
-        return Component.translatable(bool.toString());
+        return AbstractComponent.translatable(bool.toString());
     }
 
     private void setupScreenFromConfig(Object object, Class<?> clazz) {
@@ -94,7 +94,7 @@ public class CraterConfigScreen extends Screen {
                         tooltipLang = field.getAnnotation(Tooltip.class).value();
                     }
 
-                    add(Component.translatable(baseLangKey),
+                    add(AbstractComponent.translatable(baseLangKey),
                             val,
                             () -> val,
                             (ret) -> {
@@ -172,24 +172,24 @@ public class CraterConfigScreen extends Screen {
         ((List) children()).addAll(options);
 
         int buttonWidths = Math.min(200, (width - 50 - 12) / 3);
-        addRenderableWidget(new InternalConfigButton(this, width / 2 - buttonWidths - 3, height - 22, buttonWidths, 20, Component.empty(), true));
+        addRenderableWidget(new InternalConfigButton(this, width / 2 - buttonWidths - 3, height - 22, buttonWidths, 20, AbstractComponent.empty(), true));
-        addRenderableWidget(new InternalConfigButton(this, width / 2 + 3, height - 22, buttonWidths, 20, Component.empty(), false));
+        addRenderableWidget(new InternalConfigButton(this, width / 2 + 3, height - 22, buttonWidths, 20, AbstractComponent.empty(), false));
     }
 
     @Override
-    public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
+    public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
-        overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
+        overlayBackground(matrices, TOP, height - BOTTOM, 32);
+
         renderScrollBar();
 
-        matrices.pose().pushPose();
+        matrices.pushPose();
-        matrices.pose().translate(0, 0, 500.0);
+        matrices.translate(0, 0, 500.0);
-        overlayBackground(matrices.pose(), 0, TOP, 64);
+        overlayBackground(matrices, 0, TOP, 64);
-        overlayBackground(matrices.pose(), height - BOTTOM, height, 64);
+        overlayBackground(matrices, height - BOTTOM, height, 64);
-        renderShadow(matrices.pose());
+        renderShadow(matrices);
-        matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF);
+        drawCenteredString(matrices, font, getTitle(), width / 2, 9, 0xFFFFFF);
-        matrices.pose().popPose();
-
         super.render(matrices, mouseX, mouseY, delta);
+        matrices.popPose();
 
         int y = (int) (TOP + 4 - Math.round(scrollerAmount));
         for (Option<?> option : options) {
@@ -266,11 +266,12 @@ public class CraterConfigScreen extends Screen {
     }
 
     protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
+
         Tesselator tesselator = Tesselator.getInstance();
         BufferBuilder buffer = tesselator.getBuilder();
-        RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
         RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
         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();
         buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
@@ -324,22 +325,22 @@ public class CraterConfigScreen extends Screen {
     @Override
     public void onClose() {
         if (isEdited()) {
-            minecraft.setScreen(new ConfirmScreen(this::acceptConfirm, Component.translatable("t.clc.quit_config"),
+            minecraft.setScreen(new ConfirmScreen(this::acceptConfirm, AbstractComponent.translatable("t.clc.quit_config"),
-                    Component.translatable("t.clc.quit_config_sure"),
+                    AbstractComponent.translatable("t.clc.quit_config_sure"),
-                    Component.translatable("t.clc.quit_discard"),
+                    AbstractComponent.translatable("t.clc.quit_discard"),
-                    Component.translatable("gui.cancel")));
+                    AbstractComponent.translatable("gui.cancel")));
         } else {
             minecraft.setScreen(parent);
         }
     }
 
     @Override
-    public boolean mouseScrolled(double d, double e, double f, double g) {
+    public boolean mouseScrolled(double d, double e, double f) {
         if (e >= TOP && e <= height - BOTTOM) {
             scrollerAmount = Mth.clamp(scrollerAmount - f * 16.0D, 0, scrollHeight());
             return true;
         }
-        return super.mouseScrolled(d, e, f, g);
+        return super.mouseScrolled(d, e, f);
     }
 
     @Override
@@ -378,15 +379,15 @@ 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<>();
-                list.add(Component.translatable(ChatFormatting.BOLD + "" + ChatFormatting.YELLOW + title));
+                list.add(AbstractComponent.translatable(ChatFormatting.BOLD + "" + ChatFormatting.YELLOW + title));
                 for (String desc : description) {
-                    list.add(Component.translatable(desc));
+                    list.add(AbstractComponent.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,11 +17,11 @@ 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);
+        widget.x = (x + width - 200 - resetButtonOffset + i);
-        widget.setY(y + i + 1);
+        widget.y = (y + i + 1);
         widget.render(matrices, mouseX, mouseY, delta);
     }
 }

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

@@ -1,11 +1,11 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
+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;
 import net.minecraft.network.chat.TextColor;
 
@@ -16,7 +16,7 @@ import net.minecraft.network.chat.TextColor;
 public class BaseWidget<T> extends Option<T> {
 
     public static final int resetButtonOffset = 48;
-    private final Button resetButton = addChild(Button.builder(Component.literal("Reset"), this::onResetPressed).size(46, 20).build());
+    private final Button resetButton = addChild(new Button(0, 0, 46, 20, AbstractComponent.literal("Reset"), this::onResetPressed));
     private boolean hideReset = false;
 
     private boolean isSubConfig = false;
@@ -39,8 +39,8 @@ 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());
+        MutableComponent text = AbstractComponent.literal(this.text.getString());
         boolean edited = isEdited() || hasErrors;
         if (edited) {
             text.withStyle(ChatFormatting.ITALIC);
@@ -50,9 +50,9 @@ public class BaseWidget<T> extends Option<T> {
         } else {
             text.withStyle(ChatFormatting.GRAY);
         }
-        matrices.drawString(font, text, x, y + font.lineHeight - 2, 0xFFFFFF);
+        font.draw(matrices, text, x, y, 0xFFFFFF);
-        resetButton.setX(x + width - 46);
+        resetButton.x = (x + width - 46);
-        resetButton.setY(y + 1);
+        resetButton.y = (y + 1);
         resetButton.active = isNotDefault();
         if (!hideReset) {
             resetButton.render(matrices, mouseX, mouseY, delta);

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

@@ -1,11 +1,13 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
 import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import net.minecraft.client.gui.GuiGraphics;
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
+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;
 import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author HypherionSA
@@ -22,20 +24,15 @@ public class InternalConfigButton extends AbstractButton {
     }
 
     @Override
-    protected void renderWidget(GuiGraphics arg, 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"));
+            setMessage(AbstractComponent.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
         } else {
             boolean hasErrors = screen.hasErrors();
             active = screen.isEdited() && !hasErrors;
-            setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
+            setMessage(AbstractComponent.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
         }
-        super.renderWidget(arg, i, j, f);
+        super.render(poseStack, i, j, f);
-    }
-
-    @Override
-    protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
-        narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
     }
 
     @Override
@@ -48,4 +45,8 @@ public class InternalConfigButton extends AbstractButton {
     }
 
 
+    @Override
+    public void updateNarration(NarrationElementOutput narrationElementOutput) {
+        narrationElementOutput.add(NarratedElementType.USAGE, getMessage());
+    }
 }

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

@@ -1,13 +1,13 @@
 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;
-import org.jetbrains.annotations.Nullable;
 
+import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -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

@@ -1,13 +1,13 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
 import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
 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;
 
 /**
  * @author HypherionSA
@@ -23,12 +23,12 @@ public class SubConfigWidget<T> extends AbstractConfigWidget<T, Button> {
         this.subConfig = subConfig;
         this.screen = screen;
 
-        this.widget = addChild(Button.builder(Component.translatable("t.clc.opensubconfig"), this::openSubConfig).size(200, buttonHeight).build());
+        this.widget = addChild(new Button(0, 0, 200, buttonHeight, AbstractComponent.translatable("t.clc.opensubconfig"), this::openSubConfig));
     }
 
     @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.text = AbstractComponent.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/ToggleButton.java

@@ -1,5 +1,6 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 
@@ -18,7 +19,7 @@ public class ToggleButton<T> extends AbstractConfigWidget<T, Button> {
     public ToggleButton(List<T> options, Function<T, Component> toComponent) {
         this.options = options;
         this.toComponent = toComponent;
-        this.widget = addChild(Button.builder(Component.empty(), this::switchNext).size(buttonWidth, buttonHeight).build());
+        this.widget = addChild(new Button(0, 0, buttonWidth, buttonHeight, AbstractComponent.empty(), this::switchNext));
     }
 
     @Override

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/client/gui/widgets/TimeSliderWidget.java

@@ -1,5 +1,6 @@
 package com.hypherionmc.craterlib.client.gui.widgets;
 
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.network.chat.Component;
 
@@ -35,9 +36,9 @@ public class TimeSliderWidget extends AbstractSliderButton {
         if (this.value * this.maxValue >= 1200) {
             String appendString = (minutes == 1) ? "Minute" : "Minutes";
             String doSeconds = ((seconds - (minutes * 60)) > 0) ? ", " + (seconds - (minutes * 60)) + " Seconds" : "";
-            return Component.literal(minutes + " " + appendString + doSeconds);
+            return AbstractComponent.literal(minutes + " " + appendString + doSeconds);
         } else {
-            return Component.literal(seconds + " Seconds");
+            return AbstractComponent.literal(seconds + " Seconds");
         }
     }
 

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

@@ -9,7 +9,6 @@ import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
 
 import java.util.UUID;
-import java.util.function.Supplier;
 
 public class AbstractFakePlayer extends CommandSourceStack {
 
@@ -25,13 +24,13 @@ public class AbstractFakePlayer extends CommandSourceStack {
     }
 
     @Override
-    public void sendSuccess(Supplier<Component> component, boolean bl) {
+    public void sendSuccess(Component component, boolean bl) {
-        this.onSuccess(component.get(), 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,12 +1,14 @@
 package com.hypherionmc.craterlib.core.abstraction.server;
 
+import net.minecraft.Util;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.MinecraftServer;
 
 public class AbstractServer {
 
     public static void broadcastMessage(MinecraftServer server, MutableComponent message) {
-        server.getPlayerList().broadcastSystemMessage(message, false);
+        server.getPlayerList().broadcastMessage(message, ChatType.CHAT, Util.NIL_UUID);
     }
 
 }

Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/text/AbstractComponent.java

@@ -1,23 +1,29 @@
 package com.hypherionmc.craterlib.core.abstraction.text;
 
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.*;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.Style;
 
 public class AbstractComponent {
 
     public static MutableComponent literal(String component) {
-        return Component.literal(component);
+        return new TextComponent(component);
     }
 
     public static MutableComponent translatable(String component) {
-        return Component.translatable(component);
+        return new TranslatableComponent(component);
+    }
+
+    public static MutableComponent translatable(String component, Object... objects) {
+        return new TranslatableComponent(component, objects);
     }
 
     public static Component safeCopy(Component inComponent) {
         String value = inComponent.getString();
         Style style = inComponent.getStyle();
-        return Component.literal(value).withStyle(style);
+        return new TextComponent(value).withStyle(style);
+    }
+
+    public static Component empty() {
+        return new TextComponent("");
     }
 
 }

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

@@ -12,7 +12,7 @@ import java.util.function.Supplier;
  */
 public interface CraterNetworkHandler {
 
-    <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection);
+    <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection);
 
     Packet<?> toServerBound(CraterPacket<?> packet);
 

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

@@ -3,35 +3,53 @@ package com.hypherionmc.craterlib.mixin.events;
 import com.google.common.base.Throwables;
 import com.hypherionmc.craterlib.api.event.server.CraterCommandEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.ParseResults;
+import com.mojang.brigadier.StringReader;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
+import org.spongepowered.asm.mixin.Final;
 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.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Commands.class)
 public class CommandMixin {
 
-    @Inject(method = "performCommand",
+    @Shadow @Final private CommandDispatcher<CommandSourceStack> dispatcher;
-            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;",
+    @Inject(
-                    shift = At.Shift.BEFORE
+            method = "performCommand",
-            ), cancellable = true
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/util/profiling/ProfilerFiller;push(Ljava/lang/String;)V",
+                    shift = At.Shift.AFTER
+            ),
+            cancellable = true
     )
-    private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfo ci) {
+    private void injectCommandEvent(CommandSourceStack stack, String command, CallbackInfoReturnable<Integer> cir) {
-        CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command);
+        StringReader stringreader = new StringReader(command);
-        CraterEventBus.INSTANCE.postEvent(commandEvent);
+        if (stringreader.canRead() && stringreader.peek() == '/') {
-        if (commandEvent.wasCancelled()) {
+            stringreader.skip();
-            ci.cancel();
-            return;
         }
 
-        if (commandEvent.getException() != null) {
+        try {
-            Throwables.throwIfUnchecked(commandEvent.getException());
+            ParseResults<CommandSourceStack> parse = dispatcher.parse(stringreader, stack);
-            ci.cancel();
+
-        }
+            CraterCommandEvent commandEvent = new CraterCommandEvent(parse, command);
+            CraterEventBus.INSTANCE.postEvent(commandEvent);
+            if (commandEvent.wasCancelled()) {
+                cir.setReturnValue(1);
+                return;
+            }
+
+            if (commandEvent.getException() != null) {
+                Throwables.throwIfUnchecked(commandEvent.getException());
+                cir.setReturnValue(1);
+            }
+        } catch (Exception ignored) {}
     }
 
-}
+}

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

@@ -3,7 +3,6 @@ package com.hypherionmc.craterlib.mixin.events;
 import com.hypherionmc.craterlib.api.event.server.CraterAdvancementEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
 import net.minecraft.advancements.Advancement;
-import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.server.PlayerAdvancements;
 import net.minecraft.server.level.ServerPlayer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,17 +14,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(PlayerAdvancements.class)
 public class PlayerAdvancementsMixin {
 
-    @Shadow
+    @Shadow private ServerPlayer player;
-    private ServerPlayer player;
 
     @Inject(method = "award", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancements/AdvancementRewards;grant(Lnet/minecraft/server/level/ServerPlayer;)V", shift = At.Shift.AFTER))
-    private void injectAdvancementEvent(AdvancementHolder advancementHolder, String string, CallbackInfoReturnable<Boolean> cir) {
+    private void injectAdvancementEvent(Advancement advancement, String $$1, CallbackInfoReturnable<Boolean> cir) {
-        CraterAdvancementEvent event = new CraterAdvancementEvent(this.player, advancementHolder.value());
+        if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat()) {
-
+            CraterEventBus.INSTANCE.postEvent(new CraterAdvancementEvent(this.player, advancement));
-        Advancement advancement = advancementHolder.value();
-
-        if (advancement.display().isPresent() && advancement.display().get().shouldAnnounceChat()) {
-            CraterEventBus.INSTANCE.postEvent(event);
         }
     }
 }

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

@@ -6,9 +6,9 @@ import com.hypherionmc.craterlib.api.event.server.PlayerPreLoginEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.network.Connection;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.players.PlayerList;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,19 +17,20 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.net.SocketAddress;
-import java.util.function.Function;
+import java.util.UUID;
 
 @Mixin(PlayerList.class)
 public class PlayerListMixin {
 
-    @Inject(method = "broadcastSystemMessage(Lnet/minecraft/network/chat/Component;Ljava/util/function/Function;Z)V", at = @At("HEAD"))
+    @Inject(method = "broadcastMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/ChatType;Ljava/util/UUID;)V", at = @At("HEAD"))
-    private void injectBroadcastEvent(Component component, Function<ServerPlayer, Component> function, boolean bl, CallbackInfo ci) {
+    private void injectBroadcast(Component component, ChatType chatType, UUID uUID, CallbackInfo ci) {
-        MessageBroadcastEvent event = new MessageBroadcastEvent(component, function, bl);
+        String thread = Thread.currentThread().getStackTrace()[3].getClassName();
+        MessageBroadcastEvent event = new MessageBroadcastEvent(component, uUID, chatType, thread);
         CraterEventBus.INSTANCE.postEvent(event);
     }
 
     @Inject(method = "placeNewPlayer", at = @At("TAIL"))
-    private void injectPlayerLoginEvent(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) {
+    private void injectPlayerLoginEvent(Connection connection, ServerPlayer serverPlayer, CallbackInfo ci) {
         CraterPlayerEvent.PlayerLoggedIn loggedIn = new CraterPlayerEvent.PlayerLoggedIn(serverPlayer);
         CraterEventBus.INSTANCE.postEvent(loggedIn);
     }

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

@@ -14,7 +14,7 @@ public class PlayerMixin {
 
     @Inject(method = "die", at = @At("HEAD"), cancellable = true)
     private void injectPlayerDeathEvent(DamageSource damageSource, CallbackInfo ci) {
-        CraterLivingDeathEvent event = new CraterLivingDeathEvent(((Player) (Object) this), damageSource);
+        CraterLivingDeathEvent event = new CraterLivingDeathEvent(((Player)(Object) this), damageSource);
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();

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

@@ -2,24 +2,34 @@ package com.hypherionmc.craterlib.mixin.events;
 
 import com.hypherionmc.craterlib.api.event.server.CraterServerChatEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import net.minecraft.network.chat.PlayerChatMessage;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.server.network.TextFilter;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ServerGamePacketListenerImpl.class)
+@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
 public class ServerGamePacketListenerImplMixin {
 
     @Shadow
     public ServerPlayer player;
 
-    @Inject(method = "broadcastChatMessage", at = @At("HEAD"), cancellable = true)
+    @Inject(
-    private void injectChatEvent(PlayerChatMessage chatMessage, CallbackInfo ci) {
+            method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V",
-        CraterServerChatEvent event = new CraterServerChatEvent(this.player, chatMessage.decoratedContent().getString(), chatMessage.decoratedContent());
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/TextFilter$FilteredText;getFiltered()Ljava/lang/String;"),
+            cancellable = true
+    )
+    private void injectChatEvent(TextFilter.FilteredText arg, CallbackInfo ci) {
+        Component message = new TextComponent(arg.getRaw());
+        if (message.getString().startsWith("/"))
+            return;
+
+        CraterServerChatEvent event = new CraterServerChatEvent(this.player, arg.getFiltered(), message);
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();

Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/ClientLevelMixin.java

@@ -3,8 +3,7 @@ package com.hypherionmc.craterlib.mixin.events.client;
 import com.hypherionmc.craterlib.api.event.client.CraterSinglePlayerEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,12 +12,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(ClientLevel.class)
 public class ClientLevelMixin {
 
-    @Inject(method = "addEntity", at = @At("HEAD"))
+    @Inject(method = "addPlayer", at = @At("HEAD"))
-    private void injectSinglePlayerJoinEvent(Entity entity, CallbackInfo ci) {
+    private void injectSinglePlayerJoinEvent(int $$0, AbstractClientPlayer player, CallbackInfo ci) {
-        if (entity instanceof Player player) {
+        CraterSinglePlayerEvent.PlayerLogin playerLogin = new CraterSinglePlayerEvent.PlayerLogin(player);
-            CraterSinglePlayerEvent.PlayerLogin playerLogin = new CraterSinglePlayerEvent.PlayerLogin(player);
+        CraterEventBus.INSTANCE.postEvent(playerLogin);
-            CraterEventBus.INSTANCE.postEvent(playerLogin);
-        }
     }
 
 }

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
+    @Shadow @Nullable public Screen screen;
-    @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/mixin/events/client/RealmsMainScreenMixin.java

@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class RealmsMainScreenMixin {
 
     @Inject(at = @At("HEAD"), method = "play")
-    private static void play(RealmsServer serverData, Screen parent, CallbackInfo ci) {
+    private void play(RealmsServer serverData, Screen parent, CallbackInfo ci) {
         PlayerJoinRealmEvent playerJoinRealm = new PlayerJoinRealmEvent(serverData);
         CraterEventBus.INSTANCE.postEvent(playerJoinRealm);
     }

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

@@ -1,5 +1,6 @@
 package com.hypherionmc.craterlib.util;
 
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 
@@ -10,19 +11,19 @@ import net.minecraft.network.chat.Component;
 public class LangUtils {
 
     public static Component getTooltipTitle(String key) {
-        return Component.literal(ChatFormatting.YELLOW + Component.translatable(key).getString());
+        return AbstractComponent.literal(ChatFormatting.YELLOW + AbstractComponent.translatable(key).getString());
     }
 
     public static String resolveTranslation(String key) {
-        return Component.translatable(key).getString();
+        return AbstractComponent.translatable(key).getString();
     }
 
     public static Component getTranslation(String key) {
-        return Component.translatable(key);
+        return AbstractComponent.translatable(key);
     }
 
     public static Component makeComponent(String text) {
-        return Component.translatable(text);
+        return AbstractComponent.translatable(text);
     }
 
 }

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

@@ -1,9 +1,10 @@
 package com.hypherionmc.craterlib.util;
 
+import com.hypherionmc.craterlib.core.abstraction.text.AbstractComponent;
+import com.mojang.math.Vector4f;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.DyeColor;
-import org.joml.Vector4f;
 
 import java.awt.*;
 
@@ -26,7 +27,7 @@ public class RenderUtils {
         amount = amount / 81;
         capacity = capacity / 81;
         String text = String.valueOf((int) (((float) amount / capacity) * 100));
-        return amount > 0 ? Component.literal(ChatFormatting.AQUA + text + "%") : Component.literal(text + "%");
+        return amount > 0 ? AbstractComponent.literal(ChatFormatting.AQUA + text + "%") : AbstractComponent.literal(text + "%");
     }
 
     public static Component getTimeDisplayString(double value) {
@@ -35,21 +36,12 @@ public class RenderUtils {
         if (seconds >= 60) {
             String appendString = (minutes == 1) ? "Minute" : "Minutes";
             String doSeconds = ((seconds - (minutes * 60)) > 0) ? ", " + (seconds - (minutes * 60)) + " Seconds" : "";
-            return Component.literal(minutes + " " + appendString + doSeconds);
+            return AbstractComponent.literal(minutes + " " + appendString + doSeconds);
         } else {
-            return Component.literal(seconds + " Seconds");
+            return AbstractComponent.literal(seconds + " Seconds");
         }
     }
 
-    public static int renderColorFromDye(DyeColor color) {
-        return color.getMapColor().col | 0xFF000000;
-    }
-
-    public static int alphaColorFromDye(DyeColor color, float alpha) {
-        float[] colors = color.getTextureDiffuseColors();
-        return new Color(colors[0], colors[1], colors[2], alpha).getRGB();
-    }
-
     public static class ARGB32 {
         public static int alpha(int pPackedColor) {
             return pPackedColor >>> 24;
@@ -67,4 +59,13 @@ public class RenderUtils {
             return pPackedColor & 255;
         }
     }
+
+    public static int renderColorFromDye(DyeColor color) {
+        return color.getMaterialColor().col | 0xFF000000;
+    }
+
+    public static int alphaColorFromDye(DyeColor color, float alpha) {
+        float[] colors = color.getTextureDiffuseColors();
+        return new Color(colors[0], colors[1], colors[2], alpha).getRGB();
+    }
 }

Common/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name}",
-    "pack_format": 18
+    "pack_format": 8
   }
 }

Fabric/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     shade "me.hypherionmc.moon-config:core:${moon_config}"
     shade "me.hypherionmc.moon-config:toml:${moon_config}"
     shade "com.hypherionmc:rpcsdk:1.0"
-    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
+    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.18.1:2.0.0")
 
     modImplementation("com.terraformersmc:modmenu:${mod_menu_version}") {
         exclude(group: "net.fabricmc.fabric-api")
@@ -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.2] CraterLib - ${project.version}"
+    displayName = "[FABRIC/QUILT 1.18.2] CraterLib - ${project.version}"
-    gameVersions = ["1.20.2"]
+    gameVersions = ["1.18.2"]
     loaders = ["fabric", "quilt"]
     artifact = remapJar
 

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

@@ -5,7 +5,7 @@ import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent;
 import com.hypherionmc.craterlib.common.FabricCommonPlatform;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 
 public class CraterLibInitializer implements ModInitializer {
@@ -13,7 +13,7 @@ public class CraterLibInitializer implements ModInitializer {
     @Override
     public void onInitialize() {
         CommandRegistrationCallback.EVENT.register(
-                (dispatcher, registryAccess, environment) -> CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(dispatcher)));
+                (dispatcher, registryAccess) -> CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(dispatcher)));
 
 
         ServerLifecycleEvents.SERVER_STARTING.register(server -> {

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

@@ -35,22 +35,16 @@ public class FabricNetworkHandler implements CraterNetworkHandler {
         this.modid = modid;
     }
 
-    public synchronized static CraterNetworkHandler of(String modId) {
-        return NETWORK_HANDLERS.computeIfAbsent(modId, FabricNetworkHandler::new);
-    }
-
     @Override
-    public <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
+    public <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
         ResourceLocation channelName = this.nextId();
         this.packets.put(clazz, new PacketData(clazz, channelName, packetDirection));
 
         final Function<FriendlyByteBuf, CraterPacket<?>> decoder = buf -> Util.make(supplier.get(), message -> message.read(buf));
 
         switch (packetDirection) {
-            case TO_CLIENT ->
+            case TO_CLIENT -> FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerClientReceiver(channelName, decoder);
-                    FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerClientReceiver(channelName, decoder);
+            case TO_SERVER -> FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerServerReceiver(channelName, decoder);
-            case TO_SERVER ->
-                    FabricNetworkHelper.getForDist(FabricLoader.getInstance().getEnvironmentType()).registerServerReceiver(channelName, decoder);
         }
     }
 
@@ -60,15 +54,13 @@ public class FabricNetworkHandler implements CraterNetworkHandler {
 
     @Override
     public Packet<?> toServerBound(CraterPacket<?> packet) {
-        if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_SERVER)
+        if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_SERVER) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_SERVER, PacketDirection.TO_CLIENT));
-            throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_SERVER, PacketDirection.TO_CLIENT));
         return this.toPacket(ClientPlayNetworking::createC2SPacket, packet);
     }
 
     @Override
     public Packet<?> toClientBound(CraterPacket<?> packet) {
-        if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_CLIENT)
+        if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_CLIENT) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_CLIENT, PacketDirection.TO_SERVER));
-            throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_CLIENT, PacketDirection.TO_SERVER));
         return this.toPacket(ServerPlayNetworking::createS2CPacket, packet);
     }
 
@@ -79,8 +71,11 @@ public class FabricNetworkHandler implements CraterNetworkHandler {
         return packetFactory.apply(identifier, byteBuf);
     }
 
-    private record PacketData(Class<? extends CraterPacket<?>> clazz, ResourceLocation identifier,
+    public synchronized static CraterNetworkHandler of(String modId) {
-                              PacketDirection direction) {
+        return NETWORK_HANDLERS.computeIfAbsent(modId, FabricNetworkHandler::new);
+    }
+
+    private record PacketData(Class<? extends CraterPacket<?>> clazz, ResourceLocation identifier, PacketDirection direction) {
 
     }
 }

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

@@ -12,6 +12,10 @@ import java.util.function.Function;
 
 public interface FabricNetworkHelper {
 
+    /* FABRIC ONLY */
+    void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull Function<FriendlyByteBuf, @NotNull CraterPacket<?>> factory);
+    void registerServerReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory);
+
     public static FabricNetworkHelper getForDist(EnvType dist) {
         switch (dist) {
             case CLIENT -> {
@@ -24,9 +28,4 @@ public interface FabricNetworkHelper {
         return null;
     }
 
-    /* FABRIC ONLY */
-    void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull Function<FriendlyByteBuf, @NotNull CraterPacket<?>> factory);
-
-    void registerServerReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory);
-
 }

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

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

Forge/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     shade "me.hypherionmc.moon-config:core:${moon_config}"
     shade "me.hypherionmc.moon-config:toml:${moon_config}"
     shade "com.hypherionmc:rpcsdk:1.0"
-    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:2.0.0")
+    shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.18.1:2.0.0")
 
     // Do not edit or remove
     implementation project(":Common")
@@ -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.2] CraterLib - ${project.version}"
+    displayName = "[FORGE 1.18.2] CraterLib - ${project.version}"
-    gameVersions = ["1.20.2"]
+    gameVersions = ["1.18.2"]
     loaders = ["forge"]
     artifact = remapJar
 }

Forge/src/main/java/com/hypherionmc/craterlib/client/ForgeClientEvents.java

@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.Mod;
 public class ForgeClientEvents {
 
     @SubscribeEvent
-    public static void clientTick(TickEvent.LevelTickEvent event) {
+    public static void clientTick(TickEvent.WorldTickEvent event) {
         CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(Minecraft.getInstance().level);
         CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
     }

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

@@ -6,7 +6,7 @@ import com.hypherionmc.craterlib.core.config.ModuleConfig;
 import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.client.ConfigScreenHandler;
+import net.minecraftforge.client.ConfigGuiHandler;
 import net.minecraftforge.forgespi.language.IModInfo;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,7 +19,7 @@ import java.util.function.BiFunction;
 /**
  * @author HypherionSA
  */
-@Mixin(ConfigScreenHandler.class)
+@Mixin(ConfigGuiHandler.class)
 public class ConfigScreenHandlerMixin {
 
     /**
@@ -28,7 +28,7 @@ public class ConfigScreenHandlerMixin {
      * @param selectedMod
      * @param cir
      */
-    @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
+    @Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false)
     private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
         ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
             if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {

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

@@ -5,20 +5,17 @@ import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
 import com.hypherionmc.craterlib.core.network.CraterPacket;
 import com.hypherionmc.craterlib.core.network.PacketDirection;
 import com.hypherionmc.craterlib.core.platform.ClientPlatform;
-import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.common.util.LogicalSidedProvider;
-import net.minecraftforge.event.network.CustomPayloadEvent;
 import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.network.ChannelBuilder;
 import net.minecraftforge.network.NetworkDirection;
-import net.minecraftforge.network.SimpleChannel;
+import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.simple.SimpleChannel;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
@@ -32,6 +29,7 @@ import java.util.function.Supplier;
 public class ForgeNetworkHandler implements CraterNetworkHandler {
 
     private static final Map<String, ForgeNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
+    private static final String PROTOCOL = Integer.toString(1);
 
     private final SimpleChannel channel;
 
@@ -41,87 +39,52 @@ public class ForgeNetworkHandler implements CraterNetworkHandler {
 
     private final AtomicInteger packetID = new AtomicInteger();
 
-    private HashMap<Class<?>, Integer> packetMap = new LinkedHashMap<>();
-
     private ForgeNetworkHandler(SimpleChannel channel, boolean clientRequired, boolean serverRequired) {
         this.channel = channel;
         this.clientRequired = clientRequired;
         this.serverRequired = serverRequired;
     }
 
-    public synchronized static CraterNetworkHandler of(String modId, boolean clientRequired, boolean serverRequired) {
-        ForgeNetworkHandler handler = NETWORK_HANDLERS.computeIfAbsent(modId, modId1 -> new ForgeNetworkHandler(buildSimpleChannel(modId1, clientRequired, serverRequired), clientRequired, serverRequired));
-        if (handler.clientRequired != clientRequired)
-            throw new IllegalArgumentException("client channel settings mismatch, expected %s, but was %s".formatted(handler.clientRequired, clientRequired));
-        if (handler.serverRequired != serverRequired)
-            throw new IllegalArgumentException("server channel settings mismatch, expected %s, but was %s".formatted(handler.serverRequired, serverRequired));
-        return handler;
-    }
-
-    private static SimpleChannel buildSimpleChannel(String modId, boolean clientAcceptsVanillaOrMissing, boolean serverAcceptsVanillaOrMissing) {
-        ChannelBuilder builder = ChannelBuilder.named(new ResourceLocation(modId, "crater_network"));
-
-        if (clientAcceptsVanillaOrMissing) {
-            builder = builder.optionalClient();
-        }
-
-        if (serverAcceptsVanillaOrMissing) {
-            builder = builder.optionalServer();
-        }
-
-        return builder.simpleChannel();
-    }
-
     @Override
-    public <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
+    public <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
         BiConsumer<T, FriendlyByteBuf> encoder = CraterPacket::write;
         Function<FriendlyByteBuf, T> decoder = buf -> {
-            T packet = supplier.get();
+          T packet = supplier.get();
-            packet.read(buf);
+          packet.read(buf);
-            return packet;
+          return packet;
         };
 
-        BiConsumer<T, CustomPayloadEvent.Context> handler = (packet, sup) -> {
+        BiConsumer<T, Supplier<NetworkEvent.Context>> handler = (packet, sup) -> {
+            NetworkEvent.Context context = sup.get();
             LogicalSide expectedSide = getSideFromDirection(packetDirection);
-            LogicalSide currentSide = sup.getDirection().getReceptionSide();
+            LogicalSide currentSide = context.getDirection().getReceptionSide();
 
             if (expectedSide != currentSide) {
                 throw new IllegalStateException(String.format("Received message on wrong side, expected %s, was %s", expectedSide, currentSide));
             }
 
-            sup.enqueueWork(() -> {
+            context.enqueueWork(() -> {
                 Player player;
                 if (packetDirection == PacketDirection.TO_CLIENT) {
                     player = ClientPlatform.INSTANCE.getClientPlayer();
                 } else {
-                    player = sup.getSender();
+                    player = context.getSender();
                 }
                 packet.handle(player, LogicalSidedProvider.WORKQUEUE.get(expectedSide));
             });
-            sup.setPacketHandled(true);
+            context.setPacketHandled(true);
         };
-
+        this.channel.registerMessage(this.packetID.getAndIncrement(), (Class<T>) clazz, encoder, decoder, handler);
-        int id = packetID.getAndIncrement();
-        packetMap.put(clazz, id);
-
-        this.channel
-                .messageBuilder((Class<T>) clazz, id)
-                .encoder(encoder)
-                .decoder(decoder)
-                .consumerNetworkThread(handler)
-                .add();
     }
 
     @Override
     public Packet<?> toServerBound(CraterPacket<?> packet) {
-        return NetworkDirection.PLAY_TO_SERVER.buildPacket(toBuffer(packet), channel.getName()).getThis();
+        return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_SERVER);
-        //return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_SERVER);
     }
 
     @Override
     public Packet<?> toClientBound(CraterPacket<?> packet) {
-        return NetworkDirection.PLAY_TO_CLIENT.buildPacket(toBuffer(packet), channel.getName()).getThis();
+        return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_CLIENT);
-        //return this.channel.toVanillaPacket(packet, NetworkDirection.PLAY_TO_CLIENT);
     }
 
     @Override
@@ -129,16 +92,23 @@ public class ForgeNetworkHandler implements CraterNetworkHandler {
         CraterNetworkHandler.super.sendToServer(packet);
     }
 
+    public synchronized static CraterNetworkHandler of(String modId, boolean clientRequired, boolean serverRequired) {
+        ForgeNetworkHandler handler = NETWORK_HANDLERS.computeIfAbsent(modId, modId1 -> new ForgeNetworkHandler(buildSimpleChannel(modId1, clientRequired, serverRequired), clientRequired, serverRequired));
+        if (handler.clientRequired != clientRequired) throw new IllegalArgumentException("client channel settings mismatch, expected %s, but was %s".formatted(handler.clientRequired, clientRequired));
+        if (handler.serverRequired != serverRequired) throw new IllegalArgumentException("server channel settings mismatch, expected %s, but was %s".formatted(handler.serverRequired, serverRequired));
+        return handler;
+    }
+
+    private static SimpleChannel buildSimpleChannel(String modId, boolean clientAcceptsVanillaOrMissing, boolean serverAcceptsVanillaOrMissing) {
+        return NetworkRegistry.ChannelBuilder
+                .named(new ResourceLocation(modId, "crater_network"))
+                .networkProtocolVersion(() -> PROTOCOL)
+                .clientAcceptedVersions(clientAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
+                .serverAcceptedVersions(serverAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
+                .simpleChannel();
+    }
+
     private LogicalSide getSideFromDirection(PacketDirection direction) {
         return direction == PacketDirection.TO_CLIENT ? LogicalSide.CLIENT : LogicalSide.SERVER;
     }
-
-    protected FriendlyByteBuf toBuffer(CraterPacket<?> message) {
-        var msg = packetMap.get(message.getClass());
-
-        var ret = new FriendlyByteBuf(Unpooled.buffer());
-        ret.writeVarInt(msg);
-        message.write(ret);
-        return ret;
-    }
 }

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

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

NeoForge/build.gradle

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

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

@@ -1,28 +0,0 @@
-package com.hypherionmc.craterlib;
-
-import com.hypherionmc.craterlib.api.event.client.LateInitEvent;
-import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import net.minecraft.client.Minecraft;
-import net.neoforged.bus.api.IEventBus;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.neoforge.common.NeoForge;
-
-@Mod(CraterConstants.MOD_ID)
-public class CraterLib {
-
-    public CraterLib(IEventBus eventBus) {
-        NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
-    }
-
-    public void commonSetup(FMLCommonSetupEvent evt) {
-        if (FMLEnvironment.dist.isClient()) {
-            LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options);
-            CraterEventBus.INSTANCE.postEvent(event);
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,129 +0,0 @@
-package com.hypherionmc.craterlib.network;
-
-import com.google.common.collect.Maps;
-import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
-import com.hypherionmc.craterlib.core.network.CraterPacket;
-import com.hypherionmc.craterlib.core.network.PacketDirection;
-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.player.Player;
-import net.neoforged.fml.LogicalSide;
-import net.neoforged.neoforge.common.util.LogicalSidedProvider;
-import net.neoforged.neoforge.network.NetworkEvent;
-import net.neoforged.neoforge.network.NetworkRegistry;
-import net.neoforged.neoforge.network.PlayNetworkDirection;
-import net.neoforged.neoforge.network.simple.MessageFunctions;
-import net.neoforged.neoforge.network.simple.SimpleChannel;
-
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-/**
- * @author HypherionSA
- * Partly inspired by and based on <a href="https://github.com/Fuzss/puzzleslib/blob/1.19/Forge/src/main/java/fuzs/puzzleslib/network/ForgeNetworkHandler.java">...</a>
- */
-public class NeoForgeNetworkHandler implements CraterNetworkHandler {
-
-    private static final Map<String, NeoForgeNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
-    private static final String PROTOCOL = Integer.toString(1);
-
-    private final SimpleChannel channel;
-
-    private final boolean clientRequired;
-
-    private final boolean serverRequired;
-
-    private final AtomicInteger packetID = new AtomicInteger();
-
-    private NeoForgeNetworkHandler(SimpleChannel channel, boolean clientRequired, boolean serverRequired) {
-        this.channel = channel;
-        this.clientRequired = clientRequired;
-        this.serverRequired = serverRequired;
-    }
-
-    public synchronized static CraterNetworkHandler of(String modId, boolean clientRequired, boolean serverRequired) {
-        NeoForgeNetworkHandler handler = NETWORK_HANDLERS.computeIfAbsent(modId, modId1 -> new NeoForgeNetworkHandler(buildSimpleChannel(modId1, clientRequired, serverRequired), clientRequired, serverRequired));
-        if (handler.clientRequired != clientRequired)
-            throw new IllegalArgumentException("client channel settings mismatch, expected %s, but was %s".formatted(handler.clientRequired, clientRequired));
-        if (handler.serverRequired != serverRequired)
-            throw new IllegalArgumentException("server channel settings mismatch, expected %s, but was %s".formatted(handler.serverRequired, serverRequired));
-        return handler;
-    }
-
-    private static SimpleChannel buildSimpleChannel(String modId, boolean clientAcceptsVanillaOrMissing, boolean serverAcceptsVanillaOrMissing) {
-        return NetworkRegistry.ChannelBuilder
-                .named(new ResourceLocation(modId, "crater_network"))
-                .networkProtocolVersion(() -> PROTOCOL)
-                .clientAcceptedVersions(clientAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
-                .serverAcceptedVersions(serverAcceptsVanillaOrMissing ? NetworkRegistry.acceptMissingOr(PROTOCOL) : PROTOCOL::equals)
-                .simpleChannel();
-    }
-
-    @Override
-    public <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
-        BiConsumer<T, FriendlyByteBuf> encoder = CraterPacket::write;
-        Function<FriendlyByteBuf, T> decoder = buf -> {
-            T packet = supplier.get();
-            packet.read(buf);
-            return packet;
-        };
-
-        BiConsumer<T, NetworkEvent.Context> handler = (packet, ctx) -> {
-            LogicalSide expectedSide = getSideFromDirection(packetDirection);
-            LogicalSide currentSide = ctx.getDirection().getReceptionSide();
-
-            if (expectedSide != currentSide) {
-                throw new IllegalStateException(String.format("Received message on wrong side, expected %s, was %s", expectedSide, currentSide));
-            }
-
-            ctx.enqueueWork(() -> {
-                Player player;
-                if (packetDirection == PacketDirection.TO_CLIENT) {
-                    player = ClientPlatform.INSTANCE.getClientPlayer();
-                } else {
-                    player = ctx.getSender();
-                }
-                packet.handle(player, LogicalSidedProvider.WORKQUEUE.get(expectedSide));
-            });
-            ctx.setPacketHandled(true);
-        };
-
-        this.channel.registerMessage(this.packetID.getAndIncrement(), clazz, encoder(encoder), decoder(decoder), buildHandler(handler));
-    }
-
-    @Override
-    public Packet<?> toServerBound(CraterPacket<?> packet) {
-        return this.channel.toVanillaPacket(packet, PlayNetworkDirection.PLAY_TO_SERVER);
-    }
-
-    @Override
-    public Packet<?> toClientBound(CraterPacket<?> packet) {
-        return this.channel.toVanillaPacket(packet, PlayNetworkDirection.PLAY_TO_CLIENT);
-    }
-
-    @Override
-    public void sendToServer(CraterPacket<?> packet) {
-        CraterNetworkHandler.super.sendToServer(packet);
-    }
-
-    private LogicalSide getSideFromDirection(PacketDirection direction) {
-        return direction == PacketDirection.TO_CLIENT ? LogicalSide.CLIENT : LogicalSide.SERVER;
-    }
-
-    private <T> MessageFunctions.MessageEncoder<T> encoder(BiConsumer<T, FriendlyByteBuf> encoder) {
-        return encoder::accept;
-    }
-
-    private <T> MessageFunctions.MessageDecoder<T> decoder(Function<FriendlyByteBuf, T> decoder) {
-        return decoder::apply;
-    }
-
-    private <T> MessageFunctions.MessageConsumer<T> buildHandler(BiConsumer<T, NetworkEvent.Context> handler) {
-        return (message, ctx) -> handler.accept(message, ctx);
-    }
-}

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

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

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

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

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

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

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

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

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

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

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 ext {
-    release = project.properties['release'] ?: false
+    release=project.properties['release'] ?: false
 }
 
 var base_version = "${version_major}.${version_minor}"
@@ -68,7 +68,7 @@ subprojects {
                     'Implementation-Version'  : project.jar.archiveVersion,
                     'Implementation-Vendor'   : mod_author,
                     'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-                    'Timestamp'               : System.currentTimeMillis(),
+                    'Timestamp'              : System.currentTimeMillis(),
                     'Built-On-Java'           : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
                     'Build-On-Minecraft'      : minecraft_version
             ])

gradle.properties

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

settings.gradle

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