v5.2

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - name: setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'microsoft'
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew

README.md

@@ -1,6 +1,6 @@
 # jenny's mod 2 100% real
 
-mod para Minecraft Fabric 1.21.11 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
+mod para Minecraft Fabric 26.1.2 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
 
 ## instalación
 
@@ -10,7 +10,7 @@ mod para Minecraft Fabric 1.21.11 que añade algunas cosas QOL, mayormente relac
 3. descargar el .jar
 4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`)
 
-asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `1.21.11`; Fabric `0.17.3`)
+asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `26.1.2`; Fabric `0.19.2`)
 es posible que haya problemas al usarlo junto a otros mods, especialmente junto a otros clientes, pues pueden conflictar entre ellos.
 
 ### para frikis de 200 de iq
@@ -23,7 +23,7 @@ es posible que haya problemas al usarlo junto a otros mods, especialmente junto
 
 `shift derecho` por defecto para abrir la interfaz
 
-`pág. arriba` por defecto para abrir el editor del hud
+`insertar` por defecto para abrir el editor del hud
 
 `$` como prefijo por defecto para comandos (se autocompletan)
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version "${loom_version}"
+    id "net.fabricmc.fabric-loom" version "${loom_version}"
     id 'maven-publish'
 }
 
@@ -7,10 +7,12 @@ version = project.mod_version
 group = project.maven_group
 
 base {
-	archivesName = project.archives_base_name
+    archivesName = project.archives_base_name
 }
 
 repositories {
+    mavenCentral()
+    maven { url 'https://jitpack.io' }
     maven {
         name = "FDD Maven"
         url = "https://maven.firstdark.dev/releases"
@@ -19,53 +21,65 @@ repositories {
 
 dependencies {
     // mc
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	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_api_version}"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
 
-    // otros
-    include(modImplementation "dev.firstdark.discordrpc:discord-rpc:1.0.3")
+    // fabric & su api
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+
+    // sistema de eventos
+    include(implementation  "com.github.retuci0:neutrino:${project.neutrino_version}")
+
+    // rpc de discord
+    include(implementation "dev.firstdark.discordrpc:discord-rpc:${project.discord_rpc_version}")
 }
 
 loom {
-	accessWidenerPath = file("src/main/resources/sputnik.accesswidener")
+    accessWidenerPath = file("src/main/resources/sputnik.accesswidener")
 }
 
 processResources {
-	inputs.property "version", project.version
+    inputs.property "version", project.version
+    inputs.property "loader_version", project.loader_version
+    inputs.property "minecraft_version", project.minecraft_version
+    inputs.property "jdk_version", project.jdk_version
 
-	filesMatching("fabric.mod.json") {
-		expand "version": inputs.properties.version
-	}
+    filesMatching("fabric.mod.json") {
+        expand(
+                "version": project.version,
+                "loader_version": project.loader_version,
+                "minecraft_version": project.minecraft_version,
+                "jdk_version": project.jdk_version
+        )
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+    it.options.release = jdk_version.toInteger()
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.toVersion(jdk_version)
+    targetCompatibility = JavaVersion.toVersion(jdk_version)
 }
 
 jar {
-	inputs.property "archivesName", project.base.archivesName
+    inputs.property "archivesName", project.base.archivesName
 
-	from("LICENSE") {
-		rename {
+    from("LICENSE") {
+        rename {
             "${it}_${inputs.properties.archivesName}"
         }
-	}
+    }
 }
 
 publishing {
-	publications {
-		create("mavenJava", MavenPublication) {
-			artifactId = project.archives_base_name
-			from components.java
-		}
-	}
+    publications {
+        create("mavenJava", MavenPublication) {
+            artifactId = project.archives_base_name
+            from components.java
+        }
+    }
 
-	repositories {}
+    repositories {}
 }

cambios.md

@@ -1,30 +1,18 @@
-# v2.9
+# v5.2
 
 ## novedades
 
-varios módulos que no quería añadir porque son cheats en toda regla, pero ya total, como la mayoría que he añadido hasta la fecha es baneable
-
 ### adiciones
 
-- categoría de movimiento
-
 #### módulos nuevos:
 
-- packetmine: mina usando paquetes, para minar más rápido o para evitar la animación de minado
-- aliviar cpu: evita renderizar objetos en pantalla si la ventana no está seleccionada
-- delfín: *ruidos de delfín*
-- patinaje: esparce semen allá por donde pisas (haciéndolo más resbaladizo)
-- jesús: hermano se cree Jesús (camina sobre el agua)
-- info. de bloque: (muestra el contenido nbt de un bloque)
-- estampaescrotos: mazo en esteroides
-- tenedor mágico: hermano se cree Poseidón (tweaks a la propulsión acuática del tridente)
-- elytras: vuela con las elytras (en vez de solo planear)
-- barco volador: convierte tu bote de acacia en un caza militar
-
 ### arreglos / mejoras
 
-- ahora puedes cambiar el título de la ventana en los ajustes del mod
+- `andamios` ya funciona correctamente
+- autoguardado cada cierto intervalo de tiempo en vez de guardar inmediatamente tras cada cambio en los ajustes, por optimización
+- el guardado se realiza desde otro hilo ahora, para evitar que el I/O bloque el hilo principal
 
 ## problemas reconocidos
 
-- muchos, pero repórtalos en la página de problemas si quieres para que queden bien registrados 
+- lo de siempre.
+- el ítem del tótem no se renderiza en el editor del HUD si es abierto en la pantalla de inicio

credits.txt

@@ -1,4 +1,4 @@
-Meteor Client: https://github.com/MeteorDevelopment/meteor-client  |  https://meteorclient.com
+Meteor Client: https://github.com/MeteorDevelopment/meteor-client | https://meteorclient.com
 OyVey Port: https://github.com/mioclient/oyvey-ported/
 Lenny Boi: https://www.youtube.com/@lennyboi7195
 Shotify: https://modrinth.com/mod/shotify
@@ -7,6 +7,9 @@ Trouser Streak: https://github.com/etianl/Trouser-Streak
 No More Purple: https://github.com/Pepperoni-Jabroni/NoMorePurple/
 bypass-resource-pack: https://github.com/emilyy-dev/bypass-resource-pack
 elytra-recast: https://github.com/InLieuOfLuna/elytra-recast/
+SpearHax: https://github.com/etianl/spearHax/
+ProjectileTrajectoryPreview: https://github.com/maDU59/ProjectilesTrajectoryPreview
+DupersUnited public addon: https://discord.gg/dupes | https://dupers.wtf
 
 probablemente más pero como tengo demencia se me olvida
 si quieres que te acredite o quite tu código de mi mod, mándame un mensaje en discord (username: retucio) y sin problemas :)

gradle.properties

@@ -1,13 +1,15 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.3
-loader_version=0.18.4
-loom_version=1.13-SNAPSHOT
+minecraft_version=26.1.2
+loader_version=0.19.2
+loom_version=1.16-SNAPSHOT
 
-fabric_api_version=0.140.2+1.21.11
+fabric_api_version=0.146.0+26.1.2
+discord_rpc_version=1.0.3
+neutrino_version=1.1.0
+jdk_version=25
 
-mod_version=2.9
+mod_version=5.2
 maven_group=me.retucio
 archives_base_name=sputnik

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/me/retucio/sputnik/Sputnik.java

@@ -1,36 +1,37 @@
 package me.retucio.sputnik;
 
-
+import com.github.retucio.neutrino.EventBus;
+import com.github.retucio.neutrino.EventListener;
 import me.retucio.sputnik.cape.CapeManager;
 import me.retucio.sputnik.command.CommandManager;
 import me.retucio.sputnik.command.commands.BindCommand;
 
 import me.retucio.sputnik.config.ConfigManager;
 
-import me.retucio.sputnik.event.EventBus;
-import me.retucio.sputnik.event.SubscribeEvent;
-import me.retucio.sputnik.event.events.ShutdownEvent;
-import me.retucio.sputnik.event.events.sputnik.LoadCapeManagerEvent;
-import me.retucio.sputnik.event.events.sputnik.LoadClickGUIEvent;
-import me.retucio.sputnik.event.events.sputnik.LoadCommandManagerEvent;
-import me.retucio.sputnik.event.events.sputnik.LoadModuleManagerEvent;
+import me.retucio.sputnik.event.ShutdownEvent;
+import me.retucio.sputnik.event.interact.OpenScreenEvent;
+import me.retucio.sputnik.event.sputnik.*;
 
+import me.retucio.sputnik.friend.FriendManager;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.ModuleManager;
-import me.retucio.sputnik.module.modules.client.HUD;
+import me.retucio.sputnik.module.modules.client.Hud;
 
 import me.retucio.sputnik.ui.hud.HudRenderer;
-import me.retucio.sputnik.ui.screen.ClickGUI;
+import me.retucio.sputnik.ui.screen.ClickGui;
 import me.retucio.sputnik.ui.hud.HudEditorScreen;
+import me.retucio.sputnik.ui.screen.UpdateScreen;
 import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton;
 import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
 import me.retucio.sputnik.ui.widgets.buttons.settings.TextButton;
-import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
-import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
+import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
+import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
 import me.retucio.sputnik.ui.widgets.Button;
 
 import me.retucio.sputnik.util.*;
 import me.retucio.sputnik.util.KeyUtil;
+import me.retucio.sputnik.util.misc.BlockIterator;
+import me.retucio.sputnik.util.misc.VersionChecker;
 import me.retucio.sputnik.util.render.DrawUtil;
 import me.retucio.sputnik.util.render.RenderUtil;
 
@@ -39,26 +40,28 @@ 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 net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.ChatScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen;
+import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen;
+import net.minecraft.client.gui.screens.inventory.AnvilScreen;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import org.lwjgl.glfw.GLFW;
 
 
-
 public class Sputnik implements ClientModInitializer {
 
-    // cosas necesarias
     public static final Sputnik INSTANCE = new Sputnik();
+
+    // cosas del mod
     public static final EventBus EVENT_BUS = new EventBus();
     public static final Logger LOGGER = LogManager.getLogger(Sputnik.class);
-    public static MinecraftClient mc;
+    public static final long LAUNCH_TIME = System.currentTimeMillis();
+    public static Minecraft mc;
 
     // id y versión
     public static final String MOD_ID = "sputnik";
@@ -79,22 +82,28 @@ public class Sputnik implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        mc = MinecraftClient.getInstance();
-        ConfigManager.load();
+        mc = Minecraft.getInstance();
 
-        EVENT_BUS.register(this);
+        ConfigManager.INSTANCE = new ConfigManager();
+        ConfigManager.INSTANCE.load();
 
-        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);
+        VersionChecker.INSTANCE.check();
+
+        EVENT_BUS.subscribe(this);
+
+        EVENT_BUS.subscribe(ChatUtil.class);
+        EVENT_BUS.subscribe(DrawUtil.class);
+        EVENT_BUS.subscribe(EntityUtil.class);
+        EVENT_BUS.subscribe(InventoryUtil.class);
+        EVENT_BUS.subscribe(MiscUtil.class);
+        EVENT_BUS.subscribe(NetworkUtil.class);
+        EVENT_BUS.subscribe(RenderUtil.class);
+
+        EVENT_BUS.subscribe(BlockIterator.class);
 
         Lists.init();
 
-        Textures.registerAll();
+        HudRenderer.INSTANCE = new HudRenderer();
 
         CapeManager.INSTANCE = new CapeManager();
         EVENT_BUS.post(new LoadCapeManagerEvent());
@@ -105,11 +114,18 @@ public class Sputnik implements ClientModInitializer {
         CommandManager.INSTANCE = new CommandManager();
         EVENT_BUS.post(new LoadCommandManagerEvent());
 
-        ClickGUI.INSTANCE = new ClickGUI();
-        HudEditorScreen.INSTANCE = new HudEditorScreen();
-        EVENT_BUS.post(new LoadClickGUIEvent());
+        FriendManager.INSTANCE = new FriendManager();
+        EVENT_BUS.post(new LoadFriendManagerEvent());
 
-        mc.execute(HudRenderer::init);
+        mc.execute(() -> {
+            Textures.init();
+
+            ClickGui.INSTANCE = new ClickGui();
+            HudEditorScreen.INSTANCE = new HudEditorScreen();
+            EVENT_BUS.post(new LoadClickGuiEvent());
+
+            HudRenderer.INSTANCE.init();
+        });
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             EVENT_BUS.post(new ShutdownEvent());
@@ -119,23 +135,26 @@ public class Sputnik implements ClientModInitializer {
     // se ejecuta cada tick, es decir, 20 veces por segundo
     public void onTick() {
         if (!settingsApplied
-                && ConfigManager.getConfig() != null
-                && !ConfigManager.hasLoaded()) {
-            ConfigManager.applyConfig();
+                && ConfigManager.INSTANCE.getConfig() != null
+                && !ConfigManager.INSTANCE.hasLoaded()) {
+            ConfigManager.INSTANCE.applyConfig();
             settingsApplied = true;
         }
 
         ModuleManager.INSTANCE.getEnabledModules().forEach(Module::onTick);
-        mc.getWindow().setTitle(ClientSettingsFrame.guiSettings.windowTitle.getValue());
+        mc.getWindow().setTitle(ClientSettingsPanel.clientSettings.windowTitle.getValue());
+
+        ConfigManager.INSTANCE.tickAutosave();
     }
 
 
     // se ejecuta cada vez que se presiona una tecla
-    public void onKey(int key, int action) {
-        if (key == GLFW.GLFW_KEY_F3) return;  // prevenir activación de módulos al usar combinaciones de F3
+    public void onInput(int key, int action) {
+        // prevenir interrumpir combos de F3
+        if (key == GLFW.GLFW_KEY_F3) return;
 
-        boolean anyFocused = isAnySettingButtonFocused() || ClickGUI.INSTANCE.getSearchBar().isFocused();
-        ClickGUI.INSTANCE.setAnyFocused(anyFocused);
+        boolean anyFocused = isAnySettingButtonFocused() || ClickGui.INSTANCE.getSearchBar().isFocused();
+        ClickGui.INSTANCE.setAnyFocused(anyFocused);
 
         if (action != GLFW.GLFW_RELEASE) {
             if (BindCommand.onKeyPress(key)) return;
@@ -144,7 +163,10 @@ public class Sputnik implements ClientModInitializer {
                 handleClickGUIKey(key, anyFocused);
                 handleHudEditorKey(key, anyFocused);
             }
-            handleSettingButtonsKey(key, action);
+            // solo reenviar teclas del teclado
+            if (key >= 32) {
+                handleSettingButtonsKey(key, action);
+            }
         } else if (!anyFocused) {
             handleModuleRelease(key);
         }
@@ -152,7 +174,7 @@ public class Sputnik implements ClientModInitializer {
 
     // verifica si algún botón de ajustes está escuchando
     private boolean isAnySettingButtonFocused() {
-        for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames())
+        for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels())
             for (Button sb : sf.getButtons())
                 if ((sb instanceof BindButton b && b.isFocused()) || (sb instanceof TextButton t && t.isFocused()))
                     return true;
@@ -161,10 +183,11 @@ public class Sputnik implements ClientModInitializer {
 
     // se ocupa de la lógica de encendido y apagado de los módulos
     private void handleModuleToggle(int key, boolean anyFocused) {
-        if (mc.currentScreen != null && mc.currentScreen != ClickGUI.INSTANCE) return;
+        if (mc.screen != null && mc.screen != ClickGui.INSTANCE) return;
 
         for (Module module : ModuleManager.INSTANCE.getModules()) {
-            if (key != module.getKey() || anyFocused || KeyUtil.isKeyDown(GLFW.GLFW_KEY_F3)) continue;  // evitar interrumpir combinaciones de teclas del F3
+            // evitar interrumpir combinaciones de teclas del F3
+            if (key != module.getKey() || anyFocused || KeyUtil.isKeyDown(GLFW.GLFW_KEY_F3)) continue;
 
             if (module.shouldToggleOnBindRelease() && !module.isEnabled())
                 module.setEnabled(true);
@@ -175,7 +198,7 @@ public class Sputnik implements ClientModInitializer {
 
     // se ocupa de hacer los botones de ajustes que lo necesiten escuchar teclas
     private void handleSettingButtonsKey(int key, int action) {
-        for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames()) {
+        for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) {
             for (SettingButton<?> sb : sf.getButtons()) {
                 if (sb instanceof BindButton bb) bb.onKey(key, action);
                 if (sb instanceof TextButton tb) tb.onKey(key, action);
@@ -185,41 +208,39 @@ public class Sputnik implements ClientModInitializer {
 
     // maneja la lógica de apertura de la interfaz
     private void handleClickGUIKey(int key, boolean anyFocused) {
-        if (key != ClientSettingsFrame.guiSettings.getKey() || anyFocused || isOnTypingScreen())
+        if (key != ClientSettingsPanel.clientSettings.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
-        if (mc.currentScreen != ClickGUI.INSTANCE) {
-            prevScreen = mc.currentScreen;
-            mc.setScreen(ClickGUI.INSTANCE);
+        if (mc.screen != ClickGui.INSTANCE) {
+            prevScreen = mc.screen;
+            mc.setScreen(ClickGui.INSTANCE);
         } else {
-            ClickGUI.INSTANCE.close();
+            ClickGui.INSTANCE.onClose();
             mc.setScreen(prevScreen);
         }
     }
 
     // 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);
+        Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
         if (key != hud.editorKey.getValue() || anyFocused || isOnTypingScreen()) return;
 
-        if (mc.currentScreen != HudEditorScreen.INSTANCE) {
+        if (mc.screen != HudEditorScreen.INSTANCE) {
             if (!hud.isEnabled()) {
                 ChatUtil.warn("HUD está desactivado, lumbreras");
                 return;
             }
-            prevScreen = mc.currentScreen;
+            prevScreen = mc.screen;
             mc.setScreen(HudEditorScreen.INSTANCE);
         } else {
-            HudEditorScreen.INSTANCE.close();
+            HudEditorScreen.INSTANCE.onClose();
             mc.setScreen(prevScreen);
         }
     }
 
     // se ocupa de apagar los módulos que tengan configurado hacerlo tras soltar su tecla
     private void handleModuleRelease(int key) {
-        if (mc.currentScreen != null && mc.currentScreen != ClickGUI.INSTANCE) return;
+        if (mc.screen != null && mc.screen != ClickGui.INSTANCE) return;
 
         for (Module module : ModuleManager.INSTANCE.getEnabledModules())
             if (module.shouldToggleOnBindRelease() && key == module.getKey())
@@ -227,18 +248,28 @@ public class Sputnik implements ClientModInitializer {
     }
 
     private boolean isOnTypingScreen() {
-                return mc.currentScreen instanceof ChatScreen
-                || mc.currentScreen instanceof AnvilScreen
-                || mc.currentScreen instanceof AbstractSignEditScreen
-                || mc.currentScreen instanceof AbstractCommandBlockScreen;
+                return mc.screen instanceof ChatScreen
+                || mc.screen instanceof AnvilScreen
+                || mc.screen instanceof AbstractSignEditScreen
+                || mc.screen instanceof AbstractCommandBlockEditScreen;
     }
 
-    @SubscribeEvent
+    @EventListener
+    // notificar al usuario de que hay una actualización disponible, si la hay
+    public void onSetScreen(OpenScreenEvent event) {
+        if (VersionChecker.INSTANCE.shouldShowScreen && event.getScreen() instanceof TitleScreen) {
+            event.cancel();
+            VersionChecker.INSTANCE.shouldShowScreen = false;
+            mc.execute(() -> mc.screen = new UpdateScreen());
+        }
+    }
+
+    @EventListener
     public void onStop(ShutdownEvent event) {
-        ConfigManager.save();
+        ConfigManager.INSTANCE.saveOnShutdown();
     }
 
     public static String getVersionName() {
-        return MOD_ID + "_v" + MOD_VERSION + "_" + SharedConstants.getGameVersion().name();
+        return MOD_ID + "_v" + MOD_VERSION + "_" + SharedConstants.getCurrentVersion().name();
     }
 }

src/main/java/me/retucio/sputnik/cape/Cape.java

@@ -1,26 +1,27 @@
 package me.retucio.sputnik.cape;
 
 import me.retucio.sputnik.Sputnik;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.texture.NativeImage;
-import net.minecraft.client.texture.NativeImageBackedTexture;
-import net.minecraft.util.Identifier;
+import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.resources.Identifier;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+
 public class Cape {
 
-    private final MinecraftClient mc = MinecraftClient.getInstance();
+    private final Minecraft mc = Minecraft.getInstance();
 
     private final String name;
     private final Identifier id;
     private NativeImage img;
-    private NativeImageBackedTexture texture;
+    private DynamicTexture texture;
 
     public Cape(String name) {
         this.name = name;
-        this.id = Identifier.of(Sputnik.MOD_ID, "textures/capes/" + name + ".png");
+        this.id = Identifier.fromNamespaceAndPath(Sputnik.MOD_ID, "textures/capes/" + name + ".png");
     }
 
     public void load() {
@@ -28,7 +29,7 @@ public class Cape {
     }
 
     public NativeImage loadTexture(Identifier id) {
-        try (InputStream inputStream = mc.getResourceManager().getResource(id).get().getInputStream()) {
+        try (InputStream inputStream = mc.getResourceManager().getResource(id).get().open()) {
             return NativeImage.read(inputStream);
         } catch (IOException e) {
             Sputnik.LOGGER.error("ups: {}", e.getMessage());
@@ -37,8 +38,8 @@ public class Cape {
     }
 
     public void register() {
-        texture = new NativeImageBackedTexture(null, img);
-        mc.getTextureManager().registerTexture(id, texture);
+        texture = new DynamicTexture(null, img);
+        mc.getTextureManager().register(id, texture);
         img = null;
     }
 
@@ -50,7 +51,7 @@ public class Cape {
         return id;
     }
 
-    public NativeImageBackedTexture getTexture() {
+    public DynamicTexture getTexture() {
         return texture;
     }
 

src/main/java/me/retucio/sputnik/command/Command.java

@@ -4,21 +4,21 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.command.CommandSource;
-import net.minecraft.registry.BuiltinRegistries;
-import net.minecraft.server.command.CommandManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.data.registries.VanillaRegistries;
 
 import java.util.List;
 
 public abstract class Command {
 
     // utilizar los "registries" ya existentes de Brigadier para el autocompletado
-    protected static final CommandRegistryAccess REGISTRY_ACCESS = CommandManager.createRegistryAccess(BuiltinRegistries.createWrapperLookup());
+    protected static final CommandBuildContext REGISTRY_ACCESS = Commands.createValidationContext(VanillaRegistries.createLookup());
     protected static final int SUCCESS = com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
-    protected static final MinecraftClient mc = MinecraftClient.getInstance();
+    protected static final Minecraft mc = Minecraft.getInstance();
 
     private final String name, description;
     private final List<String> aliases;
@@ -30,27 +30,27 @@ public abstract class Command {
     }
 
     // métodos "helper" para reducir el "boilerplate"
-    protected static <T> RequiredArgumentBuilder<CommandSource, T> argument(final String name, final ArgumentType<T> type) {
+    protected static <T> RequiredArgumentBuilder<SharedSuggestionProvider, T> argument(final String name, final ArgumentType<T> type) {
         return RequiredArgumentBuilder.argument(name, type);
     }
 
-    protected static LiteralArgumentBuilder<CommandSource> literal(final String name) {
+    protected static LiteralArgumentBuilder<SharedSuggestionProvider> literal(final String name) {
         return LiteralArgumentBuilder.literal(name);
     }
 
     // para registrar comandos
-    public final void registerTo(CommandDispatcher<CommandSource> dispatcher) {
+    public final void registerTo(CommandDispatcher<SharedSuggestionProvider> dispatcher) {
         register(dispatcher, name);
         for (String alias : aliases) register(dispatcher, alias);
     }
 
-    public void register(CommandDispatcher<CommandSource> dispatcher, String name) {
-        LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.literal(name);
+    public void register(CommandDispatcher<SharedSuggestionProvider> dispatcher, String name) {
+        LiteralArgumentBuilder<SharedSuggestionProvider> builder = LiteralArgumentBuilder.literal(name);
         build(builder);
         dispatcher.register(builder);
     }
 
-    public abstract void build(LiteralArgumentBuilder<CommandSource> builder);
+    public abstract void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder);
 
     public String getName() {
         return name;

src/main/java/me/retucio/sputnik/command/CommandManager.java

@@ -1,12 +1,12 @@
 package me.retucio.sputnik.command;
 
+import com.github.retucio.neutrino.EventListener;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import me.retucio.sputnik.Sputnik;
 import me.retucio.sputnik.command.commands.*;
-import me.retucio.sputnik.event.SubscribeEvent;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.command.CommandSource;
+import net.minecraft.client.Minecraft;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -22,9 +22,9 @@ public class CommandManager {
     private String prefix = "$";
 
     public static final List<Command> commands = new ArrayList<>();
-    public static final CommandDispatcher<CommandSource> dispatcher = new CommandDispatcher<>();
+    public static final CommandDispatcher<SharedSuggestionProvider> dispatcher = new CommandDispatcher<>();
 
-    private static final MinecraftClient mc = MinecraftClient.getInstance();
+    private static final Minecraft mc = Minecraft.getInstance();
 
     public CommandManager() {
         registerCommands();
@@ -32,24 +32,30 @@ public class CommandManager {
 
     public static void registerCommands() {
         addCommand(new BindCommand());
+        addCommand(new ClickSlotCommand());
         addCommand(new ConfigCommand());
         addCommand(new CopyScreenshotCommand());
         addCommand(new EnderChestCommand());
+        addCommand(new FriendCommand());
         addCommand(new GarbageCleanerCommand());
         addCommand(new PeekCommand());
+        addCommand(new PluginsCommand());
         addCommand(new PrefixCommand());
         addCommand(new PurgeCommand());
+        addCommand(new RepeatCommand());
+        addCommand(new RepeatWaitCommand());
         addCommand(new SaveScreenshotCommand());
         addCommand(new SendCommand());
         addCommand(new SpectateCommand());
         addCommand(new ToggleCommand());
+        addCommand(new WaitCommand());
 
         commands.sort(Comparator.comparing(Command::getName));
 
         for (Command command : commands) {
             for (Method method : command.getClass().getDeclaredMethods()) {
-                if (method.isAnnotationPresent(SubscribeEvent.class)) {
-                    Sputnik.EVENT_BUS.register(command);
+                if (method.isAnnotationPresent(EventListener.class)) {
+                    Sputnik.EVENT_BUS.subscribe(command);
                     break;
                 }
             }
@@ -63,7 +69,7 @@ public class CommandManager {
     }
 
     public static void dispatch(String message) throws CommandSyntaxException {
-        dispatcher.execute(message, Objects.requireNonNull(mc.getNetworkHandler()).getCommandSource());
+        dispatcher.execute(message, Objects.requireNonNull(mc.getConnection()).getSuggestionsProvider());
     }
 
     public static Command getCommandByName(String name) {

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

@@ -9,9 +9,9 @@ import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 
 import me.retucio.sputnik.util.EntityUtil;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -25,7 +25,7 @@ public class EntityArgumentType implements ArgumentType<Entity> {
 
     public static final EntityArgumentType INSTANCE = new EntityArgumentType();
     private static final DynamicCommandExceptionType NO_SUCH_ENTITY = new DynamicCommandExceptionType(
-            name -> Text.literal("Entidad \"" + name + "\" no encontrada"));
+            name -> Component.literal("Entidad \"" + name + "\" no encontrada"));
 
     private static final Collection<String> EXAMPLES = List.of(
             "AdlerHitdolf",
@@ -42,7 +42,7 @@ public class EntityArgumentType implements ArgumentType<Entity> {
     public Entity parse(StringReader reader) throws CommandSyntaxException {
         String argument = reader.readString();
 
-        if (mc.world == null)
+        if (mc.level == null)
             throw NO_SUCH_ENTITY.create(argument);
 
         if (argument.startsWith("@"))
@@ -83,13 +83,13 @@ public class EntityArgumentType implements ArgumentType<Entity> {
     }
 
     private Entity findNearestPlayer() throws CommandSyntaxException {
-        PlayerEntity nearest = null;
+        Player nearest = null;
         double nearestDistance = Double.MAX_VALUE;
 
-        for (PlayerEntity player : mc.world.getPlayers()) {
+        for (Player player : mc.level.players()) {
             if (player == mc.player) continue;
 
-            double distance = mc.player.squaredDistanceTo(player);
+            double distance = mc.player.distanceToSqr(player);
             if (distance < nearestDistance) {
                 nearestDistance = distance;
                 nearest = player;
@@ -103,7 +103,7 @@ public class EntityArgumentType implements ArgumentType<Entity> {
     }
 
     private Entity findRandomPlayer() throws CommandSyntaxException {
-        List<PlayerEntity> players = new ArrayList<>(mc.world.getPlayers());
+        List<Player> players = new ArrayList<>(mc.level.players());
         if (players.isEmpty()) throw NO_SUCH_ENTITY.create("@r");
 
         players.remove(mc.player);
@@ -116,8 +116,8 @@ public class EntityArgumentType implements ArgumentType<Entity> {
     private Entity parseEntitySelector(String selector) throws CommandSyntaxException {
         if (selector.equals("@e")) {
             List<Entity> entities = new ArrayList<>();
-            for (Entity entity : mc.world.getEntities())
-                if (!(entity instanceof PlayerEntity))
+            for (Entity entity : mc.level.getEntities().getAll())
+                if (!(entity instanceof Player))
                     entities.add(entity);
 
             if (entities.isEmpty()) throw NO_SUCH_ENTITY.create(selector);
@@ -141,8 +141,8 @@ public class EntityArgumentType implements ArgumentType<Entity> {
     private Entity findEntityByType(String type) throws CommandSyntaxException {
         List<Entity> matchingEntities = new ArrayList<>();
 
-        for (Entity entity : mc.world.getEntities()) {
-            String entityType = entity.getType().getTranslationKey();
+        for (Entity entity : mc.level.getEntities().getAll()) {
+            String entityType = entity.getType().getDescriptionId();
             if (entityType.contains(type.toLowerCase().replace("minecraft:", "")))
                 matchingEntities.add(entity);
         }
@@ -153,7 +153,7 @@ public class EntityArgumentType implements ArgumentType<Entity> {
         double nearestDistance = Double.MAX_VALUE;
 
         for (Entity entity : matchingEntities) {
-            double distance = mc.player.squaredDistanceTo(entity);
+            double distance = mc.player.distanceToSqr(entity);
             if (distance < nearestDistance) {
                 nearestDistance = distance;
                 nearest = entity;
@@ -164,15 +164,15 @@ public class EntityArgumentType implements ArgumentType<Entity> {
     }
 
     private Entity findEntityByUUID(UUID uuid) throws CommandSyntaxException {
-        for (Entity entity : mc.world.getEntities())
-            if (entity.getUuid().equals(uuid))
+        for (Entity entity : mc.level.getEntities().getAll())
+            if (entity.getUUID().equals(uuid))
                 return entity;
 
         throw NO_SUCH_ENTITY.create(uuid.toString());
     }
 
-    private PlayerEntity findPlayerByName(String name) throws CommandSyntaxException {
-        for (PlayerEntity player : mc.world.getPlayers())
+    private Player findPlayerByName(String name) throws CommandSyntaxException {
+        for (Player player : mc.level.players())
             if (player.getName().getString().equalsIgnoreCase(name))
                 return player;
 
@@ -181,8 +181,8 @@ public class EntityArgumentType implements ArgumentType<Entity> {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        if (mc.world != null)
-            for (PlayerEntity player : mc.world.getPlayers())
+        if (mc.level != null)
+            for (Player player : mc.level.players())
                 builder.suggest(player.getName().getString());
 
 
@@ -192,7 +192,7 @@ public class EntityArgumentType implements ArgumentType<Entity> {
 
         Entity lookingAt = EntityUtil.getEntityPlayerIsLookingAt();
         if (lookingAt != null)
-            builder.suggest(lookingAt.getUuid().toString());
+            builder.suggest(lookingAt.getUUID().toString());
 
         return builder.buildFuture();
     }

src/main/java/me/retucio/sputnik/command/args/EnumArgumentType.java

@@ -0,0 +1,46 @@
+package me.retucio.sputnik.command.args;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
+
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+
+public class EnumArgumentType<T extends Enum<T>> implements ArgumentType<T> {
+
+    private static final DynamicCommandExceptionType NO_SUCH_TYPE = new DynamicCommandExceptionType((value) -> Component.nullToEmpty(" argumento inválido: " + value));
+
+    private final T[] values;
+
+    public EnumArgumentType(T defaultValue) {
+        this.values = defaultValue.getDeclaringClass().getEnumConstants();
+    }
+
+    public static <T extends Enum<T>> EnumArgumentType<T> enumArgument(T defaultValue) {
+        return new EnumArgumentType<>(defaultValue);
+    }
+
+    public static <T extends Enum<T>> T getEnum(CommandContext<?> context, String name, T defaultValue) {
+        return context.getArgument(name, defaultValue.getDeclaringClass());
+    }
+
+    public T parse(StringReader reader) throws CommandSyntaxException {
+        String argument = reader.readString();
+        return Arrays.stream(this.values)
+                .filter((value) -> value.toString().equals(argument))
+                .findFirst()
+                .orElseThrow(() -> NO_SUCH_TYPE.create(argument)
+        );
+    }
+
+    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+        return SharedSuggestionProvider.suggest(Arrays.stream(this.values).map(e -> e.toString().toLowerCase()), builder);
+    }
+}

src/main/java/me/retucio/sputnik/command/args/ModuleArgumentType.java

@@ -10,8 +10,8 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.util.MiscUtil;
-import net.minecraft.command.CommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
@@ -22,7 +22,7 @@ public class ModuleArgumentType implements ArgumentType<Module> {
     public static final ModuleArgumentType INSTANCE = new ModuleArgumentType();
 
     private static final DynamicCommandExceptionType UNKNOWN_MODULE = new DynamicCommandExceptionType(
-            name -> Text.literal("módulo \"" + name + "\" no encontrado"));
+            name -> Component.literal("módulo \"" + name + "\" no encontrado"));
 
     private static final Collection<String> examples = ModuleManager.INSTANCE.getModules()
             .stream().limit(3).map(module -> module.getName().replace(" ", "_")).toList();
@@ -37,7 +37,7 @@ public class ModuleArgumentType implements ArgumentType<Module> {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return CommandSource.suggestMatching(ModuleManager.INSTANCE.getModules()
+        return SharedSuggestionProvider.suggest(ModuleManager.INSTANCE.getModules()
                 .stream().map(module -> MiscUtil.removeAccentMarks(module.getName().replace(" ", "_"))), builder);
     }
 
@@ -46,7 +46,7 @@ public class ModuleArgumentType implements ArgumentType<Module> {
         return examples;
     }
 
-    public static Module get(CommandContext<CommandSource> ctx) {
+    public static Module get(CommandContext<SharedSuggestionProvider> ctx) {
         return ctx.getArgument("módulo", Module.class);
     }
 }

src/main/java/me/retucio/sputnik/command/args/PlayerArgumentType.java

@@ -7,9 +7,9 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.minecraft.command.CommandSource;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.text.Text;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Player;
 
 import java.util.Collection;
 import java.util.List;
@@ -18,21 +18,21 @@ import java.util.concurrent.CompletableFuture;
 import static me.retucio.sputnik.Sputnik.mc;
 
 // para autocompletar nombres de jugadores
-public class PlayerArgumentType implements ArgumentType<PlayerEntity> {
+public class PlayerArgumentType implements ArgumentType<Player> {
 
     public static final PlayerArgumentType INSTANCE = new PlayerArgumentType();
-    private static final DynamicCommandExceptionType NO_SUCH_PLAYER = new DynamicCommandExceptionType(name -> Text.literal("Player with name " + name + " doesn't exist."));
+    private static final DynamicCommandExceptionType NO_SUCH_PLAYER = new DynamicCommandExceptionType(name -> Component.literal("Player with name " + name + " doesn't exist."));
 
     private static final Collection<String> EXAMPLES = List.of("retucio", "prepucio", "postpucio", "pucio", "adler hitdolf");
 
     private PlayerArgumentType() {}
 
     @Override
-    public PlayerEntity parse(StringReader reader) throws CommandSyntaxException {
+    public Player parse(StringReader reader) throws CommandSyntaxException {
         String argument = reader.readString();
-        PlayerEntity playerEntity = null;
+        Player playerEntity = null;
 
-        for (PlayerEntity p : mc.world.getPlayers())
+        for (Player p : mc.level.players())
             if (p.getName().getString().equalsIgnoreCase(argument)) {
                 playerEntity = p;
                 break;
@@ -45,7 +45,7 @@ public class PlayerArgumentType implements ArgumentType<PlayerEntity> {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return CommandSource.suggestMatching(mc.world.getPlayers().stream().map(
+        return SharedSuggestionProvider.suggest(mc.level.players().stream().map(
                 abstractClientPlayerEntity -> abstractClientPlayerEntity.getName().getString()), builder);
     }
 
@@ -54,8 +54,8 @@ public class PlayerArgumentType implements ArgumentType<PlayerEntity> {
         return EXAMPLES;
     }
 
-    public static PlayerEntity get(CommandContext<?> context) {
-        return context.getArgument("jugador", PlayerEntity.class);
+    public static Player get(CommandContext<?> context) {
+        return context.getArgument("jugador", Player.class);
     }
 
 }

src/main/java/me/retucio/sputnik/command/commands/BindCommand.java

@@ -5,11 +5,18 @@ import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.command.args.ModuleArgumentType;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.setting.settings.KeySetting;
+import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
 import me.retucio.sputnik.util.ChatUtil;
 import me.retucio.sputnik.util.KeyUtil;
-import net.minecraft.command.CommandSource;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
+
+import java.util.ArrayList;
+import java.util.List;
 
 // asignar una tecla a un módulo, lógica similar a BindButton
 public class BindCommand extends Command {
@@ -21,19 +28,20 @@ public class BindCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder
                 .then(argument("módulo", ModuleArgumentType.INSTANCE)
                         .executes(ctx -> {
                             Module module = ctx.getArgument("módulo", Module.class);
                             listeningModule = module;
-                            ChatUtil.info("presiona una tecla para asignarla al módulo " + Formatting.GREEN + module.getName());
+                            ChatUtil.info("presiona una tecla para asignarla al módulo " + ChatFormatting.GREEN + module.getName());
                             return SUCCESS;
                         })
                         .then(literal("reset").executes(ctx -> {
                             Module module = ctx.getArgument("módulo", Module.class);
                             module.getBind().reset();
-                            ChatUtil.info("tecla para el módulo " + Formatting.GREEN + module.getName() + " restablecida a " + Formatting.AQUA + KeyUtil.getKeyName(module.getKey()));
+                            ChatUtil.info("tecla para el módulo " + ChatFormatting.GREEN + module.getName()
+                                    + " restablecida a " + ChatFormatting.AQUA + KeyUtil.getKeyName(module.getKey()));
                             return SUCCESS;
                         }))
                 );
@@ -42,11 +50,29 @@ public class BindCommand extends Command {
     public static boolean onKeyPress(int key) {
         if (listeningModule == null) return false;
         KeySetting bind = listeningModule.getBind();
+
+        if (ClientSettingsPanel.clientSettings.multipleKeybinds.getValue()) {
+            List<KeyMapping> keys = new ArrayList<>(List.of(mc.options.keyMappings));
+            keys.removeAll(List.of(mc.options.debugKeys));
+
+            for (KeyMapping kb : keys) {
+                boolean keyAlreadyBound = kb.matches(new KeyEvent(key, 0, 0));
+                boolean allowMultiple = ClientSettingsPanel.clientSettings.multipleKeybinds.getValue();
+
+                if (keyAlreadyBound && !allowMultiple) {
+                    ChatUtil.warn("esa tecla ya está cogida por "
+                            + ChatFormatting.GREEN + "\"" + I18n.get(kb.getName() + "\""));
+                    listeningModule = null;
+                    return true;
+                }
+            }
+        }
+
         if (bind != null) bind.setValue(key);
 
         ChatUtil.info(
-                Text.of("la tecla " + Formatting.AQUA + KeyUtil.getKeyName(key) + Formatting.RESET +
-                        " ha sido asignada al módulo " + Formatting.GREEN + listeningModule.getName())
+                Component.nullToEmpty("la tecla " + ChatFormatting.AQUA + KeyUtil.getKeyName(key) + ChatFormatting.RESET +
+                        " ha sido asignada al módulo " + ChatFormatting.GREEN + listeningModule.getName())
         );
 
         listeningModule = null;

src/main/java/me/retucio/sputnik/command/commands/ClickSlotCommand.java

@@ -0,0 +1,36 @@
+package me.retucio.sputnik.command.commands;
+
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import me.retucio.sputnik.command.Command;
+import me.retucio.sputnik.command.args.EnumArgumentType;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.ContainerScreen;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.world.inventory.ContainerInput;
+
+// https://cdn.discordapp.com/attachments/1456079799045980400/1457154232737206375/dupersunited-public-addon-1.21.11-3.1.3.jar?ex=69735be1&is=69720a61&hm=77fb6faee49762e0a812661f0d98931e89cb725db711c45722249d0efe3b91e4&
+public class ClickSlotCommand extends Command {
+
+    public ClickSlotCommand() {
+        super("clickslot", "simula un clic a un slot");
+    }
+
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
+        builder.then(argument("slot", IntegerArgumentType.integer())
+                .then(argument("botón", IntegerArgumentType.integer())
+                        .then(argument("acción", EnumArgumentType.enumArgument(ContainerInput.SWAP))
+                                .executes(context -> {
+                                    int slot = context.getArgument("slot", Integer.class), button = context.getArgument("botón", Integer.class);
+                                    ContainerInput action = context.getArgument("acción", ContainerInput.class);
+                                    Screen screen = mc.screen;
+                                    int syncId = (screen instanceof ContainerScreen cScreen) ? cScreen.getMenu().containerId : 0;
+                                    if (mc.gameMode == null) return 0;
+                                    mc.gameMode.handleContainerInput(syncId, slot, button, action, mc.player);
+                                    return SUCCESS;
+                                })
+                        )
+                )
+        );
+    }
+}

src/main/java/me/retucio/sputnik/command/commands/ConfigCommand.java

@@ -5,9 +5,9 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.command.args.ModuleArgumentType;
-import me.retucio.sputnik.ui.screen.ClickGUI;
-import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
-import net.minecraft.command.CommandSource;
+import me.retucio.sputnik.ui.screen.ClickGui;
+import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
+import net.minecraft.commands.SharedSuggestionProvider;
 import me.retucio.sputnik.module.Module;
 
 public class ConfigCommand extends Command {
@@ -17,7 +17,7 @@ public class ConfigCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder
                 .then(argument("módulo", ModuleArgumentType.INSTANCE)
                         .executes(ctx -> {
@@ -38,29 +38,29 @@ public class ConfigCommand extends Command {
     }
 
 
-    private void openSf(CommandContext<CommandSource> ctx) {
+    private void openSf(CommandContext<SharedSuggestionProvider> ctx) {
         Module module = ctx.getArgument("módulo", Module.class);
-        mc.setScreen(ClickGUI.INSTANCE);
+        mc.setScreen(ClickGui.INSTANCE);
 
-        if (ClickGUI.INSTANCE.isSettingsFrameOpen(module)) return;
+        if (ClickGui.INSTANCE.isSettingsPanelOpen(module)) return;
 
-        SettingsFrame sf = ClickGUI.INSTANCE.getSfOfModule(module);
-        int x = mc.getWindow().getScaledWidth() / 2 - sf.getW() / 2;
+        SettingsPanel sf = ClickGui.INSTANCE.getSettingsPanelOfModule(module);
+        int x = mc.getWindow().getGuiScaledWidth() / 2 - sf.getW() / 2;
         int y = 67;
 
-        ClickGUI.INSTANCE.openSettingsFrame(module, x, y);
+        ClickGui.INSTANCE.openSettingsPanel(module, x, y);
     }
 
-    private void openSfWithPos(CommandContext<CommandSource> ctx, int x, int y) {
+    private void openSfWithPos(CommandContext<SharedSuggestionProvider> ctx, int x, int y) {
         Module module = ctx.getArgument("módulo", Module.class);
-        mc.setScreen(ClickGUI.INSTANCE);
+        mc.setScreen(ClickGui.INSTANCE);
 
-        if (ClickGUI.INSTANCE.isSettingsFrameOpen(module)) {
-            SettingsFrame sf = ClickGUI.INSTANCE.getSfOfModule(module);
+        if (ClickGui.INSTANCE.isSettingsPanelOpen(module)) {
+            SettingsPanel sf = ClickGui.INSTANCE.getSettingsPanelOfModule(module);
             sf.setX(x);
             sf.setY(y);
         }
 
-        ClickGUI.INSTANCE.openSettingsFrame(module, x, y);
+        ClickGui.INSTANCE.openSettingsPanel(module, x, y);
     }
 }

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

@@ -4,7 +4,7 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.misc.ScreenshotPlus;
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 // se usa principalmente para el módulo ScreenshotPlus, pero también se puede usar sin él supongo
 public class CopyScreenshotCommand extends Command {
@@ -14,7 +14,7 @@ public class CopyScreenshotCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.executes(ctx -> {
             ScreenshotPlus screenshotPlus = ModuleManager.INSTANCE.getModuleByClass(ScreenshotPlus.class);
 

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

@@ -1,13 +1,13 @@
 package me.retucio.sputnik.command.commands;
 
+import com.github.retucio.neutrino.EventListener;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
-import me.retucio.sputnik.event.SubscribeEvent;
-import me.retucio.sputnik.event.events.TickEvent;
+import me.retucio.sputnik.event.TickEvent;
 import me.retucio.sputnik.ui.screen.PreviewScreen;
 import me.retucio.sputnik.util.ChatUtil;
 import me.retucio.sputnik.util.InventoryUtil;
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 // accede a los contenidos de tu enderchest
 public class EnderChestCommand extends Command {
@@ -19,7 +19,7 @@ public class EnderChestCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.executes(ctx -> {
             mc.execute(() -> {
                 if (mc.player == null) return;
@@ -35,7 +35,7 @@ public class EnderChestCommand extends Command {
         });
     }
 
-    @SubscribeEvent
+    @EventListener
     public void onTick(TickEvent.Post event) {
         if (shouldOpenEchest) {
             shouldOpenEchest = false;

src/main/java/me/retucio/sputnik/command/commands/FriendCommand.java

@@ -0,0 +1,52 @@
+package me.retucio.sputnik.command.commands;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import me.retucio.sputnik.command.Command;
+import me.retucio.sputnik.command.args.PlayerArgumentType;
+import me.retucio.sputnik.friend.Friend;
+import me.retucio.sputnik.friend.FriendManager;
+import me.retucio.sputnik.util.ChatUtil;
+import net.minecraft.ChatFormatting;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.world.entity.player.Player;
+
+public class FriendCommand extends Command {
+
+    public FriendCommand() {
+        super("friend", "gestión de amigos", "amigo", "f");
+    }
+
+    @Override
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
+        builder
+                .then(literal("add")
+                        .then(argument("amigo", PlayerArgumentType.INSTANCE)
+                                .executes(ctx -> {
+                                        Player friend = ctx.getArgument("amigo", Player.class);
+                                        FriendManager.INSTANCE.add(friend.getUUID());
+                                        ChatUtil.info(ChatFormatting.GREEN + friend.getName().getString() + ChatFormatting.RESET + " ahora es tu amigo :)");
+                                        return SUCCESS;
+                                })
+                        )
+                )
+                .then(literal("remove")
+                        .then(argument("amigo", PlayerArgumentType.INSTANCE)
+                                .executes(ctx -> {
+                                        Player friend = ctx.getArgument("amigo", Player.class);
+                                        FriendManager.INSTANCE.remove(friend.getUUID());
+                                        ChatUtil.info(ChatFormatting.GREEN + friend.getName().getString() + ChatFormatting.RESET + " ya no es tu amigo :(");
+                                        return SUCCESS;
+                                })
+                        )
+                )
+                .then(literal("list")
+                        .executes(ctx -> {
+                                ChatUtil.info(ChatFormatting.GOLD + "amigos:");
+                                for (Friend friend : FriendManager.INSTANCE.getFriends()) {
+                                    ChatUtil.info("- " + friend.getName());
+                                }
+                                return SUCCESS;
+                        })
+                );
+    }
+}

src/main/java/me/retucio/sputnik/command/commands/GarbageCleanerCommand.java

@@ -3,8 +3,8 @@ package me.retucio.sputnik.command.commands;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.util.ChatUtil;
-import net.minecraft.command.CommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
 
 public class GarbageCleanerCommand extends Command {
 
@@ -13,10 +13,10 @@ public class GarbageCleanerCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.executes(context -> {
             System.gc();
-            ChatUtil.info(Text.of("basura recolectada"));
+            ChatUtil.info(Component.nullToEmpty("basura recolectada"));
             return SUCCESS;
         });
     }

src/main/java/me/retucio/sputnik/command/commands/PeekCommand.java

@@ -4,8 +4,8 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.command.args.PlayerArgumentType;
 import me.retucio.sputnik.util.MiscUtil;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-import net.minecraft.command.CommandSource;
+import net.minecraft.client.gui.screens.inventory.InventoryScreen;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 // comando que debería de mostrar el inventario de un jugador, pero por cómo funcionan los servers, solo te deja ver el ítem que tenga en la mano
 public class PeekCommand extends Command {
@@ -15,7 +15,7 @@ public class PeekCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder
                 .then(argument("jugador", PlayerArgumentType.INSTANCE)
                         .executes(ctx -> {

src/main/java/me/retucio/sputnik/command/commands/PluginsCommand.java

@@ -0,0 +1,111 @@
+package me.retucio.sputnik.command.commands;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.tree.CommandNode;
+
+import com.mojang.brigadier.tree.RootCommandNode;
+import me.retucio.sputnik.Sputnik;
+import me.retucio.sputnik.command.Command;
+import me.retucio.sputnik.event.network.PacketEvent;
+import me.retucio.sputnik.util.ChatUtil;
+
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.client.multiplayer.ClientSuggestionProvider;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.protocol.game.ClientboundCommandsPacket;
+
+import java.util.HashSet;
+import java.util.Set;
+
+
+public class PluginsCommand extends Command {
+    private final Set<String> plugins = new HashSet<>();
+    private boolean scanning = false;
+
+    public PluginsCommand() {
+        super("plugins", "busca los plugins que tenga el server", "pl", "serverplugins");
+        Sputnik.EVENT_BUS.subscribe(this);
+    }
+
+    @Override
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
+        builder.executes(context -> {
+            if (mc.hasSingleplayerServer()) {
+                ChatUtil.error("estás en un solo jugador");
+                return SUCCESS;
+            }
+
+            if (scanning) {
+                ChatUtil.error("calmaaa");
+                return SUCCESS;
+            }
+
+            plugins.clear();
+            scanning = true;
+
+            findNamespaces();
+
+            return SUCCESS;
+        });
+    }
+
+    private void findNamespaces() {
+        try {
+            ClientPacketListener networkHandler = mc.getConnection();
+            if (networkHandler == null) {
+                return;
+            }
+
+            RootCommandNode<ClientSuggestionProvider> root = networkHandler.getCommands().getRoot();
+            root.getChildren().forEach(this::checkNodeForPlugins);
+
+            if (!plugins.isEmpty()) {
+                ChatUtil.info(plugins.size() + " namespace(s) encontrado(s) de comandos:");
+                plugins.stream()
+                        .sorted()
+                        .forEach(plugin -> ChatUtil.info("  - " + plugin));
+            }
+
+            displayResults();
+
+        } catch (Exception e) {
+            ChatUtil.error("error analizando comandos: " + e.getMessage());
+        }
+    }
+
+    private void checkNodeForPlugins(CommandNode<ClientSuggestionProvider> node) {
+        String name = node.getName();
+
+        if (name.contains(":")) {
+            String namespace = name.split(":")[0];
+            if (!namespace.equalsIgnoreCase("minecraft")
+                    && !namespace.equalsIgnoreCase("bukkit")
+                    && !namespace.equalsIgnoreCase("spigot")
+                    && !namespace.equalsIgnoreCase("paper")) {
+                plugins.add(namespace);
+            }
+        }
+
+        node.getChildren().forEach(this::checkNodeForPlugins);
+    }
+
+    private void onPacketReceive(PacketEvent.Receive event) {
+        if (!scanning) return;
+
+        if (event.getPacket() instanceof ClientboundCommandsPacket) {
+            findNamespaces();
+        }
+    }
+
+    private void displayResults() {
+        if (!plugins.isEmpty()) {
+                ChatUtil.info(plugins.size() + " plugin(s) encontrado(s)");
+                plugins.stream().sorted()
+                        .forEach(plugin -> ChatUtil.info("  - " + plugin));
+        } else {
+            ChatUtil.warn("sin plugins (probablemente)");
+        }
+
+        scanning = false;
+    }
+}

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

@@ -3,11 +3,11 @@ package me.retucio.sputnik.command.commands;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
-import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
+import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
 import me.retucio.sputnik.util.ChatUtil;
-import net.minecraft.command.CommandSource;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
 
 // también se puede hacer desde los ajustes de la interfaz
 public class PrefixCommand extends Command {
@@ -17,12 +17,12 @@ public class PrefixCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder
             .then(argument("prefijo", StringArgumentType.word()).executes(ctx -> {
                 String prefix = ctx.getArgument("prefijo", String.class);
-                ClientSettingsFrame.guiSettings.commandPrefix.setValue(prefix);
-                ChatUtil.info(Text.literal("prefijo cambiado a " + Formatting.AQUA + prefix));
+                ClientSettingsPanel.clientSettings.commandPrefix.setValue(prefix);
+                ChatUtil.info(Component.literal("prefijo cambiado a " + ChatFormatting.AQUA + prefix));
                 return SUCCESS;
             }));
     }

src/main/java/me/retucio/sputnik/command/commands/PurgeCommand.java

@@ -3,10 +3,10 @@ package me.retucio.sputnik.command.commands;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
-import me.retucio.sputnik.util.interfaces.IChatHud;
-import net.minecraft.client.gui.hud.ChatHud;
-import net.minecraft.client.gui.hud.ChatHudLine;
-import net.minecraft.command.CommandSource;
+import me.retucio.sputnik.util.interfaces.IChatComponent;
+import net.minecraft.client.gui.components.ChatComponent;
+import net.minecraft.client.multiplayer.chat.GuiMessage;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ public class PurgeCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.then(argument("cantidad", IntegerArgumentType.integer(1))
                 .executes(context -> {
                     int amount = IntegerArgumentType.getInteger(context, "cantidad");
@@ -28,10 +28,10 @@ public class PurgeCommand extends Command {
     }
 
     private void purgeMessages(int amount) {
-        ChatHud chatHud = mc.inGameHud.getChatHud();
+        ChatComponent chatHud = mc.gui.getChat();
 
         synchronized (chatHud) {
-            List<ChatHudLine.Visible> visibleMessages = ((IChatHud) chatHud).sputnik$getVisibleMessages();
+            List<GuiMessage.Line> visibleMessages = ((IChatComponent) chatHud).sputnik$getVisibleMessages();
             int toRemove = Math.min(amount, visibleMessages.size());
             for (int i = 0; i < toRemove; i++)
                 visibleMessages.removeFirst();

src/main/java/me/retucio/sputnik/command/commands/RepeatCommand.java

@@ -0,0 +1,32 @@
+package me.retucio.sputnik.command.commands;
+
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import me.retucio.sputnik.command.Command;
+import me.retucio.sputnik.util.ChatUtil;
+import net.minecraft.commands.SharedSuggestionProvider;
+
+public class RepeatCommand extends Command {
+
+    public RepeatCommand() {
+        super("repetir", "repite un comando x veces", "repeat");
+    }
+
+    @Override
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
+        builder
+                .then(argument("veces", IntegerArgumentType.integer(1))
+                        .then(argument("comando", StringArgumentType.greedyString())
+                                .executes(ctx -> {
+                                    int j = ctx.getArgument("veces", Integer.class);
+                                    String command = ctx.getArgument("comando", String.class);
+                                    for (int i = 0; i < j; i++) {
+                                        ChatUtil.simulateChatMessage(command);
+                                    }
+                                    return SUCCESS;
+                                })
+                        )
+                );
+    }
+}

src/main/java/me/retucio/sputnik/command/commands/RepeatWaitCommand.java

@@ -0,0 +1,46 @@
+package me.retucio.sputnik.command.commands;
+
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import me.retucio.sputnik.command.Command;
+import me.retucio.sputnik.util.ChatUtil;
+import net.minecraft.commands.SharedSuggestionProvider;
+
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class RepeatWaitCommand extends Command {
+
+    public RepeatWaitCommand() {
+        super("repesperar", "combinación de $repetir y $esperar");
+    }
+
+    @Override
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
+        builder.then(argument("ms", IntegerArgumentType.integer(1))
+                .then(argument("veces", IntegerArgumentType.integer(1))
+                        .then(argument("comando", StringArgumentType.greedyString())
+                                .executes((context) -> {
+                                    int ms = context.getArgument("ms", Integer.class);
+                                    int times = context.getArgument("veces", Integer.class);
+                                    String cmd = context.getArgument("comando", String.class);
+
+                                    for (int i = 0; i < times; i++) {
+                                        int delay = i * ms;
+                                        int finalI = i;
+                                        new ScheduledThreadPoolExecutor(2).schedule(
+                                                () -> ChatUtil.info(
+                                                        cmd.replaceAll("(?i)%index%",
+                                                                String.valueOf(finalI))),
+                                                delay,
+                                                TimeUnit.MILLISECONDS
+                                        );
+                                    }
+                                    return SUCCESS;
+                                })
+                        )
+                )
+        );
+    }
+}

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

@@ -5,7 +5,7 @@ import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.misc.ScreenshotPlus;
 import me.retucio.sputnik.util.ChatUtil;
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 import java.io.IOException;
 
@@ -17,7 +17,7 @@ public class SaveScreenshotCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.executes(ctx -> {
             ScreenshotPlus screenshotPlus = ModuleManager.INSTANCE.getModuleByClass(ScreenshotPlus.class);
 

src/main/java/me/retucio/sputnik/command/commands/SendCommand.java

@@ -3,18 +3,18 @@ package me.retucio.sputnik.command.commands;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
-import me.retucio.sputnik.mixin.accessor.ClientPlayNetworkHandlerAccessor;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.command.CommandSource;
-import net.minecraft.network.encryption.NetworkEncryptionUtils;
-import net.minecraft.network.message.LastSeenMessagesCollector;
-import net.minecraft.network.message.MessageBody;
-import net.minecraft.network.message.MessageSignatureData;
-import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
+import me.retucio.sputnik.mixin.accessors.ClientPacketListenerAccessor;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.LastSeenMessagesTracker;
+import net.minecraft.network.chat.MessageSignature;
+import net.minecraft.network.chat.SignedMessageBody;
+import net.minecraft.network.protocol.game.ServerboundChatPacket;
+import net.minecraft.util.Crypt;
 
 import java.time.Instant;
 
-// uso principal: protección de coordenadas de ChatPlus, que ni siquiera funciona
+// uso principal: protección de coordenadas de ChatPlus
 public class SendCommand extends Command {
 
     public SendCommand() {
@@ -22,31 +22,35 @@ public class SendCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder.then(argument("message", StringArgumentType.greedyString()).executes(context -> {
             String message = context.getArgument("message", String.class);
 
             if (message != null && !message.isEmpty()) {
                 Instant instant = Instant.now();
-                long salt = NetworkEncryptionUtils.SecureRandomUtil.nextLong();
-                ClientPlayNetworkHandler handler = mc.getNetworkHandler();
+                long salt = Crypt.SaltSupplier.getLong();
+                ClientPacketListener handler = mc.getConnection();
 
                 // obtener últimos mensajes vistos para la firma
-                LastSeenMessagesCollector.LastSeenMessages lastSeenMessages =
-                        ((ClientPlayNetworkHandlerAccessor) handler).getLastSeenMessagesCollector().collect();
+                ClientPacketListenerAccessor listener = ((ClientPacketListenerAccessor) handler);
+                if (listener == null) return 0;
+                LastSeenMessagesTracker tracker = ((ClientPacketListenerAccessor) handler).getLastSeenMessagesTracker();
+                LastSeenMessagesTracker.Update lastSeenMessages = tracker.generateAndApplyUpdate();
 
                 // empacar firma para un chat seguro
-                MessageSignatureData messageSignatureData =
-                        ((ClientPlayNetworkHandlerAccessor) handler).getMessagePacker().pack(
-                                new MessageBody(message, instant, salt, lastSeenMessages.lastSeen())
-                        );
+                MessageSignature messageSignature = ((ClientPacketListenerAccessor) handler)
+                        .getSignedMessageEncoder()
+                        .pack(new SignedMessageBody(
+                                message, instant, salt, lastSeenMessages.lastSeen()
+                        )
+                );
 
                 // enviar paquete para enviar mensaje
-                handler.sendPacket(new ChatMessageC2SPacket(
+                handler.send(new ServerboundChatPacket(
                         message,
                         instant,
                         salt,
-                        messageSignatureData,
+                        messageSignature,
                         lastSeenMessages.update()
                 ));
             }

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

@@ -1,13 +1,13 @@
 package me.retucio.sputnik.command.commands;
 
+import com.github.retucio.neutrino.EventListener;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.command.args.EntityArgumentType;
-import me.retucio.sputnik.event.SubscribeEvent;
-import me.retucio.sputnik.event.events.KeyEvent;
+import me.retucio.sputnik.event.input.KeyEvent;
 import me.retucio.sputnik.util.EntityUtil;
-import net.minecraft.command.CommandSource;
-import net.minecraft.entity.Entity;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.world.entity.Entity;
 import org.lwjgl.glfw.GLFW;
 
 public class SpectateCommand extends Command {
@@ -17,7 +17,7 @@ public class SpectateCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder
                 .executes(ctx -> {  // If no argument, use the entity player is looking at
                     mc.execute(() -> {
@@ -38,9 +38,9 @@ public class SpectateCommand extends Command {
                 );
     }
 
-    @SubscribeEvent
+    @EventListener
     public void onKey(KeyEvent event) {
-        if (mc.getCameraEntity() != mc.player && mc.currentScreen == null
+        if (mc.getCameraEntity() != mc.player && mc.screen == null
                 && event.getKey() == GLFW.GLFW_KEY_ESCAPE && event.getAction() != GLFW.GLFW_RELEASE ) {
             event.cancel();
             mc.setCameraEntity(mc.player);

src/main/java/me/retucio/sputnik/command/commands/ToggleCommand.java

@@ -5,7 +5,7 @@ import me.retucio.sputnik.command.Command;
 import me.retucio.sputnik.command.args.ModuleArgumentType;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.ModuleManager;
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
 
 // porque usar el ratón es más lento que escribir, a menos que tengas toque con el teclado como yo
 public class ToggleCommand extends Command {
@@ -15,7 +15,7 @@ public class ToggleCommand extends Command {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
         builder
                 .then(literal("todos")
                         .then(literal("on")

src/main/java/me/retucio/sputnik/command/commands/WaitCommand.java

@@ -0,0 +1,37 @@
+package me.retucio.sputnik.command.commands;
+
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import me.retucio.sputnik.command.Command;
+import me.retucio.sputnik.util.ChatUtil;
+import net.minecraft.commands.SharedSuggestionProvider;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class WaitCommand extends Command {
+
+    private static final ScheduledExecutorService DELAYED_EXECUTOR = new ScheduledThreadPoolExecutor(2);
+
+    public WaitCommand() {
+        super("wait", "espera un tiempo determinado antes de ejecutar otro comando", "esperar", "sleep", "delay");
+    }
+
+    @Override
+    public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
+        builder
+            .then(argument("delay", IntegerArgumentType.integer(0))
+                .then(argument("comando", StringArgumentType.greedyString())
+                    .executes(ctx -> {
+                        int delay = ctx.getArgument("delay", Integer.class);
+                        String command = ctx.getArgument("comando", String.class);
+
+                        DELAYED_EXECUTOR.schedule(() -> ChatUtil.simulateChatMessage(command), delay, TimeUnit.MILLISECONDS);
+                        return SUCCESS;
+                   })
+                )
+            );
+    }
+}

src/main/java/me/retucio/sputnik/config/BinarySerializer.java

@@ -2,13 +2,17 @@ package me.retucio.sputnik.config;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class BinarySerializer {
 
-    private static final int MAGIC_NUMBER = 0x53505554; // "SPUT"
-    private static final int VERSION = 1;
+    private static final int MAGIC_NUMBER = 0x53505554;  // "SPUT"
+    private static final int VERSION = 2;
 
     private static final byte TYPE_NULL = 0;
     private static final byte TYPE_BOOLEAN = 1;
@@ -19,32 +23,60 @@ public class BinarySerializer {
     private static final byte TYPE_INT_ARRAY = 6;
     private static final byte TYPE_FRAME_DATA = 7;
 
-    public static void writeConfig(ClientConfig config, File file)
-            throws IOException {
-        try (DataOutputStream out = new DataOutputStream(
-                new BufferedOutputStream(new FileOutputStream(file)))) {
+    public static void writeConfig(ClientConfig config, File file) throws IOException {
+        byte[] bytes = toBytes(config);
+        writeBytes(bytes, file);
+    }
 
-            // cabezal
-            out.writeInt(MAGIC_NUMBER);
-            out.writeInt(VERSION);
+    // serializar a bytes en memoria
+    public static byte[] toBytes(ClientConfig config) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (DataOutputStream out = new DataOutputStream(baos)) {
+            writeConfigTo(config, out);
+        }
+        return baos.toByteArray();
+    }
 
-            // mapas
-            writeStringBooleanMap(out, config.moduleStates);
-            writeSettingsMap(out, config.settings);
-            writeStringIntArrayMap(out, config.settingsFrames);
-            writeExtendableFrames(out, config.extendableFrames);
-            writeStringIntArrayMap(out, config.hudPositions);
-            writeStringBooleanMap(out, config.hudVisibilities);
-            writeStringStringMap(out, config.hudImagePaths);
+    // escribir bytes a disco (puede llamarse desde un hilo de fondo)
+    public static void writeBytes(byte[] bytes, File file) throws IOException {
+        // escribir a archivo temporal primero para evitar corrupción si el proceso muere a mitad
+        File temp = new File(file.getParent(), file.getName() + ".tmp");
+        try (FileOutputStream fos = new FileOutputStream(temp);
+             BufferedOutputStream out = new BufferedOutputStream(fos)) {
+            out.write(bytes);
+            out.flush();
+            fos.getFD().sync();  // forzar flush al disco antes de renombrar
+        }
 
-            // posición de la barra de búsqueda
-            if (config.searchBarPosition != null) {
-                out.writeBoolean(true);
-                out.writeInt(config.searchBarPosition[0]);
-                out.writeInt(config.searchBarPosition[1]);
-            } else {
-                out.writeBoolean(false);
-            }
+        // renombrar atómicamente
+        if (!temp.renameTo(file)) {
+            // renameTo puede fallar entre sistemas de archivos distintos
+            Files.move(temp.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+
+    // lógica de serialización compartida
+    private static void writeConfigTo(ClientConfig config, DataOutputStream out) throws IOException {
+        // cabezal
+        out.writeInt(MAGIC_NUMBER);
+        out.writeInt(VERSION);
+
+        // el resto
+        writeStringBooleanMap(out, config.moduleStates);
+        writeSettingsMap(out, config.settings);
+        writeStringIntArrayMap(out, config.settingsPanels);
+        writeExtendableFrames(out, config.extendablePanels);
+        writeStringIntArrayMap(out, config.hudPositions);
+        writeStringBooleanMap(out, config.hudVisibilities);
+        writeStringStringMap(out, config.hudImagePaths);
+        writeStringStringMap(out, config.friends);
+
+        if (config.searchBarPosition != null) {
+            out.writeBoolean(true);
+            out.writeInt(config.searchBarPosition[0]);
+            out.writeInt(config.searchBarPosition[1]);
+        } else {
+            out.writeBoolean(false);
         }
     }
 
@@ -77,11 +109,12 @@ public class BinarySerializer {
             // leer mapas
             config.moduleStates = readStringBooleanMap(in);
             config.settings = readSettingsMap(in);
-            config.settingsFrames = readStringIntArrayMap(in);
-            config.extendableFrames = readExtendableFrames(in);
+            config.settingsPanels = readStringIntArrayMap(in);
+            config.extendablePanels = readExtendablePanels(in);
             config.hudPositions = readStringIntArrayMap(in);
             config.hudVisibilities = readStringBooleanMap(in);
             config.hudImagePaths = readStringStringMap(in);
+            config.friends = readStringStringMap(in);
 
             // leer pos. de la barra de búsqueda
             if (in.readBoolean()) {
@@ -281,32 +314,31 @@ public class BinarySerializer {
         return map;
     }
 
-    private static void writeExtendableFrames(DataOutputStream out, Map<String, ClientConfig.FrameData> map)
+    private static void writeExtendableFrames(DataOutputStream out, Map<String, ClientConfig.PanelData> map)
             throws IOException {
         if (map == null) {
             out.writeInt(0);
             return;
         }
         out.writeInt(map.size());
-        for (Map.Entry<String, ClientConfig.FrameData> entry : map.entrySet()) {
+        for (Map.Entry<String, ClientConfig.PanelData> entry : map.entrySet()) {
             writeString(out, entry.getKey());
-            ClientConfig.FrameData data = entry.getValue();
+            ClientConfig.PanelData data = entry.getValue();
             out.writeInt(data.x());
             out.writeInt(data.y());
             out.writeBoolean(data.extended());
         }
     }
 
-    private static Map<String, ClientConfig.FrameData> readExtendableFrames(DataInputStream in)
-            throws IOException {
+    private static Map<String, ClientConfig.PanelData> readExtendablePanels(DataInputStream in) throws IOException {
         int size = in.readInt();
-        Map<String, ClientConfig.FrameData> map = new HashMap<>(size);
+        Map<String, ClientConfig.PanelData> map = new HashMap<>(size);
         for (int i = 0; i < size; i++) {
             String key = readString(in);
             int x = in.readInt();
             int y = in.readInt();
             boolean extended = in.readBoolean();
-            map.put(key, new ClientConfig.FrameData(x, y, extended));
+            map.put(key, new ClientConfig.PanelData(x, y, extended));
         }
         return map;
     }
@@ -336,7 +368,6 @@ public class BinarySerializer {
         return map;
     }
 
-    // Optimized string writing (UTF-8 with length prefix)
     private static void writeString(DataOutputStream out, String str) throws IOException {
         if (str == null) {
             out.writeInt(-1);
@@ -352,6 +383,6 @@ public class BinarySerializer {
         if (length == -1) return null;
         byte[] bytes = new byte[length];
         in.readFully(bytes);
-        return new String(bytes, "UTF-8");
+        return new String(bytes, StandardCharsets.UTF_8);
     }
 }

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

@@ -1,13 +1,17 @@
 package me.retucio.sputnik.config;
 
-import me.retucio.sputnik.event.SubscribeEvent;
-import me.retucio.sputnik.event.events.sputnik.*;
+import com.github.retucio.neutrino.EventListener;
+import me.retucio.sputnik.event.sputnik.*;
 import me.retucio.sputnik.module.setting.settings.*;
-import me.retucio.sputnik.ui.screen.ClickGUI;
+import me.retucio.sputnik.ui.screen.ClickGui;
+import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
+import me.retucio.sputnik.util.ChatUtil;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static me.retucio.sputnik.Sputnik.EVENT_BUS;
@@ -23,10 +27,10 @@ public class ClientConfig {
     public Map<String, Object> settings = new HashMap<>();
 
     // nombre del módulo -> posición (x, y)
-    public Map<String, int[]> settingsFrames = new HashMap<>();
+    public Map<String, int[]> settingsPanels = new HashMap<>();
 
     // nombre del frame -> FrameData (que contiene extended, x & y)
-    public Map<String, FrameData> extendableFrames = new HashMap<>();
+    public Map<String, PanelData> extendablePanels = new HashMap<>();
 
     // id del elemento del hud -> posición (x, y)
     public Map<String, int[]> hudPositions = new HashMap<>();
@@ -34,23 +38,26 @@ public class ClientConfig {
     // id del elemento del hud -> true: visible / false: no visible
     public Map<String, Boolean> hudVisibilities = new HashMap<>();
 
-    // id del elemento del hud -> ruta de la imagen (NEW)
+    // id del elemento del hud -> ruta de la imagen
     public Map<String, String> hudImagePaths = new HashMap<>();
 
     // posición de la barra de búsqueda (x, y)
-    public int[] searchBarPosition = new int[]{340, 16};
+    public int[] searchBarPosition = new int[] { 340, 16 };
+
+    // amigos: uuid -> nombre
+    public Map<String, String> friends = new HashMap<>();
 
     public ClientConfig() {
-        EVENT_BUS.register(this);
+        EVENT_BUS.subscribe(this);
     }
 
-    @SubscribeEvent
+    @EventListener
     public void onToggleModule(ToggleModuleEvent event) {
-        ConfigManager.setModuleState(event.getModule());
+        ConfigManager.INSTANCE.setModuleState(event.getModule());
     }
 
     @SuppressWarnings("rawtypes")
-    @SubscribeEvent
+    @EventListener
     public void onUpdateSetting(UpdateSettingEvent event) {
         if (mc == null || !event.shouldSave()) return;
 
@@ -68,59 +75,97 @@ public class ClientConfig {
             default: break;
         }
 
-        ConfigManager.setSetting(event.getSetting(), value);
+        ConfigManager.INSTANCE.setSetting(event.getSetting(), value);
     }
 
-    @SubscribeEvent
-    public void onOpenSettingsFrame(SettingsFrameEvent.Open event) {
-        ConfigManager.setFramePosition(event.getFrame());
+    @EventListener
+    public void onOpenSettingsPanel(SettingsPanelEvent.Open event) {
+        ConfigManager.INSTANCE.setPanelPosition(event.getPanel());
     }
 
-    @SubscribeEvent
-    public void onCloseSettingsFrame(SettingsFrameEvent.Close event) {
-        settingsFrames.remove(event.getFrame().getModule().getName());
-        ConfigManager.save();
+    @EventListener
+    public void onCloseSettingsPanel(SettingsPanelEvent.Close event) {
+        settingsPanels.remove(event.getPanel().getModule().getName());
+        ConfigManager.INSTANCE.markDirty();
     }
 
-    @SubscribeEvent
-    public void onMoveSettingsFrame(SettingsFrameEvent.Move event) {
-        settingsFrames.replace(event.getFrame().getModule().getName(), new int[]{event.getFrame().getX(), event.getFrame().getY()});
-        ConfigManager.save();
+    @EventListener
+    public void onMoveSettingsPanel(SettingsPanelEvent.Move event) {
+        settingsPanels.replace(event.getPanel().getModule().getName(), new int[]{event.getPanel().getX(), event.getPanel().getY()});
+        ConfigManager.INSTANCE.markDirty();
     }
 
-    @SubscribeEvent
-    public void onExtendModuleFrame(ModuleFrameEvent.Extend event) {
-        extendableFrames.put("M", new FrameData(
-                ClickGUI.INSTANCE.getModulesFrame().getX(),
-                ClickGUI.INSTANCE.getModulesFrame().getY(),
-                ClickGUI.INSTANCE.getModulesFrame().extended));
+    @EventListener
+    public void onExtendModulePanel(ModulePanelEvent.Extend event) {
+        extendablePanels.put(event.getPanel().category.toString(), new PanelData(
+                event.getPanel().getX(),
+                event.getPanel().getY(),
+                event.getPanel().isExtended()));
+        ConfigManager.INSTANCE.markDirty();
     }
 
-    @SubscribeEvent
-    public void onMoveModuleFrame(ModuleFrameEvent.Move event) {
-        extendableFrames.replace("M", new FrameData(
-                ClickGUI.INSTANCE.getModulesFrame().getX(),
-                ClickGUI.INSTANCE.getModulesFrame().getY(),
-                ClickGUI.INSTANCE.getModulesFrame().extended));
+    @EventListener
+    public void onMoveModulePanel(ModulePanelEvent.Move event) {
+        extendablePanels.replace(event.getPanel().category.toString(), new PanelData(
+                event.getPanel().getX(),
+                event.getPanel().getY(),
+                event.getPanel().isExtended()));
+        ConfigManager.INSTANCE.markDirty();
     }
 
-    @SubscribeEvent
-    public void onExtendGUISettingsFrame(GUISettingsFrameEvent.Extend event) {
-        extendableFrames.put("S", new FrameData(
-                ClickGUI.INSTANCE.getGuiSettingsFrame().getX(),
-                ClickGUI.INSTANCE.getGuiSettingsFrame().getY(),
-                ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
+    @EventListener
+    public void onExtendClientSettingsPanel(ClientSettingsPanelEvent.Extend event) {
+        extendablePanels.put("ajustes", new PanelData(
+                ClickGui.INSTANCE.getClientSettingsPanel().getX(),
+                ClickGui.INSTANCE.getClientSettingsPanel().getY(),
+                ClickGui.INSTANCE.getClientSettingsPanel().isExtended()));
+        ConfigManager.INSTANCE.markDirty();
     }
 
-    @SubscribeEvent
-    public void onMoveGUISettingsFrame(GUISettingsFrameEvent.Move event) {
-        extendableFrames.replace("S", new FrameData(
-                ClickGUI.INSTANCE.getGuiSettingsFrame().getX(),
-                ClickGUI.INSTANCE.getGuiSettingsFrame().getY(),
-                ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
+    @EventListener
+    public void onMoveClientSettingsPanel(ClientSettingsPanelEvent.Move event) {
+        extendablePanels.replace("ajustes", new PanelData(
+                ClickGui.INSTANCE.getClientSettingsPanel().getX(),
+                ClickGui.INSTANCE.getClientSettingsPanel().getY(),
+                ClickGui.INSTANCE.getClientSettingsPanel().isExtended()));
+        ConfigManager.INSTANCE.markDirty();
     }
 
-    public record FrameData(int x, int y, boolean extended) implements Serializable {
+    @EventListener
+    public void onExtendFriendsPanel(FriendPanelEvent.Extend event) {
+        extendablePanels.put("amigos", new PanelData(
+                ClickGui.INSTANCE.getFriendsPanel().getX(),
+                ClickGui.INSTANCE.getFriendsPanel().getY(),
+                ClickGui.INSTANCE.getFriendsPanel().isExtended()));
+        ConfigManager.INSTANCE.markDirty();
+    }
+
+    @EventListener
+    public void onMoveFriendsPanel(FriendPanelEvent.Move event) {
+        extendablePanels.replace("amigos", new PanelData(
+                ClickGui.INSTANCE.getFriendsPanel().getX(),
+                ClickGui.INSTANCE.getFriendsPanel().getY(),
+                ClickGui.INSTANCE.getFriendsPanel().isExtended()));
+        ConfigManager.INSTANCE.markDirty();
+    }
+
+    @EventListener
+    public void onAddFriend(FriendEvent.Add event) {
+        String uuid = event.getFriend().getUuid().toString();
+        String name = event.getFriend().getName();
+        if (!friends.containsKey(uuid)) {
+            friends.put(uuid, name);
+        }
+        ConfigManager.INSTANCE.markDirty();
+    }
+
+    @EventListener
+    public void onRemoveFriend(FriendEvent.Remove event) {
+        friends.remove(event.getFriend().getUuid().toString());
+        ConfigManager.INSTANCE.markDirty();
+    }
+
+    public record PanelData(int x, int y, boolean extended) implements Serializable {
         @Serial private static final long serialVersionUID = 1L;
     }
 }

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

@@ -3,21 +3,32 @@ package me.retucio.sputnik.config;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import me.retucio.sputnik.Sputnik;
+import me.retucio.sputnik.friend.Friend;
+import me.retucio.sputnik.friend.FriendManager;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.ModuleManager;
+import me.retucio.sputnik.module.modules.client.ClientSettingsModule;
 import me.retucio.sputnik.module.setting.*;
 import me.retucio.sputnik.module.setting.settings.*;
-import me.retucio.sputnik.ui.widgets.Frame;
-import me.retucio.sputnik.ui.widgets.frames.ModuleFrame;
-import me.retucio.sputnik.ui.screen.ClickGUI;
-import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
-import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
+import me.retucio.sputnik.ui.hud.HudRenderer;
+import me.retucio.sputnik.ui.widgets.Panel;
+import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
+import me.retucio.sputnik.ui.widgets.panels.ModulePanel;
+import me.retucio.sputnik.ui.screen.ClickGui;
+import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
+import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
+import me.retucio.sputnik.util.ChatUtil;
 
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
 // se ocupa de guardar, cargar y aplicar ajustes
@@ -26,26 +37,70 @@ public class ConfigManager {
     private static final File CONFIG_FILE = new File("sputnik.dat");
     private static final File LEGACY_JSON_FILE = new File("sputnik.json");
 
-    private static boolean loaded = false;
-    private static ClientConfig config = null;
+    public static ConfigManager INSTANCE;
+
+    private boolean loaded = false;
+    private boolean dirty = false;
+    private long lastDirtyTime = 0L;
+    private ClientConfig config = null;
+
+    private final ExecutorService saveExecutor = Executors.newSingleThreadExecutor(r -> {
+        Thread t = new Thread(r, "sputnik-config-save");
+        t.setDaemon(true);  // no bloquear el cierre de la JVM
+        return t;
+    });
+
+    private final AtomicBoolean saveQueued = new AtomicBoolean(false);
 
 
     // ------------------ MÉTODOS PRINCIPALES ------------------
 
     // guardar configuraciones
-    public static void save() {
+    public void save() {
         if (!loaded) return;
         ensureConfig();
 
+        // serializar a bytes en el hilo principal (snapshot inmediato, evita race conditions)
+        final byte[] snapshot;
         try {
-            BinarySerializer.writeConfig(config, CONFIG_FILE);
-            Sputnik.LOGGER.info("ajustes guardados");
+            snapshot = BinarySerializer.toBytes(config);
         } catch (IOException e) {
-            Sputnik.LOGGER.error("error al guardar ajustes", e);
+            Sputnik.LOGGER.error("error al serializar ajustes", e);
+            return;
         }
+
+        // si ya hay un guardado en cola, no añadir otro
+        if (!saveQueued.compareAndSet(false, true)) return;
+
+        saveExecutor.execute(() -> {
+            try {
+                BinarySerializer.writeBytes(snapshot, CONFIG_FILE);
+                Sputnik.LOGGER.info("ajustes guardados");
+            } catch (IOException e) {
+                Sputnik.LOGGER.error("error al guardar ajustes", e);
+            } finally {
+                saveQueued.set(false);
+            }
+        });
     }
 
-    public static void load() {
+    public void saveOnShutdown() {
+        // esperar a que termine cualquier guardado en curso, luego guardar síncronamente
+        saveExecutor.shutdown();
+        try {
+            // dar hasta 5 segundos para que termine el guardado en curso
+            if (!saveExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
+                Sputnik.LOGGER.warn("el hilo de guardado no terminó a tiempo");
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        // guardado final sincrónico por si había cambios pendientes no guardados
+        if (dirty) save();
+    }
+
+    public void load() {
         Sputnik.LOGGER.info("cargando ajustes...");
 
         if (CONFIG_FILE.exists()) {
@@ -58,7 +113,7 @@ public class ConfigManager {
             }
         }
 
-        // Fallback to legacy JSON
+        // fallback to legacy JSON
         if (LEGACY_JSON_FILE.exists()) {
             try (FileReader reader = new FileReader(LEGACY_JSON_FILE)) {
                 Gson gson = new GsonBuilder().setPrettyPrinting().create();
@@ -78,22 +133,23 @@ public class ConfigManager {
     }
 
     // aplicar configuraciones cargadas
-    public static void applyConfig() {
+    public void applyConfig() {
         if (!shouldApply()) return;
 
         applyModuleStates();
         applyModuleSettings();
-        applySettingsFrames();
+        applySettingsPanels();
         applySearchBarPosition();
-        applyGuiSettings();
-        applyExtendableFrames();
+        applyClientSettings();
+        applyExtendablePanels();
+        applyFriends();
 
         loaded = true;
         Sputnik.LOGGER.info("ajustes aplicados");
     }
 
     // obtener configuración actual
-    public static ClientConfig getConfig() {
+    public ClientConfig getConfig() {
         ensureConfig();
         return config;
     }
@@ -101,56 +157,65 @@ public class ConfigManager {
 
     // ------------------ GUARDAR VALORES INDIVIDUALES EN LA CONFIG. ------------------
 
-    public static void setModuleState(Module module) {
+    public void setModuleState(Module module) {
         ensureConfig();
         config.moduleStates.put(module.getName(), module.isEnabled());
-        save();
+        markDirty();
     }
 
-    public static void setSetting(Setting<?> setting, Object value) {
+    public void setSetting(Setting<?> setting, Object value) {
         ensureConfig();
         config.settings.put(getSettingKey(setting), value);
-        save();
+        markDirty();
     }
 
-    public static void setFramePosition(SettingsFrame frame) {
+    public void setPanelPosition(SettingsPanel panel) {
         ensureConfig();
-        if (!config.settingsFrames.containsKey(frame.getModule().getName()))
-            config.settingsFrames.put(frame.getModule().getName(), new int[] {frame.getX(), frame.getY()});
+        if (!config.settingsPanels.containsKey(panel.getModule().getName()))
+            config.settingsPanels.put(panel.getModule().getName(), new int[] {panel.getX(), panel.getY()});
         else
-            config.settingsFrames.replace(frame.getModule().getName(), new int[] {frame.getX(), frame.getY()});
-        save();
+            config.settingsPanels.replace(panel.getModule().getName(), new int[] {panel.getX(), panel.getY()});
+        markDirty();
     }
 
-    public static void setExtendableFrame(String key, ClientConfig.FrameData data) {
+    public void setExtendablePanel(String key, ClientConfig.PanelData data) {
         ensureConfig();
-        config.extendableFrames.put(key, data);
-        save();
+        config.extendablePanels.put(key, data);
+        markDirty();
     }
 
-    public static void setHudPosition(String id, int x, int y) {
+    public void setHudPosition(String id, int x, int y) {
         ensureConfig();
         config.hudPositions.put(id, new int[] {x, y});
-        save();
+        markDirty();
     }
 
-    public static void setHudVisibility(String id, Boolean visible) {
+    public void setHudVisibility(String id, Boolean visible) {
         ensureConfig();
         config.hudVisibilities.put(id, visible);
-        save();
+        markDirty();
     }
 
-    public static void setSearchBarPosition(int x, int y) {
+    public void setSearchBarPosition(int x, int y) {
         ensureConfig();
         config.searchBarPosition = new int[] {x, y};
-        save();
+        markDirty();
     }
 
 
     // ------------------ APLICAR AJUSTES ------------------
 
+    public void applyFriends() {
+        config.friends.forEach((uuid, name) -> {
+            Friend friend = new Friend(UUID.fromString(uuid));
+            friend.setName(name);
+            FriendManager.INSTANCE.add(friend);
+        });
+        Sputnik.LOGGER.info("amigos aplicados");
+    }
+
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public static void applySetting(Module parent, Setting<?> setting) {
+    public void applySetting(Setting<?> setting) {
         String key = getSettingKey(setting);
 
         if (!config.settings.containsKey(key)) return;
@@ -170,7 +235,7 @@ public class ConfigManager {
         }
     }
 
-    private static void applyModuleStates() {
+    private void applyModuleStates() {
         ModuleManager.INSTANCE.getModules().forEach(module -> {
             if (config.moduleStates.containsKey(module.getName())) {
                 module.setEnabled(config.moduleStates.get(module.getName()));
@@ -179,15 +244,15 @@ public class ConfigManager {
         Sputnik.LOGGER.info("estados de módulos aplicados");
     }
 
-    private static void applyModuleSettings() {
+    private void applyModuleSettings() {
         ModuleManager.INSTANCE.getModules().forEach(module -> {
-            module.getSettings().forEach(setting -> applySetting(module, setting));
+            module.getSettings().forEach(this::applySetting);
         });
         Sputnik.LOGGER.info("ajustes de módulos aplicados");
     }
 
-    private static void applySettingsFrames() {
-        config.settingsFrames.forEach((moduleName, position) -> {
+    private void applySettingsPanels() {
+        config.settingsPanels.forEach((moduleName, position) -> {
             Module module = ModuleManager.INSTANCE.getModuleByName(moduleName);
 
             if (module == null) {
@@ -195,52 +260,63 @@ public class ConfigManager {
                 return;
             }
 
-            ClickGUI.INSTANCE.openSettingsFrame(module, position[0], position[1]);
+            ClickGui.INSTANCE.openSettingsPanel(module, position[0], position[1]);
         });
 
         Sputnik.LOGGER.info("estados de marcos de ajustes aplicados");
     }
 
-    private static void applySearchBarPosition() {
+    private void applySearchBarPosition() {
         if (config.searchBarPosition != null && config.searchBarPosition.length == 2) {
-            ClickGUI.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]);
-            ClickGUI.INSTANCE.getSearchBar().setY(config.searchBarPosition[1]);
+            ClickGui.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]);
+            ClickGui.INSTANCE.getSearchBar().setY(config.searchBarPosition[1]);
         }
         Sputnik.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);
-        });
+    private void applyClientSettings() {
+        ClientSettingsPanel.clientSettings.setEnabled(true);
+        ClientSettingsPanel.clientSettings.getSettings().forEach(this::applySetting);
         Sputnik.LOGGER.info("ajustes del cliente aplicados");
     }
 
-    private static void applyExtendableFrames() {
-        applyExtendableFrame(ClickGUI.INSTANCE.getModulesFrame());
-        applyExtendableFrame(ClickGUI.INSTANCE.getGuiSettingsFrame());
+    private void applyExtendablePanels() {
+        for (ModulePanel panel : ClickGui.INSTANCE.getModulePanels()) {
+            applyExtendablePanel(panel);
+        }
+        applyExtendablePanel(ClickGui.INSTANCE.getClientSettingsPanel());
+        applyExtendablePanel(ClickGui.INSTANCE.getFriendsPanel());
 
         Sputnik.LOGGER.info("posiciones de marcos extendibles aplicadas");
-        ClickGUI.INSTANCE.refreshListButtons();
+        ClickGui.INSTANCE.refreshListButtons();
     }
 
-    private static void applyExtendableFrame(Frame<?> frame) {
-        ClientConfig.FrameData frameData = null;
-        if (frame instanceof ModuleFrame)
-            frameData = config.extendableFrames.get("M");
+    private void applyExtendablePanel(Panel<?> panel) {
+        ClientConfig.PanelData panelData = null;
 
-        if (frame instanceof ClientSettingsFrame)
-            frameData = config.extendableFrames.get("S");
+        if (panel instanceof ModulePanel mp) {
+            panelData = config.extendablePanels.get(mp.category.toString());
+        }
+        if (panel instanceof ClientSettingsPanel) {
+            panelData = config.extendablePanels.get("ajustes");
+        }
+        if (panel instanceof FriendsPanel) {
+            panelData = config.extendablePanels.get("amigos");
+        }
 
-        if (frameData != null) {
-            frame.setX(frameData.x());
-            frame.setY(frameData.y());
+        if (panelData != null) {
+            panel.setX(panelData.x());
+            panel.setY(panelData.y());
 
-            if (frame instanceof ModuleFrame mFrame)
-                mFrame.extended = frameData.extended();
-            if (frame instanceof ClientSettingsFrame sFrame)
-                sFrame.extended = frameData.extended();
+            if (panel instanceof ModulePanel mPanel) {
+                mPanel.setExtended(panelData.extended());
+            }
+            if (panel instanceof ClientSettingsPanel sPanel) {
+                sPanel.setExtended(panelData.extended());
+            }
+            if (panel instanceof FriendsPanel fPanel) {
+                fPanel.setExtended(panelData.extended());
+            }
         }
     }
 
@@ -334,19 +410,42 @@ public class ConfigManager {
 
     // ------------------ MÉTODOS DE AYUDA ------------------
 
-    private static boolean shouldApply() {
+    private static String getSettingKey(Setting<?> setting) {
+        return setting.getSg().getModule().getName() + ":" + setting.getTrueName();
+    }
+
+    private boolean shouldApply() {
         return Sputnik.mc != null && ModuleManager.INSTANCE != null && config != null;
     }
 
-    private static void ensureConfig() {
+    private void ensureConfig() {
         if (config == null) config = new ClientConfig();
     }
 
-    private static String getSettingKey(Setting<?> setting) {
-        return setting.getSg().getModule().getName() + ":" + setting.getName();
-    }
-
-    public static boolean hasLoaded() {
+    public boolean hasLoaded() {
         return loaded;
     }
+
+    public void markDirty() {
+        this.dirty = true;
+        this.lastDirtyTime = System.currentTimeMillis();
+    }
+
+    public boolean isDirty() {
+        return dirty;
+    }
+
+    public void tickAutosave() {
+        if (!loaded || !dirty) return;
+
+        ClientSettingsModule settings = ClientSettingsPanel.clientSettings;
+        if (!settings.autosave.getValue()) return;
+
+        long intervalMs = (long) (settings.autosaveInterval.getValue() * 1000);
+        if (System.currentTimeMillis() - lastDirtyTime < intervalMs) return;
+
+        HudRenderer.INSTANCE.pushNotification("autoguardando...", "guardando configuración...");
+        save();
+        dirty = false;
+    }
 }

src/main/java/me/retucio/sputnik/event/BoatMoveEvent.java

@@ -1,27 +0,0 @@
-package me.retucio.sputnik.event;
-
-import net.minecraft.entity.vehicle.AbstractBoatEntity;
-import net.minecraft.util.math.Vec3d;
-
-public class BoatMoveEvent extends Event {
-
-    private final AbstractBoatEntity boat;
-    private Vec3d pos;
-
-    public BoatMoveEvent(AbstractBoatEntity boat, Vec3d pos) {
-        this.boat = boat;
-        this.pos = pos;
-    }
-
-    public AbstractBoatEntity getBoat() {
-        return boat;
-    }
-
-    public Vec3d getPos() {
-        return pos;
-    }
-
-    public void setPos(Vec3d pos) {
-        this.pos = pos;
-    }
-}

src/main/java/me/retucio/sputnik/event/Event.java

@@ -1,15 +0,0 @@
-package me.retucio.sputnik.event;
-
-// evento base, cancelable (usado en mixins)
-public class Event {
-
-    private boolean cancelled;
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void cancel() {
-        cancelled = true;
-    }
-}

src/main/java/me/retucio/sputnik/event/EventBus.java

@@ -1,72 +0,0 @@
-package me.retucio.sputnik.event;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.*;
-
-// al llamar un evento, se guarda en el bus de eventos, de donde luego se puede detectar si ese evento ha sucedido
-public class EventBus {
-
-    private final Map<Class<?>, List<ListenerMethod>> listeners = new HashMap<>();
-
-    private record ListenerMethod(Object instance, Method method) {}
-
-    public void register(Object listener) {
-        Class<?> targetClass;
-
-        if (listener instanceof Class<?> clazz) {
-            targetClass = clazz; // "listeners" estáticos
-            listener = null;
-        } else {
-            targetClass = listener.getClass();
-        }
-
-        for (Method method : targetClass.getDeclaredMethods()) {
-            if (!method.isAnnotationPresent(SubscribeEvent.class)) continue;
-            if (method.getParameterCount() != 1) continue;
-
-            Class<?> eventType = method.getParameterTypes()[0];
-            method.setAccessible(true);
-
-            if (listener == null && !Modifier.isStatic(method.getModifiers())) continue;
-
-            listeners.computeIfAbsent(eventType, k -> new ArrayList<>())
-                    .add(new ListenerMethod(listener, method));
-        }
-    }
-
-    public void subscribe(Object listener) { register(listener); }
-
-    public void unregister(Object listener) {
-        for (List<ListenerMethod> list : listeners.values()) {
-            list.removeIf(lm -> lm.instance == listener);
-        }
-    }
-
-    public void unsubscribe(Object listener) { unregister(listener); }
-
-    public <T extends Event> T post(T event) {
-        List<ListenerMethod> list = listeners.get(event.getClass());
-        if (list != null) {
-            for (ListenerMethod lm : new ArrayList<>(list)) {  // copiar para evitar CME
-                try {
-                    lm.method.invoke(lm.instance, event);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return event;
-    }
-
-    public boolean isRegistered(Object listener) {
-        for (List<ListenerMethod> list : listeners.values()) {
-            for (ListenerMethod lm : list) {
-                if (lm.instance == listener) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}

src/main/java/me/retucio/sputnik/event/ShutdownEvent.java

@@ -0,0 +1,13 @@
+package me.retucio.sputnik.event;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.misc.MinecraftMixin;
+
+
+/**
+ * @see MinecraftMixin#onStop
+ */
+public class ShutdownEvent extends Event {
+
+    public ShutdownEvent() {}
+}

src/main/java/me/retucio/sputnik/event/Stage.java

@@ -1,6 +0,0 @@
-package me.retucio.sputnik.event;
-
-public enum Stage {
-    PRE,  // antes de que haya sucedido
-    POST;  // después de que haya sucedido
-}

src/main/java/me/retucio/sputnik/event/SubscribeEvent.java

@@ -1,8 +0,0 @@
-package me.retucio.sputnik.event;
-
-import java.lang.annotation.*;
-
-// anotación para registar un "listener", que escucha cuando se llama un evento
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface SubscribeEvent {}

src/main/java/me/retucio/sputnik/event/TickEvent.java

@@ -0,0 +1,15 @@
+package me.retucio.sputnik.event;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.misc.MinecraftMixin;
+
+
+/**
+ * @see MinecraftMixin#onTickPre
+ * @see MinecraftMixin#onTickPost
+ */
+public class TickEvent {
+
+    public static class Pre extends Event {}
+    public static class Post extends Event {}
+}

src/main/java/me/retucio/sputnik/event/events/AttackEntityEvent.java

@@ -1,21 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.entity.Entity;
-
-
-/**
- * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onAttackEntity
- */
-public class AttackEntityEvent extends Event {
-
-    private final Entity entity;
-
-    public AttackEntityEvent(Entity entity) {
-        this.entity = entity;
-    }
-
-    public Entity getEntity() {
-        return entity;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/ChunkOcclusionEvent.java

@@ -1,9 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-
-
-/**
- * @see me.retucio.sputnik.mixin.ChunkOcclusionDataBuilderMixin#onChunkOcclusion
- */
-public class ChunkOcclusionEvent extends Event {}

src/main/java/me/retucio/sputnik/event/events/DisconnectEvent.java

@@ -1,28 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.network.ServerInfo;
-import net.minecraft.network.DisconnectionInfo;
-
-
-/**
- * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onDisconnect
- */
-public class DisconnectEvent extends Event {
-
-    private final DisconnectionInfo info;
-    private final ServerInfo server;
-
-    public DisconnectEvent(DisconnectionInfo info, ServerInfo server) {
-        this.info = info;
-        this.server = server;
-    }
-
-    public DisconnectionInfo getInfo() {
-        return info;
-    }
-
-    public ServerInfo getServer() {
-        return server;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/InteractEntityEvent.java

@@ -1,32 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.Hand;
-
-
-/**
- * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onEntityInteract
- */
-public class InteractEntityEvent extends Event {
-
-    private final Entity entity;
-    private Hand hand;
-
-    public InteractEntityEvent(Entity entity, Hand hand) {
-        this.entity = entity;
-        this.hand = hand;
-    }
-
-    public Entity getEntity() {
-        return entity;
-    }
-
-    public Hand getHand() {
-        return hand;
-    }
-
-    public void setHand(Hand hand) {
-        this.hand = hand;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/JoinWorldEvent.java

@@ -1,21 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.world.ClientWorld;
-
-
-/**
- * @see me.retucio.sputnik.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/sputnik/event/events/PerspectiveChangeEvent.java

@@ -1,25 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.option.Perspective;
-
-
-/**
- * @see me.retucio.sputnik.mixin.GameOptionsMixin#changePerspective
- */
-public class PerspectiveChangeEvent extends Event {
-
-    private Perspective perspective;
-
-    public PerspectiveChangeEvent(Perspective perspective) {
-        this.perspective = perspective;
-    }
-
-    public Perspective getPerspective() {
-        return perspective;
-    }
-
-    public void setPerspective(Perspective perspective) {
-        this.perspective = perspective;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/PlaceBlockEvent.java

@@ -1,36 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.util.Hand;
-import net.minecraft.util.hit.BlockHitResult;
-
-
-/**
- * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onBlockPlace
- */
-public class PlaceBlockEvent extends Event {
-
-    private Hand hand;
-    private BlockHitResult result;
-
-    public PlaceBlockEvent(Hand hand, BlockHitResult result) {
-        this.hand = hand;
-        this.result = result;
-    }
-
-    public Hand getHand() {
-        return hand;
-    }
-
-    public void setHand(Hand hand) {
-        this.hand = hand;
-    }
-
-    public BlockHitResult getResult() {
-        return result;
-    }
-
-    public void setResult(BlockHitResult result) {
-        this.result = result;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/ReceiveMessageEvent.java

@@ -1,46 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.gui.hud.MessageIndicator;
-import net.minecraft.text.Text;
-
-/**
- * @see me.retucio.sputnik.mixin.ChatHudMixin#onAddMessage
- */
-public class ReceiveMessageEvent extends Event {
-
-    private Text text;
-    private MessageIndicator indicator;
-    private int id;
-    private boolean modified = false;
-
-    public ReceiveMessageEvent(Text text, MessageIndicator indicator, int id) {
-        this.text = text;
-        this.indicator =  indicator;
-        this.id = id;
-    }
-
-    public Text getMessage() {
-        return text;
-    }
-
-    public MessageIndicator getIndicator() {
-        return indicator;
-    }
-
-    public void setMessage(Text message) {
-        this.text = message;
-        this.modified = true;
-    }
-
-    public void setIndicator(MessageIndicator indicator) {
-        this.indicator = indicator;
-        this.modified = true;
-    }
-
-    public boolean wasModified() {
-        return modified;
-    }
-
-
-}

src/main/java/me/retucio/sputnik/event/events/Render2DEvent.java

@@ -1,24 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.render.RenderTickCounter;
-
-public class Render2DEvent extends Event {
-
-    private final DrawContext ctx;
-    private final RenderTickCounter tc;
-
-    public Render2DEvent(DrawContext ctx, RenderTickCounter tc) {
-        this.ctx = ctx;
-        this.tc = tc;
-    }
-
-    public DrawContext getCtx() {
-        return ctx;
-    }
-
-    public RenderTickCounter getTc() {
-        return tc;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/Render3DEvent.java

@@ -1,35 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.RenderTickCounter;
-import net.minecraft.client.util.math.MatrixStack;
-
-
-/**
- * @see me.retucio.sputnik.mixin.WorldRendererMixin#render
- */
-public class Render3DEvent extends Event {
-
-    private final MatrixStack matrices;
-    private final RenderTickCounter tc;
-    private final Camera camera;
-
-    public Render3DEvent(MatrixStack matrices, RenderTickCounter tc, Camera camera) {
-        this.matrices = matrices;
-        this.tc = tc;
-        this.camera = camera;
-    }
-
-    public MatrixStack getMatrices() {
-        return matrices;
-    }
-
-    public RenderTickCounter getTickCounter() {
-        return tc;
-    }
-
-    public Camera getCamera() {
-        return camera;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/RenderArmEvent.java

@@ -1,36 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.Hand;
-
-
-/**
- * @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderArm
- */
-public class RenderArmEvent extends Event {
-
-    private MatrixStack matrices;
-    private Hand hand;
-
-    public RenderArmEvent(MatrixStack matrices, Hand hand) {
-        this.matrices = matrices;
-        this.hand = hand;
-    }
-
-    public MatrixStack getMatrices() {
-        return matrices;
-    }
-
-    public void setMatrices(MatrixStack matrices) {
-        this.matrices = matrices;
-    }
-
-    public Hand getHand() {
-        return hand;
-    }
-
-    public void setHand(Hand hand) {
-        this.hand = hand;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/RenderBossbarEvent.java

@@ -1,77 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.gui.hud.ClientBossBar;
-import net.minecraft.text.Text;
-
-import java.util.Iterator;
-
-
-/**
- * @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarIterator
- * @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarName
- * @see me.retucio.sputnik.mixin.BossBarHudMixin#modifySpacingConstant
- */
-public class RenderBossbarEvent {
-
-    public static class BossText extends Event {
-
-        private ClientBossBar bossBar;
-        private Text name;
-
-        public BossText(ClientBossBar bossBar, Text name) {
-            this.bossBar = bossBar;
-            this.name = name;
-        }
-
-        public ClientBossBar getBossBar() {
-            return bossBar;
-        }
-
-        public void setBossBar(ClientBossBar bossBar) {
-            this.bossBar = bossBar;
-        }
-
-        public Text getName() {
-            return name;
-        }
-
-        public void setName(Text name) {
-            this.name = name;
-        }
-    }
-
-    public static class BossSpacing extends Event {
-
-        private int spacing;
-
-        public BossSpacing(int spacing) {
-            this.spacing = spacing;
-        }
-
-        public int getSpacing() {
-            return spacing;
-        }
-
-        public void setSpacing(int spacing) {
-            this.spacing = spacing;
-        }
-    }
-
-    public static class BossIterator extends Event {
-
-        private Iterator<ClientBossBar> iterator;
-
-        public BossIterator(Iterator<ClientBossBar> iterator) {
-            this.iterator = iterator;
-        }
-
-        public Iterator<ClientBossBar> getIterator() {
-            return iterator;
-        }
-
-        public void setIterator(Iterator<ClientBossBar> iterator) {
-            this.iterator = iterator;
-        }
-    }
-}

src/main/java/me/retucio/sputnik/event/events/RenderHeldItemEvent.java

@@ -1,36 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.Hand;
-
-
-/**
- * @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderItem
- */
-public class RenderHeldItemEvent extends Event {
-
-    private MatrixStack matrices;
-    private Hand hand;
-
-    public RenderHeldItemEvent(MatrixStack matrices, Hand hand) {
-        this.matrices = matrices;
-        this.hand = hand;
-    }
-
-    public MatrixStack getMatrices() {
-        return matrices;
-    }
-
-    public void setMatrices(MatrixStack matrices) {
-        this.matrices = matrices;
-    }
-
-    public Hand getHand() {
-        return hand;
-    }
-
-    public void setHand(Hand hand) {
-        this.hand = hand;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/ShutdownEvent.java

@@ -1,12 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-
-
-/**
- * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onStop
- */
-public class ShutdownEvent extends Event {
-
-    public ShutdownEvent() {}
-}

src/main/java/me/retucio/sputnik/event/events/TickEvent.java

@@ -1,14 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-
-
-/**
- * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onTickPre
- * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onTickPost
- */
-public class TickEvent {
-
-    public static class Pre extends Event {}
-    public static class Post extends Event {}
-}

src/main/java/me/retucio/sputnik/event/events/UseItemEvent.java

@@ -1,36 +0,0 @@
-package me.retucio.sputnik.event.events;
-
-import me.retucio.sputnik.event.Event;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Hand;
-
-
-/**
- * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onUseItem
- */
-public class UseItemEvent extends Event {
-
-    private ItemStack stack;
-    private Hand hand;
-
-    public UseItemEvent(ItemStack stack, Hand hand) {
-        this.stack = stack;
-        this.hand = hand;
-    }
-
-    public ItemStack getStack() {
-        return stack;
-    }
-
-    public void setStack(ItemStack stack) {
-        this.stack = stack;
-    }
-
-    public Hand getHand() {
-        return hand;
-    }
-
-    public void setHand(Hand hand) {
-        this.hand = hand;
-    }
-}

src/main/java/me/retucio/sputnik/event/events/sputnik/LoadClickGUIEvent.java

@@ -1,6 +0,0 @@
-package me.retucio.sputnik.event.events.sputnik;
-
-import me.retucio.sputnik.event.Event;
-
-// se genera cuando carga la interfaz del mod
-public class LoadClickGUIEvent extends Event {}

src/main/java/me/retucio/sputnik/event/events/sputnik/ModuleFrameEvent.java

@@ -1,10 +0,0 @@
-package me.retucio.sputnik.event.events.sputnik;
-
-import me.retucio.sputnik.event.Event;
-
-// se genera cada que se interactúa con el marco de módulos
-public class ModuleFrameEvent {
-
-    public static class Extend extends Event {}  // al extenderlo / contraerlo
-    public static class Move extends Event {}  // al cambiarlo de posición
-}

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

@@ -1,27 +0,0 @@
-package me.retucio.sputnik.event.events.sputnik;
-
-import me.retucio.sputnik.event.Event;
-import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
-
-// se genera cada que se interactúa con un marco de ajustes de un módulo
-public class SettingsFrameEvent {
-
-    public static class Open extends Event {  // al abrirlo
-        private final SettingsFrame frame;
-        public Open(SettingsFrame frame) { this.frame = frame; }
-        public SettingsFrame getFrame() { return frame; }
-    }
-
-    public static class Close extends Event {  // al cerrarlo
-        private final SettingsFrame frame;
-        public Close(SettingsFrame frame) { this.frame = frame; }
-        public SettingsFrame getFrame() { return frame; }
-    }
-
-    public static class Move extends Event {  // al cambiarlo de posición
-        private final SettingsFrame frame;
-        public Move(SettingsFrame frame) { this.frame = frame; }
-        public SettingsFrame getFrame() { return frame; }
-    }
-
-}

src/main/java/me/retucio/sputnik/event/input/ClientClickEvent.java

@@ -1,12 +1,14 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.input;
 
 import me.retucio.sputnik.module.modules.misc.ChatPlus;
-import net.minecraft.text.ClickEvent;
+import net.minecraft.network.chat.ClickEvent;
+import org.jspecify.annotations.NonNull;
 
 
 /** este evento es solo para asegurarse de que comandos del mod se puedan ejecutar solo desde el lado del cliente
  * @see ChatPlus#getSendButton
  */
+
 public class ClientClickEvent implements ClickEvent {
 
     private final String value;
@@ -20,7 +22,7 @@ public class ClientClickEvent implements ClickEvent {
     }
 
     @Override
-    public Action getAction() {
+    public @NonNull Action action() {
         return Action.RUN_COMMAND;
     }
 

src/main/java/me/retucio/sputnik/event/input/KeyEvent.java

@@ -1,10 +1,11 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.input;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.io.KeyboardHandlerMixin;
 
 
 /**
- * @see me.retucio.sputnik.mixin.KeyboardMixin#onKeyPress
+ * @see KeyboardHandlerMixin#onKeyPress
  */
 public class KeyEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/input/MouseClickEvent.java

@@ -1,10 +1,11 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.input;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.io.MouseHandlerMixin;
 
 
 /**
- * @see me.retucio.sputnik.mixin.MouseMixin#onMouseButton
+ * @see MouseHandlerMixin#onMouseButton
  */
 public class MouseClickEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/input/MouseScrollEvent.java

@@ -1,10 +1,11 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.input;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.io.MouseHandlerMixin;
 
 
 /**
- * @see me.retucio.sputnik.mixin.MouseMixin#onMouseScroll
+ * @see MouseHandlerMixin#onMouseScroll
  */
 public class MouseScrollEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/input/SneakEvent.java

@@ -0,0 +1,5 @@
+package me.retucio.sputnik.event.input;
+
+import com.github.retucio.neutrino.Event;
+
+public class SneakEvent extends Event {}

src/main/java/me/retucio/sputnik/event/interact/AttackBlockEvent.java

@@ -1,8 +1,8 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.interact;
 
-import me.retucio.sputnik.event.Event;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
+import com.github.retucio.neutrino.Event;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 
 public class AttackBlockEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/interact/AttackEntityEvent.java

@@ -0,0 +1,23 @@
+package me.retucio.sputnik.event.interact;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.player.MultiPlayerGameModeMixin;
+import net.minecraft.world.entity.Entity;
+
+
+/**
+ * @see MultiPlayerGameModeMixin#onAttackEntity
+ */
+
+public class AttackEntityEvent extends Event {
+
+    private final Entity entity;
+
+    public AttackEntityEvent(Entity entity) {
+        this.entity = entity;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+}

src/main/java/me/retucio/sputnik/event/interact/BlockShapeEvent.java

@@ -1,9 +1,9 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.interact;
 
-import me.retucio.sputnik.event.Event;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.shape.VoxelShape;
+import com.github.retucio.neutrino.Event;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class BlockShapeEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/interact/BoatMoveEvent.java

@@ -0,0 +1,28 @@
+package me.retucio.sputnik.event.interact;
+
+import com.github.retucio.neutrino.Event;
+import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
+import net.minecraft.world.phys.Vec3;
+
+public class BoatMoveEvent extends Event {
+
+    private final AbstractBoat boat;
+    private Vec3 pos;
+
+    public BoatMoveEvent(AbstractBoat boat, Vec3 pos) {
+        this.boat = boat;
+        this.pos = pos;
+    }
+
+    public AbstractBoat getBoat() {
+        return boat;
+    }
+
+    public Vec3 getPos() {
+        return pos;
+    }
+
+    public void setPos(Vec3 pos) {
+        this.pos = pos;
+    }
+}

src/main/java/me/retucio/sputnik/event/interact/BreakBlockEvent.java

@@ -1,12 +1,14 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.interact;
 
-import me.retucio.sputnik.event.Event;
-import net.minecraft.util.math.BlockPos;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.player.MultiPlayerGameModeMixin;
+import net.minecraft.core.BlockPos;
 
 
 /**
- * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onBlockBreak
+ * @see MultiPlayerGameModeMixin#onBlockBreak
  */
+
 public class BreakBlockEvent extends Event {
 
     private BlockPos pos;

src/main/java/me/retucio/sputnik/event/interact/ClipAtLedgeEvent.java

@@ -1,6 +1,6 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.interact;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
 
 public class ClipAtLedgeEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/interact/DamageItemEvent.java

@@ -1,11 +1,12 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.interact;
 
-import me.retucio.sputnik.event.Event;
-import net.minecraft.item.ItemStack;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.item.ItemStackMixin;
+import net.minecraft.world.item.ItemStack;
 
 
 /**
- * @see me.retucio.sputnik.mixin.ItemStackMixin#onDamage
+ * @see ItemStackMixin#onDamage
  */
 public class DamageItemEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/interact/InteractEntityEvent.java

@@ -0,0 +1,34 @@
+package me.retucio.sputnik.event.interact;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.player.MultiPlayerGameModeMixin;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.Entity;
+
+
+/**
+ * @see MultiPlayerGameModeMixin#onEntityInteract
+ */
+
+public class InteractEntityEvent extends Event {
+
+    private final Entity entity;
+    private InteractionHand hand;
+
+    public InteractEntityEvent(Entity entity, InteractionHand hand) {
+        this.entity = entity;
+        this.hand = hand;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public InteractionHand getHand() {
+        return hand;
+    }
+
+    public void setHand(InteractionHand hand) {
+        this.hand = hand;
+    }
+}

src/main/java/me/retucio/sputnik/event/interact/KnockbackEvent.java

@@ -0,0 +1,46 @@
+package me.retucio.sputnik.event.interact;
+
+import com.github.retucio.neutrino.Event;
+import net.minecraft.world.entity.LivingEntity;
+
+public class KnockbackEvent extends Event {
+
+    private double strength;
+    private double x, z;
+    private final LivingEntity target;
+
+    public KnockbackEvent(LivingEntity target, double z, double x, double strength) {
+        this.target = target;
+        this.z = z;
+        this.x = x;
+        this.strength = strength;
+    }
+
+    public double getStrength() {
+        return strength;
+    }
+
+    public void setStrength(double strength) {
+        this.strength = strength;
+    }
+
+    public double getX() {
+        return x;
+    }
+
+    public void setX(double x) {
+        this.x = x;
+    }
+
+    public double getZ() {
+        return z;
+    }
+
+    public void setZ(double z) {
+        this.z = z;
+    }
+
+    public LivingEntity getTarget() {
+        return target;
+    }
+}

src/main/java/me/retucio/sputnik/event/interact/OpenScreenEvent.java

@@ -1,11 +1,12 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.interact;
 
-import me.retucio.sputnik.event.Event;
-import net.minecraft.client.gui.screen.Screen;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.misc.MinecraftMixin;
+import net.minecraft.client.gui.screens.Screen;
 
 
 /**
- * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onOpenScreen
+ * @see MinecraftMixin#onOpenScreen
  */
 public class OpenScreenEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/interact/PlaceBlockEvent.java

@@ -0,0 +1,37 @@
+package me.retucio.sputnik.event.interact;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.player.MultiPlayerGameModeMixin;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.phys.BlockHitResult;
+
+
+/**
+ * @see MultiPlayerGameModeMixin#onBlockPlace
+ */
+public class PlaceBlockEvent extends Event {
+
+    private InteractionHand hand;
+    private BlockHitResult result;
+
+    public PlaceBlockEvent(InteractionHand hand, BlockHitResult result) {
+        this.hand = hand;
+        this.result = result;
+    }
+
+    public InteractionHand getHand() {
+        return hand;
+    }
+
+    public void setHand(InteractionHand hand) {
+        this.hand = hand;
+    }
+
+    public BlockHitResult getResult() {
+        return result;
+    }
+
+    public void setResult(BlockHitResult result) {
+        this.result = result;
+    }
+}

src/main/java/me/retucio/sputnik/event/interact/SwitchSlotEvent.java

@@ -0,0 +1,26 @@
+package me.retucio.sputnik.event.interact;
+
+import com.github.retucio.neutrino.Event;
+
+public class SwitchSlotEvent extends Event {
+
+    private final int prevSlot;
+    private int slot;
+
+    public SwitchSlotEvent(int prevSlot, int slot) {
+        this.prevSlot = prevSlot;
+        this.slot = slot;
+    }
+
+    public int getPrevSlot() {
+        return prevSlot;
+    }
+
+    public int getSlot() {
+        return slot;
+    }
+
+    public void setSlot(int slot) {
+        this.slot = slot;
+    }
+}

src/main/java/me/retucio/sputnik/event/interact/UseItemEvent.java

@@ -0,0 +1,42 @@
+package me.retucio.sputnik.event.interact;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.misc.MinecraftMixin;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+
+
+/**
+ * @see MinecraftMixin#onUseItem
+ */
+public class UseItemEvent extends Event {
+
+    private ItemStack stack;
+    private InteractionHand hand;
+
+    public UseItemEvent(ItemStack stack, InteractionHand hand) {
+        this.stack = stack;
+        this.hand = hand;
+    }
+
+    public ItemStack getStack() {
+        return stack;
+    }
+
+    public void setStack(ItemStack stack) {
+        this.stack = stack;
+    }
+
+    public Item getItem() {
+        return stack.getItem();
+    }
+
+    public InteractionHand getHand() {
+        return hand;
+    }
+
+    public void setHand(InteractionHand hand) {
+        this.hand = hand;
+    }
+}

src/main/java/me/retucio/sputnik/event/network/AddEntityEvent.java

@@ -1,11 +1,12 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.network;
 
-import me.retucio.sputnik.event.Event;
-import net.minecraft.entity.Entity;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.world.ClientLevelMixin;
+import net.minecraft.world.entity.Entity;
 
 
 /**
- * @see me.retucio.sputnik.mixin.ClientWorldMixin#onAddEntity
+ * @see ClientLevelMixin#onAddEntity
  */
 public class AddEntityEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/network/ChunkOcclusionEvent.java

@@ -0,0 +1,10 @@
+package me.retucio.sputnik.event.network;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.world.VisGraphMixin;
+
+
+/**
+ * @see VisGraphMixin#onChunkOcclusion
+ */
+public class ChunkOcclusionEvent extends Event {}

src/main/java/me/retucio/sputnik/event/network/DisconnectEvent.java

@@ -0,0 +1,29 @@
+package me.retucio.sputnik.event.network;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.network.ConnectionMixin;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.network.DisconnectionDetails;
+
+
+/**
+ * @see ConnectionMixin#onDisconnect
+ */
+public class DisconnectEvent extends Event {
+
+    private final DisconnectionDetails details;
+    private final ServerData server;
+
+    public DisconnectEvent(DisconnectionDetails details, ServerData server) {
+        this.details = details;
+        this.server = server;
+    }
+
+    public DisconnectionDetails getDetails() {
+        return details;
+    }
+
+    public ServerData getServer() {
+        return server;
+    }
+}

src/main/java/me/retucio/sputnik/event/network/JoinWorldEvent.java

@@ -0,0 +1,23 @@
+package me.retucio.sputnik.event.network;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.misc.MinecraftMixin;
+import net.minecraft.client.multiplayer.ClientLevel;
+
+
+/**
+ * @see MinecraftMixin#onJoinWorld
+ */
+
+public class JoinWorldEvent extends Event {
+
+    private final ClientLevel world;
+
+    public JoinWorldEvent(ClientLevel world) {
+        this.world = world;
+    }
+
+    public ClientLevel getWorld() {
+        return world;
+    }
+}

src/main/java/me/retucio/sputnik/event/network/PacketEvent.java

@@ -1,34 +1,29 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.network;
 
-import me.retucio.sputnik.event.Event;
-import me.retucio.sputnik.event.Stage;
-import net.minecraft.network.packet.Packet;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.network.ConnectionMixin;
+import net.minecraft.network.protocol.Packet;
 
 
 /**
- * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPre
- * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPost
- * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onReceivePacket
+ * @see ConnectionMixin#onSendPacketPre
+ * @see ConnectionMixin#onSendPacketPost
+ * @see ConnectionMixin#onReceivePacket
  */
 public class PacketEvent {
 
     public static class Send extends Event {
 
         private final Packet<?> packet;
-        private final Stage stage;
 
         public Send(Packet<?> packet, Stage stage) {
             this.packet = packet;
-            this.stage = stage;
+            this.setStage(stage);
         }
 
         public Packet<?> getPacket() {
             return packet;
         }
-
-        public Stage getStage() {
-            return stage;
-        }
     }
 
     public static class Receive extends Event {

src/main/java/me/retucio/sputnik/event/network/ReceiveMessageEvent.java

@@ -0,0 +1,51 @@
+package me.retucio.sputnik.event.network;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.hud.ChatComponentMixin;
+import net.minecraft.client.multiplayer.chat.GuiMessageTag;
+import net.minecraft.network.chat.Component;
+
+
+/**
+ * @see ChatComponentMixin#onAddMessage
+ */
+
+public class ReceiveMessageEvent extends Event {
+
+    private Component text;
+    private GuiMessageTag tag;
+    private final int id;
+    private boolean modified = false;
+
+    public ReceiveMessageEvent(Component text, GuiMessageTag tag, int id) {
+        this.text = text;
+        this.tag =  tag;
+        this.id = id;
+    }
+
+    public Component getMessage() {
+        return text;
+    }
+
+    public GuiMessageTag getTag() {
+        return tag;
+    }
+
+    public void setMessage(Component message) {
+        this.text = message;
+        this.modified = true;
+    }
+
+    public void setTag(GuiMessageTag tag) {
+        this.tag = tag;
+        this.modified = true;
+    }
+
+    public boolean wasModified() {
+        return modified;
+    }
+
+    public int getId() {
+        return id;
+    }
+}

src/main/java/me/retucio/sputnik/event/network/RemoveEntityEvent.java

@@ -1,11 +1,12 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.network;
 
-import me.retucio.sputnik.event.Event;
-import net.minecraft.entity.Entity;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.world.ClientLevelMixin;
+import net.minecraft.world.entity.Entity;
 
 
 /**
- * @see me.retucio.sputnik.mixin.ClientWorldMixin#onRemoveEntity
+ * @see ClientLevelMixin#onRemoveEntity
  */
 public class RemoveEntityEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/network/SendMessageEvent.java

@@ -1,10 +1,11 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.network;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.network.ClientPacketListenerMixin;
 
 
 /**
- * @see me.retucio.sputnik.mixin.ClientPlayNetworkHandlerMixin#onSendMessage
+ * @see ClientPacketListenerMixin#onSendMessage
  */
 public class SendMessageEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/render/ChangeRotationEvent.java

@@ -1,12 +1,13 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.render;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.entity.EntityMixin;
 
 
 /**
- * @see me.retucio.sputnik.mixin.EntityMixin#onRotation
- * @see me.retucio.sputnik.mixin.EntityMixin#onChangeYaw
- * @see me.retucio.sputnik.mixin.EntityMixin#onChangePitch
+ * @see EntityMixin#onRotation
+ * @see EntityMixin#onChangeYaw
+ * @see EntityMixin#onChangePitch
  */
 public class ChangeRotationEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/render/GetFOVEvent.java

@@ -1,10 +1,11 @@
-package me.retucio.sputnik.event.events;
+package me.retucio.sputnik.event.render;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.render.GameRendererMixin;
 
 
 /**
- * @see me.retucio.sputnik.mixin.GameRendererMixin#modifyFov
+ * @see GameRendererMixin#modifyFov
  */
 public class GetFOVEvent extends Event {
 

src/main/java/me/retucio/sputnik/event/render/PerspectiveChangeEvent.java

@@ -0,0 +1,26 @@
+package me.retucio.sputnik.event.render;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.misc.OptionsMixin;
+import net.minecraft.client.CameraType;
+
+
+/**
+ * @see OptionsMixin#changePerspective
+ */
+public class PerspectiveChangeEvent extends Event {
+
+    private CameraType perspective;
+
+    public PerspectiveChangeEvent(CameraType perspective) {
+        this.perspective = perspective;
+    }
+
+    public CameraType getPerspective() {
+        return perspective;
+    }
+
+    public void setPerspective(CameraType perspective) {
+        this.perspective = perspective;
+    }
+}

src/main/java/me/retucio/sputnik/event/render/Render2DEvent.java

@@ -0,0 +1,26 @@
+package me.retucio.sputnik.event.render;
+
+import com.github.retucio.neutrino.Event;
+
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+
+
+public class Render2DEvent extends Event {
+
+    private final GuiGraphicsExtractor gui;
+    private final DeltaTracker dt;
+
+    public Render2DEvent(GuiGraphicsExtractor gui, DeltaTracker dt) {
+        this.gui = gui;
+        this.dt = dt;
+    }
+
+    public GuiGraphicsExtractor getGui() {
+        return gui;
+    }
+
+    public DeltaTracker getDt() {
+        return dt;
+    }
+}

src/main/java/me/retucio/sputnik/event/render/Render3DEvent.java

@@ -0,0 +1,42 @@
+package me.retucio.sputnik.event.render;
+
+import com.github.retucio.neutrino.Event;
+import com.mojang.blaze3d.vertex.PoseStack;
+import me.retucio.sputnik.mixin.mixins.render.LevelRendererMixin;
+import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.renderer.state.level.CameraRenderState;
+
+
+/**
+ * @see LevelRendererMixin#renderLevel
+ */
+
+public class Render3DEvent extends Event {
+
+    private final PoseStack matrices;
+    private final DeltaTracker dt;
+    private final CameraRenderState cameraState;
+
+    public Render3DEvent(PoseStack matrices, DeltaTracker dt, CameraRenderState cameraState) {
+        this.matrices = matrices;
+        this.dt = dt;
+        this.cameraState = cameraState;
+    }
+
+    public PoseStack getMatrices() {
+        return matrices;
+    }
+
+    public DeltaTracker getDeltaTracker() {
+        return dt;
+    }
+
+    public CameraRenderState getCamera() {
+        return cameraState;
+    }
+
+    public float getTickDelta() {
+        return dt.getGameTimeDeltaTicks();
+    }
+}

src/main/java/me/retucio/sputnik/event/render/RenderArmEvent.java

@@ -0,0 +1,37 @@
+package me.retucio.sputnik.event.render;
+
+import com.github.retucio.neutrino.Event;
+import com.mojang.blaze3d.vertex.PoseStack;
+import me.retucio.sputnik.mixin.mixins.render.ItemInHandRendererMixin;
+import net.minecraft.world.InteractionHand;
+
+
+/**
+ * @see ItemInHandRendererMixin#onRenderArm
+ */
+public class RenderArmEvent extends Event {
+
+    private PoseStack matrices;
+    private InteractionHand hand;
+
+    public RenderArmEvent(PoseStack matrices, InteractionHand hand) {
+        this.matrices = matrices;
+        this.hand = hand;
+    }
+
+    public PoseStack getMatrices() {
+        return matrices;
+    }
+
+    public void setMatrices(PoseStack matrices) {
+        this.matrices = matrices;
+    }
+
+    public InteractionHand getHand() {
+        return hand;
+    }
+
+    public void setHand(InteractionHand hand) {
+        this.hand = hand;
+    }
+}

src/main/java/me/retucio/sputnik/event/render/RenderBlockOutlineEvent.java

@@ -0,0 +1,30 @@
+package me.retucio.sputnik.event.render;
+
+import com.github.retucio.neutrino.Event;
+
+public class RenderBlockOutlineEvent extends Event {
+
+    private int color;
+    private float lineWidth;
+
+    public RenderBlockOutlineEvent(int color, float lineWidth) {
+        this.color = color;
+        this.lineWidth = lineWidth;
+    }
+
+    public int getColor() {
+        return color;
+    }
+
+    public void setColor(int color) {
+        this.color = color;
+    }
+
+    public float getLineWidth() {
+        return lineWidth;
+    }
+
+    public void setLineWidth(float lineWidth) {
+        this.lineWidth = lineWidth;
+    }
+}

src/main/java/me/retucio/sputnik/event/render/RenderBossbarEvent.java

@@ -0,0 +1,79 @@
+package me.retucio.sputnik.event.render;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.mixin.mixins.hud.BossBarHudMixin;
+import net.minecraft.client.gui.components.LerpingBossEvent;
+import net.minecraft.network.chat.MutableComponent;
+
+import java.awt.*;
+import java.util.Iterator;
+
+
+/**
+ * @see BossBarHudMixin#modifyBossBarIterator
+ * @see BossBarHudMixin#modifyBossBarName
+ * @see BossBarHudMixin#modifySpacingConstant
+ */
+public class RenderBossbarEvent {
+
+    public static class BossText extends Event {
+
+        private LerpingBossEvent bossBar;
+        private MutableComponent name;
+
+        public BossText(LerpingBossEvent bossBar, MutableComponent name) {
+            this.bossBar = bossBar;
+            this.name = name;
+        }
+
+        public LerpingBossEvent getBossBar() {
+            return bossBar;
+        }
+
+        public void setBossBar(LerpingBossEvent bossBar) {
+            this.bossBar = bossBar;
+        }
+
+        public MutableComponent getName() {
+            return name;
+        }
+
+        public void setName(MutableComponent name) {
+            this.name = name;
+        }
+    }
+
+    public static class BossSpacing extends Event {
+
+        private int spacing;
+
+        public BossSpacing(int spacing) {
+            this.spacing = spacing;
+        }
+
+        public int getSpacing() {
+            return spacing;
+        }
+
+        public void setSpacing(int spacing) {
+            this.spacing = spacing;
+        }
+    }
+
+    public static class BossIterator extends Event {
+
+        private Iterator<LerpingBossEvent> iterator;
+
+        public BossIterator(Iterator<LerpingBossEvent> iterator) {
+            this.iterator = iterator;
+        }
+
+        public Iterator<LerpingBossEvent> getIterator() {
+            return iterator;
+        }
+
+        public void setIterator(Iterator<LerpingBossEvent> iterator) {
+            this.iterator = iterator;
+        }
+    }
+}

src/main/java/me/retucio/sputnik/event/render/RenderHeldItemEvent.java

@@ -0,0 +1,38 @@
+package me.retucio.sputnik.event.render;
+
+import com.github.retucio.neutrino.Event;
+import com.mojang.blaze3d.vertex.PoseStack;
+import me.retucio.sputnik.mixin.mixins.render.ItemInHandRendererMixin;
+import net.minecraft.world.InteractionHand;
+
+
+/**
+ * @see ItemInHandRendererMixin#onRenderItem
+ */
+
+public class RenderHeldItemEvent extends Event {
+
+    private PoseStack matrices;
+    private InteractionHand hand;
+
+    public RenderHeldItemEvent(PoseStack matrices, InteractionHand hand) {
+        this.matrices = matrices;
+        this.hand = hand;
+    }
+
+    public PoseStack getMatrices() {
+        return matrices;
+    }
+
+    public void setMatrices(PoseStack matrices) {
+        this.matrices = matrices;
+    }
+
+    public InteractionHand getHand() {
+        return hand;
+    }
+
+    public void setHand(InteractionHand hand) {
+        this.hand = hand;
+    }
+}

src/main/java/me/retucio/sputnik/event/sputnik/ClientSettingsPanelEvent.java

@@ -1,9 +1,9 @@
-package me.retucio.sputnik.event.events.sputnik;
+package me.retucio.sputnik.event.sputnik;
 
-import me.retucio.sputnik.event.Event;
+import com.github.retucio.neutrino.Event;
 
 // se genera cada que se interactúa con el marco de ajustes de la interfaz
-public class GUISettingsFrameEvent {
+public class ClientSettingsPanelEvent {
 
     public static class Extend extends Event {}  // al extenderlo / contraerlo
     public static class Move extends Event {}  // al cambiarlo de posición

src/main/java/me/retucio/sputnik/event/sputnik/FriendEvent.java

@@ -0,0 +1,26 @@
+package me.retucio.sputnik.event.sputnik;
+
+import com.github.retucio.neutrino.Event;
+import me.retucio.sputnik.friend.Friend;
+
+// evento lanzado cuando se agrega o se elimina un amigo
+public class FriendEvent extends Event {
+
+    private final Friend friend;
+
+    public FriendEvent(Friend friend) {
+        this.friend = friend;
+    }
+
+    public Friend getFriend() {
+        return friend;
+    }
+
+    public static class Add extends FriendEvent {
+        public Add(Friend friend) { super(friend); }
+    }
+
+    public static class Remove extends FriendEvent {
+        public Remove(Friend friend) { super(friend); }
+    }
+}