v2.1

README.md

@@ -54,6 +54,7 @@ algunos módulos tienen teclas asignadas por defecto, asígnales `ESC` para desa
 <img src="screenshots/fullbright.png" alt="fullbright en modo gamma cambiando el color de los shaders">
 <img src="screenshots/hud.png" alt="HUD">
 <img src="screenshots/hudeditor.png" alt="editor de HUD">
+<img src="screenshots/colorpicker.png" alt="selector de colores">
 
 ## contibuciones
 

build.gradle

@@ -24,7 +24,7 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 	
 }
 

cambios.md

@@ -1,32 +1,29 @@
-# v1.9
+# v2.1 (roto)
 
 ## novedades
 
+- actualizado a la 1.21.11 (maomeno)
 
 ### adiciones
 
-- tipo de ajuste específico para colores (el selector está muy roto, ya lo arreglaré)
-- comando para espectar a jugadores o entidades (`$spec`)
+- categorías de módulos: ahora puedes buscar "cámara", "jugador", "mundo", "renderizado", "red", "cliente" o "misc" para que se filtren los módulos de esas categorías, respectivamente
 
 #### módulos nuevos:
 
-- reconectar: añade un botón para reconectarse a un servidor tras ser desconectado
-- superposición de luz: te muestra en qué bloques pueden spawnear bichos
-- yunques con pluma: te permite utilizar tipografías distintas al renombrar items en un yunque (a falta de formato)
+- muletas: hace te no te caigas (de bloques), como cuando estás agachado, pero sin agacharte
 
 ### arreglos / mejoras
 
-- aviso de baja dur. ya funciona en servers de paper
-- ahora puedes filtrar módulos también mediante la barra de búsqueda, además de que esta ahora funciona y tal
-- los ajustes cuya visibilidad dependía de otros ajustes ahora se muestran correctamente
-- ahora la posición de la barra de búsqueda es guardada en el config
-- ya no te sigues moviendo en el freecam al estar moviéndote, abrir una interfaz y soltar las teclas de movimiento
-- elemento del hud que muestra el ping en milisegundos (a veces no va)
-- ya no se dibujan los tooltips de ajustes del marco de ajustes del mod si no está extendido
-- el problema donde se restablecían las teclas a las de por defecto en módulos cuyas teclas ya estaban establecidas tras cada relaunch se ha solucionado
-- puntos de desconexión ahora funciona y todo (gracias Meteor)
-- alguna que otra cosilla más, supongo
+- ahora ya puedes escribir espacios en la barra de búsqueda
+- ahora se ignoran las tildes al buscar en la barra de búsqueda
+- aviso de baja dur. ya no te avisa al reparar objetos dañados por debajo del límite
+- creo que cielo custom ya funciona por completo (las fases lunares)
 
 ## problemas reconocidos
 
-- muchos, pero repórtalos en la página de problemas si quieres para que queden bien registrados 
+- muchos, pero repórtalos en la página de problemas si quieres para que queden bien registrados 
+- de esta actualización:
+  - superposición de daño no funciona porque no lo he podido actualizar porque han cambiado cosas relacionadas a la renderización
+  - la renderización de líneas (no rellenos) está rota, por el mismo motivo
+  - por el mismo motivo, destello de enchants no funciona 
+  - minar sin interrupción no funciona

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.2
-loader_version=0.17.3
-loom_version=1.11-SNAPSHOT
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.3
+loader_version=0.18.4
+loom_version=1.13-SNAPSHOT
 
-mod_version=1.9
+fabric_api_version=0.140.2+1.21.11
+
+mod_version=2.1
 maven_group=me.retucio
-archives_base_name=camtweaks
-
-fabric_version=0.135.0+1.21.10
+archives_base_name=camtweaks

src/main/java/me/retucio/camtweaks/CameraTweaks.java

@@ -16,29 +16,33 @@ import me.retucio.camtweaks.event.events.camtweaks.LoadModuleManagerEvent;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.ModuleManager;
 
-import me.retucio.camtweaks.module.modules.HUD;
+import me.retucio.camtweaks.module.modules.client.HUD;
 import me.retucio.camtweaks.ui.screen.ClickGUI;
-import me.retucio.camtweaks.ui.screen.HudEditorScreen;
-import me.retucio.camtweaks.ui.HudRenderer;
-import me.retucio.camtweaks.ui.buttons.BindButton;
-import me.retucio.camtweaks.ui.buttons.SettingButton;
-import me.retucio.camtweaks.ui.buttons.TextButton;
-import me.retucio.camtweaks.ui.frames.ClientSettingsFrame;
-import me.retucio.camtweaks.ui.frames.SettingsFrame;
+import me.retucio.camtweaks.ui.hud.HudEditorScreen;
+import me.retucio.camtweaks.ui.hud.HudRenderer;
+import me.retucio.camtweaks.ui.widgets.buttons.settings.BindButton;
+import me.retucio.camtweaks.ui.widgets.buttons.SettingButton;
+import me.retucio.camtweaks.ui.widgets.buttons.settings.TextButton;
+import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
+import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame;
 
-import me.retucio.camtweaks.util.ChatUtil;
-import me.retucio.camtweaks.util.KeyUtil;
-import me.retucio.camtweaks.util.Lists;
-import me.retucio.camtweaks.util.MiscUtil;
+import me.retucio.camtweaks.ui.widgets.Button;
+import me.retucio.camtweaks.util.*;
 
 
+import me.retucio.camtweaks.util.render.DrawUtil;
+import me.retucio.camtweaks.util.render.RenderUtil;
 import net.fabricmc.api.ClientModInitializer;
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.Screen;
 
