[PORT] 25w35a

This reverts commit 78cc17f718.

.gitignore

@@ -22,4 +22,8 @@ eclipse
 run
 
 artifacts
-src/test/**
+src/test/**
+
+workspace
+upstream
+rejects

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/discord.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="ASK" />
-    <option name="description" value="" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <list size="4">
-      <item index="0" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.Mod" />
-      <item index="1" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.Mod.EventHandler" />
-      <item index="2" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.eventhandler.SubscribeEvent" />
-      <item index="3" class="java.lang.String" itemvalue="net.minecraftforge.eventbus.api.SubscribeEvent" />
-    </list>
-  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

.jenkins/Jenkinsfile.deploy

@@ -1,15 +1,24 @@
+def JDK = "21"
+def majorMc = "1.21.9";
+
 pipeline {
     agent {
-        label "master"
+        docker {
+            image "registry.firstdark.dev/java${JDK}:latest"
+            alwaysPull true
+            args '-v gradle-cache:/home/gradle/.gradle'
+        }
     }
-    tools {
-        jdk "JAVA17"
+
+    environment {
+        GRADLE_USER_HOME = '/home/gradle/.gradle'
     }
+
     stages {
         stage("Notify Discord") {
             steps {
                 discordSend webhookURL: env.FDD_WH_ADMIN,
-                        title: "Deploy Started: CraterLib 1.20.2 Deploy #${BUILD_NUMBER}",
+                        title: "Deploy Started: CraterLib ${majorMc} Deploy #${BUILD_NUMBER}",
                         link: env.BUILD_URL,
                         result: 'SUCCESS',
                         description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -38,7 +47,7 @@ pipeline {
             deleteDir()
 
             discordSend webhookURL: env.FDD_WH_ADMIN,
-                    title: "CraterLib 1.20.2 Deploy #${BUILD_NUMBER}",
+                    title: "CraterLib Port Deploy #${BUILD_NUMBER}",
                     link: env.BUILD_URL,
                     result: currentBuild.currentResult,
                     description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"

.jenkins/Jenkinsfile.snapshot

@@ -1,19 +1,35 @@
 def projectName = "CraterLib";
 def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
+def JDK = "21";
+def majorMc = "25w35a";
+def modLoaders = "fabric|quilt";
+def supportedMc = "25w35a";
+def reltype = "experimental";
 
 pipeline {
     agent {
-        label "master"
+        docker {
+            image "registry.firstdark.dev/java${JDK}:latest"
+            alwaysPull true
+            args '-v gradle-cache:/home/gradle/.gradle'
+        }
     }
-    tools {
-        jdk "JAVA17"
+
+    environment {
+        GRADLE_USER_HOME = '/home/gradle/.gradle'
     }
 
     stages {
+        stage('Checkout') {
+            steps {
+                scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*')
+            }
+        }
+
         stage("Notify Discord") {
             steps {
                 discordSend webhookURL: env.SSS_WEBHOOK,
-                        title: "Deploy Started: ${projectName} 1.20.2 Deploy #${BUILD_NUMBER}",
+                        title: "Deploy Started: ${projectName} ${majorMc} Deploy #${BUILD_NUMBER}",
                         link: env.BUILD_URL,
                         result: 'SUCCESS',
                         description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -23,20 +39,14 @@ pipeline {
         stage("Prepare") {
             steps {
                 sh "chmod +x ./gradlew"
-                sh "./gradlew clean"
-            }
-        }
-
-        stage("Build") {
-            steps {
-                sh "./gradlew build"
+                sh "./gradlew build -PreleaseType=${reltype}"
             }
         }
 
         stage("Publish to Maven") {
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh "./gradlew publish"
+                    sh "./gradlew publish -PreleaseType=${reltype}"
                 }
             }
         }
@@ -51,10 +61,10 @@ pipeline {
                 projectSlug: "craterlib",
                 projectName: "${projectName}",
                 projectIcon: "${projectIcon}",
-                versionName: "Snapshot 1.1.${BUILD_NUMBER}",
-                version: "1.1.${BUILD_NUMBER}",
-                modLoaders: "forge|neoforge|fabric|quilt",
-                minecraftVersions: "1.20.2",
+                modLoaders: "${modLoaders}",
+                minecraftVersions: "${supportedMc}",
+                type: "experimental",
+                dependsOn: "",
                 failWebhook: env.SSS_WEBHOOK,
                 publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
 

Common/build.gradle

@@ -1,19 +1,22 @@
 archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
 
 dependencies {
-    implementation "com.hypherionmc:rpcsdk:1.0"
-    implementation("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
+    stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
+    stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
+
+    stupidRemapArch("me.shedaniel.cloth:cloth-config:${cloth_config}")
 }
 
 shadowJar {
     from sourceSets.main.output
+    configurations = [project.configurations.shade]
+
     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.19.1:2.0.0"))
+        exclude(dependency('com.google.code.gson:.*'))
 
         relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
         relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
+        relocate 'net.kyori', 'shadow.kyori'
     }
     setArchiveClassifier("dev")
 }
@@ -46,9 +49,7 @@ processResources {
 publishing {
     publications {
         mavenCommon(MavenPublication) {
-            groupId project.group
             artifactId project.archivesBaseName
-            version project.version
             from components.java
 
             pom.withXml {
@@ -65,12 +66,6 @@ publishing {
     }
 
     repositories {
-        maven {
-            url "https://maven.firstdark.dev/" + (project.release ? "releases" : "snapshots")
-            credentials {
-                username System.getenv("MAVEN_USER")
-                password System.getenv("MAVEN_PASS")
-            }
-        }
+        maven rootProject.orion.getPublishingMaven()
     }
 }

Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java

@@ -0,0 +1,162 @@
+package com.hypherionmc.craterlib.api.commands;
+
+import com.hypherionmc.craterlib.CraterConstants;
+import com.hypherionmc.craterlib.compat.LuckPermsCompat;
+import com.hypherionmc.craterlib.core.platform.LoaderType;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
+import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
+import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import com.hypherionmc.craterlib.utils.TriConsumer;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.BoolArgumentType;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.GameProfileArgument;
+import net.minecraft.world.entity.player.Player;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+public class CraterCommand {
+
+    private final LiteralArgumentBuilder<CommandSourceStack> mojangCommand;
+    private int permLevel = 4;
+    private String luckPermNode = "";
+
+    CraterCommand(LiteralArgumentBuilder<CommandSourceStack> cmd) {
+        this.mojangCommand = cmd;
+    }
+
+    public static CraterCommand literal(String commandName) {
+        return new CraterCommand(Commands.literal(commandName));
+    }
+
+    public CraterCommand requiresPermission(int perm) {
+        this.permLevel = perm;
+        this.mojangCommand.requires(this::checkPermission);
+        return this;
+    }
+
+    public CraterCommand withNode(String key) {
+        this.luckPermNode = key;
+        return this;
+    }
+
+    public CraterCommand then(CraterCommand child) {
+        this.mojangCommand.then(child.mojangCommand);
+        return this;
+    }
+
+    public CraterCommand withGameProfilesArgument(String key, CommandExecutorWithArgs<List<BridgedGameProfile>> executor) {
+        this.mojangCommand.then(Commands.argument(key, GameProfileArgument.gameProfile())
+                .executes(context -> executor.run(
+                        BridgedPlayer.of(context.getSource().getPlayer()),
+                        GameProfileArgument.getGameProfiles(context, key).stream().map(BridgedGameProfile::of).toList(),
+                        BridgedCommandSourceStack.of(context.getSource()))
+                ));
+        return this;
+    }
+
+    public CraterCommand withBoolArgument(String key, CommandExecutorWithArgs<Boolean> executor) {
+        this.mojangCommand.then(Commands.argument(key, BoolArgumentType.bool())
+                .executes(context -> executor.run(
+                        BridgedPlayer.of(context.getSource().getPlayer()),
+                        BoolArgumentType.getBool(context, key),
+                        BridgedCommandSourceStack.of(context.getSource())
+                )));
+        return this;
+    }
+
+    public CraterCommand withWordArgument(String key, CommandExecutorWithArgs<String> executor) {
+        this.mojangCommand.then(Commands.argument(key, StringArgumentType.word())
+                .executes(context -> executor.run(
+                        BridgedPlayer.of(context.getSource().getPlayer()),
+                        StringArgumentType.getString(context, key),
+                        BridgedCommandSourceStack.of(context.getSource())
+                )));
+        return this;
+    }
+
+    public CraterCommand withStringArgument(String key, CommandExecutorWithArgs<String> executor) {
+        this.mojangCommand.then(Commands.argument(key, StringArgumentType.string())
+                .executes(context -> executor.run(
+                        BridgedPlayer.of(context.getSource().getPlayer()),
+                        StringArgumentType.getString(context, key),
+                        BridgedCommandSourceStack.of(context.getSource())
+                )));
+        return this;
+    }
+
+    public CraterCommand withPhraseArgument(String key, CommandExecutorWithArgs<String> executor) {
+        this.mojangCommand.then(Commands.argument(key, StringArgumentType.greedyString())
+                .executes(context -> executor.run(
+                        BridgedPlayer.of(context.getSource().getPlayer()),
+                        StringArgumentType.getString(context, key),
+                        BridgedCommandSourceStack.of(context.getSource())
+                )));
+        return this;
+    }
+
+    public CraterCommand withIntegerArgument(String key, CommandExecutorWithArgs<Integer> executor) {
+        this.mojangCommand.then(Commands.argument(key, IntegerArgumentType.integer())
+                .executes(context -> executor.run(
+                        BridgedPlayer.of(context.getSource().getPlayer()),
+                        IntegerArgumentType.getInteger(context, key),
+                        BridgedCommandSourceStack.of(context.getSource())
+                )));
+        return this;
+    }
+
+    public CraterCommand execute(SingleCommandExecutor<BridgedCommandSourceStack> executor) {
+        this.mojangCommand.executes(context -> executor.run(BridgedCommandSourceStack.of(context.getSource())));
+        return this;
+    }
+
+    @Deprecated(forRemoval = true)
+    public CraterCommand executes(Consumer<BridgedCommandSourceStack> ctx) {
+        return this.execute(stack -> {
+            ctx.accept(stack);
+            return 1;
+        });
+    }
+
+    @Deprecated(forRemoval = true)
+    public CraterCommand withGameProfileArgument(String key, TriConsumer<BridgedPlayer, List<BridgedGameProfile>, BridgedCommandSourceStack> executor) {
+        return this.withGameProfilesArgument(key, (player, argument, stack) -> {
+            executor.accept(player, argument, stack);
+            return 1;
+        });
+    }
+
+    @ApiStatus.Internal
+    public void register(CommandDispatcher<CommandSourceStack> stack) {
+        stack.register(this.mojangCommand);
+    }
+
+    private boolean checkPermission(CommandSourceStack stack) {
+        try {
+            if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty())
+                return stack.hasPermission(this.permLevel);
+
+            return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel);
+        } catch (Exception e) {
+            CraterConstants.LOG.error("Failed to check luckperms permissions", e);
+            return stack.hasPermission(this.permLevel);
+        }
+    }
+
+    @FunctionalInterface
+    public interface CommandExecutorWithArgs<S> {
+        int run(BridgedPlayer player, S argument, BridgedCommandSourceStack stack);
+    }
+
+    @FunctionalInterface
+    public interface SingleCommandExecutor<S> {
+        int run(S stack);
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/event/client/CraterClientTickEvent.java

@@ -1,26 +0,0 @@
-package com.hypherionmc.craterlib.api.event.client;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.client.multiplayer.ClientLevel;
-
-/**
- * @author HypherionSA
- * Cross Modloader Client Tick Event.
- */
-public class CraterClientTickEvent extends CraterEvent {
-
-    private final ClientLevel level;
-
-    public CraterClientTickEvent(ClientLevel level) {
-        this.level = level;
-    }
-
-    public ClientLevel getLevel() {
-        return level;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-}

Common/src/main/java/com/hypherionmc/craterlib/api/event/client/CraterSinglePlayerEvent.java

@@ -1,30 +0,0 @@
-package com.hypherionmc.craterlib.api.event.client;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.world.entity.player.Player;
-
-public class CraterSinglePlayerEvent extends CraterEvent {
-
-    private final Player player;
-
-    public CraterSinglePlayerEvent(Player player) {
-        this.player = player;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-
-    public static class PlayerLogin extends CraterSinglePlayerEvent {
-
-        public PlayerLogin(Player player) {
-            super(player);
-        }
-
-    }
-}

Common/src/main/java/com/hypherionmc/craterlib/api/event/client/LateInitEvent.java

@@ -1,29 +0,0 @@
-package com.hypherionmc.craterlib.api.event.client;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
-
-public class LateInitEvent extends CraterEvent {
-
-    private final Minecraft minecraft;
-    private final Options options;
-
-    public LateInitEvent(Minecraft minecraft, Options options) {
-        this.minecraft = minecraft;
-        this.options = options;
-    }
-
-    public Minecraft getMinecraft() {
-        return minecraft;
-    }
-
-    public Options getOptions() {
-        return options;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-}

Common/src/main/java/com/hypherionmc/craterlib/api/event/client/PlayerJoinRealmEvent.java

@@ -1,22 +0,0 @@
-package com.hypherionmc.craterlib.api.event.client;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import com.mojang.realmsclient.dto.RealmsServer;
-
-public class PlayerJoinRealmEvent extends CraterEvent {
-
-    private final RealmsServer server;
-
-    public PlayerJoinRealmEvent(RealmsServer server) {
-        this.server = server;
-    }
-
-    public RealmsServer getServer() {
-        return server;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-}

Common/src/main/java/com/hypherionmc/craterlib/api/event/client/ScreenEvent.java

@@ -1,49 +0,0 @@
-package com.hypherionmc.craterlib.api.event.client;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.client.gui.screens.Screen;
-
-import java.util.Objects;
-
-public class ScreenEvent extends CraterEvent {
-
-    private final Screen screen;
-
-    protected ScreenEvent(Screen screen) {
-        this.screen = Objects.requireNonNull(screen);
-    }
-
-    public Screen getScreen() {
-        return screen;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-
-    public static class Opening extends ScreenEvent {
-
-        private final Screen currentScreen;
-        private Screen newScreen;
-
-        public Opening(Screen currentScreen, Screen newScreen) {
-            super(newScreen);
-            this.currentScreen = currentScreen;
-            this.newScreen = newScreen;
-        }
-
-        public Screen getCurrentScreen() {
-            return currentScreen;
-        }
-
-        public Screen getNewScreen() {
-            return newScreen;
-        }
-
-        public void setNewScreen(Screen newScreen) {
-            this.newScreen = newScreen;
-        }
-
-    }
-}

Common/src/main/java/com/hypherionmc/craterlib/api/event/common/CraterLivingDeathEvent.java

@@ -1,29 +0,0 @@
-package com.hypherionmc.craterlib.api.event.common;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.LivingEntity;
-
-public class CraterLivingDeathEvent extends CraterEvent {
-
-    private final DamageSource damageSource;
-    private final LivingEntity entity;
-
-    public CraterLivingDeathEvent(LivingEntity entity, DamageSource source) {
-        this.entity = entity;
-        this.damageSource = source;
-    }
-
-    public LivingEntity getEntity() {
-        return entity;
-    }
-
-    public DamageSource getDamageSource() {
-        return damageSource;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return true;
-    }
-}

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

@@ -1,53 +0,0 @@
-package com.hypherionmc.craterlib.api.event.server;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.advancements.Advancement;
-import net.minecraft.advancements.DisplayInfo;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.player.Player;
-
-import java.util.Optional;
-
-public class CraterAdvancementEvent extends CraterEvent {
-
-    private final Advancement advancement;
-    private final Player player;
-    private final Component title;
-    private final Component description;
-
-    public CraterAdvancementEvent(Player player, Advancement advancement) {
-        this.player = player;
-        this.advancement = advancement;
-
-        Optional<DisplayInfo> displayInfo = advancement.display();
-
-        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() {
-        return advancement;
-    }
-
-    public Component getDescription() {
-        return description;
-    }
-
-    public Component getTitle() {
-        return title;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.hypherionmc.craterlib.api.event.server;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import com.mojang.brigadier.ParseResults;
-import net.minecraft.commands.CommandSourceStack;
-
-public class CraterCommandEvent extends CraterEvent {
-
-    private ParseResults<CommandSourceStack> parseResults;
-    private Throwable exception;
-    private String command;
-
-    public CraterCommandEvent(ParseResults<CommandSourceStack> parseResults, String command) {
-        this.parseResults = parseResults;
-        this.command = command;
-    }
-
-    public ParseResults<CommandSourceStack> getParseResults() {
-        return parseResults;
-    }
-
-    public void setParseResults(ParseResults<CommandSourceStack> parseResults) {
-        this.parseResults = parseResults;
-    }
-
-    public Throwable getException() {
-        return exception;
-    }
-
-    public void setException(Throwable exception) {
-        this.exception = exception;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return true;
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.hypherionmc.craterlib.api.event.server;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.server.level.ServerPlayer;
-
-public class CraterPlayerEvent extends CraterEvent {
-
-    private final ServerPlayer player;
-
-    public CraterPlayerEvent(ServerPlayer player) {
-        this.player = player;
-    }
-
-    public ServerPlayer getPlayer() {
-        return player;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-
-    public static class PlayerLoggedIn extends CraterPlayerEvent {
-
-        public PlayerLoggedIn(ServerPlayer player) {
-            super(player);
-        }
-
-    }
-
-    public static class PlayerLoggedOut extends CraterPlayerEvent {
-
-        public PlayerLoggedOut(ServerPlayer player) {
-            super(player);
-        }
-
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.hypherionmc.craterlib.api.event.server;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import com.mojang.brigadier.CommandDispatcher;
-import net.minecraft.commands.CommandSourceStack;
-
-public class CraterRegisterCommandEvent extends CraterEvent {
-
-    private final CommandDispatcher<CommandSourceStack> dispatcher;
-
-    public CraterRegisterCommandEvent(CommandDispatcher<CommandSourceStack> dispatcher) {
-        this.dispatcher = dispatcher;
-    }
-
-    public CommandDispatcher<CommandSourceStack> getDispatcher() {
-        return dispatcher;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.hypherionmc.craterlib.api.event.server;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-
-public class CraterServerChatEvent extends CraterEvent {
-
-    private final String message, username;
-    private final ServerPlayer player;
-    private Component component;
-
-    public CraterServerChatEvent(ServerPlayer player, String message, Component component) {
-        this.message = message;
-        this.player = player;
-        this.username = player.getGameProfile().getName();
-        this.component = component;
-    }
-
-    public Component getComponent() {
-        return component;
-    }
-
-    public void setComponent(Component component) {
-        this.component = component;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public ServerPlayer getPlayer() {
-        return player;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return true;
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.hypherionmc.craterlib.api.event.server;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import net.minecraft.server.MinecraftServer;
-
-public class CraterServerLifecycleEvent extends CraterEvent {
-
-    public CraterServerLifecycleEvent() {
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-
-    public static class Starting extends CraterServerLifecycleEvent {
-
-        private final MinecraftServer server;
-
-        public Starting(MinecraftServer server) {
-            this.server = server;
-        }
-
-        public MinecraftServer getServer() {
-            return server;
-        }
-    }
-
-    public static class Started extends CraterServerLifecycleEvent {
-
-        public Started() {
-        }
-
-    }
-
-    public static class Stopping extends CraterServerLifecycleEvent {
-
-        public Stopping() {
-        }
-
-    }
-
-    public static class Stopped extends CraterServerLifecycleEvent {
-
-        public Stopped() {
-        }
-
-    }
-}

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

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

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

@@ -1,40 +0,0 @@
-package com.hypherionmc.craterlib.api.event.server;
-
-import com.hypherionmc.craterlib.core.event.CraterEvent;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.network.chat.Component;
-
-import java.net.SocketAddress;
-
-public class PlayerPreLoginEvent extends CraterEvent {
-
-    private final SocketAddress address;
-    private final GameProfile gameProfile;
-    private Component message;
-
-    public PlayerPreLoginEvent(SocketAddress address, GameProfile profile) {
-        this.address = address;
-        this.gameProfile = profile;
-    }
-
-    public Component getMessage() {
-        return message;
-    }
-
-    public void setMessage(Component message) {
-        this.message = message;
-    }
-
-    public GameProfile getGameProfile() {
-        return gameProfile;
-    }
-
-    public SocketAddress getAddress() {
-        return address;
-    }
-
-    @Override
-    public boolean canCancel() {
-        return false;
-    }
-}

Common/src/main/java/com/hypherionmc/craterlib/api/events/client/CraterClientTickEvent.java

@@ -0,0 +1,14 @@
+package com.hypherionmc.craterlib.api.events.client;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class CraterClientTickEvent extends CraterEvent {
+
+    private final BridgedClientLevel level;
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/client/CraterSinglePlayerEvent.java

@@ -0,0 +1,21 @@
+package com.hypherionmc.craterlib.api.events.client;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class CraterSinglePlayerEvent extends CraterEvent {
+
+    private final BridgedPlayer player;
+
+    public static class PlayerLogin extends CraterSinglePlayerEvent {
+
+        public PlayerLogin(BridgedPlayer player) {
+            super(player);
+        }
+
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/client/LateInitEvent.java

@@ -0,0 +1,16 @@
+package com.hypherionmc.craterlib.api.events.client;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
+import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class LateInitEvent extends CraterEvent {
+
+    private final BridgedMinecraft minecraft;
+    private final BridgedOptions options;
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/client/PlayerJoinRealmEvent.java

@@ -0,0 +1,14 @@
+package com.hypherionmc.craterlib.api.events.client;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.realmsclient.dto.BridgedRealmsServer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class PlayerJoinRealmEvent extends CraterEvent {
+
+    private final BridgedRealmsServer server;
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/client/ScreenEvent.java

@@ -0,0 +1,27 @@
+package com.hypherionmc.craterlib.api.events.client;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.client.gui.BridgedScreen;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@RequiredArgsConstructor
+public class ScreenEvent extends CraterEvent {
+
+    private final BridgedScreen screen;
+
+    @Getter
+    public static class Opening extends ScreenEvent {
+
+        private final BridgedScreen currentScreen;
+        @Setter private BridgedScreen newScreen;
+
+        public Opening(BridgedScreen currentScreen, BridgedScreen newScreen) {
+            super(newScreen);
+            this.currentScreen = currentScreen;
+            this.newScreen = newScreen;
+        }
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/common/CraterPlayerDeathEvent.java

@@ -0,0 +1,21 @@
+package com.hypherionmc.craterlib.api.events.common;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import com.hypherionmc.craterlib.utils.ChatUtils;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import net.kyori.adventure.text.Component;
+import net.minecraft.world.damagesource.DamageSource;
+
+@RequiredArgsConstructor
+@Getter
+public class CraterPlayerDeathEvent extends CraterEvent {
+
+    private final BridgedPlayer player;
+    private final DamageSource damageSource;
+
+    public Component getDeathMessage() {
+        return ChatUtils.mojangToAdventure(damageSource.getLocalizedDeathMessage(player.toMojang()));
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/compat/FTBRankEvents.java

@@ -0,0 +1,56 @@
+// @excludeplugin
+package com.hypherionmc.craterlib.api.events.compat;
+
+import com.hypherionmc.craterlib.compat.ftbranks.BridgedRank;
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
+import com.mojang.authlib.GameProfile;
+import dev.ftb.mods.ftbranks.api.Rank;
+import lombok.Getter;
+
+public class FTBRankEvents {
+
+    @Getter
+    public static class RankAddedEvent extends CraterEvent {
+        private final BridgedGameProfile gameProfile;
+        private final BridgedRank rank;
+
+        private RankAddedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
+            this.gameProfile = gameProfile;
+            this.rank = rank;
+        }
+
+        public static RankAddedEvent of(GameProfile profile, Rank rank) {
+            return new RankAddedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
+        }
+    }
+
+    @Getter
+    public static class RankRemovedEvent extends CraterEvent {
+        private final BridgedGameProfile gameProfile;
+        private final BridgedRank rank;
+
+        private RankRemovedEvent(BridgedGameProfile gameProfile, BridgedRank rank) {
+            this.gameProfile = gameProfile;
+            this.rank = rank;
+        }
+
+        public static RankRemovedEvent of(GameProfile profile, Rank rank) {
+            return new RankRemovedEvent(BridgedGameProfile.of(profile), BridgedRank.of(rank));
+        }
+    }
+
+    @Getter
+    public static class RankDeletedEvent extends CraterEvent {
+        private final BridgedRank rank;
+
+        private RankDeletedEvent(BridgedRank rank) {
+            this.rank = rank;
+        }
+
+        public static RankDeletedEvent of(Rank rank) {
+            return new RankDeletedEvent(BridgedRank.of(rank));
+        }
+    }
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/compat/LuckPermsCompatEvents.java

@@ -0,0 +1,35 @@
+package com.hypherionmc.craterlib.api.events.compat;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.UUID;
+
+public class LuckPermsCompatEvents {
+
+    @RequiredArgsConstructor(staticName = "of")
+    @Getter
+    public static class GroupAddedEvent extends CraterEvent {
+        private final String identifier;
+        private final UUID uuid;
+        private final String username;
+
+        public BridgedGameProfile toProfile() {
+            return BridgedGameProfile.mojang(uuid, username);
+        }
+    }
+
+    @RequiredArgsConstructor(staticName = "of")
+    @Getter
+    public static class GroupRemovedEvent extends CraterEvent {
+        private final String identifier;
+        private final UUID uuid;
+        private final String username;
+
+        public BridgedGameProfile toProfile() {
+            return BridgedGameProfile.mojang(uuid, username);
+        }
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/compat/PlayerBleedOutEvent.java

@@ -0,0 +1,12 @@
+package com.hypherionmc.craterlib.api.events.compat;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor(staticName = "of")
+@Getter
+public class PlayerBleedOutEvent extends CraterEvent {
+    private final BridgedPlayer player;
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/compat/PlayerRevivedEvent.java

@@ -0,0 +1,12 @@
+package com.hypherionmc.craterlib.api.events.compat;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor(staticName = "of")
+@Getter
+public class PlayerRevivedEvent extends CraterEvent {
+    private final BridgedPlayer player;
+}

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

@@ -0,0 +1,34 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.advancements.BridgedAdvancement;
+import com.hypherionmc.craterlib.nojang.advancements.BridgedDisplayInfo;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.Getter;
+import net.kyori.adventure.text.Component;
+
+import java.util.Optional;
+
+@Getter
+public class CraterAdvancementEvent extends CraterEvent {
+
+    private final BridgedAdvancement advancement;
+    private final BridgedPlayer player;
+    private final Component title;
+    private final Component description;
+
+    public CraterAdvancementEvent(BridgedPlayer player, BridgedAdvancement advancement) {
+        this.advancement = advancement;
+        this.player = player;
+
+        Optional<BridgedDisplayInfo> displayInfo = advancement.displayInfo();
+
+        if (displayInfo.isPresent()) {
+            this.title = displayInfo.get().displayName();
+            this.description = displayInfo.get().description();
+        } else {
+            this.title = Component.text("Unknown");
+            this.description = Component.text("Unknown");
+        }
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java

@@ -0,0 +1,58 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import com.hypherionmc.craterlib.utils.ChatUtils;
+import com.mojang.brigadier.ParseResults;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.context.StringRange;
+import lombok.Getter;
+import lombok.Setter;
+import net.kyori.adventure.text.Component;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.world.entity.player.Player;
+import org.jetbrains.annotations.Nullable;
+
+@Getter
+public class CraterCommandEvent extends CraterEvent {
+
+    private final ParseResults<CommandSourceStack> parseResults;
+    @Setter private Throwable exception;
+    private final String command;
+
+    private CraterCommandEvent(ParseResults<CommandSourceStack> parseResults, String command) {
+        this.parseResults = parseResults;
+        this.command = command;
+    }
+
+    public static CraterCommandEvent of(ParseResults<CommandSourceStack> stack, String command) {
+        return new CraterCommandEvent(stack, command);
+    }
+
+    public String getCommandString() {
+        return parseResults.getReader().getString();
+    }
+
+    @Nullable
+    public BridgedPlayer getPlayer() {
+        try {
+            Player p = parseResults.getContext().getLastChild().getSource().getPlayer();
+
+            if (p != null)
+                return BridgedPlayer.of(p);
+        } catch (Exception ignored) {}
+
+        return null;
+    }
+
+    public String getTarget() {
+        CommandContext<CommandSourceStack> context = parseResults.getContext().build(parseResults.getReader().getString());
+        StringRange selector_range = parseResults.getContext().getArguments().get("targets").getRange();
+        return context.getInput().substring(selector_range.getStart(), selector_range.getEnd());
+    }
+
+    public Component getMessage() {
+        return ChatUtils.mojangToAdventure(ComponentArgument.getRawComponent(parseResults.getContext().build(parseResults.getReader().getString()), "message"));
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterPlayerEvent.java

@@ -0,0 +1,44 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class CraterPlayerEvent extends CraterEvent {
+
+    private final BridgedPlayer player;
+
+    @Getter
+    public static class PlayerLoggedIn extends CraterPlayerEvent {
+        private final boolean isFromVanish;
+
+        public PlayerLoggedIn(BridgedPlayer player) {
+            this(player, false);
+        }
+
+        public PlayerLoggedIn(BridgedPlayer player, boolean isFromVanish) {
+            super(player);
+            this.isFromVanish = isFromVanish;
+        }
+
+    }
+
+    @Getter
+    public static class PlayerLoggedOut extends CraterPlayerEvent {
+        private final boolean isFromVanish;
+
+        public PlayerLoggedOut(BridgedPlayer player) {
+            this(player, false);
+        }
+
+        public PlayerLoggedOut(BridgedPlayer player, boolean isFromVanish) {
+            super(player);
+            this.isFromVanish = isFromVanish;
+        }
+
+    }
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterRegisterCommandEvent.java

@@ -0,0 +1,18 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.api.commands.CraterCommand;
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.mojang.brigadier.CommandDispatcher;
+import lombok.AllArgsConstructor;
+import net.minecraft.commands.CommandSourceStack;
+
+@AllArgsConstructor
+public class CraterRegisterCommandEvent extends CraterEvent {
+
+    private final CommandDispatcher<CommandSourceStack> stack;
+
+    public void registerCommand(CraterCommand cmd) {
+        cmd.register(stack);
+    }
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterServerChatEvent.java

@@ -0,0 +1,25 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.core.event.annot.Cancellable;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.Getter;
+import lombok.Setter;
+import net.kyori.adventure.text.Component;
+
+@Cancellable
+@Getter
+public class CraterServerChatEvent extends CraterEvent {
+
+    public final String message, username;
+    public final BridgedPlayer player;
+    @Setter private Component component;
+
+    public CraterServerChatEvent(BridgedPlayer player, String message, Component component) {
+        this.message = message;
+        this.player = player;
+        this.username = player.getGameProfile().getName();
+        this.component = component;
+    }
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterServerLifecycleEvent.java

@@ -0,0 +1,34 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+public class CraterServerLifecycleEvent extends CraterEvent {
+
+    @RequiredArgsConstructor
+    @Getter
+    public static class Starting extends CraterServerLifecycleEvent {
+        private final BridgedMinecraftServer server;
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    public static class Started extends CraterServerLifecycleEvent {
+        private final BridgedMinecraftServer server;
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    public static class Stopping extends CraterServerLifecycleEvent {
+        private final BridgedMinecraftServer server;
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    public static class Stopped extends CraterServerLifecycleEvent {
+        private final BridgedMinecraftServer server;
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import net.kyori.adventure.text.Component;
+
+import java.util.function.Function;
+
+@RequiredArgsConstructor
+@Getter
+public class MessageBroadcastEvent extends CraterEvent {
+
+    private final Component component;
+    private final Function<BridgedPlayer, Component> function;
+    private final boolean bl;
+    private final String threadName;
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/PlayerPreLoginEvent.java

@@ -0,0 +1,20 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import net.kyori.adventure.text.Component;
+
+import java.net.SocketAddress;
+
+@RequiredArgsConstructor
+@Getter
+public class PlayerPreLoginEvent extends CraterEvent {
+
+    private final SocketAddress address;
+    private final BridgedGameProfile gameProfile;
+    @Setter private Component message;
+
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/ServerStatusEvent.java

@@ -0,0 +1,35 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.network.protocol.status.WrappedServerStatus;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+
+public class ServerStatusEvent {
+
+    @RequiredArgsConstructor
+    @Getter
+    @Setter
+    public static class StatusRequestEvent extends CraterEvent {
+
+        private final Component status;
+        @Nullable
+        private Component newStatus = null;
+
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    @Setter
+    public static class FaviconRequestEvent extends CraterEvent {
+
+        private final Optional<WrappedServerStatus.WrappedFavicon> favicon;
+        private Optional<WrappedServerStatus.WrappedFavicon> newIcon = Optional.empty();
+
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/api/events/server/WhitelistChangedEvent.java

@@ -0,0 +1,26 @@
+package com.hypherionmc.craterlib.api.events.server;
+
+import com.hypherionmc.craterlib.core.event.CraterEvent;
+import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+public class WhitelistChangedEvent {
+
+    @RequiredArgsConstructor
+    @Getter
+    public static final class EntryAdded extends CraterEvent {
+
+        private final BridgedGameProfile profile;
+
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    public static final class EntryRemoved extends CraterEvent {
+
+        private final BridgedGameProfile profile;
+
+    }
+
+}

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

@@ -0,0 +1,18 @@
+package com.hypherionmc.craterlib.api.networking;
+
+import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
+import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+
+public record CommonPacketWrapper<T>(PacketHolder<T> container, T packet) implements CustomPacketPayload {
+    public void encode(BridgedFriendlyByteBuf buf)
+    {
+        container().encoder().accept(packet(), buf);
+    }
+
+    @Override
+    public Type<? extends CustomPacketPayload> type()
+    {
+        return container.type();
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.hypherionmc.craterlib.api.networking;
 
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
+import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 
 import java.util.List;
 
@@ -14,15 +14,15 @@ public interface CraterNetworkHandler {
 
     <T> void sendToServer(T packet, boolean ignoreCheck);
 
-    <T> void sendToClient(T packet, ServerPlayer player);
+    <T> void sendToClient(T packet, BridgedPlayer player);
 
-    default <T> void sendToClients(T packet, List<ServerPlayer> players) {
-        for (ServerPlayer player : players) {
+    default <T> void sendToClients(T packet, List<BridgedPlayer> players) {
+        for (BridgedPlayer player : players) {
             sendToClient(packet, player);
         }
     }
 
-    default <T> void sendToAllClients(T packet, MinecraftServer server) {
-        sendToClients(packet, server.getPlayerList().getPlayers());
+    default <T> void sendToAllClients(T packet, BridgedMinecraftServer server) {
+        sendToClients(packet, server.getPlayers());
     }
 }

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

@@ -0,0 +1,409 @@
+package com.hypherionmc.craterlib.client.gui.config;
+
+import com.hypherionmc.craterlib.CraterConstants;
+import com.hypherionmc.craterlib.client.gui.config.widgets.ClothConfigButtonEntry;
+import com.hypherionmc.craterlib.core.config.AbstractConfig;
+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 me.hypherionmc.moonconfig.core.conversion.SpecComment;
+import me.shedaniel.clothconfig2.api.ConfigBuilder;
+import me.shedaniel.clothconfig2.api.ConfigCategory;
+import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author HypherionSA
+ * A Helper Class to convert {@link AbstractConfig}s into Cloth Config Screens
+ */
+@SuppressWarnings({"rawtypes", "unchecked"})
+@ApiStatus.Internal
+public class ClothConfigScreenBuilder {
+
+    /**
+     * Build a new Cloth Config screen, from an {@link AbstractConfig}
+     *
+     * @param config The {@link AbstractConfig} the config screen is for
+     * @param parent The parent {@link Screen} this screen will return to when closed
+     * @return A fully usable Cloth Config screen
+     */
+    public static Screen buildConfigScreen(AbstractConfig config, @Nullable Screen parent) {
+        ConfigBuilder builder = ConfigBuilder.create()
+                .setParentScreen(parent)
+                .setTitle(getTranslationKey(config, config, null));
+
+        readConfigFields(config, config, builder);
+
+        builder.setSavingRunnable(() -> safeSaveConfig(config));
+        return builder.build();
+    }
+
+    /**
+     * Build a new sub-screen for config entries marked with {@link SubConfig}
+     *
+     * @param config The {@link AbstractConfig} the config screen is for
+     * @param clazz The object or class that the screen is being built for
+     * @param parent The parent {@link Screen} this screen will return to when closed
+     * @return A fully usable Cloth Config screen
+     */
+    private static Screen buildSubScreen(AbstractConfig config, Object clazz, @Nullable Screen parent) {
+        ConfigBuilder builder = ConfigBuilder.create()
+                .setParentScreen(parent)
+                .setTitle(getTranslationKey(config, clazz, null));
+
+        readConfigFields(config, clazz, builder);
+
+        builder.setSavingRunnable(() -> safeSaveConfig(config));
+        return builder.build();
+    }
+
+    /**
+     * Build a new screen, that allows editing lists of complex objects, like a list of Classes
+     *
+     * @param config The {@link AbstractConfig} the config screen is for
+     * @param list The list of objects this screen will be responsible for
+     * @param field The field this list belongs to in the main config
+     * @param invoker The object used to invoke the field, when setting the new value
+     * @param parent The parent {@link Screen} this screen will return to when closed
+     * @param edited Was this list edited
+     * @return A fully usable Cloth Config screen
+     */
+    private static Screen buildListScreen(AbstractConfig config, List list, Field field, Object invoker, @Nullable Screen parent, boolean edited) {
+        ConfigBuilder builder = ConfigBuilder.create()
+                .setParentScreen(parent)
+                .setTitle(getTranslationKey(config, invoker, field.getName()));
+
+        ConfigCategory category = builder.getOrCreateCategory(Component.literal("Entries"));
+
+        // Handle Existing items in the list
+        for (int i = 0; i < list.size(); i++) {
+            Object item = list.get(i);
+
+            int finalI = i;
+            // Add a button to open the edit screen, as well as a delete button
+            category.addEntry(
+                    new ClothConfigButtonEntry(
+                            Component.translatable("cl.buttons.entry", (i + 1)),
+                            Component.translatable("cl.buttons.edit"),
+                            button -> Minecraft.getInstance().setScreen(
+                                    buildSubScreen(config, item, builder.build())
+                            ),
+                            button -> {
+                                list.remove(finalI);
+                                saveFieldValue(list, field, invoker);
+                                Minecraft.getInstance().setScreen(buildListScreen(config, list, field, invoker, parent, true));
+                            },
+                            edited
+                    )
+            );
+        }
+
+        // Add a button to add new list entries
+        Type listType = field.getGenericType();
+        if (listType instanceof ParameterizedType paramType) {
+            Class<?> elementType = (Class<?>) paramType.getActualTypeArguments()[0];
+
+            category.addEntry(
+                    new ClothConfigButtonEntry(
+                            Component.literal(""),
+                            Component.translatable("cl.buttons.add_entry"),
+                            button -> {
+                                try {
+                                    Object newItem = elementType.getDeclaredConstructor().newInstance();
+                                    list.add(newItem);
+                                    saveFieldValue(list, field, invoker);
+                                    Minecraft.getInstance().setScreen(buildListScreen(config, list, field, invoker, parent, true));
+                                } catch (Exception e) {
+                                    CraterConstants.LOG.error("Failed to create new list entry", e);
+                                }
+                            }
+                    )
+            );
+        }
+
+        builder.setSavingRunnable(() -> safeSaveConfig(config));
+        return builder.build();
+    }
+
+    /**
+     * A helper method to convert an {@link AbstractConfig} into the corresponding cloth config gui fields
+     *
+     * @param baseConfig The {@link AbstractConfig} to convert
+     * @param config The base class that is being processed
+     * @param builder The {@link ClothConfigScreenBuilder} we are currently working with
+     */
+    private static void readConfigFields(AbstractConfig baseConfig, Object config, ConfigBuilder builder) {
+        ConfigEntryBuilder entryBuilder = builder.entryBuilder();
+        ConfigCategory configCategory = builder.getOrCreateCategory(Component.literal("General"));
+
+        for (Field field : config.getClass().getDeclaredFields()) {
+            try {
+                field.setAccessible(true);
+
+                // We ignore static, transient fields or fields marked with @HideFromScreen
+                final int fieldModifiers = field.getModifiers();
+                if (Modifier.isStatic(fieldModifiers) || Modifier.isTransient(fieldModifiers) || field.isAnnotationPresent(HideFromScreen.class))
+                    continue;
+
+                Object val = field.get(config);
+
+                // Field is marked as sub-config, so we add a button field for it
+                if (field.isAnnotationPresent(SubConfig.class)) {
+                    if (val != null) {
+                        configCategory.addEntry(
+                                new ClothConfigButtonEntry(
+                                        Component.translatable("cl.config." + baseConfig.getClass().getSimpleName().toLowerCase() + "." + field.getName().toLowerCase()),
+                                        Component.translatable("cl.buttons.edit"),
+                                        button -> Minecraft.getInstance().setScreen(
+                                                buildSubScreen(baseConfig, val, builder.build())
+                                        )
+                                )
+                        );
+                        continue;
+                    }
+                }
+
+                // Boolean Values
+                if (val instanceof Boolean bool) {
+                    configCategory.addEntry(entryBuilder.startBooleanToggle(getTranslationKey(baseConfig, config, field.getName()), bool)
+                            .setTooltip(getToolTip(field))
+                            .setSaveConsumer(newValue -> saveFieldValue(newValue, field, config))
+                            .setDefaultValue(bool).build());
+                }
+
+                // Enum Values
+                if (val instanceof Enum<?> enumValue) {
+                    Class<Enum> enumClass = (Class<Enum>)enumValue.getDeclaringClass();
+                    configCategory.addEntry(entryBuilder.startEnumSelector(
+                                    getTranslationKey(baseConfig, config, field.getName()),
+                                    enumClass,
+                                    enumValue)
+                            .setTooltip(getToolTip(field))
+                            .setSaveConsumer(newValue -> saveFieldValue(newValue, field, config))
+                            .setDefaultValue(enumValue)
+                            .build());
+                }
+
+                // Int Values
+                if (val instanceof Integer intt) {
+                    configCategory.addEntry(entryBuilder.startIntField(getTranslationKey(baseConfig, config, field.getName()), intt)
+                            .setTooltip(getToolTip(field))
+                            .setSaveConsumer(newValue -> saveFieldValue(newValue, field, config))
+                            .setDefaultValue(intt).build());
+                }
+
+                // Long Values
+                if (val instanceof Long longt) {
+                    configCategory.addEntry(entryBuilder.startLongField(getTranslationKey(baseConfig, config, field.getName()), longt)
+                            .setTooltip(getToolTip(field))
+                            .setSaveConsumer(newValue -> saveFieldValue(newValue, field, config))
+                            .setDefaultValue(longt).build());
+                }
+
+                // Float Values
+                if (val instanceof Float floatt) {
+                    configCategory.addEntry(entryBuilder.startFloatField(getTranslationKey(baseConfig, config, field.getName()), floatt)
+                            .setTooltip(getToolTip(field))
+                            .setSaveConsumer(newValue -> saveFieldValue(newValue, field, config))
+                            .setDefaultValue(floatt).build());
+                }
+
+                // Double Values
+                if (val instanceof Double doublet) {
+                    configCategory.addEntry(entryBuilder.startDoubleField(getTranslationKey(baseConfig, config, field.getName()), doublet)
+                            .setTooltip(getToolTip(field))
+                            .setSaveConsumer(newValue -> saveFieldValue(newValue, field, config))
+                            .setDefaultValue(doublet).build());
+                }
+
+                // String Values
+                if (val instanceof String string) {
+                    configCategory.addEntry(entryBuilder.startStrField(getTranslationKey(baseConfig, config, field.getName()), string)
+                            .setTooltip(getToolTip(field))
+                            .setSaveConsumer(newValue -> saveFieldValue(newValue, field, config))
+                            .setDefaultValue(string).build());
+                }
+
+                // Lists
+                if (val instanceof List<?> list) {
+                    Type listType = field.getGenericType();
+                    if (listType instanceof ParameterizedType paramType) {
+                        Type elementType = paramType.getActualTypeArguments()[0];
+
+                        // String List
+                        if (elementType.equals(String.class)) {
+                            configCategory.addEntry(entryBuilder.startStrList(getTranslationKey(baseConfig, config, field.getName()), (List<String>) list)
+                                    .setTooltip(getToolTip(field))
+                                    .setSaveConsumer(newValue -> saveFieldValue(new ArrayList<>(newValue), field, config))
+                                    .setDefaultValue((List<String>) list).build());
+
+                            // Int List
+                        } else if (elementType.equals(Integer.class)) {
+                            configCategory.addEntry(entryBuilder.startIntList(getTranslationKey(baseConfig, config, field.getName()), (List<Integer>) list)
+                                    .setTooltip(getToolTip(field))
+                                    .setSaveConsumer(newValue -> saveFieldValue(new ArrayList<>(newValue), field, config))
+                                    .setDefaultValue((List<Integer>) list).build());
+
+                            // Long List
+                        } else if (elementType.equals(Long.class)) {
+                            configCategory.addEntry(entryBuilder.startLongList(getTranslationKey(baseConfig, config, field.getName()), (List<Long>) list)
+                                    .setTooltip(getToolTip(field))
+                                    .setSaveConsumer(newValue -> saveFieldValue(new ArrayList<>(newValue), field, config))
+                                    .setDefaultValue((List<Long>) list).build());
+
+                            // Float List
+                        } else if (elementType.equals(Float.class)) {
+                            configCategory.addEntry(entryBuilder.startFloatList(getTranslationKey(baseConfig, config, field.getName()), (List<Float>) list)
+                                    .setTooltip(getToolTip(field))
+                                    .setSaveConsumer(newValue -> saveFieldValue(new ArrayList<>(newValue), field, config))
+                                    .setDefaultValue((List<Float>) list).build());
+
+                            // Double List
+                        } else if (elementType.equals(Double.class)) {
+                            configCategory.addEntry(entryBuilder.startDoubleList(getTranslationKey(baseConfig, config, field.getName()), (List<Double>) list)
+                                    .setTooltip(getToolTip(field))
+                                    .setSaveConsumer(newValue -> saveFieldValue(new ArrayList<>(newValue), field, config))
+                                    .setDefaultValue((List<Double>) list).build());
+                        } else {
+                            // List of complex objects
+                            configCategory.addEntry(
+                                    new ClothConfigButtonEntry(
+                                            getTranslationKey(baseConfig, config, field.getName()),
+                                            Component.translatable("cl.buttons.edit"),
+                                            button -> Minecraft.getInstance().setScreen(
+                                                    buildListScreen(baseConfig, list, field, config, builder.build(), false)
+                                            )
+                                    )
+                            );
+                        }
+                    }
+                }
+
+            } catch (Exception e) {
+                CraterConstants.LOG.error("Failed to process config file {}", baseConfig.getConfigName(), e);
+            }
+        }
+    }
+
+    /**
+     * Helper method to supply tooltips to config fields.
+     * If the field has an {@link SpecComment}, we use that, otherwise we use the {@link Tooltip} annotation
+     * or generate one from the field name
+     *
+     * @param field The field that is being processed
+     * @return A {@link Component} that can be used for the tooltip
+     */
+    private static Component getToolTip(Field field) {
+        Component component = Component.empty();
+
+        if (field.isAnnotationPresent(SpecComment.class)) {
+            SpecComment comment = field.getAnnotation(SpecComment.class);
+            component = Component.literal(comment.value());
+        }
+
+        if (field.isAnnotationPresent(Tooltip.class)) {
+            Tooltip tooltip = field.getAnnotation(Tooltip.class);
+            Component c = Component.empty();
+
+            for (String comment : tooltip.value()) {
+                c.getSiblings().add(Component.literal(comment));
+            }
+
+            component = c;
+        }
+
+        return component;
+    }
+
+    /**
+     * A helper method to build translation keys for config screens, fields etc
+     *
+     * @param baseConfig The {@link AbstractConfig} being processed
+     * @param currentConfig The field being processed
+     * @param fieldName The raw name of the field
+     * @return A {@link Component} with the new translation key
+     */
+    private static Component getTranslationKey(AbstractConfig baseConfig, Object currentConfig, String fieldName) {
+        String baseKey = "cl.config." + baseConfig.getClass().getSimpleName().toLowerCase();
+
+        if (currentConfig != baseConfig) {
+            baseKey += "." + currentConfig.getClass().getSimpleName().toLowerCase();
+        }
+
+        if (fieldName != null) {
+            baseKey += "." + fieldName.toLowerCase();
+        }
+
+        return Component.translatable(baseKey);
+    }
+
+    /**
+     * Helper method to write changes values back to the config using reflection
+     *
+     * @param value The new value of the field
+     * @param field The field that needs to be updated
+     * @param config The object used to invoke the field for updating
+     */
+    private static void saveFieldValue(Object value, Field field, Object config) {
+        try {
+            if (value instanceof List && !field.getType().equals(List.class)) {
+                List newList = (List)field.getType().getDeclaredConstructor().newInstance();
+                newList.addAll((List)value);
+                field.set(config, newList);
+            } else {
+                field.set(config, value);
+            }
+        } catch (Exception e) {
+            CraterConstants.LOG.error("Failed to write config field {}", field.getName(), e);
+        }
+    }
+
+    /**
+     * Safety method to prevent config screens from corrupting configs. In some edge cases, the config gui
+     * can generate invalid values, that cause the config saving to fail, and then save an empty file.
+     * This method makes a backup of the config before writing to it, and restores the backup if it fails
+     *
+     * @param config The {@link AbstractConfig} being saved
+     */
+    private static void safeSaveConfig(AbstractConfig config) {
+        File configPath = config.getConfigPath();
+        Path backupPath = configPath.toPath().resolveSibling(configPath.getName() + ".bak");
+
+        try {
+            Files.copy(configPath.toPath(), backupPath, StandardCopyOption.REPLACE_EXISTING);
+            config.saveConfig(config);
+            Files.deleteIfExists(backupPath);
+        } catch (Exception e) {
+            Minecraft.getInstance().getToastManager().addToast(
+                    new SystemToast(
+                            SystemToast.SystemToastId.PACK_LOAD_FAILURE,
+                            Component.literal("Failed To Save Config"),
+                            Component.literal("Restoring Backup Copy. Check log for details"))
+            );
+            CraterConstants.LOG.error("Failed to save config, restoring backup", e);
+            try {
+                Files.copy(backupPath, configPath.toPath(), StandardCopyOption.REPLACE_EXISTING);
+                config.configReloaded();
+            } catch (Exception restoreError) {
+                CraterConstants.LOG.error("Failed to restore config backup", restoreError);
+            }
+        }
+    }
+
+}

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

@@ -2,7 +2,7 @@ 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.config.ModuleConfig;
+import com.hypherionmc.craterlib.core.config.AbstractConfig;
 import com.hypherionmc.craterlib.core.config.annotations.HideFromScreen;
 import com.hypherionmc.craterlib.core.config.annotations.SubConfig;
 import com.hypherionmc.craterlib.core.config.annotations.Tooltip;
@@ -37,6 +37,8 @@ import java.util.function.Supplier;
 /**
  * @author HypherionSA
  */
+@SuppressWarnings("deprecation")
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class CraterConfigScreen extends Screen {
     public static final float SCROLLBAR_BOTTOM_COLOR = .5f;
     public static final float SCROLLBAR_TOP_COLOR = .67f;
@@ -44,11 +46,11 @@ public class CraterConfigScreen extends Screen {
     private static final int BOTTOM = 24;
     private final Screen parent;
     private final List<Option<?>> options = new ArrayList<>();
-    private final ModuleConfig config;
+    private final AbstractConfig config;
     public double scrollerAmount;
     private boolean dragging;
 
-    public CraterConfigScreen(ModuleConfig config, Screen parent, Object subConfig) {
+    public CraterConfigScreen(AbstractConfig config, Screen parent, Object subConfig) {
         super(Component.translatable("cl." + config.getClass().getSimpleName().toLowerCase() + ".title"));
         this.parent = parent;
         this.config = config;
@@ -59,7 +61,7 @@ public class CraterConfigScreen extends Screen {
         }
     }
 
-    public CraterConfigScreen(ModuleConfig config, Screen parent) {
+    public CraterConfigScreen(AbstractConfig config, Screen parent) {
         this(config, parent, null);
     }
 
@@ -158,7 +160,7 @@ public class CraterConfigScreen extends Screen {
             return new TextConfigOption<>(Objects::toString, BigDecimal::new);
         }
         if (value instanceof ResourceLocation) {
-            return new TextConfigOption<>(Objects::toString, ResourceLocation::new);
+            return new TextConfigOption<>(Objects::toString, ResourceLocation::parse);
         }
         if (isSubConfig) {
             return new SubConfigWidget<>(config, this, value);
@@ -178,7 +180,7 @@ 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);
+        /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
         renderScrollBar();
 
         matrices.pose().pushPose();
@@ -197,7 +199,7 @@ public class CraterConfigScreen extends Screen {
             option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta);
             renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0]));
             y += height1;
-        }
+        }*/
     }
 
     private void renderScrollBar() {
@@ -216,49 +218,47 @@ public class CraterConfigScreen extends Screen {
             int maxY = this.height - BOTTOM;
             //RenderSystem.disableTexture();
             Tesselator tesselator = Tesselator.getInstance();
-            BufferBuilder buffer = tesselator.getBuilder();
-            RenderSystem.setShader(GameRenderer::getPositionColorShader);
-            buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+            BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+            //RenderSystem.setShader(RenderSystem.getShader());
 
-            buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex();
-            buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex();
-            buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex();
-            buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex();
+            buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255);
+            buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255);
+            buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255);
+            buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255);
 
-            buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
-            buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
-            buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
-            buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex();
-            buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
-            buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
-            buffer.vertex((scrollbarPositionMaxX - 1), minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
-            buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex();
-            tesselator.end();
-            RenderSystem.disableBlend();
+            buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
+            buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
+            buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
+            buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
+            buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
+            buffer.addVertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
+            buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
+            buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
+            //BufferUploader.drawWithShader(buffer.buildOrThrow());
+            //RenderSystem.disableBlend();
             //RenderSystem.enableTexture();
         }
     }
 
     private void renderShadow(PoseStack matrices) {
         Tesselator tesselator = Tesselator.getInstance();
-        BufferBuilder buffer = tesselator.getBuilder();
-        RenderSystem.enableBlend();
-        RenderSystem.blendFuncSeparate(770, 771, 0, 1);
+        BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+        //RenderSystem.enableBlend();
+        //RenderSystem.blendFuncSeparate(770, 771, 0, 1);
         //RenderSystem.disableTexture();
-        RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+        //RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
         Matrix4f matrix = matrices.last().pose();
-        buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
-        buffer.vertex(matrix, 0, TOP + 4, 0.0F).uv(0, 1).color(0, 0, 0, 0).endVertex();
-        buffer.vertex(matrix, width, TOP + 4, 0.0F).uv(1, 1).color(0, 0, 0, 0).endVertex();
-        buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex();
-        buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex();
-        buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex();
-        buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex();
-        buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex();
-        buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex();
-        tesselator.end();
+        buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0);
+        buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0);
+        buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185);
+        buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185);
+        buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185);
+        buffer.addVertex(matrix, width, height - BOTTOM, 0.0F).setUv(1, 1).setColor(0, 0, 0, 185);
+        buffer.addVertex(matrix, width, height - BOTTOM - 4, 0.0F).setUv(1, 0).setColor(0, 0, 0, 0);
+        buffer.addVertex(matrix, 0, height - BOTTOM - 4, 0.0F).setUv(0, 0).setColor(0, 0, 0, 0);
+        //BufferUploader.drawWithShader(buffer.buildOrThrow());
         //RenderSystem.enableTexture();
-        RenderSystem.disableBlend();
+        //RenderSystem.disableBlend();
     }
 
     protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) {
@@ -267,16 +267,15 @@ 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);
-        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();
-        buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex();
-        buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex();
-        tesselator.end();
+        BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+        //RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+        //RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+        //RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
+        buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
+        buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
+        buffer.addVertex(matrix, minX, minY, 0.0F).setUv(minX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
+        //BufferUploader.drawWithShader(buffer.buildOrThrow());
     }
 
     public int scrollHeight() {
@@ -343,9 +342,9 @@ public class CraterConfigScreen extends Screen {
     }
 
     @Override
-    public boolean mouseClicked(double d, double e, int i) {
+    public boolean mouseClicked(double d, double e, int i, boolean bl) {
         this.dragging = i == 0 && d >= width - 6 && d < width;
-        return super.mouseClicked(d, e, i) || dragging;
+        return super.mouseClicked(d, e, i, bl);
     }
 
     @Override
@@ -386,7 +385,7 @@ public class CraterConfigScreen extends Screen {
                 for (String desc : description) {
                     list.add(Component.translatable(desc));
                 }
-                stack.renderComponentTooltip(font, list, mouseX, mouseY);
+                //stack.renderComponentTooltip(font, list, mouseX, mouseY);
             }
         }
     }

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

@@ -10,6 +10,7 @@ import net.minecraft.client.gui.components.EditBox;
  * Copied from Cloth Config Lite
  * <a href="https://github.com/shedaniel/cloth-config-lite/blob/1.17/src/main/java/me/shedaniel/clothconfiglite/impl/option/AbstractWidgetOption.java">...</a>
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class AbstractConfigWidget<T, W extends AbstractWidget> extends BaseWidget<T> {
 
     public static final int buttonWidth = 200;

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

@@ -13,6 +13,7 @@ import net.minecraft.network.chat.TextColor;
  * Copied from Cloth Config Lite
  * <a href="https://github.com/shedaniel/cloth-config-lite/blob/1.17/src/main/java/me/shedaniel/clothconfiglite/impl/option/BaseOption.java">...</a>
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class BaseWidget<T> extends Option<T> {
 
     public static final int resetButtonOffset = 48;

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

@@ -0,0 +1,128 @@
+package com.hypherionmc.craterlib.client.gui.config.widgets;
+
+import com.mojang.blaze3d.platform.Window;
+import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.narration.NarratableEntry;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author HypherionSA
+ * A Custom Cloth Config GUI entry to allow buttons to be added to the GUI
+ */
+public class ClothConfigButtonEntry extends AbstractConfigListEntry<Void> {
+
+    private final Button button;
+    private final Button deleteButton;
+    private final Component displayName;
+    private final boolean hasDeleteButton;
+    private final boolean wasEdited;
+
+    /**
+     * Create a new Cloth Button Entry, that will have no delete button
+     *
+     * @param displayName The Display Name that will be used for the field
+     * @param fieldName The Display Name that will be used on the button
+     * @param onPress The Action to perform when the button was pressed
+     */
+    public ClothConfigButtonEntry(Component displayName, Component fieldName, @Nullable Button.OnPress onPress) {
+        this(displayName, fieldName, onPress, null, false);
+    }
+
+    /***
+     * Create a new Cloth Button Entry, with optional delete button
+     *
+     * @param displayName The Display Name that will be used for the field
+     * @param fieldName The Display Name that will be used on the button
+     * @param onPress The Action to perform when the button was pressed
+     * @param deletePress The Action to perform when the delete button is pressed. If this is null, the button is disabled
+     * @param wasEdited Was a change made to the field this button belongs to. This is to tell cloth to enable the save button
+     */
+    public ClothConfigButtonEntry(Component displayName, Component fieldName, Button.OnPress onPress, @Nullable Button.OnPress deletePress, boolean wasEdited) {
+        super(fieldName, false);
+        this.hasDeleteButton = deletePress != null;
+        this.wasEdited = wasEdited;
+
+        int mainButtonWidth = hasDeleteButton ? 75 : 100;
+        this.button = Button.builder(fieldName, onPress).size(mainButtonWidth, 20).pos(0, 0).build();
+        this.deleteButton = deletePress != null ? Button.builder(Component.literal("X"), deletePress).size(20, 20).pos(0, 0).build() : null;
+        this.displayName = displayName;
+    }
+
+    @Override
+    public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
+        Window window = Minecraft.getInstance().getWindow();
+        Component displayedFieldName = displayName;
+        if (Minecraft.getInstance().font.isBidirectional()) {
+            matrices.drawString(Minecraft.getInstance().font, displayedFieldName.getVisualOrderText(), window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName), y + 6, 16777215);
+            this.button.setX(x);
+            if (hasDeleteButton) {
+                this.deleteButton.setX(x + this.button.getWidth() + 4);
+            }
+        } else {
+            matrices.drawString(Minecraft.getInstance().font, displayedFieldName.getVisualOrderText(), x, y + 6, this.getPreferredTextColor());
+            if (hasDeleteButton) {
+                this.button.setX(x + entryWidth - this.button.getWidth() - 24);
+                this.deleteButton.setX(x + entryWidth - 20);
+            } else {
+                this.button.setX(x + entryWidth - this.button.getWidth());
+            }
+        }
+
+        button.setY(y + (entryHeight - 20) / 2);
+        button.render(matrices, mouseX, mouseY, delta);
+
+        if (hasDeleteButton) {
+            deleteButton.setY(y + (entryHeight - 20) / 2);
+            deleteButton.render(matrices, mouseX, mouseY, delta);
+        }
+    }
+
+    @Override
+    public Void getValue() { return null; }
+
+    @Override
+    public Optional<Void> getDefaultValue() { return Optional.empty(); }
+
+    @Override
+    public void save() {}
+
+    @NotNull
+    @Override
+    public List<? extends GuiEventListener> children() {
+        ArrayList<GuiEventListener> children = new ArrayList<>();
+        children.add(button);
+
+        if (hasDeleteButton) {
+            children.add(deleteButton);
+        }
+
+        return children;
+    }
+
+    @Override
+    public List<? extends NarratableEntry> narratables() {
+        ArrayList<NarratableEntry> children = new ArrayList<>();
+        children.add(button);
+
+        if (hasDeleteButton) {
+            children.add(deleteButton);
+        }
+
+        return children;
+    }
+
+    @Override
+    public boolean isEdited() {
+        return wasEdited;
+    }
+}

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

@@ -6,11 +6,11 @@ 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
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class InternalConfigButton extends AbstractButton {
 
     CraterConfigScreen screen;
@@ -23,7 +23,7 @@ public class InternalConfigButton extends AbstractButton {
     }
 
     @Override
-    public void render(@NotNull GuiGraphics poseStack, int i, int j, float f) {
+    protected void renderWidget(GuiGraphics arg, int i, int j, float f) {
         if (cancel) {
             setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
         } else {
@@ -31,7 +31,7 @@ public class InternalConfigButton extends AbstractButton {
             active = screen.isEdited() && !hasErrors;
             setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
         }
-        super.render(poseStack, i, j, f);
+        super.renderWidget(arg, i, j, f);
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package com.hypherionmc.craterlib.client.gui.config.widgets;
 
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
@@ -18,6 +20,7 @@ import java.util.function.Supplier;
  * Copied from Cloth Config Lite
  * <a href="https://github.com/shedaniel/cloth-config-lite/blob/1.17/src/main/java/me/shedaniel/clothconfiglite/impl/option/Option.java">...</a>
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public abstract class Option<T> extends AbstractContainerEventHandler {
 
     public Component text;
@@ -28,16 +31,10 @@ public abstract class Option<T> extends AbstractContainerEventHandler {
     public T value;
     public boolean hasErrors;
     public List<? extends GuiEventListener> children = new ArrayList<>();
+    @Setter
+    @Getter
     private List<String> langKeys = new ArrayList<>();
 
-    public List<String> getLangKeys() {
-        return langKeys;
-    }
-
-    public void setLangKeys(List<String> langKeys) {
-        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 int height() {

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

@@ -1,7 +1,7 @@
 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.hypherionmc.craterlib.core.config.AbstractConfig;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
@@ -12,13 +12,14 @@ import net.minecraft.network.chat.Component;
 /**
  * @author HypherionSA
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class SubConfigWidget<T> extends AbstractConfigWidget<T, Button> {
 
     private final Object subConfig;
-    private final ModuleConfig config;
+    private final AbstractConfig config;
     private final Screen screen;
 
-    public SubConfigWidget(ModuleConfig config, Screen screen, Object subConfig) {
+    public SubConfigWidget(AbstractConfig config, Screen screen, Object subConfig) {
         this.config = config;
         this.subConfig = subConfig;
         this.screen = screen;

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

@@ -10,6 +10,7 @@ import java.util.function.Function;
  * Copied from Cloth Config Lite
  * <a href="https://github.com/shedaniel/cloth-config-lite/blob/1.17/src/main/java/me/shedaniel/clothconfiglite/impl/option/TextFieldOption.java">...</a>
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class TextConfigOption<T> extends AbstractConfigWidget<T, WrappedEditBox> {
 
     private final Function<T, String> toString;

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

@@ -10,6 +10,7 @@ import java.util.function.Function;
  * Copied from Cloth Config Lite
  * <a href="https://github.com/shedaniel/cloth-config-lite/blob/1.17/src/main/java/me/shedaniel/clothconfiglite/impl/option/ToggleOption.java">...</a>
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class ToggleButton<T> extends AbstractConfigWidget<T, Button> {
 
     private final List<T> options;

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

@@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author HypherionSA
  */
+@Deprecated(forRemoval = true, since = "2.1.3")
 public class WrappedEditBox extends EditBox {
 
     public WrappedEditBox(Font font, int i, int j, int k, int l, @NotNull Component component) {

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

@@ -1,51 +0,0 @@
-package com.hypherionmc.craterlib.client.gui.widgets;
-
-import net.minecraft.client.gui.components.AbstractSliderButton;
-import net.minecraft.network.chat.Component;
-
-/**
- * @author HypherionSA
- * A custom slider widget used for Time. Mostly used by the Hyper Lighting Smoke Machine
- */
-public class TimeSliderWidget extends AbstractSliderButton {
-
-    private final double maxValue;
-    private final ISliderChanged sliderChanged;
-
-    public TimeSliderWidget(int x, int y, int width, int height, Component text, double value, double maxValue, ISliderChanged sliderChanged) {
-        super(x, y, width, height, text, value / maxValue);
-        this.maxValue = maxValue;
-        this.sliderChanged = sliderChanged;
-        this.updateMessage();
-    }
-
-    @Override
-    protected void updateMessage() {
-        this.setMessage(getDisplayString());
-    }
-
-    @Override
-    protected void applyValue() {
-        this.sliderChanged.onSliderChange(this);
-    }
-
-    private Component getDisplayString() {
-        long seconds = Math.round(this.value * this.maxValue / 20);
-        long minutes = Math.round(seconds / 60);
-        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);
-        } else {
-            return Component.literal(seconds + " Seconds");
-        }
-    }
-
-    public double getValue() {
-        return this.value;
-    }
-
-    public interface ISliderChanged {
-        void onSliderChange(TimeSliderWidget slider);
-    }
-}

Common/src/main/java/com/hypherionmc/craterlib/client/mentions/MentionCondition.java

@@ -0,0 +1,13 @@
+package com.hypherionmc.craterlib.client.mentions;
+
+/**
+ * Based on <a href="https://github.com/SarahIsWeird/MoreChatSuggestions/blob/main/src/main/java/com/sarahisweird/morechatsuggestions/SuggestionCondition.java">...</a>
+ */
+@FunctionalInterface
+public interface MentionCondition {
+
+    boolean shouldAddMention(String currentWord);
+
+    MentionCondition ALWAYS = currentWord -> true;
+
+}

Common/src/main/java/com/hypherionmc/craterlib/client/mentions/MentionsController.java

@@ -0,0 +1,47 @@
+package com.hypherionmc.craterlib.client.mentions;
+
+import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Based on <a href="https://github.com/SarahIsWeird/MoreChatSuggestions/blob/main/src/main/java/com/sarahisweird/morechatsuggestions/client/MoreChatSuggestions.java">...</a>
+ */
+public class MentionsController {
+
+    private static final Map<ResourceIdentifier, Collection<String>> mentions = new LinkedHashMap<>();
+    private static final Map<ResourceIdentifier, MentionCondition> mentionConditions = new LinkedHashMap<>();
+    @Getter
+    private static boolean lastMentionConditional = true;
+
+    public static void registerMention(ResourceIdentifier mentionClass, Collection<String> suggestions, MentionCondition condition) {
+        mentions.put(mentionClass, suggestions);
+        mentionConditions.put(mentionClass, condition);
+    }
+
+    public static Collection<String> getMentions(String currentWord) {
+        ArrayList<String> applicableMentions = new ArrayList<>();
+        lastMentionConditional = false;
+
+        mentionConditions.forEach((mention, condition) -> {
+            boolean shouldSuggest = condition.shouldAddMention(currentWord);
+            if (!shouldSuggest) return;
+
+            if (!lastMentionConditional && condition != MentionCondition.ALWAYS) {
+                lastMentionConditional = true;
+            }
+
+            applicableMentions.addAll(mentions.get(mention));
+        });
+
+        return applicableMentions;
+    }
+
+    public static boolean hasMentions() {
+        return !mentions.isEmpty();
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java

@@ -0,0 +1,17 @@
+// @excludeplugin
+package com.hypherionmc.craterlib.compat;
+
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
+
+import java.util.Optional;
+
+public class FTBEssentials {
+
+    public static boolean isPlayerMuted(BridgedPlayer player) {
+        Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
+        return data.map(FTBEPlayerData::isMuted).orElse(false);
+
+    }
+
+}

Common/src/main/java/com/hypherionmc/craterlib/compat/LuckPermsCompat.java

@@ -0,0 +1,102 @@
+package com.hypherionmc.craterlib.compat;
+
+import com.hypherionmc.craterlib.api.events.compat.LuckPermsCompatEvents;
+import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.LuckPermsProvider;
+import net.luckperms.api.event.EventBus;
+import net.luckperms.api.event.node.NodeMutateEvent;
+import net.luckperms.api.model.group.Group;
+import net.luckperms.api.model.user.User;
+import net.luckperms.api.node.NodeType;
+import net.luckperms.api.node.types.InheritanceNode;
+import net.minecraft.server.level.ServerPlayer;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+public class LuckPermsCompat {
+
+    public static final LuckPermsCompat INSTANCE = new LuckPermsCompat();
+    private final LuckPerms luckPerms = LuckPermsProvider.get();
+
+    LuckPermsCompat() {
+        EventBus bus = luckPerms.getEventBus();
+
+        bus.subscribe(NodeMutateEvent.class, e -> {
+            if (!e.isUser())
+                return;
+
+            User user = (User) e.getTarget();
+
+            Set<InheritanceNode> addedInheritance = e.getDataAfter().stream()
+                    .filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataBefore().contains(node))
+                    .map(NodeType.INHERITANCE::cast)
+                    .collect(Collectors.toSet());
+
+            Set<InheritanceNode> removedInheritance = e.getDataBefore().stream()
+                    .filter(node -> node.getType() == NodeType.INHERITANCE && !e.getDataAfter().contains(node))
+                    .map(NodeType.INHERITANCE::cast)
+                    .collect(Collectors.toSet());
+
+            if(addedInheritance.isEmpty() && removedInheritance.isEmpty()) return;
+
+            addedInheritance.forEach(node -> {
+                CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupAddedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
+            });
+
+            removedInheritance.forEach(node -> {
+                CraterEventBus.INSTANCE.postEvent(LuckPermsCompatEvents.GroupRemovedEvent.of(node.getGroupName(), user.getUniqueId(), user.getUsername()));
+            });
+        });
+    }
+
+    public boolean hasPermission(ServerPlayer player, String perm) {
+        User luckPermsUser = luckPerms.getPlayerAdapter(ServerPlayer.class).getUser(player);
+        return luckPermsUser.getCachedData().getPermissionData().checkPermission(perm).asBoolean();
+    }
+
+    public boolean hasGroup(UUID uuid, String group) {
+        return getUserGroups(uuid).stream().anyMatch(g -> g.equalsIgnoreCase(group));
+    }
+
+    public Set<String> getUserGroups(UUID uuid) {
+        User user = luckPerms.getUserManager().getUser(uuid);
+        if (user == null)
+            return new HashSet<>();
+
+        return user.getNodes(NodeType.INHERITANCE).stream().map(InheritanceNode::getGroupName).collect(Collectors.toSet());
+    }
+
+    public boolean addGroupToUser(UUID uuid, String group) {
+        AtomicBoolean added = new AtomicBoolean(false);
+
+        Group g = luckPerms.getGroupManager().getGroup(group);
+        if (g == null) {
+            return false;
+        }
+
+        luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
+            if (user == null) return;
+            user.data().add(InheritanceNode.builder(group).build());
+            luckPerms.getUserManager().saveUser(user);
+            added.set(true);
+        });
+
+        return added.get();
+    }
+
+    public boolean removeGroupFromUser(UUID uuid, String group) {
+        AtomicBoolean removed = new AtomicBoolean(false);
+
+        luckPerms.getUserManager().loadUser(uuid).thenAcceptAsync(user -> {
+            if (user == null) return;
+            user.data().remove(InheritanceNode.builder(group).build());
+            luckPerms.getUserManager().saveUser(user);
+            removed.set(true);
+        });
+
+        return removed.get();
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/compat/ftbranks/BridgedRank.java

@@ -0,0 +1,24 @@
+// @excludeplugin
+package com.hypherionmc.craterlib.compat.ftbranks;
+
+import dev.ftb.mods.ftbranks.api.Rank;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor(staticName = "of")
+public class BridgedRank {
+
+    private final Rank internal;
+
+    public String name() {
+        return internal.getName();
+    }
+
+    public String id() {
+        return internal.getId();
+    }
+
+    public Rank toFtb() {
+        return internal;
+    }
+
+}

Common/src/main/java/com/hypherionmc/craterlib/compat/ftbranks/FTBRanks.java

@@ -0,0 +1,83 @@
+// @excludeplugin
+package com.hypherionmc.craterlib.compat.ftbranks;
+
+import com.hypherionmc.craterlib.api.events.compat.FTBRankEvents;
+import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile;
+import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
+import dev.ftb.mods.ftbranks.api.event.PlayerAddedToRankEvent;
+import dev.ftb.mods.ftbranks.api.event.PlayerRemovedFromRankEvent;
+import dev.ftb.mods.ftbranks.api.event.RankDeletedEvent;
+import dev.ftb.mods.ftbranks.api.event.RankEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class FTBRanks {
+
+    public static final FTBRanks INSTANCE = new FTBRanks();
+
+    private FTBRanks() {
+        registerEvents();
+    }
+
+    public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
+        List<BridgedRank> ranks = new ArrayList<>();
+        FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
+        return ranks;
+    }
+
+    public List<BridgedRank> getAllRanks() {
+        List<BridgedRank> ranks = new ArrayList<>();
+        FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
+        return ranks;
+    }
+
+    public boolean hasRank(BridgedGameProfile profile, String rank) {
+        return getPlayerRanks(profile).stream().anyMatch(r -> r.toFtb().getName().equalsIgnoreCase(rank) || r.toFtb().getId().equalsIgnoreCase(rank));
+    }
+
+    public boolean addRank(BridgedGameProfile profile, String rank) {
+        rank = rank.toLowerCase();
+
+        AtomicBoolean didAddRank = new AtomicBoolean(false);
+        FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
+            r.add(profile.toMojang());
+            didAddRank.set(true);
+        });
+
+        return didAddRank.get();
+    }
+
+    public boolean removeRank(BridgedGameProfile profile, String rank) {
+        rank = rank.toLowerCase();
+
+        AtomicBoolean didRemoveRank = new AtomicBoolean(false);
+        FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
+            r.remove(profile.toMojang());
+            didRemoveRank.set(true);
+        });
+
+        return didRemoveRank.get();
+    }
+
+    public void registerEvents() {
+        RankEvent.ADD_PLAYER.register(this::playerAddedToRank);
+        RankEvent.REMOVE_PLAYER.register(this::playerRemovedFromRank);
+        RankEvent.DELETED.register(this::rankDeleted);
+    }
+
+    private void rankDeleted(RankDeletedEvent rankDeletedEvent) {
+        CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankDeletedEvent.of(rankDeletedEvent.getRank()));
+    }
+
+    private void playerRemovedFromRank(PlayerRemovedFromRankEvent playerRemovedFromRankEvent) {
+        CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankRemovedEvent.of(playerRemovedFromRankEvent.getPlayer(), playerRemovedFromRankEvent.getRank()));
+    }
+
+    private void playerAddedToRank(PlayerAddedToRankEvent playerAddedToRankEvent) {
+        CraterEventBus.INSTANCE.postEvent(FTBRankEvents.RankAddedEvent.of(playerAddedToRankEvent.getPlayer(), playerAddedToRankEvent.getRank()));
+    }
+
+}

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

@@ -1,16 +0,0 @@
-package com.hypherionmc.craterlib.core.abstraction.commands;
-
-import com.mojang.brigadier.context.CommandContext;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.MutableComponent;
-
-public class AbstractCommand {
-
-    public static void replySuccess(CommandContext<CommandSourceStack> stack, MutableComponent message) {
-        stack.getSource().sendSuccess(() -> message, false);
-    }
-
-    public static void replyFailure(CommandContext<CommandSourceStack> stack, MutableComponent message) {
-        stack.getSource().sendFailure(message);
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.hypherionmc.craterlib.core.abstraction.server;
-
-import net.minecraft.commands.CommandSource;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.server.MinecraftServer;
-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 {
-
-    private final UUID uuid;
-
-    public AbstractFakePlayer(MinecraftServer server, String name, MutableComponent displayName, UUID uuid) {
-        super(CommandSource.NULL, Vec3.ZERO, Vec2.ZERO, server.overworld(), 4, name, displayName, server, null);
-        this.uuid = uuid;
-    }
-
-    public void onSuccess(Component component, boolean bl) {
-
-    }
-
-    @Override
-    public void sendSuccess(Supplier<Component> component, boolean bl) {
-        this.onSuccess(component.get(), bl);
-    }
-
-    @Override
-    public void sendFailure(Component component) {
-        sendSuccess(() -> component, false);
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-}

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

@@ -1,13 +0,0 @@
-package com.hypherionmc.craterlib.core.abstraction.server;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.FriendlyByteBuf;
-
-public class AbstractFriendlyByteBuff {
-
-    public static FriendlyByteBuf write(FriendlyByteBuf buf, CompoundTag tag) {
-        buf.writeNbt(tag);
-        return buf;
-    }
-
-}

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

@@ -1,16 +0,0 @@
-package com.hypherionmc.craterlib.core.abstraction.server;
-
-import net.minecraft.commands.CommandSourceStack;
-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);
-    }
-
-    public static void executeCommand(MinecraftServer server, CommandSourceStack stack, String command) {
-        server.getCommands().performPrefixedCommand(stack, command);
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.hypherionmc.craterlib.core.abstraction.text;
-
-import net.minecraft.network.chat.Component;
-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);
-    }
-
-    public static MutableComponent translatable(String component) {
-        return Component.translatable(component);
-    }
-
-    public static Component safeCopy(Component inComponent) {
-        String value = inComponent.getString();
-        Style style = inComponent.getStyle();
-        return Component.literal(value).withStyle(style);
-    }
-
-}

Common/src/main/java/com/hypherionmc/craterlib/core/config/AbstractConfig.java

@@ -0,0 +1,71 @@
+package com.hypherionmc.craterlib.core.config;
+
+import com.hypherionmc.craterlib.core.config.formats.AbstractConfigFormat;
+import com.hypherionmc.craterlib.core.config.formats.JsonConfigFormat;
+import com.hypherionmc.craterlib.core.config.formats.TomlConfigFormat;
+import lombok.Getter;
+import lombok.Setter;
+import me.hypherionmc.moonconfig.core.Config;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+
+@Getter
+public abstract class AbstractConfig<S> {
+
+    /* Final Variables */
+    private final transient File configPath;
+    private final transient String networkID;
+    private final transient String configName;
+    private final transient String modId;
+    private transient boolean wasSaveCalled = false;
+
+    @Setter
+    private transient AbstractConfigFormat<S> configFormat;
+
+    public AbstractConfig(String modId, String configName) {
+        this(modId, null, configName);
+    }
+
+    public AbstractConfig(String modId, @Nullable String subFolder, String configName) {
+        Config.setInsertionOrderPreserved(true);
+
+        if (!configName.endsWith(".toml") && !configName.endsWith(".json"))
+            configName = configName + ".toml";
+
+        File configDir = new File("config" + (subFolder == null ? "" : File.separator + subFolder));
+        configPath = new File(configDir, configName);
+        this.modId = modId;
+        this.networkID = modId + ":conf_" + configName.replace(".toml", "").replace(".json", "").replace("-", "_").toLowerCase();
+        this.configName = configName.replace(".toml", "").replace(".json", "");
+        configDir.mkdirs();
+
+        configFormat = configName.endsWith(".json") ? new JsonConfigFormat<>(configPath, this::onSave) : new TomlConfigFormat<>(configPath, this::onSave);
+    }
+
+    public void registerAndSetup(S config) {
+        configFormat.register(config);
+        ConfigController.register_config(this);
+        this.configReloaded();
+    }
+
+    public void saveConfig(S config) {
+        this.wasSaveCalled = true;
+        configFormat.saveConfig(config);
+    }
+
+    private void onSave() {
+        this.configReloaded();
+        this.wasSaveCalled = false;
+    }
+
+    public S readConfig(S config) {
+        return configFormat.readConfig(config);
+    }
+
+    public void migrateConfig(S config) {
+        configFormat.migrateConfig(config);
+    }
+
+    public abstract void configReloaded();
+}

Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java

@@ -1,11 +1,14 @@
 package com.hypherionmc.craterlib.core.config;
 
 import com.hypherionmc.craterlib.CraterConstants;
+import lombok.Getter;
 import me.hypherionmc.moonconfig.core.file.FileWatcher;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.HashSet;
 
 /**
  * @author HypherionSA
@@ -16,7 +19,10 @@ public final class ConfigController implements Serializable {
     /**
      * Cache of registered configs
      */
-    private static final HashMap<Object, FileWatcher> monitoredConfigs = new HashMap<>();
+    @Getter
+    private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
+
+    private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
 
     /**
      * INTERNAL METHOD - Register and watch the config
@@ -24,27 +30,34 @@ public final class ConfigController implements Serializable {
      * @param config - The config class to register and watch
      */
     @ApiStatus.Internal
+    @Deprecated
     public static void register_config(ModuleConfig config) {
-        if (monitoredConfigs.containsKey(config)) {
-            CraterConstants.LOG.error("Failed to register " + config.getConfigPath().getName() + ". Config already registered");
+        register_config((AbstractConfig) config);
+    }
+
+    /**
+     * INTERNAL METHOD - Register and watch the config
+     *
+     * @param config - The config class to register and watch
+     */
+    @ApiStatus.Internal
+    public static void register_config(AbstractConfig config) {
+        if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
+            CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
         } else {
-            FileWatcher configWatcher = new FileWatcher();
             try {
-                configWatcher.setWatch(config.getConfigPath(), () -> {
-                    if (!config.isSaveCalled()) {
-                        CraterConstants.LOG.info("Sending Reload Event for: " + config.getConfigPath().getName());
+                watcher.addWatch(config.getConfigPath(), () -> {
+                    if (!config.isWasSaveCalled()) {
+                        CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
                         config.configReloaded();
                     }
                 });
             } catch (Exception e) {
-                CraterConstants.LOG.error("Failed to register " + config.getConfigPath().getName() + " for auto reloading. " + e.getMessage());
+                CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
             }
-            monitoredConfigs.put(config, configWatcher);
-            CraterConstants.LOG.info("Registered " + config.getConfigPath().getName() + " successfully!");
+            watchedConfigs.put(config.getConfigPath().toString(), config);
+            CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
         }
     }
 
-    public static HashMap<Object, FileWatcher> getMonitoredConfigs() {
-        return monitoredConfigs;
-    }
 }

Common/src/main/java/com/hypherionmc/craterlib/core/config/ModuleConfig.java

@@ -1,9 +1,7 @@
 package com.hypherionmc.craterlib.core.config;
 
+import com.hypherionmc.craterlib.core.config.formats.TomlConfigFormat;
 import me.hypherionmc.moonconfig.core.CommentedConfig;
-import me.hypherionmc.moonconfig.core.Config;
-import me.hypherionmc.moonconfig.core.conversion.ObjectConverter;
-import me.hypherionmc.moonconfig.core.file.CommentedFileConfig;
 
 import java.io.File;
 
@@ -12,17 +10,8 @@ import java.io.File;
  * Base Config class containing the save, upgrading and loading logic.
  * All config classes must extend this class
  */
-public class ModuleConfig {
-
-    /* Final Variables */
-    private final transient File configPath;
-    private final transient String networkID;
-
-    private final transient String configName;
-
-    private final transient String modId;
-
-    private transient boolean isSaveCalled = false;
+@Deprecated(forRemoval = true, since = "2.1.0")
+public class ModuleConfig extends AbstractConfig {
 
     /**
      * Set up the config
@@ -35,20 +24,7 @@ public class ModuleConfig {
     }
 
     public ModuleConfig(String modId, String subFolder, String configName) {
-        /* Preserve the order of the config values */
-        Config.setInsertionOrderPreserved(true);
-
-        /* Configure Paths and Network SYNC ID */
-        File configDir = new File("config" + (subFolder.isEmpty() ? "" : File.separator + subFolder));
-        configPath = new File(configDir + File.separator + configName + ".toml");
-        networkID = modId + ":conf_" + configName.replace("-", "_");
-        this.modId = modId;
-        this.configName = configName;
-
-        /* Check if the required directories exists, otherwise we create them */
-        if (!configDir.exists()) {
-            configDir.mkdirs();
-        }
+       super(modId, subFolder.isEmpty() ? null : subFolder, configName);
     }
 
     /**
@@ -57,14 +33,7 @@ public class ModuleConfig {
      * @param config - The config class to use
      */
     public void registerAndSetup(ModuleConfig config) {
-        if (!configPath.exists() || configPath.length() < 2) {
-            saveConfig(config);
-        } else {
-            migrateConfig(config);
-        }
-        /* Register the Config for Watching and events */
-        ConfigController.register_config(this);
-        this.configReloaded();
+        super.registerAndSetup(config);
     }
 
     /**
@@ -73,16 +42,7 @@ public class ModuleConfig {
      * @param conf - The config class to serialize and save
      */
     public void saveConfig(ModuleConfig conf) {
-        this.isSaveCalled = true;
-        /* Set up the Serializer and Config Object */
-        ObjectConverter converter = new ObjectConverter();
-        CommentedFileConfig config = CommentedFileConfig.builder(configPath).build();
-
-        /* Save the config and fire the reload events */
-        converter.toConfig(conf, config);
-        config.save();
-        configReloaded();
-        this.isSaveCalled = false;
+       super.registerAndSetup(conf);
     }
 
     /**
@@ -92,14 +52,7 @@ public class ModuleConfig {
      * @return - Returns the loaded version of the class
      */
     public <T> T loadConfig(Object conf) {
-        /* Set up the Serializer and Config Object */
-        ObjectConverter converter = new ObjectConverter();
-        CommentedFileConfig config = CommentedFileConfig.builder(configPath).build();
-        config.load();
-
-        /* Load the config and return the loaded config */
-        converter.toObject(config, conf);
-        return (T) conf;
+        return (T) super.readConfig(conf);
     }
 
     /**
@@ -108,31 +61,13 @@ public class ModuleConfig {
      * @param conf - The config class to load
      */
     public void migrateConfig(ModuleConfig conf) {
-        /* Set up the Serializer and Config Objects */
-        CommentedFileConfig config = CommentedFileConfig.builder(configPath).build();
-        CommentedFileConfig newConfig = CommentedFileConfig.builder(configPath).build();
-        config.load();
-
-        /* Upgrade the config */
-        new ObjectConverter().toConfig(conf, newConfig);
-        updateConfigValues(config, newConfig, newConfig, "");
-        newConfig.save();
-
-        config.close();
-        newConfig.close();
+        super.migrateConfig(conf);
     }
 
     public void updateConfigValues(CommentedConfig oldConfig, CommentedConfig newConfig, CommentedConfig outputConfig, String subKey) {
-        /* Loop over the config keys and check what has changed */
-        newConfig.valueMap().forEach((key, value) -> {
-            String finalKey = subKey + (subKey.isEmpty() ? "" : ".") + key;
-            if (value instanceof CommentedConfig commentedConfig) {
-                updateConfigValues(oldConfig, commentedConfig, outputConfig, finalKey);
-            } else {
-                outputConfig.set(finalKey,
-                        oldConfig.contains(finalKey) ? oldConfig.get(finalKey) : value);
-            }
-        });
+        if (getConfigFormat() instanceof TomlConfigFormat<?> t) {
+            t.updateConfigValues(oldConfig, newConfig, outputConfig, subKey);
+        }
     }
 
     /**
@@ -141,7 +76,7 @@ public class ModuleConfig {
      * @return - The FILE object containing the config file
      */
     public File getConfigPath() {
-        return configPath;
+        return super.getConfigPath();
     }
 
     /**
@@ -150,12 +85,13 @@ public class ModuleConfig {
      * @return - Returns the Sync ID in format modid:config_name
      */
     public String getNetworkID() {
-        return networkID;
+        return super.getNetworkID();
     }
 
     /**
      * Fired whenever changes to the config are detected
      */
+    @Override
     public void configReloaded() {
 
     }
@@ -166,7 +102,7 @@ public class ModuleConfig {
      * @return
      */
     public String getConfigName() {
-        return configName;
+        return super.getConfigName();
     }
 
     /**
@@ -175,10 +111,10 @@ public class ModuleConfig {
      * @return
      */
     public String getModId() {
-        return modId;
+        return super.getModId();
     }
 
     public boolean isSaveCalled() {
-        return isSaveCalled;
+        return super.isWasSaveCalled();
     }
 }

Common/src/main/java/com/hypherionmc/craterlib/core/config/annotations/ClothScreen.java

@@ -0,0 +1,12 @@
+package com.hypherionmc.craterlib.core.config.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author HypherionSA
+ * Allow mods to make use of the new Cloth Config based Config Screens
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ClothScreen {
+}

Common/src/main/java/com/hypherionmc/craterlib/core/config/formats/AbstractConfigFormat.java

@@ -0,0 +1,32 @@
+package com.hypherionmc.craterlib.core.config.formats;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import me.hypherionmc.moonconfig.core.Config;
+
+import java.io.File;
+
+@RequiredArgsConstructor
+@Getter
+public abstract class AbstractConfigFormat<S> {
+
+    private final File configPath;
+    private final Runnable onSave;
+
+    public void register(S conf) {
+        if (!configPath.exists() || configPath.length() < 2) {
+            saveConfig(conf);
+        } else {
+            migrateConfig(conf);
+        }
+    }
+
+    public boolean wasConfigChanged(Config old, Config newConfig) {
+        return true;
+    }
+
+    public abstract void saveConfig(S config);
+    public abstract S readConfig(S config);
+    public abstract void migrateConfig(S config);
+
+}

Common/src/main/java/com/hypherionmc/craterlib/core/config/formats/JsonConfigFormat.java

@@ -0,0 +1,67 @@
+package com.hypherionmc.craterlib.core.config.formats;
+
+import me.hypherionmc.moonconfig.core.Config;
+import me.hypherionmc.moonconfig.core.conversion.ObjectConverter;
+import me.hypherionmc.moonconfig.core.file.FileConfig;
+
+import java.io.File;
+
+public class JsonConfigFormat<S> extends AbstractConfigFormat<S> {
+
+    public JsonConfigFormat(File configPath, Runnable afterSave) {
+        super(configPath, afterSave);
+    }
+
+    @Override
+    public void saveConfig(S conf) {
+        ObjectConverter converter = new ObjectConverter();
+        FileConfig config = FileConfig.builder(getConfigPath()).sync().build();
+
+        converter.toConfig(conf, config);
+        config.save();
+        getOnSave().run();
+    }
+
+    @Override
+    public S readConfig(S conf) {
+        /* Set up the Serializer and Config Object */
+        ObjectConverter converter = new ObjectConverter();
+        FileConfig config = FileConfig.builder(getConfigPath()).sync().build();
+        config.load();
+
+        /* Load the config and return the loaded config */
+        converter.toObject(config, conf);
+        return conf;
+    }
+
+    @Override
+    public void migrateConfig(S conf) {
+        /* Set up the Serializer and Config Objects */
+        FileConfig config = FileConfig.builder(getConfigPath()).build();
+        FileConfig newConfig = FileConfig.builder(getConfigPath()).sync().build();
+        config.load();
+
+        /* Upgrade the config */
+        if (wasConfigChanged(config, newConfig)) {
+            new ObjectConverter().toConfig(conf, newConfig);
+            updateConfigValues(config, newConfig, newConfig, "");
+            newConfig.save();
+        }
+
+        config.close();
+        newConfig.close();
+    }
+
+    public void updateConfigValues(Config oldConfig, Config newConfig, Config outputConfig, String subKey) {
+        /* Loop over the config keys and check what has changed */
+        newConfig.valueMap().forEach((key, value) -> {
+            String finalKey = subKey + (subKey.isEmpty() ? "" : ".") + key;
+            if (value instanceof Config commentedConfig) {
+                updateConfigValues(oldConfig, commentedConfig, outputConfig, finalKey);
+            } else {
+                outputConfig.set(finalKey,
+                        oldConfig.contains(finalKey) ? oldConfig.get(finalKey) : value);
+            }
+        });
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/core/config/formats/TomlConfigFormat.java

@@ -0,0 +1,67 @@
+package com.hypherionmc.craterlib.core.config.formats;
+
+import me.hypherionmc.moonconfig.core.CommentedConfig;
+import me.hypherionmc.moonconfig.core.conversion.ObjectConverter;
+import me.hypherionmc.moonconfig.core.file.CommentedFileConfig;
+
+import java.io.File;
+
+public class TomlConfigFormat<S> extends AbstractConfigFormat<S> {
+
+    public TomlConfigFormat(File configPath, Runnable onSave) {
+        super(configPath, onSave);
+    }
+
+    @Override
+    public void saveConfig(S conf) {
+        ObjectConverter converter = new ObjectConverter();
+        CommentedFileConfig config = CommentedFileConfig.builder(getConfigPath()).sync().build();
+
+        converter.toConfig(conf, config);
+        config.save();
+        getOnSave().run();
+    }
+
+    @Override
+    public S readConfig(S conf) {
+        /* Set up the Serializer and Config Object */
+        ObjectConverter converter = new ObjectConverter();
+        CommentedFileConfig config = CommentedFileConfig.builder(getConfigPath()).sync().build();
+        config.load();
+
+        /* Load the config and return the loaded config */
+        converter.toObject(config, conf);
+        return conf;
+    }
+
+    @Override
+    public void migrateConfig(S conf) {
+        /* Set up the Serializer and Config Objects */
+        CommentedFileConfig config = CommentedFileConfig.builder(getConfigPath()).build();
+        CommentedFileConfig newConfig = CommentedFileConfig.builder(getConfigPath()).sync().build();
+        config.load();
+
+        /* Upgrade the config */
+        if (wasConfigChanged(config, newConfig)) {
+            new ObjectConverter().toConfig(conf, newConfig);
+            updateConfigValues(config, newConfig, newConfig, "");
+            newConfig.save();
+        }
+
+        config.close();
+        newConfig.close();
+    }
+
+    public void updateConfigValues(CommentedConfig oldConfig, CommentedConfig newConfig, CommentedConfig outputConfig, String subKey) {
+        /* Loop over the config keys and check what has changed */
+        newConfig.valueMap().forEach((key, value) -> {
+            String finalKey = subKey + (subKey.isEmpty() ? "" : ".") + key;
+            if (value instanceof CommentedConfig commentedConfig) {
+                updateConfigValues(oldConfig, commentedConfig, outputConfig, finalKey);
+            } else {
+                outputConfig.set(finalKey,
+                        oldConfig.contains(finalKey) ? oldConfig.get(finalKey) : value);
+            }
+        });
+    }
+}

Common/src/main/java/com/hypherionmc/craterlib/core/event/CraterEvent.java

@@ -1,12 +1,15 @@
 package com.hypherionmc.craterlib.core.event;
 
+import com.hypherionmc.craterlib.core.event.annot.Cancellable;
 import com.hypherionmc.craterlib.core.event.exception.CraterEventCancellationException;
 
-public abstract class CraterEvent {
+public class CraterEvent {
 
     private boolean canceled = false;
 
-    public abstract boolean canCancel();
+    private boolean canCancel() {
+        return this.getClass().isAnnotationPresent(Cancellable.class);
+    }
 
     public void cancelEvent() {
         try {
@@ -24,4 +27,4 @@ public abstract class CraterEvent {
         return this.canceled;
     }
 
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/event/CraterEventBus.java

@@ -238,4 +238,4 @@ public final class CraterEventBus {
 
     }
 
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/event/CraterEventPriority.java

@@ -10,4 +10,4 @@ public class CraterEventPriority {
     public static final int HIGHER = 2;
     public static final int HIGHEST = 3;
 
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/event/annot/Cancellable.java

@@ -0,0 +1,8 @@
+package com.hypherionmc.craterlib.core.event.annot;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Cancellable {
+}

Common/src/main/java/com/hypherionmc/craterlib/core/event/annot/CraterEventListener.java

@@ -8,4 +8,4 @@ import java.lang.annotation.RetentionPolicy;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CraterEventListener {
     int priority() default CraterEventPriority.NORMAL;
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/event/exception/CraterEventCancellationException.java

@@ -6,4 +6,4 @@ public class CraterEventCancellationException extends Exception {
         super(msg);
     }
 
-}
+}

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

@@ -1,34 +0,0 @@
-package com.hypherionmc.craterlib.core.network;
-
-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.server.level.ServerPlayer;
-
-import java.util.function.Supplier;
-
-/**
- * @author HypherionSA
- */
-@Deprecated(forRemoval = true)
-public interface CraterNetworkHandler {
-
-    <T extends CraterPacket<T>> void registerPacket(Class<T> clazz, Supplier<T> supplier, PacketDirection packetDirection);
-
-    Packet<?> toServerBound(CraterPacket<?> packet);
-
-    Packet<?> toClientBound(CraterPacket<?> packet);
-
-    default void sendToServer(CraterPacket<?> packet) {
-        ClientPlatform.INSTANCE.getClientConnection().send(this.toServerBound(packet));
-    }
-
-    default void sendTo(CraterPacket<?> packet, ServerPlayer player) {
-        player.connection.send(this.toClientBound(packet));
-    }
-
-    default void sendToAll(CraterPacket<?> packet) {
-        CommonPlatform.INSTANCE.getMCServer().getPlayerList().broadcastAll(this.toClientBound(packet));
-    }
-
-}

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

@@ -1,25 +0,0 @@
-package com.hypherionmc.craterlib.core.network;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.entity.player.Player;
-
-/**
- * @author HypherionSA
- */
-@Deprecated(forRemoval = true)
-public interface CraterPacket<T extends CraterPacket<T>> {
-
-    void write(final FriendlyByteBuf buf);
-
-    void read(final FriendlyByteBuf buf);
-
-    default void handle(Player player, Object minecraft) {
-        this.createHandler().handle((T) this, player, minecraft);
-    }
-
-    PacketHandler<T> createHandler();
-
-    abstract class PacketHandler<T extends CraterPacket<T>> {
-        public abstract void handle(T packet, Player player, Object minecraft);
-    }
-}

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

@@ -1,10 +0,0 @@
-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,8 +1,9 @@
 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 com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
+import lombok.Getter;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -11,6 +12,7 @@ import java.util.function.Function;
 /**
  * Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
  */
+@Getter
 public class CraterPacketNetwork {
 
     private final PacketRegistry packetRegistry;
@@ -30,7 +32,7 @@ public class CraterPacketNetwork {
         return delayedHandler;
     }
 
-    public static <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
+    public static <T> PacketRegistrar registerPacket(ResourceIdentifier id, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
         if (INSTANCE != null) {
             return INSTANCE.packetRegistry.registerPacket(id, messageType, encoder, decoder, handler);
         } else {
@@ -38,7 +40,4 @@ public class CraterPacketNetwork {
         }
     }
 
-    public PacketRegistry getPacketRegistry() {
-        return packetRegistry;
-    }
-}
+}

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

@@ -3,8 +3,8 @@ 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 com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,7 +25,7 @@ public class DeferredPacketRegistrar implements PacketRegistrar {
     }
 
     @Override
-    public <T> PacketRegistrar registerPacket(ResourceLocation packetIdentifier, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
+    public <T> PacketRegistrar registerPacket(ResourceIdentifier packetIdentifier, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
         PacketHolder<T> container = new PacketHolder<>(packetIdentifier, messageType, encoder, decoder, handler);
         QUEUED_PACKET_MAP.put(messageType, container);
         return this;
@@ -38,4 +38,4 @@ public class DeferredPacketRegistrar implements PacketRegistrar {
             QUEUED_PACKET_MAP.forEach((aClass, container) -> packetRegistration.registerPacket(container));
         }
     }
-}
+}

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

@@ -2,8 +2,8 @@ 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 com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -16,6 +16,6 @@ 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);
+    <T> PacketRegistrar registerPacket(ResourceIdentifier id, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler);
 
-}
+}

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

@@ -4,8 +4,8 @@ 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 com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@ import java.util.function.Function;
  */
 public abstract class PacketRegistry implements CraterNetworkHandler, PacketRegistrar {
 
-    final Map<Class<?>, PacketHolder<?>> PACKET_MAP = new HashMap<>();
+    protected final Map<Class<?>, PacketHolder<?>> PACKET_MAP = new HashMap<>();
 
     protected final PacketSide side;
 
@@ -26,7 +26,7 @@ public abstract class PacketRegistry implements CraterNetworkHandler, PacketRegi
         this.side = side;
     }
 
-    public <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
+    public <T> PacketRegistrar registerPacket(ResourceIdentifier id, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
         PacketHolder<T> holder = new PacketHolder<>(id, messageType, encoder, decoder, handler);
         PACKET_MAP.put(messageType, holder);
         registerPacket(holder);
@@ -38,4 +38,4 @@ public abstract class PacketRegistry implements CraterNetworkHandler, PacketRegi
     }
 
     protected abstract <T> void registerPacket(PacketHolder<T> packetHolder);
-}
+}

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

@@ -1,15 +1,15 @@
 package com.hypherionmc.craterlib.core.networking.data;
 
-import net.minecraft.world.entity.player.Player;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 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 record PacketContext<T>(@Nullable BridgedPlayer 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,7 +1,11 @@
 package com.hypherionmc.craterlib.core.networking.data;
 
+import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
+import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
+import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -10,9 +14,27 @@ import java.util.function.Function;
 /**
  * Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
  */
-public record PacketHolder<T>(ResourceLocation packetId,
+public record PacketHolder<T>(CustomPacketPayload.Type<? extends CustomPacketPayload> type,
                               Class<T> messageType,
-                              BiConsumer<T, FriendlyByteBuf> encoder,
-                              Function<FriendlyByteBuf, T> decoder,
+                              BiConsumer<T, BridgedFriendlyByteBuf> encoder,
+                              Function<BridgedFriendlyByteBuf, T> decoder,
                               Consumer<PacketContext<T>> handler) {
-}
+
+    public PacketHolder(ResourceIdentifier packetId, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
+        this(new CustomPacketPayload.Type<>(packetId.toMojang()), messageType, encoder, decoder, handler);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <K extends CustomPacketPayload> CustomPacketPayload.Type<K> getType()
+    {
+        return (CustomPacketPayload.Type<K>) type();
+    }
+
+    public StreamCodec<FriendlyByteBuf, CommonPacketWrapper> getCodec()
+    {
+        return CustomPacketPayload.codec(
+                (packet, buf) -> this.encoder().accept((T)packet.packet(), BridgedFriendlyByteBuf.of(buf)),
+                (buf) -> new CommonPacketWrapper<>(this, this.decoder().apply(BridgedFriendlyByteBuf.of(buf))));
+    }
+
+}

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

@@ -10,4 +10,4 @@ public enum PacketSide {
 
         return CLIENT;
     }
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/platform/ClientPlatform.java

@@ -1,23 +1,23 @@
 package com.hypherionmc.craterlib.core.platform;
 
-import com.hypherionmc.craterlib.util.ServiceUtil;
-import net.minecraft.client.Minecraft;
+import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
+import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import com.hypherionmc.craterlib.utils.InternalServiceUtil;
 import net.minecraft.network.Connection;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 
 /**
  * @author HypherionSA
  */
 public interface ClientPlatform {
 
-    public final ClientPlatform INSTANCE = ServiceUtil.load(ClientPlatform.class);
+    public final ClientPlatform INSTANCE = InternalServiceUtil.load(ClientPlatform.class);
 
-    Minecraft getClientInstance();
+    BridgedMinecraft getClientInstance();
 
-    Player getClientPlayer();
+    BridgedPlayer getClientPlayer();
 
-    Level getClientLevel();
+    BridgedClientLevel getClientLevel();
 
     Connection getClientConnection();
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/platform/CommonPlatform.java

@@ -1,22 +1,15 @@
 package com.hypherionmc.craterlib.core.platform;
 
-import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
-import com.hypherionmc.craterlib.util.ServiceUtil;
-import net.minecraft.server.MinecraftServer;
+import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
+import com.hypherionmc.craterlib.utils.InternalServiceUtil;
 
 /**
  * @author HypherionSA
  */
 public interface CommonPlatform {
 
-    public CommonPlatform INSTANCE = ServiceUtil.load(CommonPlatform.class);
+    public CommonPlatform INSTANCE = InternalServiceUtil.load(CommonPlatform.class);
 
-    default CraterNetworkHandler createPacketHandler(String modid) {
-        return this.createPacketHandler(modid, true, true);
-    }
+    BridgedMinecraftServer getMCServer();
 
-    CraterNetworkHandler createPacketHandler(String modid, boolean requiredClient, boolean requiredServer);
-
-    MinecraftServer getMCServer();
-
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -0,0 +1,19 @@
+package com.hypherionmc.craterlib.core.platform;
+
+import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
+
+public interface CompatUtils {
+
+    public static final CompatUtils INSTANCE = InternalServiceUtil.load(CompatUtils.class);
+
+    boolean isPlayerActive(BridgedPlayer player);
+    String getSkinUUID(BridgedPlayer player);
+    boolean isPlayerBleeding(BridgedPlayer player);
+    boolean playerBledOut(BridgedPlayer player);
+    boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
+
+}

Common/src/main/java/com/hypherionmc/craterlib/core/platform/Environment.java

@@ -15,4 +15,4 @@ public enum Environment {
     public boolean isServer() {
         return this == SERVER;
     }
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/platform/LoaderType.java

@@ -0,0 +1,8 @@
+package com.hypherionmc.craterlib.core.platform;
+
+public enum LoaderType {
+    FABRIC,
+    FORGE,
+    NEOFORGE,
+    PAPER
+}

Common/src/main/java/com/hypherionmc/craterlib/core/platform/ModloaderEnvironment.java

@@ -1,6 +1,6 @@
 package com.hypherionmc.craterlib.core.platform;
 
-import com.hypherionmc.craterlib.util.ServiceUtil;
+import com.hypherionmc.craterlib.utils.InternalServiceUtil;
 
 import java.io.File;
 
@@ -10,10 +10,13 @@ import java.io.File;
  */
 public interface ModloaderEnvironment {
 
-    public final ModloaderEnvironment INSTANCE = ServiceUtil.load(ModloaderEnvironment.class);
+    public final ModloaderEnvironment INSTANCE = InternalServiceUtil.load(ModloaderEnvironment.class);
 
+    @Deprecated(forRemoval = true, since = "2.0.2")
     boolean isFabric();
 
+    LoaderType getLoaderType();
+
     String getGameVersion();
 
     File getGameFolder();
@@ -29,4 +32,4 @@ public interface ModloaderEnvironment {
     boolean isDevEnv();
 
     int getModCount();
-}
+}

Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordEventHandlers.java

@@ -11,6 +11,7 @@ import java.util.List;
  * Class containing references to all available discord event handles.
  * Registering a handler is optional, and non-assigned handlers will be ignored
  */
+@Deprecated(forRemoval = true)
 public class DiscordEventHandlers extends Structure {
 
     // Callback for when the RPC was initialized successfully

Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRPC.java

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
  * @author HypherionSA
  * Java Wrapper of the Discord-RPC Library
  */
+@Deprecated(forRemoval = true)
 public interface DiscordRPC extends Library {
 
     DiscordRPC INSTANCE = Native.load("discord-rpc", DiscordRPC.class);

Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRichPresence.java

@@ -13,6 +13,7 @@ import java.util.List;
  * @author HypherionSA
  * Class reprenting a Discord RPC activity
  */
+@Deprecated(forRemoval = true)
 public class DiscordRichPresence extends Structure {
 
     // First line of text on the RPC

Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordUser.java

@@ -9,6 +9,7 @@ import java.util.List;
  * @author HypherionSA
  * Class representing the Discord User
  */
+@Deprecated(forRemoval = true)
 public class DiscordUser extends Structure {
 
     // The User ID of the User