chore: add modmenu & cloth-config to depends + refactor main module to match

Author: SynicalMX

src/client/java/net/playnimbus/nimbusutils/ModConfig.java

@@ -2,7 +2,6 @@
 
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
-import net.playnimbus.NimbusUtils;
 
 @Config(name = NimbusUtils.MOD_ID)
 public class ModConfig implements ConfigData {

src/client/java/net/playnimbus/nimbusutils/NimbusUtilsClient.java

@@ -8,7 +8,6 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.minecraft.client.MinecraftClient;
-import net.playnimbus.NimbusUtils;
 import net.playnimbus.nimbusutils.modules.nimnite.NimniteClient;
 import net.playnimbus.nimbusutils.modules.nimnite.NimniteKeybinds;
 import net.playnimbus.nimbusutils.networking.HandshakePacket;
@@ -38,7 +37,8 @@ public void onInitializeClient() {
 		PayloadTypeRegistry.playS2C().register(HandshakePacket.ID, HandshakePacket.CODEC);
 		PayloadTypeRegistry.playC2S().register(KeybindPacket.ID, KeybindPacket.CODEC);
 
-		// handle incoming handshake packet
+		// handle incoming handshake packets
+		// note: we have to update this when new server types and modules are implemented
 		ClientPlayNetworking.registerGlobalReceiver(HandshakePacket.ID, (packet, ctx) -> {
 			MinecraftClient client = ctx.client();
 
@@ -49,10 +49,13 @@ public void onInitializeClient() {
 
 				// enable the server type's submodule
 				switch (SERVERTYPE) {
+					case 0 -> LOGGER.warn("todo: hub implementation");
 					case 1 -> NIMNITE.setEnabled(true);
+					default -> {
+						NIMNITE.setEnabled(false);
+						LOGGER.info("Disabled all modules.");
+					}
 				}
-
-				LOGGER.info("handshake received: {}, serverType: {}", state, SERVERTYPE);
 			});
 		});
 

src/client/java/net/playnimbus/nimbusutils/mixin/client/MinecraftClientMixin.java

@@ -1,13 +1,11 @@
 package net.playnimbus.nimbusutils.mixin.client;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.playnimbus.NimbusUtils;
+import net.playnimbus.nimbusutils.NimbusUtils;
 import net.playnimbus.nimbusutils.events.SwapHandsEvent;
 import net.playnimbus.nimbusutils.modules.nimnite.NimniteKeybinds;
-import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongepowered.asm.mixin.Mixin;
@@ -29,9 +27,6 @@ public abstract class MinecraftClientMixin {
     @Shadow
     private int itemUseCooldown;
 
-    @Shadow
-    public abstract @Nullable ClientPlayNetworkHandler getNetworkHandler();
-
     @Inject(method = "doAttack", at = @At("HEAD"), cancellable = true)
     private void cancelAttack(CallbackInfoReturnable<Boolean> cir) {
         if (NIMNITE.isEnabled() && NIMNITE.isHoldingGun()) {

src/client/java/net/playnimbus/nimbusutils/modules/nimnite/NimniteClient.java

@@ -9,7 +9,7 @@
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket;
 import net.minecraft.util.Hand;
-import net.playnimbus.NimbusUtils;
+import net.playnimbus.nimbusutils.NimbusUtils;
 import net.playnimbus.nimbusutils.NimbusUtilsClient;
 import net.playnimbus.nimbusutils.events.HotbarChangeEvent;
 import net.playnimbus.nimbusutils.events.SwapHandsEvent;

src/client/java/net/playnimbus/nimbusutils/modules/nimnite/NimniteKeybinds.java

@@ -5,7 +5,7 @@
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.util.Identifier;
-import net.playnimbus.NimbusUtils;
+import net.playnimbus.nimbusutils.NimbusUtils;
 import net.playnimbus.nimbusutils.NimbusUtilsClient;
 import net.playnimbus.nimbusutils.networking.Keybind;
 import net.playnimbus.nimbusutils.networking.KeybindPacket;

src/client/java/net/playnimbus/nimbusutils/networking/HandshakePacket.java

@@ -5,7 +5,7 @@
 import net.minecraft.network.codec.PacketCodecs;
 import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.util.Identifier;
-import net.playnimbus.NimbusUtils;
+import net.playnimbus.nimbusutils.NimbusUtils;
 
 /**
  * The Handshake packet works in both C2S and S2C.

src/client/java/net/playnimbus/nimbusutils/networking/KeybindPacket.java

@@ -5,7 +5,7 @@
 import net.minecraft.network.codec.PacketCodecs;
 import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.util.Identifier;
-import net.playnimbus.NimbusUtils;
+import net.playnimbus.nimbusutils.NimbusUtils;
 
 public record KeybindPacket(String key) implements CustomPayload {
 	public static final Identifier KEYBIND_PAYLOAD_ID = Identifier.of(NimbusUtils.MOD_ID, "keybind");

…ain/java/net/playnimbus/NimbusUtils.java …/playnimbus/nimbusutils/NimbusUtils.javasrc/main/java/net/playnimbus/NimbusUtils.java renamed to src/main/java/net/playnimbus/nimbusutils/NimbusUtils.java src/main/java/net/playnimbus/NimbusUtils.java renamed to src/main/java/net/playnimbus/nimbusutils/NimbusUtils.java

@@ -1,10 +1,7 @@
-package net.playnimbus;
+package net.playnimbus.nimbusutils;
 
 import net.fabricmc.api.ModInitializer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class NimbusUtils implements ModInitializer {
 	public static final String MOD_ID = "nimbusutils";
 

src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
 	"environment": "*",
 	"entrypoints": {
 		"main": [
-			"net.playnimbus.NimbusUtils"
+			"net.playnimbus.nimbusutils.NimbusUtils"
 		],
 		"client": [
           "net.playnimbus.nimbusutils.NimbusUtilsClient"
@@ -37,6 +37,8 @@
 		"minecraft": "~1.21.11",
 		"java": ">=21",
 		"fabric-api": "*",
-		"fabric-key-binding-api-v1": "*"
+		"fabric-key-binding-api-v1": "*",
+		"modmenu": ">=17.0.0",
+		"cloth-config": ">=21.11.153"
 	}
 }