+import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen;
+import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
+import net.minecraft.client.gui.screen.ingame.AnvilScreen;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -68,7 +72,7 @@ public class CameraTweaks implements ClientModInitializer {
 
 
     private Screen prevScreen;
-    public boolean settingsApplied = false;
+    public static boolean settingsApplied = false;
 
 
     @Override
@@ -80,14 +84,20 @@ public class CameraTweaks implements ClientModInitializer {
         ConfigManager.load();
 
         EVENT_BUS.register(this);
-        EVENT_BUS.register(new HudRenderer());
 
-        EVENT_BUS.register(MiscUtil.class);
+        EVENT_BUS.register(HudRenderer.class);
+
         EVENT_BUS.register(ChatUtil.class);
+        EVENT_BUS.register(DrawUtil.class);
+        EVENT_BUS.register(EntityUtil.class);
+        EVENT_BUS.register(InventoryUtil.class);
+        EVENT_BUS.register(MiscUtil.class);
+        EVENT_BUS.register(NetworkUtil.class);
+        EVENT_BUS.register(RenderUtil.class);
 
         Lists.init();
 
-        ModuleManager.INSTANCE = new ModuleManager(EVENT_BUS);
+        ModuleManager.INSTANCE = new ModuleManager();
         EVENT_BUS.post(new LoadModuleManagerEvent());
 
         CommandManager.INSTANCE = new CommandManager();
@@ -140,7 +150,7 @@ public class CameraTweaks implements ClientModInitializer {
     // verifica si algún botón de ajustes está escuchando
     private boolean isAnySettingButtonFocused() {
         for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames())
-            for (SettingButton sb : sf.getButtons())
+            for (Button sb : sf.getButtons())
                 if ((sb instanceof BindButton b && b.isFocused()) || (sb instanceof TextButton t && t.isFocused()))
                     return true;
         return false;
@@ -164,15 +174,16 @@ public class CameraTweaks implements ClientModInitializer {
     private void handleSettingButtonsKey(int key, int action) {
         for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames()) {
             for (SettingButton sb : sf.getButtons()) {
-                if (sb instanceof BindButton b) b.onKey(key, action);
-                else if (sb instanceof TextButton t) t.onKey(key, action);
+                if (sb instanceof BindButton bb) bb.onKey(key, action);
+                if (sb instanceof TextButton tb) tb.onKey(key, action);
             }
         }
     }
 
     // maneja la lógica de apertura de la interfaz
     private void handleClickGUIKey(int key, boolean anyFocused) {
-        if (key != ClientSettingsFrame.guiSettings.getKey() || anyFocused) return;
+        if (key != ClientSettingsFrame.guiSettings.getKey() || anyFocused || isOnTypingScreen())
+            return;
 
         // al parecer esto hace que con la tecla de la interfaz puedas ir cambiando de splash text en la pantalla del título
         // pero me ha hecho gracia así que así se queda
@@ -188,13 +199,13 @@ public class CameraTweaks implements ClientModInitializer {
     // manejar la lógica de apertura del editor de elementos del hud, con la misma lógica que handleClickGUIKey()
     private void handleHudEditorKey(int key, boolean anyFocused) {
         HUD hud = ModuleManager.INSTANCE.getModuleByClass(HUD.class);
-        if (key != hud.editorKey.getKey() || anyFocused) return;
-        if (!hud.isEnabled()) {
-            ChatUtil.warn("HUD está desactivado, lumbreras");
-            return;
-        }
+        if (key != hud.editorKey.getKey() || anyFocused || isOnTypingScreen()) return;
 
         if (mc.currentScreen != HudEditorScreen.INSTANCE) {
+            if (!hud.isEnabled()) {
+                ChatUtil.warn("HUD está desactivado, lumbreras");
+                return;
+            }
             prevScreen = mc.currentScreen;
             mc.setScreen(HudEditorScreen.INSTANCE);
         } else {
@@ -212,6 +223,13 @@ public class CameraTweaks implements ClientModInitializer {
                 module.setEnabled(false);
     }
 
+    private boolean isOnTypingScreen() {
+                return mc.currentScreen instanceof ChatScreen
+                || mc.currentScreen instanceof AnvilScreen
+                || mc.currentScreen instanceof AbstractSignEditScreen
+                || mc.currentScreen instanceof AbstractCommandBlockScreen;
+    }
+
     @SubscribeEvent
     public void onStop(ShutdownEvent event) {
         ConfigManager.save();

src/main/java/me/retucio/camtweaks/command/args/EntityArgumentType.java

@@ -8,7 +8,7 @@ import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 
-import me.retucio.camtweaks.util.MiscUtil;
+import me.retucio.camtweaks.util.EntityUtil;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.Text;
@@ -190,7 +190,7 @@ public class EntityArgumentType implements ArgumentType<Entity> {
         builder.suggest("@r");
         builder.suggest("@s");
 
-        Entity lookingAt = MiscUtil.getEntityPlayerIsLookingAt();
+        Entity lookingAt = EntityUtil.getEntityPlayerIsLookingAt();
         if (lookingAt != null)
             builder.suggest(lookingAt.getUuid().toString());
 

src/main/java/me/retucio/camtweaks/command/commands/CopyScreenshotCommand.java

@@ -3,7 +3,7 @@ package me.retucio.camtweaks.command.commands;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.camtweaks.command.Command;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ScreenshotPlus;
+import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus;
 import net.minecraft.command.CommandSource;
 
 // se usa principalmente para el módulo ScreenshotPlus, pero también se puede usar sin él supongo

src/main/java/me/retucio/camtweaks/command/commands/EnderChestCommand.java

@@ -4,23 +4,11 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.command.Command;
 import me.retucio.camtweaks.event.SubscribeEvent;
-import me.retucio.camtweaks.event.events.DisconnectEvent;
-import me.retucio.camtweaks.event.events.OpenScreenEvent;
-import me.retucio.camtweaks.event.events.PacketEvent;
 import me.retucio.camtweaks.event.events.TickEvent;
 import me.retucio.camtweaks.ui.screen.PreviewScreen;
 import me.retucio.camtweaks.util.ChatUtil;
-import me.retucio.camtweaks.util.MiscUtil;
-import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
+import me.retucio.camtweaks.util.InventoryUtil;
 import net.minecraft.command.CommandSource;
-import net.minecraft.inventory.EnderChestInventory;
-import net.minecraft.inventory.Inventories;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.SimpleInventory;
-import net.minecraft.network.packet.s2c.play.CloseScreenS2CPacket;
-import net.minecraft.screen.GenericContainerScreenHandler;
-import net.minecraft.text.Text;
-import net.minecraft.util.ActionResult;
 
 // accede a los contenidos de tu enderchest
 public class EnderChestCommand extends Command {
@@ -36,7 +24,7 @@ public class EnderChestCommand extends Command {
         builder.executes(ctx -> {
             mc.execute(() -> {
                 if (mc.player == null) return;
-                if (MiscUtil.getEchestInv() == null) {
+                if (InventoryUtil.getEchestInv() == null) {
                     ChatUtil.warn("necesitas abrir un enderchest una vez primero");
                     return;
                 }
@@ -52,8 +40,8 @@ public class EnderChestCommand extends Command {
     public void onTick(TickEvent.Post event) {
         if (shouldOpenEchest) {
             shouldOpenEchest = false;
-            if (MiscUtil.getEchestInv() != null)
-                mc.setScreen(new PreviewScreen(MiscUtil.getEchestInv(), null));
+            if (InventoryUtil.getEchestInv() != null)
+                mc.setScreen(new PreviewScreen(InventoryUtil.getEchestInv(), null));
         }
     }
 }

src/main/java/me/retucio/camtweaks/command/commands/PrefixCommand.java

@@ -3,7 +3,7 @@ package me.retucio.camtweaks.command.commands;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.camtweaks.command.Command;
-import me.retucio.camtweaks.ui.frames.ClientSettingsFrame;
+import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
 import me.retucio.camtweaks.util.ChatUtil;
 import net.minecraft.command.CommandSource;
 import net.minecraft.text.Text;

src/main/java/me/retucio/camtweaks/command/commands/SaveScreenshotCommand.java

@@ -3,7 +3,7 @@ package me.retucio.camtweaks.command.commands;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.camtweaks.command.Command;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ScreenshotPlus;
+import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus;
 import me.retucio.camtweaks.util.ChatUtil;
 import net.minecraft.command.CommandSource;
 

src/main/java/me/retucio/camtweaks/command/commands/SpectateCommand.java

@@ -5,6 +5,7 @@ import me.retucio.camtweaks.command.Command;
 import me.retucio.camtweaks.command.args.EntityArgumentType;
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.KeyEvent;
+import me.retucio.camtweaks.util.EntityUtil;
 import me.retucio.camtweaks.util.MiscUtil;
 import net.minecraft.command.CommandSource;
 import net.minecraft.entity.Entity;
@@ -21,7 +22,7 @@ public class SpectateCommand extends Command {
         builder
                 .executes(ctx -> {  // If no argument, use the entity player is looking at
                     mc.execute(() -> {
-                        Entity target = MiscUtil.getEntityPlayerIsLookingAt();
+                        Entity target = EntityUtil.getEntityPlayerIsLookingAt();
                         if (target != null)
                             mc.setCameraEntity(target);
                     });

src/main/java/me/retucio/camtweaks/config/ClientConfig.java

@@ -57,8 +57,9 @@ public class ClientConfig {
             case KeySetting k: value = k.getKey(); break;
             case NumberSetting n: value = n.getValue(); break;
             case StringSetting s: value = s.getValue(); break;
-            case ListSetting l: value = l.getValues(); break;
+            case ListSetting l: value = l.getConfigValues(); break;
             case ColorSetting c: value = c.getConfigValue(); break;
+            case OptionSetting o: value = o.getIndex(); break;
             default: break;
         }
 
@@ -79,39 +80,39 @@ public class ClientConfig {
 
     @SubscribeEvent
     public void onMoveSettingsFrame(SettingsFrameEvent.Move event) {
-        settingsFrames.replace(event.getFrame().module.getName(), new int[]{event.getFrame().x, event.getFrame().y});
+        settingsFrames.replace(event.getFrame().module.getName(), new int[]{event.getFrame().getX(), event.getFrame().getY()});
         ConfigManager.save();
     }
 
     @SubscribeEvent
     public void onExtendModuleFrame(ModuleFrameEvent.Extend event) {
         extendableFrames.put("M", new FrameData(
-                ClickGUI.INSTANCE.getModulesFrame().x,
-                ClickGUI.INSTANCE.getModulesFrame().y,
+                ClickGUI.INSTANCE.getModulesFrame().getX(),
+                ClickGUI.INSTANCE.getModulesFrame().getY(),
                 ClickGUI.INSTANCE.getModulesFrame().extended));
     }
 
     @SubscribeEvent
     public void onMoveModuleFrame(ModuleFrameEvent.Move event) {
         extendableFrames.replace("M", new FrameData(
-                ClickGUI.INSTANCE.getModulesFrame().x,
-                ClickGUI.INSTANCE.getModulesFrame().y,
+                ClickGUI.INSTANCE.getModulesFrame().getX(),
+                ClickGUI.INSTANCE.getModulesFrame().getY(),
                 ClickGUI.INSTANCE.getModulesFrame().extended));
     }
 
     @SubscribeEvent
     public void onExtendGUISettingsFrame(GUISettingsFrameEvent.Extend event) {
         extendableFrames.put("S", new FrameData(
-                ClickGUI.INSTANCE.getGuiSettingsFrame().x,
-                ClickGUI.INSTANCE.getGuiSettingsFrame().y,
+                ClickGUI.INSTANCE.getGuiSettingsFrame().getX(),
+                ClickGUI.INSTANCE.getGuiSettingsFrame().getY(),
                 ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
     }
 
     @SubscribeEvent
     public void onMoveGUISettingsFrame(GUISettingsFrameEvent.Move event) {
         extendableFrames.replace("S", new FrameData(
-                ClickGUI.INSTANCE.getGuiSettingsFrame().x,
-                ClickGUI.INSTANCE.getGuiSettingsFrame().y,
+                ClickGUI.INSTANCE.getGuiSettingsFrame().getX(),
+                ClickGUI.INSTANCE.getGuiSettingsFrame().getY(),
                 ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
     }
 

src/main/java/me/retucio/camtweaks/config/ConfigManager.java

@@ -6,9 +6,10 @@ import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.ModuleManager;
 import me.retucio.camtweaks.module.settings.*;
+import me.retucio.camtweaks.ui.widgets.frames.ModuleFrame;
 import me.retucio.camtweaks.ui.screen.ClickGUI;
-import me.retucio.camtweaks.ui.frames.ClientSettingsFrame;
-import me.retucio.camtweaks.ui.frames.SettingsFrame;
+import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
+import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame;
 
 import java.io.File;
 import java.io.FileReader;
@@ -23,24 +24,29 @@ public class ConfigManager {
 
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     private static final File CONFIG_FILE = new File("camera_tweaks.json");
-    private static boolean loaded = false;
 
+    private static boolean loaded = false;
     private static ClientConfig config = null;
 
+
+    // ------------------ MÉTODOS PRINCIPALES ------------------
+
     // guardar configuraciones
     public static void save() {
         ensureConfig();
+
         try (FileWriter writer = new FileWriter(CONFIG_FILE)) {
             GSON.toJson(config, writer);
             CameraTweaks.LOGGER.info("ajustes guardados");
         } catch (IOException e) {
-            e.printStackTrace();
+            CameraTweaks.LOGGER.error("error al guardar ajustes", e);
         }
     }
 
     // cargar configuraciones
     public static void load() {
-        CameraTweaks.LOGGER.info("ajustes cargados");
+        CameraTweaks.LOGGER.info("cargando ajustes...");
+
         if (!CONFIG_FILE.exists()) {
             ensureConfig();
             save();
@@ -49,79 +55,52 @@ public class ConfigManager {
 
         try (FileReader reader = new FileReader(CONFIG_FILE)) {
             config = GSON.fromJson(reader, ClientConfig.class);
+            CameraTweaks.LOGGER.info("ajustes cargados");
         } catch (IOException e) {
-            e.printStackTrace();
+            CameraTweaks.LOGGER.error("no se pudieron cargar los ajustes, usando ajustes por defecto", e);
             ensureConfig();
         }
     }
 
     // aplicar configuraciones cargadas
     public static void applyConfig() {
-        if (CameraTweaks.mc == null || ModuleManager.INSTANCE == null || config == null)
-            return;
+        if (!shouldApply()) return;
 
-        ModuleManager.INSTANCE.getModules().forEach(module -> {
-            if (config.moduleStates.containsKey(module.getName()))
-                module.setEnabled(config.moduleStates.get(module.getName()));  // estados
-
-            module.getSettings().forEach(setting -> applySetting(module, setting));
-
-            if (config.settingsFrames.containsKey(module.getName())) {
-                int[] position = config.settingsFrames.get(module.getName());
-                ClickGUI.INSTANCE.openSettingsFrame(module, position[0], position[1]);
-            }
-        });
-
-        if (config.searchBarPosition != null && config.searchBarPosition.length == 2) {
-            ClickGUI.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]);
-            ClickGUI.INSTANCE.getSearchBar().setY(config.searchBarPosition[1]);
-        }
-
-        ClientSettingsFrame.guiSettings.setEnabled(true);
-        ClientSettingsFrame.guiSettings.getSettings().forEach(setting -> applySetting(ClientSettingsFrame.guiSettings, setting));
-
-        CameraTweaks.LOGGER.info("módulos encendidos cargados");
-        CameraTweaks.LOGGER.info("ajustes de módulos cargados");
-
-        ClientConfig.FrameData moduleFrameData = config.extendableFrames.get("M");
-        if (moduleFrameData != null) {
-            ClickGUI.INSTANCE.getModulesFrame().x = moduleFrameData.x();
-            ClickGUI.INSTANCE.getModulesFrame().y = moduleFrameData.y();
-            ClickGUI.INSTANCE.getModulesFrame().extended = moduleFrameData.extended();
-        }
-
-        ClientConfig.FrameData guiSettingsData = config.extendableFrames.get("S");
-        if (guiSettingsData != null) {
-            ClickGUI.INSTANCE.getGuiSettingsFrame().x = guiSettingsData.x();
-            ClickGUI.INSTANCE.getGuiSettingsFrame().y = guiSettingsData.y();
-            ClickGUI.INSTANCE.getGuiSettingsFrame().extended = guiSettingsData.extended();
-        }
-
-        CameraTweaks.LOGGER.info("posiciones de frames cargadas");
-        ClickGUI.INSTANCE.refreshListButtons();
+        applyModuleStates();
+        applyModuleSettings();
+        applySettingsFrames();
+        applySearchBarPosition();
+        applyGuiSettings();
+        applyExtendableFrames();
 
         loaded = true;
+        CameraTweaks.LOGGER.info("ajustes aplicados");
     }
 
+    // obtener configuración actual
     public static ClientConfig getConfig() {
+        ensureConfig();
         return config;
     }
 
+
+    // ------------------ GUARDAR VALORES INDIVIDUALES EN LA CONFIG. ------------------
+
     public static void setModuleState(Module module) {
         ensureConfig();
         config.moduleStates.put(module.getName(), module.isEnabled());
         save();
     }
 
-    public static void setSetting(AbstractSetting setting, Object value) {
+    public static void setSetting(Setting setting, Object value) {
         ensureConfig();
-        config.settings.put(setting.getModule().getName() + ":" + setting.getName(), value);
+        config.settings.put(getSettingKey(setting), value);
         save();
     }
 
     public static void setFramePosition(SettingsFrame frame) {
         ensureConfig();
-        config.settingsFrames.put(frame.module.getName(), new int[]{frame.x, frame.y});
+        config.settingsFrames.put(frame.module.getName(), new int[] {frame.getX(), frame.getY()});
         save();
     }
 
@@ -133,7 +112,7 @@ public class ConfigManager {
 
     public static void setHudPosition(String id, int x, int y) {
         ensureConfig();
-        config.hudPositions.put(id, new int[]{x, y});
+        config.hudPositions.put(id, new int[] {x, y});
         save();
     }
 
@@ -145,62 +124,197 @@ public class ConfigManager {
 
     public static void setSearchBarPosition(int x, int y) {
         ensureConfig();
-        config.searchBarPosition = new int[]{x, y};
+        config.searchBarPosition = new int[] {x, y};
         save();
     }
 
 
+    // ------------------ APLICAR AJUSTES ------------------
+
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public static void applySetting(Module parent, AbstractSetting setting) {
-        String id = parent.getName() + ":" + setting.getName();
-        if (config.settings.containsKey(id)) {
-            Object value = config.settings.get(id);
+    public static void applySetting(Module parent, Setting setting) {
+        String key = getSettingKey(setting);
 
-            switch (setting) {
-                case BooleanSetting b -> b.setEnabled((boolean) value);
-                case EnumSetting e -> e.setIndex(value instanceof Double val ? val.intValue() : (int) value);
-                case NumberSetting n -> n.setValue((double) value);
-                case StringSetting s -> s.setValue((String) value);
-                case KeySetting k -> k.setKey(value instanceof Double val ? val.intValue() : (int) value);
-                case ListSetting l -> {
-                    if (value instanceof Map<?, ?> map) {
-                        Map<Object, Boolean> converted = new HashMap<>();
-                        for (Object option : l.getOptions()) {
-                            Object key = String.valueOf(option);
-                            Object bv = map.get(key);
-                            converted.put(option, bv instanceof Boolean b && b);
-                        }
-                        l.setValues(converted);
-                    }
-                } case ColorSetting c -> {
-                    if (value instanceof Map<?, ?> map) {
-                        Number r = (Number) map.get("r");
-                        Number g = (Number) map.get("g");
-                        Number b = (Number) map.get("b");
-                        Number a = (Number) map.get("a");
-                        Boolean rainbow = (Boolean) map.get("rb");
-                        Number rainbowSpeed = (Number) map.get("rs");
-                        Number saturation = (Number) map.get("sat");
-                        Number brightness = (Number) map.get("bri");
+        if (!config.settings.containsKey(key)) return;
 
-                        if (r != null && g != null && b != null && a != null)
-                            c.setRGB(r.intValue(), g.intValue(), b.intValue(), a.intValue());
+        Object value = config.settings.get(key);
 
-                        if (rainbow != null) c.setRainbow(rainbow);
-                        if (rainbowSpeed != null) c.setRainbowSpeed(rainbowSpeed.intValue());
-                        if (saturation != null) c.setSaturation(saturation.floatValue());
-                        if (brightness != null) c.setBrightness(brightness.floatValue());
-                    }
-                }
-                default -> {}
-            }
+        switch (setting) {
+            case BooleanSetting booleanSetting -> applyBooleanSetting(booleanSetting, value);
+            case EnumSetting enumSetting -> applyEnumSetting(enumSetting, value);
+            case NumberSetting numberSetting -> applyNumberSetting(numberSetting, value);
+            case StringSetting stringSetting -> applyStringSetting(stringSetting, value);
+            case KeySetting keySetting -> applyKeySetting(keySetting, value);
+            case ListSetting listSetting -> applyListSetting(listSetting, value);
+            case ColorSetting colorSetting -> applyColorSetting(colorSetting, value);
+            case OptionSetting optionSetting -> applyOptionSetting(optionSetting, value);
+            default -> CameraTweaks.LOGGER.warn("watafac queseso: {}", setting.getClass().getSimpleName());
         }
     }
 
+    private static void applyModuleStates() {
+        ModuleManager.INSTANCE.getModules().forEach(module -> {
+            if (config.moduleStates.containsKey(module.getName())) {
+                module.setEnabled(config.moduleStates.get(module.getName()));
+            }
+        });
+        CameraTweaks.LOGGER.info("estados de módulos aplicados");
+    }
+
+    private static void applyModuleSettings() {
+        ModuleManager.INSTANCE.getModules().forEach(module -> {
+            module.getSettings().forEach(setting -> applySetting(module, setting));
+        });
+        CameraTweaks.LOGGER.info("ajustes de módulos aplicados");
+    }
+
+    private static void applySettingsFrames() {
+        config.settingsFrames.forEach((moduleName, position) -> {
+            Module module = ModuleManager.INSTANCE.getModuleByName(moduleName);
+            ClickGUI.INSTANCE.openSettingsFrame(module, position[0], position[1]);
+        });
+        CameraTweaks.LOGGER.info("estados de marcos de ajustes aplicados");
+    }
+
+    private static void applySearchBarPosition() {
+        if (config.searchBarPosition != null && config.searchBarPosition.length == 2) {
+            ClickGUI.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]);
+            ClickGUI.INSTANCE.getSearchBar().setY(config.searchBarPosition[1]);
+        }
+        CameraTweaks.LOGGER.info("posición de la barra de búsqueda aplicada");
+    }
+
+    private static void applyGuiSettings() {
+        ClientSettingsFrame.guiSettings.setEnabled(true);
+        ClientSettingsFrame.guiSettings.getSettings().forEach(setting -> {
+            applySetting(ClientSettingsFrame.guiSettings, setting);
+        });
+        CameraTweaks.LOGGER.info("ajustes del cliente aplicados");
+    }
+
+    private static void applyExtendableFrames() {
+        applyExtendableFrame(ClickGUI.INSTANCE.getModulesFrame());
+        applyExtendableFrame(ClickGUI.INSTANCE.getGuiSettingsFrame());
+
+        CameraTweaks.LOGGER.info("posiciones de marcos extendibles aplicadasa");
+        ClickGUI.INSTANCE.refreshListButtons();
+    }
+
+    private static void applyExtendableFrame(ModuleFrame frame) {
+        ClientConfig.FrameData frameData = config.extendableFrames.get("M");
+        if (frameData != null) {
+            frame.setX(frameData.x());
+            frame.setY(frameData.y());
+            frame.extended = frameData.extended();
+        }
+    }
+
+    private static void applyExtendableFrame(ClientSettingsFrame frame) {
+        ClientConfig.FrameData frameData = config.extendableFrames.get("S");
+        if (frameData != null) {
+            frame.setX(frameData.x());
+            frame.setY(frameData.y());
+            frame.extended = frameData.extended();
+        }
+    }
+
+    // ajustes de módulos
+
+    private static void applyBooleanSetting(BooleanSetting setting, Object value) {
+        if (value instanceof Boolean) {
+            setting.setEnabled((Boolean) value);
+        }
+    }
+
+    private static <T extends Enum<T>> void applyEnumSetting(EnumSetting<T> setting, Object value) {
+        if (value instanceof Double) {
+            setting.setIndex(((Double) value).intValue());
+        } else if (value instanceof Integer) {
+            setting.setIndex((Integer) value);
+        }
+    }
+
+    private static void applyNumberSetting(NumberSetting setting, Object value) {
+        if (value instanceof Double) {
+            setting.setValue((Double) value);
+        }
+    }
+
+    private static void applyStringSetting(StringSetting setting, Object value) {
+        if (value instanceof String) {
+            setting.setValue((String) value);
+        }
+    }
+
+    private static void applyKeySetting(KeySetting setting, Object value) {
+        if (value instanceof Double) {
+            setting.setKey(((Double) value).intValue());
+        } else if (value instanceof Integer) {
+            setting.setKey((Integer) value);
+        }
+    }
+
+    private static <T> void applyListSetting(ListSetting<T> setting, Object value) {
+        if (value instanceof Map<?, ?> map) {
+            Map<T, Boolean> convertedValues = new HashMap<>();
+
+            for (T option : setting.getOptions()) {
+                String key = setting.getDisplayName(option);
+                Object booleanValue = map.get(key);
+                convertedValues.put(option, booleanValue instanceof Boolean && (Boolean) booleanValue);
+            }
+
+            setting.setValues(convertedValues);
+        }
+    }
+
+    private static void applyColorSetting(ColorSetting setting, Object value) {
+        if (!(value instanceof Map<?, ?> map)) return;
+
+        Number r = (Number) map.get("r");
+        Number g = (Number) map.get("g");
+        Number b = (Number) map.get("b");
+        Number a = (Number) map.get("a");
+
+        if (r != null && g != null && b != null && a != null)
+            setting.setRGB(r.intValue(), g.intValue(), b.intValue(), a.intValue());
+
+        applyOptionalProperty(map, "rb", Boolean.class, setting::setRainbow);
+        applyOptionalProperty(map, "rs", Number.class, val -> setting.setRainbowSpeed(val.intValue()));
+        applyOptionalProperty(map, "sat", Number.class, val -> setting.setSaturation(val.floatValue()));
+        applyOptionalProperty(map, "bri", Number.class, val -> setting.setBrightness(val.floatValue()));
+    }
+
+    private static <T> void applyOptionSetting(OptionSetting<T> setting, Object value) {
+        if (value instanceof Double) {
+            int index = ((Double) value).intValue();
+            setting.setValue(setting.getOption(index));
+        }
+    }
+
+    private static <T> void applyOptionalProperty(Map<?, ?> map, String key, Class<T> type, java.util.function.Consumer<T> setter) {
+        Object value = map.get(key);
+        if (type.isInstance(value)) {
+            setter.accept(type.cast(value));
+        }
+    }
+
+
+    // ------------------ MÉTODOS DE AYUDA ------------------
+
+    private static boolean shouldApply() {
+        return CameraTweaks.mc != null && ModuleManager.INSTANCE != null && config != null;
+    }
+
+
     private static void ensureConfig() {
         if (config == null) config = new ClientConfig();
     }
 
+    private static String getSettingKey(Setting setting) {
+        return setting.getModule().getName() + ":" + setting.getName();
+    }
+
     public static boolean hasLoaded() {
         return loaded;
     }

src/main/java/me/retucio/camtweaks/event/JoinWorldEvent.java

@@ -0,0 +1,21 @@
+package me.retucio.camtweaks.event;
+
+import net.minecraft.client.world.ClientWorld;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+
+/**
+ * @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onJoinWorld 
+ */
+public class JoinWorldEvent extends Event {
+
+    private final ClientWorld world;
+
+    public JoinWorldEvent(ClientWorld world) {
+        this.world = world;
+    }
+
+    public ClientWorld getWorld() {
+        return world;
+    }
+}

src/main/java/me/retucio/camtweaks/event/events/ClientClickEvent.java

@@ -1,10 +1,11 @@
 package me.retucio.camtweaks.event.events;
 
+import me.retucio.camtweaks.module.modules.misc.ChatPlus;
 import net.minecraft.text.ClickEvent;
 
 
 /** este evento es solo para asegurarse de que comandos del mod se puedan ejecutar solo desde el lado del cliente
- * @see me.retucio.camtweaks.module.modules.ChatPlus#getSendButton
+ * @see ChatPlus#getSendButton
  */
 public class ClientClickEvent implements ClickEvent {
 

src/main/java/me/retucio/camtweaks/event/events/ClipAtLedgeEvent.java

@@ -0,0 +1,20 @@
+package me.retucio.camtweaks.event.events;
+
+import me.retucio.camtweaks.event.Event;
+
+public class ClipAtLedgeEvent extends Event {
+
+    private boolean clipping;
+
+    public ClipAtLedgeEvent(boolean clipping) {
+        this.clipping = clipping;
+    }
+
+    public boolean isClipping() {
+        return clipping;
+    }
+
+    public void setClipping(boolean clipping) {
+        this.clipping = clipping;
+    }
+}

src/main/java/me/retucio/camtweaks/event/events/PacketEvent.java

@@ -1,12 +1,14 @@
 package me.retucio.camtweaks.event.events;
 
+import io.netty.channel.ChannelFutureListener;
 import me.retucio.camtweaks.event.Event;
 import me.retucio.camtweaks.event.Stage;
 import net.minecraft.network.packet.Packet;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 
 /**
- * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPre 
+ * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPre
  * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPost 
  * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onReceivePacket
  */

src/main/java/me/retucio/camtweaks/event/events/camtweaks/SettingsFrameEvent.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.event.events.camtweaks;
 
 import me.retucio.camtweaks.event.Event;
-import me.retucio.camtweaks.ui.frames.SettingsFrame;
+import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame;
 
 // se genera cada que se interactúa con un marco de ajustes de un módulo
 public class SettingsFrameEvent {

src/main/java/me/retucio/camtweaks/event/events/camtweaks/UpdateSettingEvent.java

@@ -1,20 +1,20 @@
 package me.retucio.camtweaks.event.events.camtweaks;
 
 import me.retucio.camtweaks.event.Event;
-import me.retucio.camtweaks.module.settings.AbstractSetting;
+import me.retucio.camtweaks.module.settings.Setting;
 
 // se genera cada que se cambia el valor de un ajuste
 public class UpdateSettingEvent extends Event {
 
-    private final AbstractSetting setting;
+    private final Setting setting;
     private boolean shouldSave;
 
-    public UpdateSettingEvent(AbstractSetting setting, boolean shouldSave) {
+    public UpdateSettingEvent(Setting setting, boolean shouldSave) {
         this.setting = setting;
         this.shouldSave = shouldSave;
     }
 
-    public AbstractSetting getSetting() {
+    public Setting getSetting() {
         return setting;
     }
 

src/main/java/me/retucio/camtweaks/mixin/CameraMixin.java

@@ -1,12 +1,12 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Freelook;
-import me.retucio.camtweaks.module.modules.Freecam;
-import me.retucio.camtweaks.module.modules.PerspectivePlus;
+import me.retucio.camtweaks.module.modules.camera.Freelook;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
+import me.retucio.camtweaks.module.modules.camera.PerspectivePlus;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
-import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -44,7 +44,7 @@ public abstract class CameraMixin {
     }
 
     @Inject(method = "update", at = @At("HEAD"))
-    private void onUpdateHead(BlockView area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo info) {
+    private void onUpdateHead(World area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) {
         this.tickDelta = tickDelta;
     }
 
@@ -67,7 +67,7 @@ public abstract class CameraMixin {
     // cámara libre
 
     @Inject(method = "update", at = @At("TAIL"))
-    private void onUpdateTail(BlockView area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo info) {
+    private void onUpdateTail(World area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickProgress, CallbackInfo ci) {
         if (freecam.isEnabled())
             this.thirdPerson = true;
     }

src/main/java/me/retucio/camtweaks/mixin/ChatHudMixin.java

@@ -1,18 +1,15 @@
 package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.injector.ModifyReceiver;
 import com.llamalad7.mixinextras.sugar.Local;
 import me.retucio.camtweaks.event.events.ReceiveMessageEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ChatPlus;
+import me.retucio.camtweaks.module.modules.misc.ChatPlus;
 import me.retucio.camtweaks.util.interfaces.IChatHud;
 import me.retucio.camtweaks.util.interfaces.IChatHudLine;
 import me.retucio.camtweaks.util.interfaces.IChatHudLineVisible;
 import me.retucio.camtweaks.util.interfaces.IMessageHandler;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.client.gui.hud.ChatHudLine;
 import net.minecraft.client.gui.hud.MessageIndicator;
@@ -71,12 +68,12 @@ public abstract class ChatHudMixin implements IChatHud {
         nextId = 0;
     }
 
-    @Inject(method = "addVisibleMessage", at = @At(value = "INVOKE", target = "Ljava/util/List;add(ILjava/lang/Object;)V", shift = At.Shift.AFTER))
+    @Inject(method = "addVisibleMessage", at = @At(value = "INVOKE", target = "Ljava/util/List;addFirst(Ljava/lang/Object;)V", shift = At.Shift.AFTER))
     private void onAddMessageAfterNewChatHudLineVisible(ChatHudLine message, CallbackInfo ci) {
         ((IChatHudLine) (Object) visibleMessages.getFirst()).smegma$setId(nextId);
     }
 
-    @Inject(method = "addMessage(Lnet/minecraft/client/gui/hud/ChatHudLine;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;add(ILjava/lang/Object;)V", shift = At.Shift.AFTER))
+    @Inject(method = "addMessage(Lnet/minecraft/client/gui/hud/ChatHudLine;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;addFirst(Ljava/lang/Object;)V", shift = At.Shift.AFTER))
     private void onAddMessageAfterNewChatHudLine(ChatHudLine message, CallbackInfo ci) {
         ((IChatHudLine) (Object) messages.getFirst()).smegma$setId(nextId);
     }
@@ -144,23 +141,11 @@ public abstract class ChatHudMixin implements IChatHud {
 
     // cabezas
 
-    @ModifyExpressionValue(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;ceil(F)I"))
+    @ModifyExpressionValue(method = "render(Lnet/minecraft/client/gui/hud/ChatHud$Backend;IIZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;ceil(F)I"))
     private int onRender_modifyWidth(int width) {
         return (chatPlus.isEnabled() && chatPlus.showHeads.isEnabled()) ? width + 10 : width;
     }
 
-    @ModifyReceiver(method = "method_71991", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/OrderedText;III)V"))
-    private DrawContext onRender_beforeDrawTextWithShadow(DrawContext context, TextRenderer textRenderer, OrderedText text, int x, int y, int color, @Local(argsOnly = true) ChatHudLine.Visible line) {
-        chatPlus.beforeDrawMessage(context, line, y, color);
-        return context;
-    }
-
-    @Inject(method = "method_71991", at = @At("TAIL"))
-    private void onRender_afterDrawTextWithShadow(int i, DrawContext context, float f, int j, int k, int l, ChatHudLine.Visible visible, int m, float g, CallbackInfo info) {
-        chatPlus.afterDrawMessage(context);
-    }
-
-
 
     // historial (registro) del chat
 
@@ -181,7 +166,7 @@ public abstract class ChatHudMixin implements IChatHud {
         chatPlus.lines.addFirst(list.size());
     }
 
-    @Inject(method = "addMessage(Lnet/minecraft/client/gui/hud/ChatHudLine;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;remove(I)Ljava/lang/Object;"))
+    @Inject(method = "addMessage(Lnet/minecraft/client/gui/hud/ChatHudLine;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;removeLast()Ljava/lang/Object;"))
     private void onRemoveMessage(ChatHudLine message, CallbackInfo ci) {
         int extra = chatPlus.chatHistoryExtraLength.getIntValue();
         int size = chatPlus.lines.size();

src/main/java/me/retucio/camtweaks/mixin/ChatScreenMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ChatPlus;
+import me.retucio.camtweaks.module.modules.misc.ChatPlus;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/me/retucio/camtweaks/mixin/ChunkBorderDebugRendererMixin.java

@@ -1,18 +1,15 @@
 package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Freecam;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.debug.ChunkBorderDebugRenderer;
-import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.ChunkSectionPos;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(ChunkBorderDebugRenderer.class)
@@ -21,14 +18,16 @@ public abstract class ChunkBorderDebugRendererMixin {
     @Shadow @Final
     private MinecraftClient client;
 
-    @ModifyExpressionValue(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getChunkPos()Lnet/minecraft/util/math/ChunkPos;"))
-    private ChunkPos getChunkPos(ChunkPos chunkPos) {
+    @ModifyExpressionValue(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/ChunkSectionPos;from(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/math/ChunkSectionPos;"))
+    private ChunkSectionPos getChunkPos(ChunkSectionPos chunkPos) {
         Freecam freecam = ModuleManager.INSTANCE.getModuleByClass(Freecam.class);
         if (!freecam.isEnabled()) return chunkPos;
 
         float delta = client.getRenderTickCounter().getTickProgress(true);
-        return new ChunkPos(
+        return ChunkSectionPos.from(
                 ChunkSectionPos.getSectionCoord(MathHelper.floor(freecam.getX(delta))),
-                ChunkSectionPos.getSectionCoord(MathHelper.floor(freecam.getZ(delta))));
+                ChunkSectionPos.getSectionCoord(MathHelper.floor(freecam.getY(delta))),
+                ChunkSectionPos.getSectionCoord(MathHelper.floor(freecam.getZ(delta)))
+        );
     }
 }

src/main/java/me/retucio/camtweaks/mixin/ClientCommonNetworkHandlerMixin.java

@@ -3,7 +3,7 @@ package me.retucio.camtweaks.mixin;
 import me.retucio.camtweaks.mixin.accessor.ConfirmServerResourcePackScreenAccessor;
 import me.retucio.camtweaks.mixin.accessor.PackAccessor;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.RPackBypass;
+import me.retucio.camtweaks.module.modules.network.RPackBypass;
 import me.retucio.camtweaks.util.interfaces.IConfirmScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;

src/main/java/me/retucio/camtweaks/mixin/ClientPlayNetworkHandlerMixin.java

@@ -4,12 +4,11 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import me.retucio.camtweaks.command.CommandManager;
 import me.retucio.camtweaks.event.events.SendMessageEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import me.retucio.camtweaks.util.ChatUtil;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;

src/main/java/me/retucio/camtweaks/mixin/ClientPlayerEntityMixin.java

@@ -1,19 +1,38 @@
 package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.llamalad7.mixinextras.sugar.Local;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.PortalGUI;
+import me.retucio.camtweaks.module.modules.world.NoMiningInterruptions;
+import me.retucio.camtweaks.module.modules.player.PortalGUI;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(ClientPlayerEntity.class)
 public abstract class ClientPlayerEntityMixin {
 
-    @ModifyExpressionValue(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
+    @ModifyExpressionValue(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;", opcode = Opcodes.GETFIELD))
     private Screen allowScreensInPortals(Screen original) {
         if (ModuleManager.INSTANCE.getModuleByClass(PortalGUI.class).isEnabled()) return null;
         return original;
     }
+
+    @ModifyReturnValue(method = "getCrosshairTarget(FLnet/minecraft/entity/Entity;)Lnet/minecraft/util/hit/HitResult;", at = @At("RETURN"))
+    private static HitResult onGetCrosshairTarget(HitResult original, @Local HitResult hitResult) {
+        NoMiningInterruptions nmi = ModuleManager.INSTANCE.getModuleByClass(NoMiningInterruptions.class);
+        if (original instanceof EntityHitResult ehr) {
+            if (nmi.shouldIgnoreEntity(ehr.getEntity())
+                    && hitResult.getType() == HitResult.Type.BLOCK) {
+                return hitResult;
+            }
+        }
+
+        return original;
+    }
 }

src/main/java/me/retucio/camtweaks/mixin/ClientPlayerInteractionManagerMixin.java

@@ -1,14 +1,11 @@
 package me.retucio.camtweaks.mixin;
 
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import com.llamalad7.mixinextras.sugar.Local;
 import me.retucio.camtweaks.event.events.AttackEntityEvent;
 import me.retucio.camtweaks.event.events.BreakBlockEvent;
 import me.retucio.camtweaks.event.events.InteractEntityEvent;
 import me.retucio.camtweaks.event.events.PlaceBlockEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Freecam;
-import me.retucio.camtweaks.util.ChatUtil;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;

src/main/java/me/retucio/camtweaks/mixin/ClientWorldPropertiesMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.TimeChanger;
+import me.retucio.camtweaks.module.modules.world.TimeChanger;
 import net.minecraft.client.world.ClientWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/me/retucio/camtweaks/mixin/ConfirmScreenMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.RPackBypass;
+import me.retucio.camtweaks.module.modules.network.RPackBypass;
 import me.retucio.camtweaks.util.interfaces.IConfirmScreen;
 import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.client.gui.screen.Screen;

src/main/java/me/retucio/camtweaks/mixin/DamageParticleMixin.java

@@ -2,15 +2,13 @@ package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.CritsPlus;
+import me.retucio.camtweaks.module.modules.render.CritsPlus;
 import net.minecraft.client.particle.BillboardParticle;
 import net.minecraft.client.particle.DamageParticle;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
-import java.awt.*;
-
 @Mixin(DamageParticle.class)
 public abstract class DamageParticleMixin {
 

src/main/java/me/retucio/camtweaks/mixin/DimensionTypeMixin.java

@@ -1,30 +0,0 @@
-package me.retucio.camtweaks.mixin;
-
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import com.llamalad7.mixinextras.sugar.Local;
-import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.TimeChanger;
-import me.retucio.camtweaks.util.ChatUtil;
-import net.minecraft.world.dimension.DimensionType;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import static me.retucio.camtweaks.CameraTweaks.mc;
-
-@Mixin(DimensionType.class)
-public abstract class DimensionTypeMixin {
-
-    // no consigo arreglar lo de que la fase lunar por defecto siempre sea luna llena
-    @ModifyReturnValue(method = "getMoonPhase", at = @At("RETURN"))
-    private int overrideMoonPhase(int original, @Local(argsOnly = true) long time) {
-        TimeChanger timeChanger = ModuleManager.INSTANCE.getModuleByClass(TimeChanger.class);
-        if (timeChanger == null || !timeChanger.isEnabled() || mc.world == null) {
-            return original;
-        }
-
-        if (timeChanger.moonPhase.is(TimeChanger.MoonPhases.DEFAULT))
-            return (int) (time / 24000L % 8L + 8L) % 8;
-
-        return timeChanger.getMoonPhase();
-    }
-}

src/main/java/me/retucio/camtweaks/mixin/DisconnectedScreenMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Reconnect;
+import me.retucio.camtweaks.module.modules.network.Reconnect;
 
 import net.minecraft.client.gui.screen.DisconnectedScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/main/java/me/retucio/camtweaks/mixin/EntityMixin.java

@@ -3,7 +3,11 @@ package me.retucio.camtweaks.mixin;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.event.events.ChangeRotationEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.*;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
+import me.retucio.camtweaks.module.modules.camera.Freelook;
+import me.retucio.camtweaks.module.modules.camera.Rotations;
+import me.retucio.camtweaks.module.modules.misc.AntiInvis;
+import me.retucio.camtweaks.module.modules.render.Nametags;
 import net.minecraft.entity.*;
 import net.minecraft.entity.passive.TameableEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -31,10 +35,14 @@ public abstract class EntityMixin {
     @Shadow private float yaw;
     @Shadow private float pitch;
 
-    @Unique Freecam freecam;
-    @Unique Freelook freelook;
-    @Unique Nametags nametags;
-    @Unique Rotations rotations;
+    @Unique
+    Freecam freecam;
+    @Unique
+    Freelook freelook;
+    @Unique
+    Nametags nametags;
+    @Unique
+    Rotations rotations;
 
     @SuppressWarnings("rawtypes")
     @Inject(method = "<init>", at = @At("TAIL"))

src/main/java/me/retucio/camtweaks/mixin/EquipmentRendererMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.GlintPlus;
+import me.retucio.camtweaks.module.modules.render.GlintPlus;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.entity.equipment.EquipmentRenderer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 @Mixin(EquipmentRenderer.class)
 public abstract class EquipmentRendererMixin {
 
-    @Redirect(method = "render(Lnet/minecraft/client/render/entity/equipment/EquipmentModel$LayerType;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;ILnet/minecraft/util/Identifier;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayer;getArmorEntityGlint()Lnet/minecraft/client/render/RenderLayer;"))
+    @Redirect(method = "render(Lnet/minecraft/client/render/entity/equipment/EquipmentModel$LayerType;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;ILnet/minecraft/util/Identifier;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayers;armorEntityGlint()Lnet/minecraft/client/render/RenderLayer;"))
     private RenderLayer redirectArmorEntityGlint() {
         GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
         return glintPlus.getArmorEntityGlint();

src/main/java/me/retucio/camtweaks/mixin/FogRendererMixin.java

@@ -3,7 +3,7 @@ package me.retucio.camtweaks.mixin;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.block.enums.CameraSubmersionType;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.fog.FogModifier;
@@ -28,7 +28,7 @@ public abstract class FogRendererMixin {
         noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
     }
 
-    @Redirect(method = "applyFog(Lnet/minecraft/client/render/Camera;IZLnet/minecraft/client/render/RenderTickCounter;FLnet/minecraft/client/world/ClientWorld;)Lorg/joml/Vector4f;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/fog/FogModifier;shouldApply(Lnet/minecraft/block/enums/CameraSubmersionType;Lnet/minecraft/entity/Entity;)Z"))
+    @Redirect(method = "applyFog(Lnet/minecraft/client/render/Camera;ILnet/minecraft/client/render/RenderTickCounter;FLnet/minecraft/client/world/ClientWorld;)Lorg/joml/Vector4f;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/fog/FogModifier;shouldApply(Lnet/minecraft/block/enums/CameraSubmersionType;Lnet/minecraft/entity/Entity;)Z"))
     private boolean noRenderFogs(FogModifier instance, CameraSubmersionType cameraSubmersionType, Entity entity) {
         if (!noRender.isEnabled()) return instance.shouldApply(cameraSubmersionType, entity);
         String className = instance.getClass().getSimpleName();

src/main/java/me/retucio/camtweaks/mixin/GameOptionsMixin.java

@@ -2,7 +2,7 @@ package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.event.events.PerspectiveChangeEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Freecam;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.option.Perspective;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/me/retucio/camtweaks/mixin/GameRendererMixin.java

@@ -1,13 +1,11 @@
 package me.retucio.camtweaks.mixin;
 
 
-import com.llamalad7.mixinextras.sugar.Local;
 import me.retucio.camtweaks.event.events.GetFOVEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Freecam;
-import me.retucio.camtweaks.module.modules.NoMiningInterruptions;
-import me.retucio.camtweaks.module.modules.NoRender;
-import me.retucio.camtweaks.module.modules.Zoom;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
+import me.retucio.camtweaks.module.modules.render.NoRender;
+import me.retucio.camtweaks.module.modules.camera.Zoom;
 import me.retucio.camtweaks.util.interfaces.IVec3d;
 
 import net.minecraft.client.MinecraftClient;
@@ -17,8 +15,6 @@ import net.minecraft.client.render.block.BlockRenderManager;
 import net.minecraft.client.render.item.HeldItemRenderer;
 import net.minecraft.entity.Entity;
 
-import net.minecraft.util.hit.EntityHitResult;
-import net.minecraft.util.hit.HitResult;
 import org.joml.Matrix4f;
 import org.joml.Vector3d;
 
@@ -123,15 +119,4 @@ public abstract class GameRendererMixin {
     private float noRenderNauseaDistortion(float scaledNauseaEffectFactor) {
         return (noRender.isEnabled() && !noRender.nauseaEffect.isEnabled()) ? 0 : scaledNauseaEffectFactor;
     }
-
-    @ModifyReturnValue(method = "findCrosshairTarget", at = @At("RETURN"))
-    private HitResult onTargetEntity(HitResult original, @Local HitResult hitResult) {
-        NoMiningInterruptions nmi = ModuleManager.INSTANCE.getModuleByClass(NoMiningInterruptions.class);
-
-        Entity entity = original instanceof EntityHitResult result ? result.getEntity() : null;
-        if (nmi.shouldIgnoreEntity(entity) && hitResult.getType() == HitResult.Type.BLOCK)
-            return hitResult;
-
-        return original;
-    }
 }

src/main/java/me/retucio/camtweaks/mixin/HandshakeC2SPacketMixin.java

@@ -5,7 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.BungeecordSpoofer;
+import me.retucio.camtweaks.module.modules.network.BungeecordSpoofer;
 import net.minecraft.network.packet.c2s.handshake.ConnectionIntent;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
 import org.spongepowered.asm.mixin.*;

src/main/java/me/retucio/camtweaks/mixin/HeldItemRendererMixin.java

@@ -4,15 +4,13 @@ import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.event.events.RenderHeldItemEvent;
 import me.retucio.camtweaks.event.events.RenderArmEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.HandView;
+import me.retucio.camtweaks.module.modules.player.HandView;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.item.ItemModelManager;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRenderManager;
 import net.minecraft.client.render.item.HeldItemRenderer;
-import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -50,7 +48,7 @@ public abstract class HeldItemRendererMixin {
     protected abstract boolean shouldSkipHandAnimationOnSwap(ItemStack from, ItemStack to);
 
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void getModules(MinecraftClient client, EntityRenderManager entityRenderDispatcher, ItemRenderer itemRenderer, ItemModelManager itemModelManager, CallbackInfo ci) {
+    private void getModules(MinecraftClient client, EntityRenderManager entityRenderDispatcher, ItemModelManager itemModelManager, CallbackInfo ci) {
         handView = ModuleManager.INSTANCE.getModuleByClass(HandView.class);
     }
 

src/main/java/me/retucio/camtweaks/mixin/InGameHudMixin.java

@@ -2,10 +2,10 @@ package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ChatPlus;
-import me.retucio.camtweaks.module.modules.Freecam;
-import me.retucio.camtweaks.module.modules.NoRender;
-import me.retucio.camtweaks.ui.HudRenderer;
+import me.retucio.camtweaks.module.modules.misc.ChatPlus;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
+import me.retucio.camtweaks.module.modules.render.NoRender;
+import me.retucio.camtweaks.ui.hud.HudRenderer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;

src/main/java/me/retucio/camtweaks/mixin/InGameOverlayRendererMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.InGameOverlayRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;

src/main/java/me/retucio/camtweaks/mixin/ItemEntityMixin.java

@@ -2,7 +2,7 @@ package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Nametags;
+import me.retucio.camtweaks.module.modules.render.Nametags;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.MutableText;

src/main/java/me/retucio/camtweaks/mixin/ItemMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ShulkerPeek;
+import me.retucio.camtweaks.module.modules.misc.ShulkerPeek;
 import net.minecraft.block.ShulkerBoxBlock;
 import net.minecraft.component.type.TooltipDisplayComponent;
 import net.minecraft.item.BlockItem;

src/main/java/me/retucio/camtweaks/mixin/ItemRendererMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.GlintPlus;
+import me.retucio.camtweaks.module.modules.render.GlintPlus;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.item.ItemRenderer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -22,12 +22,12 @@ public abstract class ItemRendererMixin {
         glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
     }
 
-    @Redirect(method = "getItemGlintConsumer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayer;getGlint()Lnet/minecraft/client/render/RenderLayer;"))
+    @Redirect(method = "getItemGlintConsumer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayers;glint()Lnet/minecraft/client/render/RenderLayer;"))
     private static RenderLayer getGlint() {
         return glintPlus.getGlint();
     }
 
-    @Redirect(method = "getItemGlintConsumer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayer;getEntityGlint()Lnet/minecraft/client/render/RenderLayer;"))
+    @Redirect(method = "getItemGlintConsumer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayers;entityGlint()Lnet/minecraft/client/render/RenderLayer;"))
     private static RenderLayer getEntityGlint() {
         return glintPlus.getEntityGlint();
     }

src/main/java/me/retucio/camtweaks/mixin/KeyInputMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Freecam;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.input.KeyboardInput;
 import net.minecraft.util.PlayerInput;

src/main/java/me/retucio/camtweaks/mixin/LightmapTextureManagerMixin.java

@@ -4,8 +4,8 @@ import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.GpuTexture;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Fullbright;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.camera.Fullbright;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.LightmapTextureManager;

src/main/java/me/retucio/camtweaks/mixin/LivingEntityRendererMixin.java

@@ -4,8 +4,8 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Freecam;
-import me.retucio.camtweaks.module.modules.Nametags;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
+import me.retucio.camtweaks.module.modules.render.Nametags;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.model.EntityModel;

src/main/java/me/retucio/camtweaks/mixin/MinecraftClientMixin.java

@@ -1,17 +1,17 @@
 package me.retucio.camtweaks.mixin;
 
-import com.ibm.icu.util.CodePointTrie;
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import me.retucio.camtweaks.CameraTweaks;
+import me.retucio.camtweaks.event.JoinWorldEvent;
 import me.retucio.camtweaks.event.events.OpenScreenEvent;
 import me.retucio.camtweaks.event.events.ShutdownEvent;
 import me.retucio.camtweaks.event.events.TickEvent;
 import me.retucio.camtweaks.event.events.UseItemEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.FastUse;
+import me.retucio.camtweaks.module.modules.player.FastUse;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 import org.spongepowered.asm.mixin.Mixin;
@@ -70,4 +70,10 @@ public abstract class MinecraftClientMixin {
         if (!fastUse.isEnabled()) return;
         itemUseCooldown = fastUse.getCooldown(stack);
     }
+
+    @Inject(method = "joinWorld", at = @At("HEAD"), cancellable = true)
+    private void onJoinWorld(ClientWorld world, CallbackInfo ci) {
+        JoinWorldEvent event = EVENT_BUS.post(new JoinWorldEvent(world));
+        if (event.isCancelled()) ci.cancel();
+    }
 }

src/main/java/me/retucio/camtweaks/mixin/OverlayTextureMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.DamageOverlay;
+import me.retucio.camtweaks.module.modules.render.DamageOverlay;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import org.spongepowered.asm.mixin.Final;

src/main/java/me/retucio/camtweaks/mixin/ParticleManagerMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.particle.ParticleEffect;

src/main/java/me/retucio/camtweaks/mixin/PlayerEntityMixin.java

@@ -1,8 +1,10 @@
 package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import me.retucio.camtweaks.CameraTweaks;
+import me.retucio.camtweaks.event.events.ClipAtLedgeEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.Nametags;
+import me.retucio.camtweaks.module.modules.render.Nametags;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -11,6 +13,8 @@ import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerEntity.class)
 public abstract class PlayerEntityMixin extends LivingEntity {
@@ -49,4 +53,11 @@ public abstract class PlayerEntityMixin extends LivingEntity {
 
         return original.copy().append(text);
     }
+
+    @Inject(method = "clipAtLedge", at = @At("HEAD"), cancellable = true)
+    private void clipAtLedge(CallbackInfoReturnable<Boolean> cir) {
+        if (!getEntityWorld().isClient()) return;
+        ClipAtLedgeEvent event = CameraTweaks.EVENT_BUS.post(new ClipAtLedgeEvent(isSneaking()));
+        cir.setReturnValue(event.isClipping());
+    }
 }

src/main/java/me/retucio/camtweaks/mixin/ResourcePackPolicyMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.RPackBypass;
+import me.retucio.camtweaks.module.modules.network.RPackBypass;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/me/retucio/camtweaks/mixin/ScreenMixin.java

@@ -1,12 +1,10 @@
 package me.retucio.camtweaks.mixin;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.command.CommandManager;
 import me.retucio.camtweaks.config.ConfigManager;
 import me.retucio.camtweaks.event.events.ClientClickEvent;
-import me.retucio.camtweaks.ui.frames.ClientSettingsFrame;
-import net.minecraft.SharedConstants;
+import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -16,9 +14,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.awt.*;
-
-import static me.retucio.camtweaks.CameraTweaks.getVersionName;
 import static me.retucio.camtweaks.CameraTweaks.mc;
 
 @Mixin(Screen.class)

src/main/java/me/retucio/camtweaks/mixin/ScreenshotRecorderMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ScreenshotPlus;
+import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.text.Text;

src/main/java/me/retucio/camtweaks/mixin/ServerConnectorMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.RPackBypass;
+import me.retucio.camtweaks.module.modules.network.RPackBypass;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.client.resource.server.ServerResourcePackManager;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/me/retucio/camtweaks/mixin/ServerInfoMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.RPackBypass;
+import me.retucio.camtweaks.module.modules.network.RPackBypass;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.nbt.NbtCompound;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/me/retucio/camtweaks/mixin/SkyRendererMixin.java

@@ -1,20 +1,17 @@
 package me.retucio.camtweaks.mixin;
 
-import com.mojang.blaze3d.buffers.GpuBuffer;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
-import me.retucio.camtweaks.module.modules.PerspectivePlus;
-import me.retucio.camtweaks.module.modules.TimeChanger;
-import me.retucio.camtweaks.util.ChatUtil;
+import me.retucio.camtweaks.module.modules.render.NoRender;
+import me.retucio.camtweaks.module.modules.world.TimeChanger;
 import net.minecraft.client.render.SkyRendering;
-import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.world.MoonPhase;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(SkyRendering.class)
 public abstract class SkyRendererMixin {
@@ -33,8 +30,17 @@ public abstract class SkyRendererMixin {
     }
 
     @Inject(method = "renderMoon", at = @At("HEAD"), cancellable = true)
-    private void onRenderMoon(int phase, float alpha, MatrixStack matrixStack, CallbackInfo ci) {
-        if (timeChanger.isEnabled() && !timeChanger.renderMoon.isEnabled()) ci.cancel();
+    private void onRenderMoon(MoonPhase moonPhase, float alpha, MatrixStack matrices, CallbackInfo ci) {
+        if (!timeChanger.isEnabled()) return;
+        if (!timeChanger.renderMoon.isEnabled()) ci.cancel();
+    }
+
+    @ModifyArg(method = "renderCelestialBodies", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/SkyRendering;renderMoon(Lnet/minecraft/world/MoonPhase;FLnet/minecraft/client/util/math/MatrixStack;)V"))
+    private MoonPhase timeChangerMoonPhase(MoonPhase original) {
+        if (!timeChanger.isEnabled() || timeChanger.moonPhase.is(TimeChanger.MoonPhases.DEFAULT)) return original;
+        int phase = timeChanger.moonPhase.getIndex();
+        if (timeChanger.moonPhase.is(TimeChanger.MoonPhases.DEFAULT)) phase = original.getIndex();
+        return MoonPhase.values()[phase];
     }
 
     @Inject(method = "renderStars", at = @At("HEAD"), cancellable = true)

src/main/java/me/retucio/camtweaks/mixin/StatusEffectFogModifierMixin.java

@@ -2,7 +2,7 @@ package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.render.fog.StatusEffectFogModifier;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffects;

src/main/java/me/retucio/camtweaks/mixin/StringHelperMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.ChatPlus;
+import me.retucio.camtweaks.module.modules.misc.ChatPlus;
 import net.minecraft.util.StringHelper;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/me/retucio/camtweaks/mixin/StuckArrowsFeatureRendererMixin.java

@@ -2,7 +2,7 @@ package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.render.entity.feature.StuckArrowsFeatureRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/me/retucio/camtweaks/mixin/TextRendererDrawerMixin.java

@@ -1,22 +1,15 @@
 package me.retucio.camtweaks.mixin;
 
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
-import net.minecraft.client.font.BakedGlyph;
-import net.minecraft.client.font.GlyphProvider;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.text.Style;
 import net.minecraft.text.TextColor;
-import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static me.retucio.camtweaks.CameraTweaks.mc;
-
 // falta italics pero no sé dónde se comprueba eso, no es aquí :P
 @Mixin(TextRenderer.Drawer.class)
 public abstract class TextRendererDrawerMixin {
@@ -24,8 +17,8 @@ public abstract class TextRendererDrawerMixin {
     @Unique
     NoRender noRender;
 
-    @Inject(method = "<init>(Lnet/minecraft/client/font/TextRenderer;FFIIZ)V", at = @At("TAIL"))
-    private void getModules(TextRenderer textRenderer, float x, float y, int color, int backgroundColor, boolean shadow, CallbackInfo ci) {
+    @Inject(method = "<init>(Lnet/minecraft/client/font/TextRenderer;FFIIZZ)V", at = @At("TAIL"))
+    private void getModules(TextRenderer textRenderer, float x, float y, int color, int backgroundColor, boolean shadow, boolean trackEmpty, CallbackInfo ci) {
         noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
     }
 

src/main/java/me/retucio/camtweaks/mixin/TextRendererMixin.java

@@ -2,7 +2,7 @@ package me.retucio.camtweaks.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.font.TextRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/me/retucio/camtweaks/mixin/WeatherRenderingMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.camtweaks.mixin;
 
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.NoRender;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WeatherRendering;
@@ -15,8 +15,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.List;
-
 
 @Mixin(WeatherRendering.class)
 public abstract class WeatherRenderingMixin {
@@ -30,7 +28,7 @@ public abstract class WeatherRenderingMixin {
     }
 
     @Inject(method = "addParticlesAndSound", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;addParticleClient(Lnet/minecraft/particle/ParticleEffect;DDDDDD)V"), cancellable = true)
-    private void noRainParticles(ClientWorld world, Camera camera, int ticks, ParticlesMode particlesMode, CallbackInfo ci) {
+    private void noRainParticles(ClientWorld world, Camera camera, int ticks, ParticlesMode particlesMode, int weatherRadius, CallbackInfo ci) {
         if (noRender.isEnabled() && !noRender.rain.isEnabled()) ci.cancel();
     }
 

src/main/java/me/retucio/camtweaks/mixin/WorldRendererMixin.java

@@ -5,19 +5,15 @@ import com.mojang.blaze3d.buffers.GpuBufferSlice;
 import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.event.events.RenderWorldEvent;
 import me.retucio.camtweaks.module.ModuleManager;
-import me.retucio.camtweaks.module.modules.BlockOutline;
-import me.retucio.camtweaks.module.modules.Freecam;
-import me.retucio.camtweaks.module.modules.NoRender;
-import me.retucio.camtweaks.util.Colors;
-import net.minecraft.client.MinecraftClient;
+import me.retucio.camtweaks.module.modules.render.BlockOutline;
+import me.retucio.camtweaks.module.modules.camera.Freecam;
+import me.retucio.camtweaks.module.modules.render.NoRender;
 import net.minecraft.client.render.*;
 import net.minecraft.client.render.state.WorldRenderState;
 import net.minecraft.client.util.ObjectAllocator;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.ColorHelper;
-import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.RotationAxis;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.profiler.Profiler;
 import org.joml.Matrix4f;
 import org.joml.Vector4f;
@@ -29,15 +25,13 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.awt.*;
-
 import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS;
 import static me.retucio.camtweaks.CameraTweaks.mc;
 
 @Mixin(WorldRenderer.class)
 public abstract class WorldRendererMixin {
 
-    @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;method_74752(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/Frustum;Z)V"), index = 2)
+    @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;updateCamera(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/Frustum;Z)V"), index = 2)
     private boolean renderSetupTerrainModifyArg(boolean spectator) {
         return ModuleManager.INSTANCE.getModuleByClass(Freecam.class).isEnabled() || spectator;
     }
@@ -72,10 +66,10 @@ public abstract class WorldRendererMixin {
         if (!noRender.blindnessEffect.isEnabled() || !noRender.darknessEffect.isEnabled()) cir.setReturnValue(null);
     }
 
-    @Redirect(method = "renderTargetBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/ColorHelper;withAlpha(II)I"))
-    private int modifyBlockOutlineColor(int alpha, int rgb) {
+    @Redirect(method = "renderTargetBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/ColorHelper;toAlpha(I)I"))
+    private int modifyBlockOutlineColor(int alpha) {
         BlockOutline outline = ModuleManager.INSTANCE.getModuleByClass(BlockOutline.class);
-        if (!outline.isEnabled()) return ColorHelper.withAlpha(alpha, rgb);
+        if (!outline.isEnabled()) return ColorHelper.toAlpha(alpha);
 
         return outline.color.getRGB();
     }

src/main/java/me/retucio/camtweaks/mixin/accessor/HandledScreenAccessor.java

@@ -10,4 +10,7 @@ public interface HandledScreenAccessor {
 
     @Accessor("focusedSlot")
     Slot getFocusedSlot();
+
+    @Accessor("doubleClicking")
+    void setDoubleClicking(boolean doubleClicking);
 }

src/main/java/me/retucio/camtweaks/module/Category.java

@@ -0,0 +1,19 @@
+package me.retucio.camtweaks.module;
+
+public enum Category {
+
+    PLAYER("jugador"),
+    WORLD("mundo"),
+
+    CAMERA("cámara"),
+    RENDER("renderizado"),
+
+    NETWORK("red"),
+
+    CLIENT("cliente"),
+    MISC("misc.");
+
+    private final String name;
+    Category(String name) { this.name = name; }
+    @Override public String toString() { return name; }
+}

src/main/java/me/retucio/camtweaks/module/Module.java

@@ -1,12 +1,14 @@
 package me.retucio.camtweaks.module;
 
 import me.retucio.camtweaks.CameraTweaks;
+import me.retucio.camtweaks.config.ClientConfig;
+import me.retucio.camtweaks.config.ConfigManager;
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.camtweaks.ToggleModuleEvent;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.EnumSetting;
 import me.retucio.camtweaks.module.settings.KeySetting;
-import me.retucio.camtweaks.module.settings.AbstractSetting;
+import me.retucio.camtweaks.module.settings.Setting;
 import me.retucio.camtweaks.util.ChatUtil;
 import net.minecraft.client.MinecraftClient;
 import org.lwjgl.glfw.GLFW;
@@ -21,6 +23,8 @@ public class Module {
     // atributos
     private String name;
     private String description;
+    private Category category;
+
     private boolean enabled;
     private boolean saveSettings = true;
     private boolean searchMatch = true;
@@ -30,38 +34,44 @@ public class Module {
     protected KeySetting bind = new KeySetting("tecla", "tecla asignada al módulo, ESC para desactivar", GLFW.GLFW_KEY_UNKNOWN);
     protected BooleanSetting notify = new BooleanSetting("notificar", "notificar en el chat al activar / desactivar", true);
 
-    private final List<AbstractSetting> settings = new ArrayList<>();
+    private final List<Setting> settings = new ArrayList<>();
 
     protected MinecraftClient mc = MinecraftClient.getInstance();
 
-    public Module(String name, String description) {
+    public Module(String name, String description, Category category) {
         this.name = name;
         this.description = description;
+        this.category =  category;
         addSettings(bind, keyMode, notify);
     }
 
-    public Module(String name, String description, int key) {
+    public Module(String name, String description, Category category, int key) {
         this.name = name;
         this.description = description;
+        this.category = category;
         addSettings(bind, keyMode, notify);
         this.bind.setDefaultKey(key);
-        this.bind.setKey(key);
+
+        // puto marcos
+        if (ConfigManager.getConfig().settings
+                .get(this.getName() + ":" + bind.getName()) == null)
+            this.bind.setKey(key);
     }
 
     // ajustes
-    public List<AbstractSetting> getSettings() {
+    public List<Setting> getSettings() {
         return settings;
     }
 
     @SuppressWarnings("unchecked")
-    public <S extends AbstractSetting> S addSetting(AbstractSetting setting) {
+    public <S extends Setting> S addSetting(Setting setting) {
         settings.add(setting);
         setting.setModule(this);
         return (S) setting;  // por conveniencia
     }
 
-    public void addSettings(AbstractSetting... settings) {
-        for (AbstractSetting setting : settings) addSetting(setting);
+    public void addSettings(Setting... settings) {
+        for (Setting setting : settings) addSetting(setting);
     }
 
 
@@ -110,6 +120,14 @@ public class Module {
         this.description = description;
     }
 
+    public Category getCategory() {
+        return category;
+    }
+
+    public void setCategory(Category category) {
+        this.category = category;
+    }
+
     public boolean isEnabled() {
         return enabled;
     }

src/main/java/me/retucio/camtweaks/module/ModuleManager.java

@@ -1,8 +1,15 @@
 package me.retucio.camtweaks.module;
 
-import me.retucio.camtweaks.event.EventBus;
+import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.event.SubscribeEvent;
-import me.retucio.camtweaks.module.modules.*;
+import me.retucio.camtweaks.module.modules.camera.*;
+import me.retucio.camtweaks.module.modules.client.HUD;
+import me.retucio.camtweaks.module.modules.misc.*;
+import me.retucio.camtweaks.module.modules.network.*;
+import me.retucio.camtweaks.module.modules.player.*;
+import me.retucio.camtweaks.module.modules.render.*;
+import me.retucio.camtweaks.module.modules.render.CritsPlus;
+import me.retucio.camtweaks.module.modules.world.*;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -16,10 +23,8 @@ public class ModuleManager {
     public static ModuleManager INSTANCE;
 
     private final List<Module> modules = new ArrayList<>();
-    private final EventBus eventBus;
 
-    public ModuleManager(EventBus bus) {
-        this.eventBus = bus;
+    public ModuleManager() {
         addModules();
     }
 
@@ -29,8 +34,10 @@ public class ModuleManager {
         modules.add(new AnvilFont());
         modules.add(new AttributeSwapper());
         modules.add(new AutoSign());
+        modules.add(new BlockESP());
         modules.add(new BlockOutline());
         modules.add(new BossbarStack());
+        modules.add(new BreakingProgress());
         modules.add(new BungeecordSpoofer());
         modules.add(new ChatPlus());
         modules.add(new ColoredSigns());
@@ -45,19 +52,25 @@ public class ModuleManager {
         modules.add(new HandView());
         modules.add(new Headhitters());
         modules.add(new HUD());
+        modules.add(new InventoryPlus());
         modules.add(new LightOverlay());
         modules.add(new LogoutSpots());
         modules.add(new Nametags());
         modules.add(new NoMiningInterruptions());
         modules.add(new NoRender());
+        modules.add(new Offhand());
+        modules.add(new PacketDelay());
         modules.add(new PerspectivePlus());
         modules.add(new PortalGUI());
+        modules.add(new Racist());
         modules.add(new Reconnect());
         modules.add(new Rotations());
         modules.add(new RPackBypass());
+        modules.add(new SafeWalk());
         modules.add(new ScreenshotPlus());
         modules.add(new ShulkerPeek());
         modules.add(new TimeChanger());
+        modules.add(new UIMove());
         modules.add(new WarnLowDurability());
         modules.add(new Zoom());
 
@@ -67,7 +80,7 @@ public class ModuleManager {
         for (Module module : getEnabledModules()) {
             for (Method method : module.getClass().getDeclaredMethods()) {
                 if (method.isAnnotationPresent(SubscribeEvent.class)) {
-                    eventBus.register(module);
+                    CameraTweaks.EVENT_BUS.register(module);
                     break;
                 }
             }

src/main/java/me/retucio/camtweaks/module/modules/AntiInvis.java

@@ -1,14 +0,0 @@
-package me.retucio.camtweaks.module.modules;
-
-import me.retucio.camtweaks.module.Module;
-
-/** continúa en:
- * @see me.retucio.camtweaks.mixin.EntityMixin
- */
-
-public class AntiInvis extends Module {
-
-    public AntiInvis() {
-        super("anti invis", "te permite ver a los jugadores invisibles");
-    }
-}

src/main/java/me/retucio/camtweaks/module/modules/Headhitters.java

@@ -1,16 +0,0 @@
-package me.retucio.camtweaks.module.modules;
-
-import me.retucio.camtweaks.module.Module;
-
-public class Headhitters extends Module {
-
-    public Headhitters() {
-        super("headhitters", "mantén pulsado el espacio para hacer headhitting sin tener que espamearlo");
-    }
-
-    @Override
-    public void onTick() {
-        if (mc.player == null) return;
-        mc.player.jumpingCooldown = 0;
-    }
-}

src/main/java/me/retucio/camtweaks/module/modules/NoMiningInterruptions.java

@@ -1,24 +0,0 @@
-package me.retucio.camtweaks.module.modules;
-
-import me.retucio.camtweaks.module.Module;
-import me.retucio.camtweaks.module.settings.BooleanSetting;
-import net.minecraft.entity.Entity;
-import net.minecraft.registry.tag.ItemTags;
-
-public class NoMiningInterruptions extends Module {
-
-    public BooleanSetting withPickaxeOnly = addSetting(new BooleanSetting("solo con pico", "ignorar entidades solamente cuando se sujeta un pico", false));
-
-    public NoMiningInterruptions() {
-        super("minar sin interrupción", "te permite minar bloques a través de entidades");
-    }
-
-    public boolean shouldIgnoreEntity(Entity entity) {
-        if (entity == null || !this.isEnabled()) return false;
-        if (withPickaxeOnly.isEnabled())
-            return (mc.player.getMainHandStack().isIn(ItemTags.PICKAXES) || mc.player.getOffHandStack().isIn(ItemTags.PICKAXES));
-        return true;
-    }
-
-
-}

src/main/java/me/retucio/camtweaks/module/modules/PortalGUI.java

@@ -1,14 +0,0 @@
-package me.retucio.camtweaks.module.modules;
-
-import me.retucio.camtweaks.module.Module;
-
-/** continúa en:
- * @see me.retucio.camtweaks.mixin.ClientPlayerEntityMixin
- */
-
-public class PortalGUI extends Module {
-
-    public PortalGUI() {
-        super("interfaz en portales", "te permite abrir interfaces dentro de portales, como el chat o el inventario");
-    }
-}

src/main/java/me/retucio/camtweaks/module/modules/WarnLowDurability.java

@@ -1,64 +0,0 @@
-package me.retucio.camtweaks.module.modules;
-
-import me.retucio.camtweaks.module.Module;
-import me.retucio.camtweaks.module.settings.BooleanSetting;
-import me.retucio.camtweaks.module.settings.NumberSetting;
-import me.retucio.camtweaks.util.ChatUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.Hand;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-// al parecer DamageItemEvent no se lanza si estás en un server de Paper, o sea que ahora se usa onTick()
-public class WarnLowDurability extends Module {
-
-    public NumberSetting limitPercentage = addSetting(new NumberSetting("porcentaje", "porcentaje de durabilidad restante a la que se te avisa",
-            5, 1, 100, 1));
-
-    public BooleanSetting message = addSetting(new BooleanSetting("mensaje", "enviar un mensaje para alertar al usuario", true));
-    public BooleanSetting sound = addSetting(new BooleanSetting("sonido", "reproducir un sonido para alertar al usuario", true));
-
-    private final List<ItemStack> warned = new ArrayList<>();
-
-    public WarnLowDurability() {
-        super("aviso de baja dur.", "te avisa cuando la herramienta que sostengas sobrepase un límite de durabilidad");
-    }
-
-    @Override
-    public void onTick() {
-        if (mc.player == null || mc.world == null) return;
-        ItemStack stack = mc.player.getStackInHand(Hand.MAIN_HAND);
-        if (warned.contains(stack)) return;
-
-        float percentage = (1 - (float) stack.getDamage() / stack.getMaxDamage()) * 100;
-
-        if (percentage <= limitPercentage.getValue()) {
-            if (sound.isEnabled())
-                mc.world.playSound(mc.player, mc.player.getBlockPos(),
-                        SoundEvents.BLOCK_BELL_USE, SoundCategory.AMBIENT, 1, 1);
-
-            if (message.isEnabled()) {
-                String customName = stack.getCustomName() == null ? "" : " \"" + stack.getCustomName().getString() + "\"";
-                Text text = Text.literal(Formatting.AQUA + stack.getItemName().getString()
-                        + Formatting.GREEN + customName + Formatting.RESET
-                        + " a " + Formatting.GOLD + ((int) percentage + "") + "%"
-                        + Formatting.RESET + " de durabilidad");
-                ChatUtil.warn(text);
-            }
-
-            warned.add(stack);
-        }
-    }
-
-    @Override
-    public void onDisable() {
-        warned.clear();
-        super.onDisable();
-    }
-}

src/main/java/me/retucio/camtweaks/module/modules/camera/Freecam.java

@@ -1,8 +1,9 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.camera;
 
 import me.retucio.camtweaks.event.Stage;
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.*;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.KeySetting;
@@ -69,7 +70,11 @@ public class Freecam extends Module {
     private float yaw, pitch;
 
     public Freecam() {
-        super("cámara libre", "permite a la cámara moverse independientemente del jugador. útil para explorar alrededores", GLFW.GLFW_KEY_V);
+        super("cámara libre",
+                "permite a la cámara moverse independientemente del jugador. útil para explorar alrededores",
+                Category.CAMERA,
+                GLFW.GLFW_KEY_V);
+
         speedSetting.onUpdate(newSpeed -> speed = newSpeed);
     }
 

src/main/java/me/retucio/camtweaks/module/modules/camera/Freelook.java

@@ -1,5 +1,6 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.camera;
 
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.EnumSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -29,7 +30,10 @@ public class Freelook extends Module {
     private Perspective prevPerspective;
 
     public Freelook() {
-        super("perspectiva libre", "te permite mover la cámara de la perspectiva sin mover la del jugador, o vice versa", GLFW.GLFW_KEY_B);
+        super("perspectiva libre",
+                "te permite mover la cámara de la perspectiva sin mover la del jugador, o vice versa",
+                Category.CAMERA,
+                GLFW.GLFW_KEY_B);
 
         keyMode.setDefaultValue(KeyModes.HOLD);
         keyMode.setValue(KeyModes.HOLD);

src/main/java/me/retucio/camtweaks/module/modules/camera/Fullbright.java

@@ -1,10 +1,10 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.camera;
 
 import me.retucio.camtweaks.mixin.accessor.StatusEffectInstanceAccessor;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.ColorSetting;
 import me.retucio.camtweaks.module.settings.EnumSetting;
-import me.retucio.camtweaks.module.settings.NumberSetting;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.registry.Registries;
@@ -23,7 +23,10 @@ public class Fullbright extends Module {
     public ColorSetting color = addSetting(new ColorSetting("filtro", "filtro de color", new Color(255, 255, 255, 255), false));
 
     public Fullbright() {
-        super("brilli brilli", "deshabilita la oscuridad (y aplica colores a los shaders)", GLFW.GLFW_KEY_K);
+        super("brilli brilli",
+                "deshabilita la oscuridad (y aplica colores a los shaders)",
+                Category.CAMERA,
+                GLFW.GLFW_KEY_K);
         mode.onUpdate(mode -> { if (mode != Modes.POTION) disableNightVision(); });
         mode.onUpdate(mode -> {
             boolean v = mode.equals(Modes.GAMMA);

src/main/java/me/retucio/camtweaks/module/modules/camera/PerspectivePlus.java

@@ -1,8 +1,9 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.camera;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.MouseScrollEvent;
 import me.retucio.camtweaks.event.events.PerspectiveChangeEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.*;
 import me.retucio.camtweaks.util.KeyUtil;
@@ -28,7 +29,9 @@ public class PerspectivePlus extends Module {
     public KeySetting scrollKey = addSetting(new KeySetting("tecla del scroll", "qué tecla mantener para usar la rueda del ratón", GLFW.GLFW_KEY_LEFT_ALT));
 
     public PerspectivePlus() {
-        super("perspectiva plus", "añade cositas chulas al cambio de perspectiva");
+        super("perspectiva plus",
+                "añade cositas chulas al cambio de perspectiva",
+                Category.CAMERA);
     }
 
     @Override

src/main/java/me/retucio/camtweaks/module/modules/camera/Rotations.java

@@ -1,7 +1,8 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.camera;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.ChangeRotationEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -16,7 +17,9 @@ public class Rotations extends Module {
     public BooleanSetting serverSide = addSetting(new BooleanSetting("serverside", "espamea paquetes de rotación al servidor", false));
 
     public Rotations() {
-        super("rotaciones", "te permite forzar una rotación específica");
+        super("rotaciones",
+                "te permite forzar una rotación específica",
+                Category.CAMERA);
     }
 
     @Override

src/main/java/me/retucio/camtweaks/module/modules/camera/Zoom.java

@@ -1,8 +1,9 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.camera;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.GetFOVEvent;
 import me.retucio.camtweaks.event.events.MouseScrollEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.KeySetting;
@@ -36,7 +37,10 @@ public class Zoom extends Module {
     private double value;
 
     public Zoom() {
-        super("zoom", "lupa", GLFW.GLFW_KEY_F);
+        super("zoom",
+                "lupa",
+                Category.CAMERA,
+                GLFW.GLFW_KEY_F);
 
         keyMode.setDefaultValue(KeyModes.HOLD);
         keyMode.setValue(KeyModes.HOLD);

src/main/java/me/retucio/camtweaks/module/modules/client/GUI.java

@@ -1,4 +1,4 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.client;
 
 import me.retucio.camtweaks.CameraTweaks;
 import me.retucio.camtweaks.command.CommandManager;
@@ -6,8 +6,10 @@ import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.TickEvent;
 import me.retucio.camtweaks.event.events.camtweaks.LoadClickGUIEvent;
 import me.retucio.camtweaks.event.events.camtweaks.LoadCommandManagerEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.ModuleManager;
+import me.retucio.camtweaks.module.modules.misc.ChatPlus;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.ColorSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -42,7 +44,10 @@ public class GUI extends Module {
     public BooleanSetting multipleKeybinds = addSetting(new BooleanSetting("teclas multimódulo", "permitir asignar la misma tecla a más de un módulo", false));
 
     public GUI() {
-        super("interfaz", "ajustes de la interfaz, y otros misceláneos", GLFW.GLFW_KEY_RIGHT_SHIFT);
+        super("interfaz",
+                "ajustes de la interfaz, y otros misceláneos",
+                Category.CLIENT,
+                GLFW.GLFW_KEY_RIGHT_SHIFT);
 
         CameraTweaks.EVENT_BUS.register(this);
         keyMode.setVisible(false);

src/main/java/me/retucio/camtweaks/module/modules/client/HUD.java

@@ -1,15 +1,18 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.client;
 
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.*;
-import me.retucio.camtweaks.ui.screen.HudEditorScreen;
+import me.retucio.camtweaks.ui.hud.HudElement;
+import me.retucio.camtweaks.ui.hud.HudRenderer;
+import me.retucio.camtweaks.ui.hud.HudEditorScreen;
 import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
 
 /** lógica del HUD manejada en:
- * @see me.retucio.camtweaks.ui.HudRenderer
- * @see me.retucio.camtweaks.ui.widgets.HudElement
+ * @see HudRenderer
+ * @see HudElement
  * @see HudEditorScreen
  */
 
@@ -28,9 +31,14 @@ public class HUD extends Module {
     public NumberSetting timezone = addSetting(new NumberSetting("zona horaria", "zona horaria en UTC+n", 1, -6, 6, 1));
     public EnumSetting<TimeFormat> timeFormat = addSetting(new EnumSetting<>("formato de la hora", "12h o 24h", TimeFormat.class, TimeFormat.TWENTY_FOUR_HOUR));
     public StringSetting customText = addSetting(new StringSetting("texto custom", "marca de agua (dejar vacío para quitar)", "adolf jitler inshtagram feishbuc twiter", 40));
+    public EnumSetting<CoordsMode> coordsMode = addSetting(new EnumSetting<>("modo de coordenadas", "qué coordenadas mostrar", CoordsMode.class, CoordsMode.OVERWORLD));
 
     public HUD() {
-        super("HUD", "superposición de la pantalla con info. adicional");
+        super("HUD",
+                "superposición de la pantalla con info. adicional",
+                Category.CLIENT,
+                GLFW.GLFW_KEY_F12
+        );
     }
 
     public enum TimeFormat {
@@ -41,4 +49,14 @@ public class HUD extends Module {
         TimeFormat(String name) { this.name = name; }
         @Override public String toString() { return name; }
     }
+
+    public enum CoordsMode {
+        OVERWORLD("superficie"),
+        NETHER("nether"),
+        BOTH("ambas");
+
+        private final String name;
+        CoordsMode(String name) { this.name = name; }
+        @Override public String toString() { return name; }
+    }
 }

src/main/java/me/retucio/camtweaks/module/modules/misc/AntiInvis.java

@@ -0,0 +1,17 @@
+package me.retucio.camtweaks.module.modules.misc;
+
+import me.retucio.camtweaks.module.Category;
+import me.retucio.camtweaks.module.Module;
+
+/** continúa en:
+ * @see me.retucio.camtweaks.mixin.EntityMixin
+ */
+
+public class AntiInvis extends Module {
+
+    public AntiInvis() {
+        super("anti invis",
+                "te permite ver a los jugadores invisibles",
+                Category.MISC);
+    }
+}

src/main/java/me/retucio/camtweaks/module/modules/misc/AnvilFont.java

@@ -1,12 +1,13 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.misc;
 
 import me.retucio.camtweaks.mixin.accessor.AnvilScreenAccessor;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.EnumSetting;
 import net.minecraft.client.gui.screen.ingame.AnvilScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 
-import me.retucio.camtweaks.module.modules.AnvilFont.CustomFont.CharMap;
+import me.retucio.camtweaks.module.modules.misc.AnvilFont.CustomFont.CharMap;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -66,7 +67,9 @@ public class AnvilFont extends Module {
     );
 
     public AnvilFont() {
-        super("yunques con pluma", "te permite tipografías distintas al renombrar items en un yunque");
+        super("yunques con pluma",
+                "te permite tipografías distintas al renombrar items en un yunque",
+                Category.MISC);
     }
 
     @Override

src/main/java/me/retucio/camtweaks/module/modules/misc/BossbarStack.java

@@ -1,7 +1,8 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.misc;
 
 import me.retucio.camtweaks.event.events.RenderBossbarEvent;
 import me.retucio.camtweaks.event.SubscribeEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -22,7 +23,9 @@ public class BossbarStack extends Module {
     private final Map<ClientBossBar, Integer> bossBarMap = new WeakHashMap<>();
 
     public BossbarStack() {
-        super("apilar bossbars", "apila bossbars para reducir el espacio que ocupan en pantalla");
+        super("apilar bossbars",
+                "apila bossbars para reducir el espacio que ocupan en pantalla",
+                Category.MISC);
     }
 
     @SubscribeEvent

src/main/java/me/retucio/camtweaks/module/modules/misc/ChatPlus.java

@@ -1,4 +1,4 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.misc;
 
 import com.mojang.authlib.GameProfile;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -9,6 +9,7 @@ import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.ClientClickEvent;
 import me.retucio.camtweaks.event.events.ReceiveMessageEvent;
 import me.retucio.camtweaks.event.events.SendMessageEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -55,7 +56,9 @@ public class ChatPlus extends Module {
             0, 0, 1000, 1));
 
     public ChatPlus()  {
-        super("chat plus", "mejoras para el chat");
+        super("chat plus",
+                "mejoras para el chat",
+                Category.MISC);
         updateDateFormat();
         updateClientName();
         timestamps.onUpdate(v -> timestampSecs.setVisible(v));
@@ -68,7 +71,7 @@ public class ChatPlus extends Module {
     private SimpleDateFormat dateFormat;
 
     private static final Pattern loggerRegex = Pattern.compile("\\n(\\n|\\s)+\\n");
-    private static final Pattern usernameRegex = Pattern.compile("^(?:<[0-9]{2}:[0-9]{2}>\\s)?<(.*?)>.*");
+    private static final Pattern usernameRegex = Pattern.compile("^(?:\\[[0-9]{2}:[0-9]{2}\\]\\s*)?(?:<([^<>\\s]+)>|([^<>\\s]+)).*");
     private static final Pattern timestampRegex = Pattern.compile("^<\\d{1,2}:\\d{1,2}>");
     private static final Pattern coordRegex = Pattern.compile("(?<x>-?\\d{3,}(?:\\.\\d*)?)(?:\\s+(?<y>-?\\d{1,3}(?:\\.\\d*)?))?\\s+(?<z>-?\\d{3,}(?:\\.\\d*)?)");
 
@@ -96,7 +99,7 @@ public class ChatPlus extends Module {
 
         // agregar sellos de tiempo a los mensajes
         if (timestamps.isEnabled()) {
-            Text timestamp = Text.literal("<" + dateFormat.format(new Date()) + "> ").formatted(Formatting.GRAY);
+            Text timestamp = Text.literal("[" + dateFormat.format(new Date()) + "] ").formatted(Formatting.GRAY);
             message = Text.empty().append(timestamp).append(message);
         }
 
@@ -178,6 +181,8 @@ public class ChatPlus extends Module {
 
             if (usernameMatcher.matches()) {
                 String username = usernameMatcher.group(1);
+                if (username == null)
+                    username = usernameMatcher.group(2);
 
                 PlayerListEntry entry = mc.getNetworkHandler().getPlayerListEntry(username);
                 if (entry != null) sender = entry.getProfile();

src/main/java/me/retucio/camtweaks/module/modules/misc/FakePlayer.java

@@ -1,6 +1,7 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.misc;
 
 import com.mojang.authlib.GameProfile;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.StringSetting;
 import net.minecraft.client.network.OtherClientPlayerEntity;
@@ -16,7 +17,9 @@ public class FakePlayer extends Module {
     private OtherClientPlayerEntity player = null;
 
     public FakePlayer() {
-        super("jugador falso", "invoca una entidad de jugador falsa por motivos de testeo");
+        super("jugador falso",
+                "invoca una entidad de jugador falsa por motivos de testeo",
+                Category.MISC);
     }
 
     @Override

src/main/java/me/retucio/camtweaks/module/modules/misc/ScreenshotPlus.java

@@ -1,7 +1,8 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.misc;
 
 import me.retucio.camtweaks.command.CommandManager;
 import me.retucio.camtweaks.event.events.ClientClickEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.EnumSetting;
@@ -41,7 +42,9 @@ public class ScreenshotPlus extends Module {
     private File screenshotFile;
 
     public ScreenshotPlus() {
-        super("capturas de pantalla", "elige qué hacer tras tomar una captura de pantalla");
+        super("capturas de pantalla",
+                "elige qué hacer tras tomar una captura de pantalla",
+                Category.MISC);
     }
 
     public void sendScreenshotMessage() {

src/main/java/me/retucio/camtweaks/module/modules/misc/ShulkerPeek.java

@@ -1,8 +1,9 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.misc;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.KeyEvent;
 import me.retucio.camtweaks.mixin.accessor.HandledScreenAccessor;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.KeySetting;
@@ -10,9 +11,8 @@ import me.retucio.camtweaks.ui.screen.PreviewScreen;
 import me.retucio.camtweaks.util.ChatUtil;
 import me.retucio.camtweaks.util.Colors;
 
-import me.retucio.camtweaks.util.MiscUtil;
+import me.retucio.camtweaks.util.InventoryUtil;
 import net.minecraft.block.ShulkerBoxBlock;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.ContainerComponent;
@@ -20,7 +20,6 @@ import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.screen.slot.Slot;
 
 import org.lwjgl.glfw.GLFW;
 
@@ -36,7 +35,9 @@ public class ShulkerPeek extends Module {
     public static final HashMap<Item, Color> SHULKER_COLORS = new HashMap<>();
 
     public ShulkerPeek() {
-        super("prev. de shulkers", "te permite previsualizar el contenido de shulkers desde el inventario");
+        super("prev. de shulkers",
+                "te permite previsualizar el contenido de shulkers desde el inventario",
+                Category.MISC);
 
         // colores y tal (https://github.com/kgriff0n/shulker-preview)
         SHULKER_COLORS.put(Items.SHULKER_BOX, Colors.LAVENDER);
@@ -94,11 +95,11 @@ public class ShulkerPeek extends Module {
         } else return;
 
         if (stack.getItem() == Items.ENDER_CHEST) {
-            if (MiscUtil.getEchestInv() == null) {
+            if (InventoryUtil.getEchestInv() == null) {
                 ChatUtil.warn("abre un enderchest primero");
                 return;
             }
-            mc.setScreen(new PreviewScreen(MiscUtil.getEchestInv(), mc.currentScreen));
+            mc.setScreen(new PreviewScreen(InventoryUtil.getEchestInv(), mc.currentScreen));
             return;
         }
 

src/main/java/me/retucio/camtweaks/module/modules/network/BungeecordSpoofer.java

@@ -1,5 +1,6 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.network;
 
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.StringSetting;
 import me.retucio.camtweaks.util.ChatUtil;
@@ -9,7 +10,9 @@ public class BungeecordSpoofer extends Module {
     public StringSetting address = addSetting(new StringSetting("dirección", "la dirección IP que será enviada al server", "127.0.0.1", 15));
 
     public BungeecordSpoofer() {
-        super("spoofer de bungeecord", "te permite conectarte a los servidores backend de un server bungeecord mal configurado");
+        super("spoofer de bungeecord",
+                "te permite conectarte a los servidores backend de un server bungeecord mal configurado",
+                Category.NETWORK);
 
         address.onUpdate(text -> {
             if (!text.matches("^[0-9a-f\\\\.:]{0,45}$")) {

src/main/java/me/retucio/camtweaks/module/modules/network/LogoutSpots.java

@@ -1,14 +1,16 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.network;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.AddEntityEvent;
 import me.retucio.camtweaks.event.events.RenderWorldEvent;
-import me.retucio.camtweaks.event.events.TickEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.ModuleManager;
+import me.retucio.camtweaks.module.modules.misc.FakePlayer;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.ColorSetting;
-import me.retucio.camtweaks.module.settings.EnumSetting;
+import me.retucio.camtweaks.module.settings.NumberSetting;
+import me.retucio.camtweaks.util.MiscUtil;
 import me.retucio.camtweaks.util.render.RenderUtil;
 import net.minecraft.client.network.OtherClientPlayerEntity;
 import net.minecraft.client.network.PlayerListEntry;
@@ -19,10 +21,6 @@ import net.minecraft.util.math.Box;
 import net.minecraft.world.dimension.DimensionType;
 
 import java.awt.*;
-import java.time.Instant;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -33,6 +31,7 @@ public class LogoutSpots extends Module {
 
     public BooleanSetting outlines = addSetting(new BooleanSetting("contorno", "renderizar contorno de la caja (lados)", true));
     public ColorSetting outlineColor = addSetting(new ColorSetting("color del contorno", "Color de las líneas", new Color(255, 0, 0, 230), false));
+    public NumberSetting lineWidth = addSetting(new NumberSetting("grosor de línea", "grosor de las líneas del contorno", 1.5, 0.5, 5, 0.1));
 
     public BooleanSetting filling = addSetting(new BooleanSetting("relleno", "renderizar relleno de la caja (caras)", true));
     public ColorSetting fillingColor = addSetting(new ColorSetting("color del relleno", "Color de los lados", new Color(230, 0, 0, 55), false));
@@ -40,8 +39,6 @@ public class LogoutSpots extends Module {
     public BooleanSetting fullHeight = addSetting(new BooleanSetting("hitbox completa", "renderizar la caja completa de la hitbox, o solo marcar la posición", true));
 
     public BooleanSetting dummy = addSetting(new BooleanSetting("monigote", "spawnear un monigote para marcar la posición", true));
-    public EnumSetting<Nametags.HealthMode> healthMode = addSetting(new EnumSetting<>("formato de vida", "en qué formato mostrar la vida del jugador",
-            Nametags.HealthMode.class, Nametags.HealthMode.POINTS));
 
     private final List<LogoutEntry> players = new ArrayList<>();
     private final List<PlayerListEntry> lastPlayerList = new ArrayList<>();
@@ -51,7 +48,9 @@ public class LogoutSpots extends Module {
     private DimensionType lastDimension;
 
     public LogoutSpots() {
-        super("puntos de desconexión", "te muestra los puntos donde otros jugadores se desconectan");
+        super("puntos de desconexión",
+                "te muestra los puntos donde otros jugadores se desconectan",
+                Category.NETWORK);
 
         outlines.onUpdate(v -> {
             outlineColor.setVisible(v);
@@ -65,7 +64,6 @@ public class LogoutSpots extends Module {
 
         dummy.onUpdate(v -> {
             if (!v) removeDummies();
-            healthMode.setVisible(v);
         });
     }
 
@@ -215,7 +213,6 @@ public class LogoutSpots extends Module {
 
         public final UUID uuid;
         public final String name;
-        public final int health;
         public final String logoutTime;
 
         public final String dummyName;
@@ -234,45 +231,25 @@ public class LogoutSpots extends Module {
 
             this.uuid = player.getUuid();
             this.name = player.getName().getString();
-            this.health = Math.round(player.getHealth() + player.getAbsorptionAmount());
-            this.logoutTime = getLogoutTime();
+            this.logoutTime = MiscUtil.getCurrentFormattedTime();
 
-            String healthText = healthMode.is(Nametags.HealthMode.HEARTS)
-                    ? String.format("%.2f", (float) health / 2)
-                    : health + "hp";
-
-            this.dummyName = name + " [" + healthText + "] (" + logoutTime + ")";
+            this.dummyName = name + " (" + logoutTime + ")";
             this.dummy = ModuleManager.INSTANCE.getModuleByClass(FakePlayer.class).addPlayer(player, dummyName);
 
             this.dummy.updatePositionAndAngles(x + halfWidth, y, z + halfWidth,
                     player.getYaw(), player.getPitch());
         }
 
-        private String getLogoutTime() {
-            try {
-                HUD hud = ModuleManager.INSTANCE.getModuleByClass(HUD.class);
-                Instant instant = Instant.now();
-                ZoneOffset offset = ZoneOffset.ofHours(hud.timezone.getIntValue());
-                LocalTime logoutTime = LocalTime.from(instant.atOffset(offset));
-
-                boolean is24 = hud.timeFormat.is(HUD.TimeFormat.TWENTY_FOUR_HOUR);
-                DateTimeFormatter format = DateTimeFormatter.ofPattern(is24 ? "HH:mm" : "hh:mm a");
-                return logoutTime.format(format);
-            } catch (Exception e) {
-                return "??:??";
-            }
-        }
-
         public void renderBox(MatrixStack matrices) {
             if (fullHeight.isEnabled()) {
                 if (outlines.isEnabled())
-                    RenderUtil.drawOutlineBox(matrices, new Box(x, y, z, x + xWidth, y + height, z + zWidth), outlineColor.getColor(), 1.5);
+                    RenderUtil.drawOutlineBox(matrices, new Box(x, y, z, x + xWidth, y + height, z + zWidth), outlineColor.getColor(), lineWidth.getFloatValue());
                 if (filling.isEnabled())
                     RenderUtil.drawFilledBox(matrices, new Box(x, y, z, x + xWidth, y + height, z + zWidth), fillingColor.getColor());
             } else {
                 if (outlines.isEnabled()) {
                     Box bottomBox = new Box(x, y, z, x + xWidth, y + 0.01, z + zWidth);
-                    RenderUtil.drawOutlineBox(matrices, bottomBox, outlineColor.getColor(), 1.5);
+                    RenderUtil.drawOutlineBox(matrices, bottomBox, outlineColor.getColor(), lineWidth.getFloatValue());
                 }
                 if (filling.isEnabled()) {
                     RenderUtil.drawBlockFaceFilled(matrices,

src/main/java/me/retucio/camtweaks/module/modules/network/PacketDelay.java

@@ -0,0 +1,148 @@
+package me.retucio.camtweaks.module.modules.network;
+
+import me.retucio.camtweaks.event.JoinWorldEvent;
+import me.retucio.camtweaks.event.SubscribeEvent;
+import me.retucio.camtweaks.event.events.PacketEvent;
+import me.retucio.camtweaks.module.Category;
+import me.retucio.camtweaks.module.Module;
+import me.retucio.camtweaks.module.settings.EnumSetting;
+import me.retucio.camtweaks.module.settings.NumberSetting;
+import me.retucio.camtweaks.util.ChatUtil;
+import me.retucio.camtweaks.util.NetworkUtil;
+
+import net.minecraft.network.ClientConnection;
+import net.minecraft.network.listener.PacketListener;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket;
+import net.minecraft.network.packet.s2c.common.KeepAliveS2CPacket;
+
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+
+public class PacketDelay extends Module {
+
+    public NumberSetting delay = addSetting(new NumberSetting("delay", "delay a añadir a los paquetes, en milisegundos", 1500, 0, 3000, 5));
+    public EnumSetting<Directions> directions = addSetting(new EnumSetting<>("dirección", "dirección de los paquetes a los que añadir delay",
+            Directions.class, Directions.BOTH));
+    public EnumSetting<Packets> packets = addSetting(new EnumSetting<>("paquetes", "paquetes a los que aplicar el delay",
+            Packets.class, Packets.ALL));
+
+    private final List<DelayedPacket> delayedPackets = new CopyOnWriteArrayList<>();
+    private long lastProcessTime = 0;
+
+    public PacketDelay() {
+        super("delay de paquetes",
+                "aplica un delay a los paquetes",
+                Category.NETWORK);
+    }
+
+    @Override
+    public void onDisable() {
+        for (DelayedPacket delayedPacket : delayedPackets)
+            processDelayedPacket(delayedPacket);
+        delayedPackets.clear();
+        super.onDisable();
+    }
+
+    @Override
+    public void onTick() {
+        if (mc.player == null || mc.world == null || mc.getNetworkHandler() == null) {
+            delayedPackets.clear();
+            return;
+        }
+
+        long currentTime = System.currentTimeMillis();
+        if (currentTime - lastProcessTime < 50) return;
+        lastProcessTime = currentTime;
+
+        List<DelayedPacket> toProcess = new ArrayList<>();
+        for (DelayedPacket packet : delayedPackets) {
+            if (System.currentTimeMillis() >= packet.scheduledTime())
+                toProcess.add(packet);
+        }
+
+        for (DelayedPacket packet : toProcess) {
+            processDelayedPacket(packet);
+            delayedPackets.remove(packet);
+        }
+    }
+
+    @SubscribeEvent
+    public void onPacketSend(PacketEvent.Send event) {
+        if (directions.is(Directions.S2C)
+                || mc.player == null || mc.world == null || mc.getNetworkHandler() == null
+                || (event.getPacket() instanceof KeepAliveC2SPacket && !packets.is(Packets.OTHERS)))
+            return;
+
+        event.cancel();
+
+        delayedPackets.add(new DelayedPacket(
+                event.getPacket(),
+                System.currentTimeMillis() + delay.getLongValue(),
+                true,
+                mc.getNetworkHandler().getConnection().getPacketListener()
+        ));
+    }
+
+    @SubscribeEvent
+    public void onPacketReceive(PacketEvent.Receive event) {
+        if (mc.player == null || mc.world == null
+                || mc.getNetworkHandler() == null || mc.getNetworkHandler().getConnection() == null
+                || (event.getPacket() instanceof KeepAliveS2CPacket && !packets.is(Packets.OTHERS)))
+            return;
+
+        event.cancel();
+
+        ClientConnection connection = mc.getNetworkHandler().getConnection();
+
+        delayedPackets.add(new DelayedPacket(
+                event.getPacket(),
+                System.currentTimeMillis() + delay.getLongValue(),
+                false,
+                connection.getPacketListener()
+        ));
+    }
+
+    @SubscribeEvent
+    public void onJoinWorld(JoinWorldEvent event) {
+        ChatUtil.error("delay de paquetes no funciona en un solo jugador");
+        toggle();
+    }
+
+    private void processDelayedPacket(DelayedPacket delayedPacket) {
+        if (mc.getNetworkHandler() == null) return;
+
+        if (delayedPacket.isOutgoing()) {
+            NetworkUtil.sendPacketNoEvent(delayedPacket.packet());
+        } else {
+            if (delayedPacket.packetListener != null && mc.getNetworkHandler().getConnection() != null) {
+                NetworkUtil.receivePacketNoEvent(delayedPacket.packet(), delayedPacket.packetListener());
+            } else {
+                NetworkUtil.receivePacketNoEvent(delayedPacket.packet());
+            }
+        }
+    }
+
+    private record DelayedPacket(Packet<?> packet, long scheduledTime, boolean isOutgoing, PacketListener packetListener) {}
+
+    public enum Directions {
+        C2S("cliente a server"),
+        S2C("server a cliente"),
+        BOTH("ambos");
+
+        private final String name;
+        Directions(String name) { this.name = name; }
+        @Override public String toString() { return name; }
+    }
+
+    public enum Packets {
+        KEEP_ALIVE("paquetes KeepAlive"),
+        OTHERS("todos menos KeepAlive"),
+        ALL("todos");
+
+        private final String name;
+        Packets(String name) { this.name = name; }
+        @Override public String toString() { return name; }
+    }
+}

src/main/java/me/retucio/camtweaks/module/modules/network/RPackBypass.java

@@ -1,5 +1,6 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.network;
 
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.text.Text;
@@ -20,7 +21,9 @@ public class RPackBypass extends Module {
     public Text BYPASS_TEXT = Text.literal("nuh uh");
 
     public RPackBypass() {
-        super("bypassear packs", "te permite omitir packs de recursos forzados por servers");
+        super("bypassear packs",
+                "te permite omitir packs de recursos forzados por servers",
+                Category.NETWORK);
     }
 
     public ServerInfo.ResourcePackPolicy getPolicy() {

src/main/java/me/retucio/camtweaks/module/modules/network/Reconnect.java

@@ -1,7 +1,8 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.network;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.DisconnectEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
 import net.minecraft.client.network.ServerAddress;
@@ -12,7 +13,9 @@ public class Reconnect extends Module {
     private ServerInfo lastServer = null;
 
     public Reconnect() {
-        super("reconectar", "añade un botón para reconectarse a un servidor tras ser desconectado");
+        super("reconectar",
+                "añade un botón para reconectarse a un servidor tras ser desconectado",
+                Category.NETWORK);
     }
 
     @SubscribeEvent

src/main/java/me/retucio/camtweaks/module/modules/player/AttributeSwapper.java

@@ -1,7 +1,8 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.player;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.AttackEntityEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -16,7 +17,9 @@ public class AttributeSwapper extends Module {
     private int prevSlot = -1;
 
     public AttributeSwapper() {
-        super("attribute-swapper", "utiliza el \"attribute swapping\" entre dos herramientas para negar daño de durabilidad o aplicar encantamientos adicionales a estas");
+        super("attribute-swapper",
+                "utiliza el \"attribute swapping\" entre dos herramientas para negar daño de durabilidad o aplicar encantamientos adicionales a estas",
+                Category.PLAYER);
     }
 
     @Override

src/main/java/me/retucio/camtweaks/module/modules/player/FastUse.java

@@ -1,5 +1,6 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.player;
 
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -15,7 +16,9 @@ public class FastUse extends Module {
     public NumberSetting blockCooldown = addSetting(new NumberSetting("cooldown de bloques", "cooldown para colocar bloques en ticks", 0, 0, 4, 1));
 
     public FastUse() {
-        super("precoz", "hace cosas como usar items o colocar bloques más rápido");
+        super("precoz",
+                "hace cosas como usar items o colocar bloques más rápido",
+                Category.PLAYER);
 
         items.onUpdate(v -> itemCooldown.setVisible(v));
         blocks.onUpdate(v -> blockCooldown.setVisible(v));

src/main/java/me/retucio/camtweaks/module/modules/player/HandView.java

@@ -1,8 +1,9 @@
-package me.retucio.camtweaks.module.modules;
+package me.retucio.camtweaks.module.modules.player;
 
 import me.retucio.camtweaks.event.SubscribeEvent;
 import me.retucio.camtweaks.event.events.RenderHeldItemEvent;
 import me.retucio.camtweaks.event.events.RenderArmEvent;
+import me.retucio.camtweaks.module.Category;
 import me.retucio.camtweaks.module.Module;
 import me.retucio.camtweaks.module.settings.BooleanSetting;
 import me.retucio.camtweaks.module.settings.NumberSetting;
@@ -89,7 +90,9 @@ public class HandView extends Module {
             0, -180, 180, 1));
 
     public HandView() {
-        super("manos", "modifica la manera en la que se renderizan las manos");
+        super("manos",
+                "modifica la manera en la que se renderizan las manos",
+                Category.PLAYER);
     }
 
     @SubscribeEvent

src/main/java/me/retucio/camtweaks/module/modules/player/Headhitters.java

@@ -0,0 +1,19 @@
+package me.retucio.camtweaks.module.modules.player;
+
+import me.retucio.camtweaks.module.Category;
+import me.retucio.camtweaks.module.Module;
+
+public class Headhitters extends Module {
+
+    public Headhitters() {
+        super("headhitters",
+                "mantén pulsado el espacio para hacer headhitting sin tener que espamearlo",
+                Category.PLAYER);
+    }
+
+    @Override
+    public void onTick() {
+        if (mc.player == null) return;
+        mc.player.jumpingCooldown = 0;
+    }
+}

src/main/java/me/retucio/camtweaks/module/modules/player/InventoryPlus.java

@@ -0,0 +1,73 @@
+package me.retucio.camtweaks.module.modules.player;
+
+import me.retucio.camtweaks.event.Event;
+import me.retucio.camtweaks.event.SubscribeEvent;
+import me.retucio.camtweaks.event.events.KeyEvent;
+import me.retucio.camtweaks.event.events.MouseClickEvent;
+import me.retucio.camtweaks.mixin.accessor.HandledScreenAccessor;
+import me.retucio.camtweaks.module.Category;
+import me.retucio.camtweaks.module.Module;
+import me.retucio.camtweaks.module.settings.KeySetting;
+import me.retucio.camtweaks.util.InventoryUtil;
+import me.retucio.camtweaks.util.KeyUtil;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.screen.slot.Slot;
+import org.lwjgl.glfw.GLFW;
+
+public class InventoryPlus extends Module {
+
+    public KeySetting row1key = addSetting(new KeySetting("fila 1", "tecla para mover items a la primera fila", GLFW.GLFW_KEY_A));
+    public KeySetting row2key = addSetting(new KeySetting("fila 2", "tecla para mover items a la segunda fila", GLFW.GLFW_KEY_S));
+    public KeySetting row3key = addSetting(new KeySetting("fila 3", "tecla para mover items a la tercera fila", GLFW.GLFW_KEY_D));
+
+    public InventoryPlus() {
+        super("inventario plus",
+                "mueve ítems del inventario usando solo el teclado",
+                Category.PLAYER);
+    }
+
+    @SubscribeEvent
+    public void onKey(KeyEvent event) {
+        if (event.getAction() == GLFW.GLFW_RELEASE) return;
+        processInput(event.getKey(), event);
+    }
+
+    @SubscribeEvent
+    public void onMouseButton(MouseClickEvent event) {
+        if (event.getAction() == GLFW.GLFW_RELEASE) return;
+        processInput(event.getButton(), event);
+    }
+
+    private void processInput(int inputCode, Event event) {
+        if (!(mc.currentScreen instanceof HandledScreen<?> screen) || mc.player == null) return;
+
+        Slot focusedSlot = ((HandledScreenAccessor) screen).getFocusedSlot();
+        if (focusedSlot == null) return;
+
+        int containerSlot = focusedSlot.id;
+        int hotbarKeyIndex = InventoryUtil.getSlotNumberFromKey(inputCode);
+        if (hotbarKeyIndex == -1) return;
+
+        int rowOffset = InventoryUtil.getRowOffset(screen);
+
+        if (KeyUtil.isKeyDown(row1key.getKey())) {
+            event.cancel();
+            swapWithRow(screen, containerSlot, hotbarKeyIndex, rowOffset);
+        }
+        else if (KeyUtil.isKeyDown(row2key.getKey())) {
+            event.cancel();
+            swapWithRow(screen, containerSlot, hotbarKeyIndex, rowOffset + 9);
+        }
+        else if (KeyUtil.isKeyDown(row3key.getKey())) {
+            event.cancel();
+            swapWithRow(screen, containerSlot, hotbarKeyIndex, rowOffset + 18);
+        }
+    }
+
+    private void swapWithRow(HandledScreen<?> screen, int containerSlot, int column, int rowOffset) {
+        int targetContainerSlot = InventoryUtil.calculateTargetSlot(screen, containerSlot, column, rowOffset);
+        if (targetContainerSlot != -1) {
+            InventoryUtil.swapSlots(containerSlot, targetContainerSlot, screen);
+        }
+    }
+}

src/main/java/me/retucio/camtweaks/module/modules/player/Offhand.java

@@ -0,0 +1,86 @@
+package me.retucio.camtweaks.module.modules.player;
+
+import me.retucio.camtweaks.module.Category;
+import me.retucio.camtweaks.module.Module;
+import me.retucio.camtweaks.module.settings.BooleanSetting;
+import me.retucio.camtweaks.module.settings.NumberSetting;
+import me.retucio.camtweaks.module.settings.OptionSetting;
+import me.retucio.camtweaks.util.Lists;
+import net.minecraft.item.Item;
+import net.minecraft.item.Items;
+import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
+import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
+import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+
+public class Offhand extends Module {
+
+    public OptionSetting<Item> item = addSetting(new OptionSetting<>("ítem", "ítem a equipar",
+            Lists.itemList, Items.TOTEM_OF_UNDYING, Lists.itemNames));
+    public NumberSetting delaySetting = addSetting(new NumberSetting("delay", "delay del cambiazo (en ticks)", 0, 0, 20, 1));
+    public BooleanSetting override = addSetting(new BooleanSetting("anular", "ignora que ya haya un ítem en la mano secundaria", true));
+
+
+    private int delay;
+    private boolean holdingItem;
+
+    public Offhand() {
+        super("mano secundaria",
+                "automáticamente equipa un ítem en la mano secundaria",
+                Category.PLAYER);
+    }
+
+    @Override
+    public void onTick() {
+        if (mc.player == null || mc.interactionManager == null) return;
+
+        if (holdingItem && mc.player.getOffHandStack().getItem() != item.getValue())
+            delay = Math.max(delaySetting.getIntValue(), delay);
+
+        holdingItem = mc.player.getOffHandStack().getItem() == item.getValue();
+
+        if (delay > 0) {
+            delay--;
+            return;
+        }
+
+        if (holdingItem || (!mc.player.getOffHandStack().isEmpty()
+                && !override.isEnabled()))
+            return;
+
+        if (mc.player.playerScreenHandler == mc.player.currentScreenHandler) {
+            for (int i = 9; i < 45; i++) {
+
+                if (mc.player.getInventory().getStack(i >= 36 ? i - 36 : i).getItem() == item.getValue()) {
+                    boolean itemInOffhand = !mc.player.getOffHandStack().isEmpty();
+
+                    mc.interactionManager.clickSlot(mc.player.currentScreenHandler.syncId, i, 0, SlotActionType.PICKUP, mc.player);
+                    mc.interactionManager.clickSlot(mc.player.currentScreenHandler.syncId, 45, 0, SlotActionType.PICKUP, mc.player);
+
+                    if (itemInOffhand)
+                        mc.interactionManager.clickSlot(mc.player.currentScreenHandler.syncId, i, 0, SlotActionType.PICKUP, mc.player);
+
+                    delay = delaySetting.getIntValue();
+                    return;
+                }
+            }
+        } else {
+            for (int i = 0; i < 9; i++) {
+                if (mc.player.getInventory().getStack(i).getItem() == item.getValue()) {
+                    if (i != mc.player.getInventory().getSelectedSlot()) {
+                        mc.player.getInventory().setSelectedSlot(i);
+                        mc.player.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(i));
+                    }
+
+                    mc.player.networkHandler.sendPacket(new PlayerActionC2SPacket(
+                            PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND,
+                            BlockPos.ORIGIN,
+                            Direction.DOWN));
+                    delay = delaySetting.getIntValue();
+                    return;
+                }
+            }
+        }
+    }
+}