v6.7

README.en.md

@@ -0,0 +1,82 @@
+<p align="center">
+  <a href="README.md"><img src="https://img.shields.io/badge/lang-Español-yellow.svg" alt="español"></a>
+  <a href="README.en.md"><img src="https://img.shields.io/badge/lang-English-blue.svg" alt="english"></a>
+</p>
+
+# jenny's mod 2 (100% real)
+
+> Minecraft Fabric 26.3 mod that adds some "QOL" features, mostly related to the camera.
+
+## installation
+
+### for normal people:
+1. go to [releases](https://git.retucio.me/retucio/sputnik/releases)
+2. choose the most recent version
+3. download the .jar file
+4. move it to your mods dir (prolly `%appdata%/.minecraft/mods`)
+
+
+make sure to have a Minecraft and Fabric version compatible with the mod (MC `26.3`; Fabric `0.19.5`)
+
+issues could arise when using it with other mods, especially other clients, since they could conflict
+
+### for nerds
+1. clone the repo (`git clone https://git.retucio.me/retucio/sputnik`)
+2. enter the repo dir (`cd sputnik`)
+3. `gradlew build` for Windows (ew) or `chmod +x gradlew` + `./gradlew build` for Unix-likes (Linux & Mac)
+4. the built .jar will be found in `/build/libs/sputnik-X.X.jar`
+
+## usage
+
+`rshift` by default to open the GUI
+
+`insert` by default to open the HUD editor
+
+`$` as prefix for commands (autocompleted)
+
+some modules have keys assigned by default, assign them `ESC` to unbind them.
+
+## ui
+
+- left click to toggle modules
+- right click to open its settings
+- left click + drag to move a panel
+- right click on a panel's header to expand/contract it, or to close it
+- left click over settings to change them
+- shift + right click on a setting to reset it to its default value
+- place the mouse cursor over a module/setting to read its description
+
+## screenshots
+
+<img src="screenshots/automine.png" alt="auto mine">
+<img src="screenshots/blockesp.png" alt="block ESP + light overlay">
+<img src="screenshots/camtweaks.png" alt="perspective plus">
+<img src="screenshots/chatplus.png" alt="chatplus + nametags + screenshots plus">
+<img src="screenshots/clickgui.png" alt="click GUI">
+<img src="screenshots/freecam.png" alt="freecam + tracers">
+<img src="screenshots/hudeditor.png" alt="HUD editor">
+<img src="screenshots/itemphysics.png" alt="item physics">
+<img src="screenshots/lsd.png" alt="lsd module">
+<img src="screenshots/macros.png" alt="macros tab">
+<img src="screenshots/trajectories.png" alt="projectile trajectories">
+
+
+## contribution
+
+yes please (PRs are welcome)
+
+## license
+
+[CC0 license](LICENSE)
+
+## disclaimer
+
+i don't give a single fuck what happens to you when using this mod on servers where its features are bannable and such.
+
+## deps
+
+- [fabric api](https://modrinth.com/mod/fabric-api/)
+
+## notes
+
+this mod IS BUGGY. VERY BUGGY, i know. i started this project when i was 14 and the codebase is such a mess i refuse to fix it. i might rewrite it in a future, though.

README.md

@@ -1,23 +1,28 @@
+<p align="center">
+  <a href="README.md"><img src="https://img.shields.io/badge/lang-Español-yellow.svg" alt="español"></a>
+  <a href="README.en.md"><img src="https://img.shields.io/badge/lang-English-blue.svg" alt="english"></a>
+</p>
+
 # jenny's mod 2 100% real
 
-mod para Minecraft Fabric 26.2 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
+> mod para Minecraft Fabric 26.3 que añade algunas cosas "QOL", mayormente relacionadas a la cámara.
 
 ## instalación
 
 ### para gente normal:
-1. ir a [lanzamientos](https://codeberg.org/retucio/sputnik/releases)
-2. selecionar la versión más reciente
+1. ir a [lanzamientos](https://git.retucio.me/retucio/sputnik/releases)
+2. seleccionar la versión más reciente
 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 `26.2`; Fabric `0.19.3`)
+asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `26.3`; Fabric `0.19.5`)
 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
-1. clona el respositorio (`git clone https://github.com/retuci0/sputnik`)
+1. clona el respositorio (`git clone https://git.retucio.me/retucio/sputnik`)
 2. entra al directorio del repositorio (`cd sputnik`)
-3. `gradlew build` para Windows o `chmod +x gradlew` + `./gradlew build` para Linux (Mac es Linux)
-4. el resultado estará en `/build/libs/sputnik-X.X.jar` (el que no lleva "sources" en el nombre)
+3. `gradlew build` para Windows (ew) o `chmod +x gradlew` + `./gradlew build` para Unix-likes (Linux & Mac)
+4. el resultado estará en `/build/libs/sputnik-X.X.jar`
 
 ## uso
 
@@ -33,28 +38,25 @@ algunos módulos tienen teclas asignadas por defecto, asígnales `ESC` para desa
 
 - clic izquierdo para activar / desactivar módulos
 - clic derecho para abrir sus ajustes
-- clic izquierdo + arrastrar para mover marcos
+- clic izquierdo + arrastrar para mover paneles
 - clic derecho en la cabeza del marco para expandirlo / contraerlo o para cerrarlo
 - clic izquierdo sobre ajustes para modificarlos
 - shift + clic derecho sobre ajustes para restablecerlos
 - posiciona el puntero del ratón sobre un módulo o ajuste para leer su descripción
 
-### protips
-- shift mientras pasas el puntero por encima de un ajuste de modos para ver los modos disponibles
-- clic derecho para ciclar hacia atrás en ajustes de modo
-- usa la rueda del ratón para mover la interfaz verticalmente
-- shift + rueda del ratón para mover todos los marcos a un rango visible en la pantalla
-
 ## capturas
 
-<img src="screenshots/ui.png" alt="interfaz">
-<img src="screenshots/nametags.png" alt="nametags mostrando daño de un tridente">
-<img src="screenshots/chatplus.png" alt="chatplus y capturas en uso">
-<img src="screenshots/crits.png" alt="críticos">
-<img src="screenshots/fullbright.png" alt="fullbright en modo gamma cambiando el color de los shaders">
-<img src="screenshots/hud.png" alt="HUD">
+<img src="screenshots/automine.png" alt="auto minado">
+<img src="screenshots/blockesp.png" alt="resaltado de bloques + superposición de luz">
+<img src="screenshots/camtweaks.png" alt="perspectiva plus">
+<img src="screenshots/chatplus.png" alt="chatplus + nametags + capturas">
+<img src="screenshots/clickgui.png" alt="interfaz">
+<img src="screenshots/freecam.png" alt="cámara libre + trazos">
 <img src="screenshots/hudeditor.png" alt="editor de HUD">
-<img src="screenshots/colorpicker.png" alt="selector de colores">
+<img src="screenshots/itemphysics.png" alt="físicas de items">
+<img src="screenshots/lsd.png" alt="LSD">
+<img src="screenshots/macros.png" alt="macros">
+<img src="screenshots/trajectories.png" alt="trayectorias">
 
 ## contribuciones
 
@@ -62,26 +64,16 @@ sí por favor
 
 ## licencia
 
-no sé, haz lo que quieras con esto, es puta basura xd
-
-aunque estaría guay que acreditases
-
-pero bueno
+[licencia CC0](LICENSE)
 
 ## descargo de responsabilidad
 
 me importa una puta mierda lo que pase al usar este mod en servers donde es baneable y así.
 
-## mods recomendados
+## dependencias
 
-> mods que recomiendo usar junto a este:
+- [fabric api](https://modrinth.com/mod/fabric-api/)
 
-- [fabric api (necesario)](https://modrinth.com/mod/fabric-api/): necesario para el mod
-- [sodium](https://modrinth.com/mod/sodium): mejora el rendimiento general del juego
-- [viafabricplus](https://modrinth.com/mod/viafabricplus): te permite conectarte a servidores que tengan una versión distinta a la de tu cliente
-- [xaero's world map](https://modrinth.com/mod/xaeros-world-map/) y [xaero's minimap](https://modrinth.com/mod/xaeros-minimap/): mapa chulo
-- [mod menu](https://modrinth.com/mod/modmenu): lista de los mods instalados, y sus ajustes
-- [iris](https://modrinth.com/mod/iris): shaders
-- [lambdynamiclights](https://modrinth.com/mod/lambdynamiclights): iluminación dinámica
-- [appleskin](https://modrinth.com/mod/appleskin/): información relacionada con la comida
-- [baritone (desactualizado)](https://github.com/cabaletta/baritone): google maps para juego de cubos
+## notas
+
+este mod tiene MUCHOS bugs. empecé este proyecto cuando tenía 14 años y no sabía una mierda de programar. el código es un puto desastre y me niego a arreglarlo. puede que en un futuro reescriba el mod o algo. no sé.

cambios.md

@@ -1,22 +1,17 @@
-# v6.3
+# v6.7
 
 ## novedades
 
-- actualizado a Gradle 9.7.1
+- SIC SEBEN
+- migrado de Codeberg a mi propia instancia de Gitea
 
 ### adiciones
 
-#### módulos nuevos:
-
-- autominado: mina automáticamente los bloques seleccionados, con distintos modos de selección
-- estiloso: haz truquitos con el ítem que tienes en la mano
-
 ### arreglos / mejoras
 
-- mejoras varias a `puto gordo`
-- ahora `trazos` con `uno mismo` solo te apunta en cámara libre
-- nuevo ajuste de distancia máxima de renderizado para `nametags`
-
 ## problemas reconocidos
 
-- lo de siempre.
+- `reponer` no funciona
+- `copiar` tras sacar una captura con `capturas` no funciona correctamente 
+- `manos` no funciona del todo
+- \+ lo de siempre.

gradle.properties

@@ -1,15 +1,15 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-minecraft_version=26.2
-loader_version=0.19.3
-loom_version=1.17-SNAPSHOT
+minecraft_version=26.3
+loader_version=0.19.5
+loom_version=1.18-SNAPSHOT
 
-fabric_api_version=0.154.0+26.2
+fabric_api_version=0.160.7+26.3
 discord_rpc_version=1.0.3
 neutrino_version=1.1.0
 jdk_version=25
 
-mod_version=6.3
+mod_version=6.7
 maven_group=me.retucio
-archives_base_name=sputnik
+archives_base_name=sputnik

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Aug 29 22:10:52 CEST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -2,6 +2,7 @@ package me.retucio.sputnik;
 
 import com.github.retucio.neutrino.EventBus;
 import com.github.retucio.neutrino.EventListener;
+import com.mojang.blaze3d.platform.InputConstants;
 import me.retucio.sputnik.cape.CapeManager;
 import me.retucio.sputnik.command.CommandManager;
 import me.retucio.sputnik.command.commands.BindCommand;
@@ -55,8 +56,6 @@ import net.minecraft.network.chat.Component;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import org.lwjgl.glfw.GLFW;
-
 
 public class Sputnik implements ClientModInitializer {
 
@@ -118,7 +117,7 @@ public class Sputnik implements ClientModInitializer {
         CapeManager.INSTANCE = new CapeManager();
         EVENT_BUS.post(new LoadCapeManagerEvent());
 
-        ModuleManager.INSTANCE = new ModuleManager();
+        ModuleManager.INSTANCE = new    ModuleManager();
         EVENT_BUS.post(new LoadModuleManagerEvent());
 
         CommandManager.INSTANCE = new CommandManager();
@@ -157,32 +156,64 @@ public class Sputnik implements ClientModInitializer {
 
     // se ejecuta cada vez que se presiona una tecla
     public void onInput(int key, int action) {
+        // En SDL el valor 0 es UNKNOWN (y los botones del ratón empiezan en 1).
+        if (key == InputConstants.UNKNOWN.getValue() || key == -1) return;
         // prevenir interrumpir combos de F3
-        if (key == GLFW.GLFW_KEY_F3) return;
+        if (key == InputConstants.KEY_F3) return;
 
         boolean anyFocused = isAnySettingButtonFocused() || ClickGui.INSTANCE.isCapturingInput();
         ClickGui.INSTANCE.setAnyFocused(anyFocused);
 
-        if (action != GLFW.GLFW_RELEASE) {
+        // Las KeySetting y los campos de texto reciben el mismo código SDL scancode que
+        // guardan sus valores; procesarlos antes evita que el bind capturado dispare un módulo.
+        if (anyFocused) handleSettingButtonsKey(key, action);
+
+        if (action != InputConstants.RELEASE) {
             if (BindCommand.onKeyPress(key)) return;
-            if (action == GLFW.GLFW_PRESS && MacroManager.INSTANCE.onKeyPress(key)) return;
-            if (action == GLFW.GLFW_PRESS) {
+            if (action == InputConstants.PRESS && MacroManager.INSTANCE.onKeyPress(key)) return;
+            if (action == InputConstants.PRESS) {
                 handleModuleToggle(key, anyFocused);
                 handleClickGuiKey(key, anyFocused);
                 handleHudEditorKey(key, anyFocused);
             }
-            // solo reenviar teclas del teclado
-            if (key >= 32) {
-                handleSettingButtonsKey(key, action);
-            }
         } else if (!anyFocused) {
             handleModuleRelease(key);
         }
     }
 
+    public boolean onMouseInput(int button, int action) {
+        KeyUtil.setMouseButtonDown(button, action == InputConstants.PRESS);
+
+        boolean captured = false;
+        for (Button settingButton : ClickGui.INSTANCE.getClientSettingsPanel().getButtons()) {
+            if (settingButton instanceof BindButton bindButton && bindButton.isFocused()) {
+                bindButton.onMouse(button, action);
+                captured = true;
+            }
+        }
+        for (SettingsPanel panel : ClickGui.INSTANCE.getSettingsPanels()) {
+            for (Button settingButton : panel.getButtons()) {
+                if (settingButton instanceof BindButton bindButton && bindButton.isFocused()) {
+                    bindButton.onMouse(button, action);
+                    captured = true;
+                }
+            }
+        }
+
+        if (captured) return true;
+        onInput(KeyUtil.encodeMouseButton(button), action);
+        return false;
+    }
+
     // verifica si algún botón de ajustes está escuchando
     private boolean isAnySettingButtonFocused() {
         if (ClickGui.INSTANCE == null) return false;
+        for (Button button : ClickGui.INSTANCE.getClientSettingsPanel().getButtons())
+            if ((button instanceof BindButton bindButton && bindButton.isFocused())
+                    || (button instanceof TextButton textButton && textButton.isFocused())
+                    || (button instanceof FileButton fileButton && fileButton.isFocused())) {
+                return true;
+            }
         for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels())
             for (Button sb : sf.getButtons())
                 if ((sb instanceof BindButton b && b.isFocused())
@@ -200,7 +231,7 @@ public class Sputnik implements ClientModInitializer {
 
         for (Module module : ModuleManager.INSTANCE.getModules()) {
             // evitar interrumpir combinaciones de teclas del F3
-            if (key != module.getKey() || anyFocused || KeyUtil.isKeyDown(GLFW.GLFW_KEY_F3)) continue;
+            if (key != module.getKey() || anyFocused || KeyUtil.isKeyDown(InputConstants.KEY_F3)) continue;
 
             if (module.shouldToggleOnBindRelease() && !module.isEnabled())
                 module.setEnabled(true);
@@ -211,6 +242,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) {
+        ClickGui.INSTANCE.getClientSettingsPanel().onKey(key, action);
         for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) {
             for (SettingButton<?> sb : sf.getButtons()) {
                 if (sb instanceof BindButton bb) bb.onKey(key, action);
@@ -296,4 +328,4 @@ public class Sputnik implements ClientModInitializer {
     public static String getVersionName() {
         return MOD_ID + "_v" + MOD_VERSION + "_" + SharedConstants.getCurrentVersion().name();
     }
-}
+}

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

@@ -16,7 +16,7 @@ import java.util.List;
 public abstract class Command {
 
     // utilizar los "registries" ya existentes de Brigadier para el autocompletado
-    protected static final CommandBuildContext REGISTRY_ACCESS = Commands.createValidationContext(VanillaRegistries.createLookup());
+    protected static final CommandBuildContext REGISTRY_ACCESS = Commands.createValidationContext(VanillaRegistries.createWorldLookup());
     protected static final int SUCCESS = com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
     protected static final Minecraft mc = Minecraft.getInstance();

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

@@ -36,11 +36,12 @@ public class MacroCommand extends Command {
                     list();
                     return SUCCESS;
                 }))
+                // por ahora "add" solo crea macros de chat
                 .then(literal("add")
                         .then(argument("nombre", StringArgumentType.word()).executes(ctx -> {
                             String name = ctx.getArgument("nombre", String.class);
 
-                            if (MacroManager.INSTANCE.add(new Macro(name)))
+                            if (MacroManager.INSTANCE.add(new Macro.Chat(name)))
                                 ChatUtil.info(Component.translatable("sputnik.commands.macro.added",
                                         ChatFormatting.AQUA + name));
                             else
@@ -60,7 +61,7 @@ public class MacroCommand extends Command {
                 .then(literal("line")
                         .then(argument("nombre", StringArgumentType.word()).suggests(MACROS)
                                 .then(argument("línea", StringArgumentType.greedyString()).executes(ctx -> {
-                                    Macro macro = get(ctx.getArgument("nombre", String.class));
+                                    Macro.Chat macro = getChat(ctx.getArgument("nombre", String.class));
                                     if (macro == null) return SUCCESS;
 
                                     String line = ctx.getArgument("línea", String.class);
@@ -73,7 +74,7 @@ public class MacroCommand extends Command {
                                 }))))
                 .then(literal("clear")
                         .then(argument("nombre", StringArgumentType.word()).suggests(MACROS).executes(ctx -> {
-                            Macro macro = get(ctx.getArgument("nombre", String.class));
+                            Macro.Chat macro = getChat(ctx.getArgument("nombre", String.class));
                             if (macro == null) return SUCCESS;
 
                             macro.getLines().clear();
@@ -97,6 +98,19 @@ public class MacroCommand extends Command {
         return macro;
     }
 
+    // para los subcomandos que solo tienen sentido con líneas de chat (line, clear): si la
+    // macro existe pero es de otro tipo, avisa y devuelve null
+    private static Macro.Chat getChat(String name) {
+        Macro macro = get(name);
+        if (macro == null) return null;
+
+        if (!(macro instanceof Macro.Chat chat)) {
+            ChatUtil.error(Component.translatable("sputnik.commands.macro.notchat", macro.getName()));
+            return null;
+        }
+        return chat;
+    }
+
     private static void list() {
         List<Macro> macros = MacroManager.INSTANCE.getMacros();
 
@@ -106,9 +120,17 @@ public class MacroCommand extends Command {
         }
 
         ChatUtil.info(Component.translatable("sputnik.commands.macro.list", macros.size()));
-        for (Macro macro : macros)
+        for (Macro macro : macros) {
+            // líneas en las de chat, teclas en las Keybind
+            int count = switch (macro) {
+                case Macro.Chat chat -> chat.getLines().size();
+                case Macro.Keybind keybind -> keybind.getKeys().size();
+                default -> 0;
+            };
+
             ChatUtil.addMessage(ChatFormatting.GRAY + " - " + macro.getName()
                     + ChatFormatting.DARK_GRAY + " [" + KeyUtil.getKeyName(macro.getKey()) + "] "
-                    + macro.getLines().size());
+                    + count);
+        }
     }
-}
+}

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

@@ -50,7 +50,7 @@ public class SendCommand extends Command {
                         message,
                         instant,
                         salt,
-                        messageSignature,
+                        java.util.Optional.ofNullable(messageSignature),
                         lastSeenMessages.update()
                 ));
             }
@@ -58,4 +58,4 @@ public class SendCommand extends Command {
             return SUCCESS;
         }));
     }
-}
+}

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

@@ -8,7 +8,7 @@ import me.retucio.sputnik.event.input.KeyEvent;
 import me.retucio.sputnik.util.EntityUtil;
 import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.world.entity.Entity;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.awt.*;
 
@@ -43,7 +43,7 @@ public class SpectateCommand extends Command {
     @EventListener
     public void onKey(KeyEvent event) {
         if (mc.getCameraEntity() != mc.player && mc.gui.screen() == null
-                && event.getKey() == GLFW.GLFW_KEY_ESCAPE && event.getAction() != GLFW.GLFW_RELEASE ) {
+                && event.getKey() == InputConstants.KEY_ESCAPE && event.getAction() != InputConstants.RELEASE ) {
             event.cancel();
             mc.setCameraEntity(mc.player);
         }

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

@@ -1,6 +1,7 @@
 package me.retucio.sputnik.config;
 
 import me.retucio.sputnik.util.I18nUtil;
+import me.retucio.sputnik.util.KeyUtil;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -14,7 +15,7 @@ import java.util.Map;
 public class BinarySerializer {
 
     private static final int MAGIC_NUMBER = 0x53505554;  // "SPUT"
-    private static final int VERSION = 3;
+    private static final int VERSION = 6;
     private static final int MIN_VERSION = 2;
 
     private static final byte TYPE_NULL = 0;
@@ -26,6 +27,9 @@ public class BinarySerializer {
     private static final byte TYPE_INT_ARRAY = 6;
     private static final byte TYPE_FRAME_DATA = 7;
 
+    private static final byte MACRO_CHAT = 0;
+    private static final byte MACRO_KEYBIND = 1;
+
     public static void writeConfig(ClientConfig config, File file) throws IOException {
         byte[] bytes = toBytes(config);
         writeBytes(bytes, file);
@@ -72,7 +76,7 @@ public class BinarySerializer {
         writeStringIntArrayMap(out, config.hudPositions);
         writeStringBooleanMap(out, config.hudVisibilities);
         writeStringStringMap(out, config.hudImagePaths);
-        writeStringStringMap(out, config.friends);
+        writeFriendsMap(out, config.friends);
         writeMacros(out, config.macros);
         writeString(out, config.currentProfile);
 
@@ -123,9 +127,16 @@ public class BinarySerializer {
             Map<String, int[]> hudPositions = readStringIntArrayMap(in);
             Map<String, Boolean> hudVisibilities = readStringBooleanMap(in);
             Map<String, String> hudImagePaths = readStringStringMap(in);
-            Map<String, String> friends = readStringStringMap(in);
+            Map<String, ClientConfig.FriendData> friends = version >= 4
+                    ? readFriendsMap(in)
+                    : migrateFriendsMap(readStringStringMap(in));
+
+            // v3 y v4: macros sin tipo (todas eran de chat). v5+: con tipo
+            List<ClientConfig.MacroData> macros;
+            if (version >= 5) macros = readMacros(in);
+            else if (version >= 3) macros = readLegacyMacros(in);
+            else macros = new ArrayList<>();
 
-            List<ClientConfig.MacroData> macros = version >= 3 ? readMacros(in) : new ArrayList<>();
             String currentProfile = version >= 3 ? readString(in) : "";
 
             // leer pos. de la barra de búsqueda
@@ -145,11 +156,22 @@ public class BinarySerializer {
             config.macros = macros;
             config.currentProfile = currentProfile == null ? "" : currentProfile;
             if (searchBarPosition != null) config.searchBarPosition = searchBarPosition;
+            config.legacyKeyCodes = version < 6;
 
             return config;
         }
     }
 
+    public static void migrateLegacyKeyCodes(ClientConfig config) {
+        config.macros = config.macros.stream().map(macro -> {
+            int key = KeyUtil.fromLegacyGlfwKey(macro.key());
+            List<ClientConfig.KeyData> keys = macro.keys() == null ? List.of() : macro.keys().stream()
+                    .map(entry -> new ClientConfig.KeyData(KeyUtil.fromLegacyGlfwKey(entry.key()), entry.action()))
+                    .toList();
+            return new ClientConfig.MacroData(macro.type(), macro.name(), key, macro.lines(), keys);
+        }).toList();
+    }
+
     private static void writeStringBooleanMap(DataOutputStream out, Map<String, Boolean> map)
             throws IOException {
         if (map == null) {
@@ -369,7 +391,7 @@ public class BinarySerializer {
     }
 
     private static void writeStringStringMap(DataOutputStream out, Map<String, String> map)
-        throws IOException {
+            throws IOException {
         if (map == null) {
             out.writeInt(0);
             return;
@@ -382,7 +404,7 @@ public class BinarySerializer {
     }
 
     private static Map<String, String> readStringStringMap(DataInputStream in)
-        throws IOException {
+            throws IOException {
         int size = in.readInt();
         Map<String, String> map = new HashMap<>(size);
         for (int i = 0; i < size; i++) {
@@ -393,6 +415,9 @@ public class BinarySerializer {
         return map;
     }
 
+    // v5+: por macro va un id de tipo, luego nombre y tecla, y por último lo propio del tipo
+    // (líneas en las de chat, pares tecla/acción en las Keybind). los null (que pueden venir
+    // de un json antiguo) se tratan como chat / lista vacía
     private static void writeMacros(DataOutputStream out, List<ClientConfig.MacroData> macros)
             throws IOException {
         if (macros == null) {
@@ -401,14 +426,59 @@ public class BinarySerializer {
         }
         out.writeInt(macros.size());
         for (ClientConfig.MacroData macro : macros) {
+            boolean keybind = macro.type() == ClientConfig.MacroType.KEYBIND;
+
+            out.writeByte(keybind ? MACRO_KEYBIND : MACRO_CHAT);
             writeString(out, macro.name());
             out.writeInt(macro.key());
-            out.writeInt(macro.lines().size());
-            for (String line : macro.lines()) writeString(out, line);
+
+            if (keybind) {
+                List<ClientConfig.KeyData> keys = macro.keys() == null ? List.of() : macro.keys();
+                out.writeInt(keys.size());
+                for (ClientConfig.KeyData k : keys) {
+                    out.writeInt(k.key());
+                    out.writeInt(k.action());
+                }
+            } else {
+                List<String> lines = macro.lines() == null ? List.of() : macro.lines();
+                out.writeInt(lines.size());
+                for (String line : lines) writeString(out, line);
+            }
         }
     }
 
     private static List<ClientConfig.MacroData> readMacros(DataInputStream in) throws IOException {
+        int size = in.readInt();
+        List<ClientConfig.MacroData> macros = new ArrayList<>(size);
+        for (int i = 0; i < size; i++) {
+            byte type = in.readByte();
+            String name = readString(in);
+            int key = in.readInt();
+
+            switch (type) {
+                case MACRO_CHAT -> {
+                    int lineCount = in.readInt();
+                    List<String> lines = new ArrayList<>(lineCount);
+                    for (int j = 0; j < lineCount; j++) lines.add(readString(in));
+                    macros.add(ClientConfig.MacroData.chat(name, key, lines));
+                }
+                case MACRO_KEYBIND -> {
+                    int keyCount = in.readInt();
+                    List<ClientConfig.KeyData> keys = new ArrayList<>(keyCount);
+                    for (int j = 0; j < keyCount; j++) keys.add(new ClientConfig.KeyData(in.readInt(), in.readInt()));
+                    macros.add(ClientConfig.MacroData.keybind(name, key, keys));
+                }
+                // no hay forma de saltarse una macro de un tipo que no conocemos (no se sabe
+                // cuánto ocupa), así que lo único seguro es fallar
+                default -> throw new IOException(I18nUtil.fmt("sputnik.config.error.invalidmacro",
+                        "tipo de macro desconocido: %s", type));
+            }
+        }
+        return macros;
+    }
+
+    // v3 y v4: formato de antes de que hubiera tipos (nombre, tecla, líneas). eran todas de chat
+    private static List<ClientConfig.MacroData> readLegacyMacros(DataInputStream in) throws IOException {
         int size = in.readInt();
         List<ClientConfig.MacroData> macros = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
@@ -417,11 +487,50 @@ public class BinarySerializer {
             int lineCount = in.readInt();
             List<String> lines = new ArrayList<>(lineCount);
             for (int j = 0; j < lineCount; j++) lines.add(readString(in));
-            macros.add(new ClientConfig.MacroData(name, key, lines));
+            macros.add(ClientConfig.MacroData.chat(name, key, lines));
         }
         return macros;
     }
 
+    private static void writeFriendsMap(DataOutputStream out, Map<String, ClientConfig.FriendData> map)
+            throws IOException {
+        if (map == null) {
+            out.writeInt(0);
+            return;
+        }
+        out.writeInt(map.size());
+        for (Map.Entry<String, ClientConfig.FriendData> entry : map.entrySet()) {
+            writeString(out, entry.getKey());
+            ClientConfig.FriendData data = entry.getValue();
+            writeString(out, data.name());
+            writeString(out, data.nick());
+            out.writeLong(data.befriendedAt());
+        }
+    }
+
+    private static Map<String, ClientConfig.FriendData> readFriendsMap(DataInputStream in)
+            throws IOException {
+        int size = in.readInt();
+        Map<String, ClientConfig.FriendData> map = new HashMap<>(size);
+        for (int i = 0; i < size; i++) {
+            String uuid = readString(in);
+            String name = readString(in);
+            String nick = readString(in);
+            long befriendedAt = in.readLong();
+            map.put(uuid, new ClientConfig.FriendData(name, nick, befriendedAt));
+        }
+        return map;
+    }
+
+    private static Map<String, ClientConfig.FriendData> migrateFriendsMap(Map<String, String> legacy) {
+        Map<String, ClientConfig.FriendData> map = new HashMap<>(legacy.size());
+        long now = System.currentTimeMillis();
+        for (Map.Entry<String, String> entry : legacy.entrySet()) {
+            map.put(entry.getKey(), new ClientConfig.FriendData(entry.getValue(), entry.getValue(), now));
+        }
+        return map;
+    }
+
     private static void writeString(DataOutputStream out, String str) throws IOException {
         if (str == null) {
             out.writeInt(-1);

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

@@ -4,8 +4,6 @@ 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.widgets.panels.FriendsPanel;
-import me.retucio.sputnik.util.ChatUtil;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -44,14 +42,18 @@ public class ClientConfig {
     // posición de la barra de búsqueda (x, y)
     public int[] searchBarPosition = new int[] { 340, 16 };
 
-    // amigos: uuid -> nombre
-    public Map<String, String> friends = new HashMap<>();
+    // amigos: uuid -> FriendData (nombre, apodo, fecha)
+    public Map<String, FriendData> friends = new HashMap<>();
 
+    // macros, de cualquier tipo (ver MacroData)
     public List<MacroData> macros = new ArrayList<>();
 
     // perfil cargado actualmente, vacío si es la config. suelta
     public String currentProfile = "";
 
+    // Set only when loading a config written with GLFW keycodes (pre-26.3).
+    public transient boolean legacyKeyCodes;
+
     public ClientConfig() {
         EVENT_BUS.subscribe(this);
     }
@@ -146,31 +148,15 @@ public class ClientConfig {
         ConfigManager.INSTANCE.markDirty();
     }
 
-    @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.put("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) {
         if (isApplying()) return;
         String uuid = event.getFriend().getUuid().toString();
-        String name = event.getFriend().getName();
         if (!friends.containsKey(uuid)) {
-            friends.put(uuid, name);
+            friends.put(uuid, new FriendData(
+                    event.getFriend().getName(),
+                    event.getFriend().getNick(),
+                    event.getFriend().getBefriendedAt()));
         }
         ConfigManager.INSTANCE.markDirty();
     }
@@ -182,11 +168,42 @@ public class ClientConfig {
         ConfigManager.INSTANCE.markDirty();
     }
 
+    @EventListener
+    public void onRenameFriend(FriendEvent.Rename event) {
+        if (isApplying()) return;
+        String uuid = event.getFriend().getUuid().toString();
+        FriendData existing = friends.get(uuid);
+        if (existing == null) return;  // no debería pasar, pero porsiaca
+
+        friends.put(uuid, new FriendData(existing.name(), event.getFriend().getNick(), existing.befriendedAt()));
+        ConfigManager.INSTANCE.markDirty();
+    }
+
     public record PanelData(int x, int y, boolean extended) implements Serializable {
         @Serial private static final long serialVersionUID = 1L;
     }
 
-    public record MacroData(String name, int key, List<String> lines) implements Serializable {
+    public record FriendData(String name, String nick, long befriendedAt) implements Serializable {
         @Serial private static final long serialVersionUID = 1L;
     }
+
+    public enum MacroType { CHAT, KEYBIND }
+
+    public record KeyData(int key, int action) implements Serializable {
+        @Serial private static final long serialVersionUID = 1L;
+    }
+
+    public record MacroData(MacroType type, String name, int key,
+                            List<String> lines, List<KeyData> keys
+    ) implements Serializable {
+        @Serial private static final long serialVersionUID = 2L;
+
+        public static MacroData chat(String name, int key, List<String> lines) {
+            return new MacroData(MacroType.CHAT, name, key, List.copyOf(lines), List.of());
+        }
+
+        public static MacroData keybind(String name, int key, List<KeyData> keys) {
+            return new MacroData(MacroType.KEYBIND, name, key, List.of(), List.copyOf(keys));
+        }
+    }
 }

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

@@ -16,13 +16,12 @@ import me.retucio.sputnik.ui.hud.HudElement;
 import me.retucio.sputnik.ui.hud.HudRenderer;
 import me.retucio.sputnik.ui.widgets.Panel;
 import me.retucio.sputnik.ui.widgets.panels.ExtendablePanel;
-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 me.retucio.sputnik.util.I18nUtil;
+import me.retucio.sputnik.util.KeyUtil;
 import net.minecraft.network.chat.Component;
 
 import java.io.File;
@@ -153,6 +152,7 @@ public class ConfigManager {
             try (FileReader reader = new FileReader(LEGACY_JSON_FILE)) {
                 Gson gson = new GsonBuilder().setPrettyPrinting().create();
                 setConfig(gson.fromJson(reader, ClientConfig.class));
+                config.legacyKeyCodes = true;
                 Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.json",
                         "ajustes json cargados (migración)"));
 
@@ -177,7 +177,9 @@ public class ConfigManager {
         if (!shouldApply()) return false;
 
         applying = true;
+        boolean migratedKeys = config.legacyKeyCodes;
         try {
+            migrateLegacyKeyCodes();
             // los del mod primero: entre ellos está "teclas multimódulo", que decide si al
             // asignar una tecla se le quita a los demás módulos. aplicándolos los últimos,
             // las teclas de los módulos se cargaban con el valor por defecto de ese ajuste
@@ -202,9 +204,32 @@ public class ConfigManager {
             loaded = true;
         }
 
+        if (migratedKeys) writeSnapshot(true);
+
         return true;
     }
 
+    private void migrateLegacyKeyCodes() {
+        if (!config.legacyKeyCodes) return;
+
+        ClientSettingsPanel.clientSettings.getSettings().forEach(this::migrateLegacyKeySetting);
+        ModuleManager.INSTANCE.getModules().forEach(module ->
+                module.getSettings().forEach(this::migrateLegacyKeySetting));
+        BinarySerializer.migrateLegacyKeyCodes(config);
+        config.legacyKeyCodes = false;
+    }
+
+    private void migrateLegacyKeySetting(Setting<?> setting) {
+        if (!(setting instanceof KeySetting)) return;
+        String key = getSettingKey(setting);
+        Object value = config.settings.get(key);
+        if (value instanceof Integer code) {
+            config.settings.put(key, KeyUtil.fromLegacyGlfwKey(code));
+        } else if (value instanceof Double code) {
+            config.settings.put(key, KeyUtil.fromLegacyGlfwKey(code.intValue()));
+        }
+    }
+
     // true mientras se está cargando la config. sobre los ajustes. lo mira KeySetting para no
     // tratar las teclas guardadas como si el usuario las acabara de asignar, y ClientConfig
     // para no reescribir en la config. lo que se le está aplicando
@@ -301,7 +326,7 @@ public class ConfigManager {
     public void setMacros(List<Macro> macros) {
         ensureConfig();
         config.macros = macros.stream()
-                .map(macro -> new ClientConfig.MacroData(macro.getName(), macro.getKey(), List.copyOf(macro.getLines())))
+                .map(ConfigManager::toMacroData)
                 .toList();
         markDirty();
     }
@@ -316,9 +341,10 @@ public class ConfigManager {
     // ------------------ APLICAR AJUSTES ------------------
 
     public void applyFriends() {
-        config.friends.forEach((uuid, name) -> {
-            Friend friend = new Friend(UUID.fromString(uuid));
-            friend.setName(name);
+        config.friends.forEach((uuid, data) -> {
+            Friend friend = new Friend(UUID.fromString(uuid), data.befriendedAt());
+            friend.setName(data.name());
+            friend.setNick(data.nick());
             FriendManager.INSTANCE.add(friend);
         });
         Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.friends",
@@ -327,10 +353,37 @@ public class ConfigManager {
 
     public void applyMacros() {
         MacroManager.INSTANCE.setMacros(config.macros.stream()
-                .map(data -> new Macro(data.name(), data.key(), data.lines()))
+                .map(ConfigManager::fromMacroData)
                 .toList());
     }
 
+    private static ClientConfig.MacroData toMacroData(Macro macro) {
+        return switch (macro) {
+            case Macro.Chat chat -> ClientConfig.MacroData.chat(
+                    chat.getName(), chat.getKey(), chat.getLines());
+
+            case Macro.Keybind keybind -> ClientConfig.MacroData.keybind(
+                    keybind.getName(), keybind.getKey(),
+                    keybind.getKeys().stream()
+                            .map(k -> new ClientConfig.KeyData(k.key(), k.action()))
+                            .toList());
+
+            default -> throw new IllegalArgumentException(
+                    "tipo de macro sin serializar: " + macro.getClass().getName());
+        };
+    }
+
+    private static Macro fromMacroData(ClientConfig.MacroData data) {
+        if (data.type() == ClientConfig.MacroType.KEYBIND) {
+            List<Macro.Keybind.Key> keys = data.keys() == null ? List.of() : data.keys().stream()
+                    .map(k -> new Macro.Keybind.Key(k.key(), k.action()))
+                    .toList();
+            return new Macro.Keybind(data.name(), data.key(), keys);
+        }
+
+        return new Macro.Chat(data.name(), data.key(), data.lines() == null ? List.of() : data.lines());
+    }
+
     // el HudRenderer coloca sus elementos al construirse, pero al cambiar de perfil ya existen
     public void applyHudElements() {
         if (HudRenderer.INSTANCE == null) return;
@@ -424,7 +477,6 @@ public class ConfigManager {
             applyExtendablePanel(panel);
         }
         applyExtendablePanel(ClickGui.INSTANCE.getClientSettingsPanel());
-        applyExtendablePanel(ClickGui.INSTANCE.getFriendsPanel());
 
         Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.extendablepanels",
                 "posiciones de marcos extendibles aplicadas"));
@@ -440,9 +492,6 @@ public class ConfigManager {
         if (panel instanceof ClientSettingsPanel) {
             panelData = config.extendablePanels.get("ajustes");
         }
-        if (panel instanceof FriendsPanel) {
-            panelData = config.extendablePanels.get("amigos");
-        }
 
         if (panelData != null) {
             panel.setX(panelData.x());
@@ -598,8 +647,6 @@ public class ConfigManager {
         ClientSettingsModule settings = ClientSettingsPanel.clientSettings;
         if (!settings.autosave.getValue()) return;
 
-        // desde el último guardado, no desde el último cambio: contando desde el cambio,
-        // tocando ajustes cada menos del intervalo no se autoguardaba nunca
         long intervalMs = (long) (settings.autosaveInterval.getValue() * 1000);
         if (System.currentTimeMillis() - lastSaveTime < intervalMs) return;
 
@@ -608,4 +655,4 @@ public class ConfigManager {
                 Component.translatable("sputnik.config.autosaving.desc").getString());
         save();
     }
-}
+}

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

@@ -3,7 +3,8 @@ 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
+
+// evento lanzado cuando se agrega, elimina o renombra un amigo
 public class FriendEvent extends Event {
 
     private final Friend friend;
@@ -23,4 +24,8 @@ public class FriendEvent extends Event {
     public static class Remove extends FriendEvent {
         public Remove(Friend friend) { super(friend); }
     }
-}
+
+    public static class Rename extends FriendEvent {
+        public Rename(Friend friend) { super(friend); }
+    }
+}

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

@@ -1,9 +0,0 @@
-package me.retucio.sputnik.event.sputnik;
-
-import com.github.retucio.neutrino.Event;
-
-public class FriendPanelEvent {
-
-    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/friend/Friend.java

@@ -1,6 +1,7 @@
 package me.retucio.sputnik.friend;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.PlayerInfo;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.Nullable;
@@ -13,12 +14,20 @@ public class Friend {
     private static final Minecraft mc = Minecraft.getInstance();
 
     private String name;
+    private String nick;
     private final UUID uuid;
+    private final long befriendedAt;
 
     private boolean searchMatch;
 
     public Friend(UUID uuid) {
         this.uuid = uuid;
+        this.befriendedAt = System.currentTimeMillis();
+    }
+
+    public Friend(UUID uuid, long befriendedAt) {
+        this.uuid = uuid;
+        this.befriendedAt = befriendedAt;
     }
 
     public String getName() {
@@ -29,10 +38,27 @@ public class Friend {
         this.name = name;
     }
 
+    public String getNick() {
+        return nick;
+    }
+
+    public void setNick(String nick) {
+        this.nick = nick;
+    }
+
+    // apodo si existe, si no el nombre real
+    public String getDisplayName() {
+        return (nick == null || nick.isBlank()) ? name : nick;
+    }
+
     public UUID getUuid() {
         return uuid;
     }
 
+    public long getBefriendedAt() {
+        return befriendedAt;
+    }
+
     public @Nullable Player getPlayer() {
         if (mc.level == null) return null;
         Entity entity = mc.level.getEntity(uuid);
@@ -40,6 +66,11 @@ public class Friend {
         return player;
     }
 
+    public @Nullable PlayerInfo getPlayerInfo() {
+        if (mc.getConnection() == null) return null;
+        return mc.getConnection().getPlayerInfo(uuid);
+    }
+
     public boolean isSearchMatch() {
         return searchMatch;
     }
@@ -56,4 +87,4 @@ public class Friend {
         NOT_BEFRIENDED,
         NO_FRIENDS;  // :(
     }
-}
+}

src/main/java/me/retucio/sputnik/friend/FriendManager.java

@@ -29,6 +29,7 @@ public class FriendManager {
     public void add(UUID uuid) {
         Friend friend = new Friend(uuid);
         friend.setName(friend.getPlayer().getName().getString());
+        friend.setNick(friend.getName());
         add(friend);
     }
 
@@ -61,6 +62,11 @@ public class FriendManager {
         return Friend.Status.SUCCESS;
     }
 
+    public void rename(Friend friend, String nick) {
+        friend.setNick(nick);
+        Sputnik.EVENT_BUS.post(new FriendEvent.Rename(friend));
+    }
+
     public Friend get(UUID uuid) {
         for (Friend friend : friends) {
             if (friend.getUuid().equals(uuid)) {

src/main/java/me/retucio/sputnik/macro/Macro.java

@@ -1,38 +1,22 @@
 package me.retucio.sputnik.macro;
 
 import me.retucio.sputnik.util.ChatUtil;
+import me.retucio.sputnik.util.KeyUtil;
 import net.minecraft.client.Minecraft;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
-public class Macro {
+public abstract class Macro {
 
-    private String name;
-    private int key;
-    private final List<String> lines = new ArrayList<>();
+    protected String name;
+    protected int key;
 
-    private boolean searchMatch = true;
-
-    public Macro(String name) {
-        this(name, GLFW.GLFW_KEY_UNKNOWN, List.of());
-    }
-
-    public Macro(String name, int key, List<String> lines) {
+    protected Macro(String name, int key) {
         this.name = name;
         this.key = key;
-        this.lines.addAll(lines);
-    }
-
-    // cada línea se manda como si el usuario la hubiera escrito en el chat, así que valen
-    // comandos del mod, comandos del servidor y mensajes normales
-    public void run() {
-        if (Minecraft.getInstance().player == null) return;
-        for (String line : lines) {
-            if (!line.isBlank()) ChatUtil.simulateChatMessage(line);
-        }
     }
 
     public String getName() { return name; }
@@ -41,13 +25,80 @@ public class Macro {
     public int getKey() { return key; }
     public void setKey(int key) { this.key = key; }
 
-    public List<String> getLines() { return lines; }
-
-    public void setLines(List<String> lines) {
-        this.lines.clear();
-        this.lines.addAll(lines);
-    }
-
+    private boolean searchMatch = true;
     public boolean isSearchMatch() { return searchMatch; }
     public void setSearchMatch(boolean searchMatch) { this.searchMatch = searchMatch; }
-}
+
+    public abstract void run();
+
+
+    // cada línea se manda como si el usuario la hubiera escrito en el chat, así que valen
+    // comandos del mod, comandos del servidor y mensajes normales
+    public static class Chat extends Macro {
+
+        private final List<String> lines = new ArrayList<>();
+
+        public Chat(String name) {
+            this(name, InputConstants.UNKNOWN.getValue(), List.of());
+        }
+
+        public Chat(String name, int key, List<String> lines) {
+            super(name, key);
+            this.lines.addAll(lines);
+        }
+
+        @Override
+        public void run() {
+            if (Minecraft.getInstance().player == null) return;
+            for (String line : lines) {
+                if (!line.isBlank()) ChatUtil.simulateChatMessage(line);
+            }
+        }
+
+        public List<String> getLines() {
+            return lines;
+        }
+
+        public void setLines(List<String> lines) {
+            this.lines.clear();
+            this.lines.addAll(lines);
+        }
+    }
+
+
+    public static class Keybind extends Macro {
+
+        private final List<Key> keys = new ArrayList<>();
+
+        public Keybind(String name) {
+            this(name, InputConstants.UNKNOWN.getValue(), List.of());
+        }
+
+        public Keybind(String name, int key, List<Key> keys) {
+            super(name, key);
+            this.keys.addAll(keys);
+        }
+
+        @Override
+        public void run() {
+            for (Key k : keys) {
+                k.use();
+            }
+        }
+
+        public List<Key> getKeys() {
+            return keys;
+        }
+
+        public void setKeys(List<Key> keys) {
+            this.keys.clear();
+            this.keys.addAll(keys);
+        }
+
+        public record Key(int key, int action) {
+            public void use() {
+                KeyUtil.pressKey(key, action);
+            }
+        }
+    }
+}

src/main/java/me/retucio/sputnik/macro/MacroManager.java

@@ -2,7 +2,7 @@ package me.retucio.sputnik.macro;
 
 import me.retucio.sputnik.config.ConfigManager;
 import net.minecraft.client.Minecraft;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +14,9 @@ public class MacroManager {
 
     private final List<Macro> macros = new ArrayList<>();
 
+    // para evitar disparar un macro que presiona su propia tecla infinitamente
+    private boolean running = false;
+
     public boolean add(Macro macro) {
         if (getByName(macro.getName()) != null) return false;
         macros.add(macro);
@@ -34,15 +37,20 @@ public class MacroManager {
     }
 
     public boolean onKeyPress(int key) {
-        if (key == GLFW.GLFW_KEY_UNKNOWN || Minecraft.getInstance().gui.screen() != null) return false;
+        if (running || key == InputConstants.UNKNOWN.getValue() || Minecraft.getInstance().gui.screen() != null) return false;
 
-        boolean ran = false;
-        for (Macro macro : new ArrayList<>(macros)) {
-            if (macro.getKey() != key) continue;
-            macro.run();
-            ran = true;
+        running = true;
+        try {
+            boolean ran = false;
+            for (Macro macro : new ArrayList<>(macros)) {
+                if (macro.getKey() != key) continue;
+                macro.run();
+                ran = true;
+            }
+            return ran;
+        } finally {
+            running = false;
         }
-        return ran;
     }
 
     public void setMacros(List<Macro> macros) {

src/main/java/me/retucio/sputnik/mixin/accessors/LayerRenderStateAccessor.java

@@ -1,6 +1,7 @@
 package me.retucio.sputnik.mixin.accessors;
 
 import net.minecraft.client.renderer.item.ItemStackRenderState;
+import net.minecraft.client.resources.model.geometry.ItemQuads;
 import net.minecraft.client.resources.model.cuboid.ItemTransform;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -11,4 +12,7 @@ public interface LayerRenderStateAccessor {
 
     @Accessor("itemTransform")
     ItemTransform sputnik$getTransform();
-}
+
+    @Accessor("quads")
+    ItemQuads sputnik$getQuads();
+}

src/main/java/me/retucio/sputnik/mixin/mixins/hud/HudMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.sputnik.mixin.mixins.hud;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.renderpearl.api.pipeline.RenderPipeline;
 import me.retucio.sputnik.Sputnik;
 import me.retucio.sputnik.event.render.Render2DEvent;
 import me.retucio.sputnik.module.ModuleManager;
@@ -79,7 +79,7 @@ public abstract class HudMixin {
         HudRenderer.INSTANCE.render(gui, dt);
     }
 
-    @Redirect(method = "extractCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIII)V", ordinal = 0))
+    @Redirect(method = "extractCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;blitSprite(Lcom/mojang/renderpearl/api/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIII)V", ordinal = 0))
     private void onRenderCrosshair(GuiGraphicsExtractor gui, RenderPipeline pipeline, Identifier id, int x, int y, int width, int height) {
         // dangerous abbreviation
         CrosshairPlus cp = ModuleManager.INSTANCE.getModuleByClass(CrosshairPlus.class);

src/main/java/me/retucio/sputnik/mixin/mixins/io/KeyboardHandlerMixin.java

@@ -2,6 +2,7 @@ package me.retucio.sputnik.mixin.mixins.io;
 
 import me.retucio.sputnik.Sputnik;
 import me.retucio.sputnik.event.input.KeyEvent;
+import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyboardHandler;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,9 +15,9 @@ public abstract class KeyboardHandlerMixin {
 
     @Inject(method = "keyPress", at = @At("HEAD"), cancellable = true)
     private void onKeyPress(long handle, int action, net.minecraft.client.input.KeyEvent input, CallbackInfo ci) {
-        if (input.key() == -1) return;
+        if (input.key() == InputConstants.UNKNOWN.getValue() || input.key() == -1) return;
         Sputnik.INSTANCE.onInput(input.key(), action);
-        KeyEvent event = Sputnik.EVENT_BUS.post(new KeyEvent(input.key(), input.scancode(), action));
+        KeyEvent event = Sputnik.EVENT_BUS.post(new KeyEvent(input.key(), input.keycode(), action));
         if (event.isCancelled()) ci.cancel();
     }
 }

src/main/java/me/retucio/sputnik/mixin/mixins/io/MouseHandlerMixin.java

@@ -16,7 +16,10 @@ public abstract class MouseHandlerMixin {
 
     @Inject(method = "onButton", at = @At("HEAD"), cancellable = true)
     private void onMouseButton(long handle, MouseButtonInfo input, int action, CallbackInfo ci) {
-        Sputnik.INSTANCE.onInput(input.button(), action);
+        if (Sputnik.INSTANCE.onMouseInput(input.button(), action)) {
+            ci.cancel();
+            return;
+        }
         MouseClickEvent event = Sputnik.EVENT_BUS.post(new MouseClickEvent(action, input.button()));
         if (event.isCancelled()) ci.cancel();
     }

src/main/java/me/retucio/sputnik/mixin/mixins/network/ClientPacketListenerMixin.java

@@ -3,18 +3,13 @@ package me.retucio.sputnik.mixin.mixins.network;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import me.retucio.sputnik.command.CommandManager;
 import me.retucio.sputnik.event.network.SendMessageEvent;
-import me.retucio.sputnik.module.ModuleManager;
-import me.retucio.sputnik.module.modules.render.NoRender;
 import me.retucio.sputnik.util.ChatUtil;
 import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import static me.retucio.sputnik.Sputnik.*;
@@ -51,11 +46,4 @@ public abstract class ClientPacketListenerMixin {
         mc.gui.hud.getChat().addRecentChat(content);
         ci.cancel();
     }
-
-    @Redirect(method = "handleEntityEvent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GameRenderer;displayItemActivation(Lnet/minecraft/world/item/ItemStack;)V"))
-    private void noRenderTotemPop(GameRenderer instance, ItemStack itemStack) {
-        NoRender noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
-        if (!noRender.isEnabled() || noRender.totemPop.getValue())
-            mc.gameRenderer.displayItemActivation(itemStack);
-    }
 }

src/main/java/me/retucio/sputnik/mixin/mixins/network/YggdrasilUserApiServiceMixin.java

@@ -1,17 +1,17 @@
 package me.retucio.sputnik.mixin.mixins.network;
 
-import com.mojang.authlib.yggdrasil.YggdrasilUserApiService;
-import com.mojang.authlib.yggdrasil.response.UserAttributesResponse;
+import com.mojang.authlib.services.MinecraftServicesUserApiService;
+import com.mojang.authlib.services.response.UserAttributesResponse;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 // código robado de: https://github.com/kb-1000/no-telemetry
 
-@Mixin(YggdrasilUserApiService.class)
+@Mixin(MinecraftServicesUserApiService.class)
 public abstract class YggdrasilUserApiServiceMixin {
 
-    @Redirect(method = "fetchProperties", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/yggdrasil/response/UserAttributesResponse$Privileges;getTelemetry()Z", remap = false), remap = false, require = 0)
+    @Redirect(method = "fetchProperties", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/services/response/UserAttributesResponse$Privileges;getTelemetry()Z", remap = false), remap = false, require = 0)
     private boolean getTelemetry(UserAttributesResponse.Privileges instance) {
         return false;
     }

src/main/java/me/retucio/sputnik/mixin/mixins/render/EquipmentLayerRendererMixin.java

@@ -4,6 +4,7 @@ import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.render.GlintPlus;
 import net.minecraft.client.renderer.entity.layers.EquipmentLayerRenderer;
 import net.minecraft.client.renderer.rendertype.RenderType;
+import net.minecraft.resources.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
@@ -12,9 +13,9 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 @Mixin(EquipmentLayerRenderer.class)
 public abstract class EquipmentLayerRendererMixin {
 
-    @Redirect(method = "renderLayers(Lnet/minecraft/client/resources/model/EquipmentClientInfo$LayerType;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/world/item/ItemStack;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;ILnet/minecraft/resources/Identifier;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/rendertype/RenderTypes;armorEntityGlint()Lnet/minecraft/client/renderer/rendertype/RenderType;"))
-    private RenderType redirectArmorEntityGlint() {
+    @Redirect(method = "renderLayers(Lnet/minecraft/client/resources/model/EquipmentClientInfo$LayerType;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/world/item/ItemStack;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;ILnet/minecraft/resources/Identifier;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/rendertype/RenderTypes;armorCutoutNoCullGlint(Lnet/minecraft/resources/Identifier;)Lnet/minecraft/client/renderer/rendertype/RenderType;"))
+    private RenderType redirectArmorEntityGlint(Identifier texture) {
         GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
-        return glintPlus.getArmorEntityGlint();
+        return glintPlus.getArmorEntityGlint(texture);
     }
-}
+}

src/main/java/me/retucio/sputnik/mixin/mixins/render/GameRendererMixin.java

@@ -15,8 +15,11 @@ import com.mojang.blaze3d.resource.CrossFrameResourcePool;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.ItemInHandRenderer;
+import net.minecraft.client.renderer.FirstPersonHandsAndItemsRenderer;
 import net.minecraft.client.renderer.state.level.CameraRenderState;
+import net.minecraft.client.renderer.state.level.PlayerRenderState;
+import net.minecraft.client.renderer.item.ItemModelResolver;
+import com.mojang.renderpearl.api.textures.GpuTextureView;
 import net.minecraft.client.resources.model.ModelManager;
 import org.joml.Matrix4fc;
 
@@ -52,23 +55,20 @@ public abstract class GameRendererMixin {
     private CrossFrameResourcePool resourcePool;
 
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void getModules(Minecraft minecraft, ItemInHandRenderer itemInHandRenderer, ModelManager modelManager, CallbackInfo ci) {
+    private void getModules(Minecraft minecraft, FirstPersonHandsAndItemsRenderer itemInHandRenderer, ModelManager modelManager, ItemModelResolver itemModelResolver, CallbackInfo ci) {
         zoom = ModuleManager.INSTANCE.getModuleByClass(Zoom.class);;
         freecam = ModuleManager.INSTANCE.getModuleByClass(Freecam.class);
         noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
         lsd = ModuleManager.INSTANCE.getModuleByClass(Lsd.class);
     }
 
-    // se aplica justo donde vanilla mete sus efectos de post (nausea, etc.): el mundo ya está
-    // en mainRenderTarget y el HUD todavía no, así que sólo distorsiona la escena 3D
-    @Inject(method = "render", at = @At(value = "INVOKE", shift = At.Shift.AFTER,
-            target = "Lnet/minecraft/client/renderer/LevelRenderer;doEntityOutline()V"))
-    private void applyLsd(DeltaTracker deltaTracker, boolean advanceGameTime, CallbackInfo ci) {
+    @Inject(method = "render", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/client/renderer/LevelRenderer;blitEntityOutline()V"))
+    private void applyLsd(CallbackInfo ci) {
         if (lsd.isEnabled()) lsd.apply(mainRenderTarget, resourcePool);
     }
 
     @Inject(method = "render", at = @At("HEAD"), cancellable = true)
-    private void avoidRenderingUnfocusedCpu(DeltaTracker dt, boolean tick, CallbackInfo ci) {
+    private void avoidRenderingUnfocusedCpu(CallbackInfo ci) {
         if (ModuleManager.INSTANCE.getModuleByClass(UnfocusedCpu.class).isEnabled() && !mc.isWindowActive()) {
             ci.cancel();
         }
@@ -81,7 +81,7 @@ public abstract class GameRendererMixin {
 
 
     @Inject(method = "renderItemInHand", at = @At("HEAD"), cancellable = true)
-    private void renderHand(CameraRenderState cameraState, float deltaPartialTick, Matrix4fc modelViewMatrix, CallbackInfo ci) {
+    private void renderHand(CameraRenderState cameraState, PlayerRenderState playerRenderState, GpuTextureView texture, CallbackInfo ci) {
         if ((zoom.isEnabled() && !zoom.showHands.getValue())
                 || (freecam.isEnabled() && !freecam.renderHands.getValue()))
             ci.cancel();

src/main/java/me/retucio/sputnik/mixin/mixins/render/ItemFeatureRendererMixin.java

@@ -3,11 +3,12 @@ package me.retucio.sputnik.mixin.mixins.render;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.render.GlintPlus;
 import net.minecraft.client.renderer.feature.ItemFeatureRenderer;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
 import net.minecraft.client.renderer.rendertype.RenderType;
-import net.minecraft.client.renderer.rendertype.RenderTypes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
 
 
 @Mixin(ItemFeatureRenderer.class)
@@ -15,17 +16,15 @@ public abstract class ItemFeatureRendererMixin {
 
     // obtener módulo en cada redirect, ya que tiene un inicializador estático
 
-    @Redirect(method = "getFoilBuffer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/rendertype/RenderTypes;glint()Lnet/minecraft/client/renderer/rendertype/RenderType;"))
-    private static RenderType redirectGlint() {
+    @ModifyExpressionValue(method = "prepareMainSubmit", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/geometry/BakedQuad$MaterialInfo;itemGlintRenderType()Lnet/minecraft/client/renderer/rendertype/RenderType;"))
+    private RenderType sputnik$colorGlint(RenderType original, @Local BakedQuad.MaterialInfo materialInfo) {
         GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
-        if (glintPlus == null) return RenderTypes.glint();
-        return glintPlus.getGlint();
+        return glintPlus == null ? original : glintPlus.getGlint(original, materialInfo);
     }
 
-    @Redirect(method = "getFoilBuffer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/rendertype/RenderTypes;glintTranslucent()Lnet/minecraft/client/renderer/rendertype/RenderType;"))
-    private static RenderType redirectGlintTranslucent() {
+    @ModifyExpressionValue(method = "prepareMainSubmit", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/geometry/BakedQuad$MaterialInfo;itemGlintSpecialRenderType()Lnet/minecraft/client/renderer/rendertype/RenderType;"))
+    private RenderType sputnik$colorSpecialGlint(RenderType original, @Local BakedQuad.MaterialInfo materialInfo) {
         GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
-        if (glintPlus == null) return RenderTypes.glintTranslucent();
-        return glintPlus.getGlintTranslucent();
+        return glintPlus == null ? original : glintPlus.getGlint(original, materialInfo);
     }
 }

src/main/java/me/retucio/sputnik/mixin/mixins/render/ItemInHandRendererMixin.java

@@ -7,7 +7,7 @@ import me.retucio.sputnik.event.render.RenderArmEvent;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.render.HandView;
 import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.ItemInHandRenderer;
+import net.minecraft.client.renderer.FirstPersonHandsAndItemsRenderer;
 import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.HumanoidArm;
@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import static me.retucio.sputnik.Sputnik.*;
 
-@Mixin(ItemInHandRenderer.class)
+@Mixin(FirstPersonHandsAndItemsRenderer.class)
 public abstract class ItemInHandRendererMixin {
 
     @Unique
@@ -49,12 +49,12 @@ public abstract class ItemInHandRendererMixin {
         handView = ModuleManager.INSTANCE.getModuleByClass(HandView.class);
     }
 
-    @Inject(method = "submitArmWithItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemInHandRenderer;renderItem(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;I)V", shift = At.Shift.BEFORE))
+    @Inject(method = "submitArmWithItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/FirstPersonHandsAndItemsRenderer;renderItem(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;I)V", shift = At.Shift.BEFORE))
     private void onRenderItem(AbstractClientPlayer player, float frameInterp, float xRot, InteractionHand hand, float attack, ItemStack itemStack, float inverseArmHeight, PoseStack matrices, SubmitNodeCollector submitNodeCollector, int lightCoords, CallbackInfo ci) {
         EVENT_BUS.post(new RenderHeldItemEvent(matrices, hand));
     }
 
-    @Inject(method = "submitArmWithItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemInHandRenderer;renderPlayerArm(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;IFFLnet/minecraft/world/entity/HumanoidArm;)V"))
+    @Inject(method = "submitArmWithItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/FirstPersonHandsAndItemsRenderer;renderPlayerArm(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;IFFLnet/minecraft/world/entity/HumanoidArm;)V"))
     private void onRenderArm(AbstractClientPlayer player, float frameInterp, float xRot, InteractionHand hand, float attack, ItemStack itemStack, float inverseArmHeight, PoseStack matrices, SubmitNodeCollector submitNodeCollector, int lightCoords, CallbackInfo ci) {
         EVENT_BUS.post(new RenderArmEvent(matrices, hand));
     }

src/main/java/me/retucio/sputnik/mixin/mixins/render/LevelRendererMixin.java

@@ -1,7 +1,6 @@
 package me.retucio.sputnik.mixin.mixins.render;
 
-import com.llamalad7.mixinextras.sugar.Local;
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
+import com.mojang.renderpearl.api.buffers.GpuBufferSlice;
 import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -10,16 +9,25 @@ import me.retucio.sputnik.event.render.Render3DEvent;
 import me.retucio.sputnik.event.render.RenderBlockOutlineEvent;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.camera.Freecam;
+import me.retucio.sputnik.module.modules.render.BreakingProgress;
 import me.retucio.sputnik.util.render.SputnikBuffers;
-import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.ShaderManager;
 import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
+import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
 import net.minecraft.client.renderer.state.level.CameraRenderState;
 import net.minecraft.client.renderer.state.level.LevelRenderState;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.sprite.AtlasManager;
 import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.util.profiling.Profiler;
 import org.joml.Matrix4fc;
 import org.joml.Vector4f;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
@@ -31,18 +39,29 @@ import static me.retucio.sputnik.Sputnik.mc;
 @Mixin(LevelRenderer.class)
 public abstract class LevelRendererMixin {
 
+    @Unique
+    private BreakingProgress bp;
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private void getModules(EntityRenderDispatcher entityRenderDispatcher, BlockEntityRenderDispatcher blockEntityRenderDispatcher, ModelManager modelManager, TextureManager textureManager, AtlasManager atlasManager, ShaderManager shaderManager, GameRenderer gameRenderer, int width, int height, CallbackInfo ci) {
+        bp = ModuleManager.INSTANCE.getModuleByClass(BreakingProgress.class);
+    }
+
     @Inject(method = "render", at = @At("RETURN"))
-    private void render(GraphicsResourceAllocator resourceAllocator, DeltaTracker dt, boolean renderOutline, CameraRenderState cameraState, Matrix4fc modelViewMatrix, GpuBufferSlice terrainFog, Vector4f fogColor, boolean shouldRenderSky, CallbackInfo ci, @Local(name = "profiler") ProfilerFiller profiler) {
+    private void render(GraphicsResourceAllocator resourceAllocator, boolean renderOutline,
+                        CameraRenderState cameraState, GpuBufferSlice terrainFog, Vector4f fogColor,
+                        boolean shouldRenderSky, boolean shouldRenderWeather, CallbackInfo ci) {
         if (mc == null || mc.level == null) return;
+        ProfilerFiller profiler = Profiler.get();
 
         PoseStack matrices = new PoseStack();
         matrices.pushPose();
 
-        matrices.mulPose(Axis.XP.rotationDegrees(cameraState.xRot));
-        matrices.mulPose(Axis.YP.rotationDegrees(cameraState.yRot + 180f));
+        matrices.rotate(Axis.XP.rotationDegrees(cameraState.xRot));
+        matrices.rotate(Axis.YP.rotationDegrees(cameraState.yRot + 180f));
 
         profiler.push(Sputnik.MOD_ID + "-3d");
-        EVENT_BUS.post(new Render3DEvent(matrices, dt, cameraState));
+        EVENT_BUS.post(new Render3DEvent(matrices, mc.getDeltaTracker(), cameraState));
         SputnikBuffers.flush();  // antes de que empiece el hud
 
         profiler.pop();
@@ -55,13 +74,6 @@ public abstract class LevelRendererMixin {
         if (freecam.isEnabled() && !freecam.blockOutlines.getValue()) ci.cancel();
     }
 
-//    @Inject(method = "hasBlindnessOrDarkness(Lnet/minecraft/client/extractRenderState/Camera;)Z", at = @At("HEAD"), cancellable = true)
-//    private void hasBlindnessOrDarkness(Camera camera, CallbackInfoReturnable<Boolean> cir) {
-//        NoRender noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
-//        if (!noRender.isEnabled()) return;
-//        if (!noRender.blindnessEffect.getValue() || !noRender.darknessEffect.getValue()) cir.setReturnValue(null);
-//    }
-
     // puto mojang con sus nombres confusos
     @ModifyArgs(method = "submitBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;submitHitOutline(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/rendertype/RenderType;Lnet/minecraft/client/renderer/state/level/BlockOutlineRenderState;IFZ)V"))
     private void modifyBlockOutline(Args args) {
@@ -72,4 +84,12 @@ public abstract class LevelRendererMixin {
         if (event.getLineWidth() != (float) args.get(5))
             args.set(5, event.getLineWidth());
     }
-}
+
+    @Inject(method = "submitBlockDestroyAnimation", at = @At("HEAD"), cancellable = true)
+    private void cancelBreakingAnim(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, LevelRenderState levelRenderState, CallbackInfo ci) {
+        if (!bp.isEnabled()) return;
+        if (bp.cancelAnim.getValue()) {
+            ci.cancel();
+        }
+    }
+}

src/main/java/me/retucio/sputnik/mixin/mixins/render/LightmapMixin.java

@@ -1,7 +1,7 @@
 package me.retucio.sputnik.mixin.mixins.render;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.textures.GpuTexture;
+import com.mojang.renderpearl.api.textures.GpuTexture;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.camera.Fullbright;
 import net.minecraft.client.renderer.Lightmap;

src/main/java/me/retucio/sputnik/mixin/mixins/render/ScreenEffectRendererMixin.java

@@ -3,9 +3,9 @@ package me.retucio.sputnik.mixin.mixins.render;
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.render.NoRender;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ScreenEffectRenderer;
 import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.state.level.PlayerRenderState;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -31,7 +31,7 @@ public abstract class ScreenEffectRendererMixin {
     }
 
     @Inject(method = "submitWater", at = @At("HEAD"), cancellable = true)
-    private static void noRenderUnderwaterOverlay(Minecraft minecraft, PoseStack matrices, SubmitNodeCollector collector, CallbackInfo ci) {
+    private static void noRenderUnderwaterOverlay(PlayerRenderState.WaterOverlay waterOverlay, PoseStack matrices, SubmitNodeCollector collector, CallbackInfo ci) {
         if (noRender.isEnabled() && !noRender.fluidOverlay.getValue()) ci.cancel();
     }
-}
+}

src/main/java/me/retucio/sputnik/mixin/mixins/render/ShaderManagerMixin.java

@@ -6,14 +6,23 @@ import net.minecraft.client.renderer.ShaderManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.server.packs.resources.PreparableReloadListener;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 
 @Mixin(ShaderManager.class)
 public abstract class ShaderManagerMixin {
 
-    @Inject(method = "apply(Lnet/minecraft/client/renderer/ShaderManager$Configs;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At("TAIL"))
-    private void onReload(CallbackInfo ci) {
-        Pipelines.init();
-        PostShaders.reload();
+    @Inject(method = "reload", at = @At("RETURN"))
+    private void onReload(PreparableReloadListener.SharedState state, Executor preparationExecutor,
+                          PreparableReloadListener.PreparationBarrier barrier, Executor applyExecutor,
+                          CallbackInfoReturnable<CompletableFuture<Void>> cir) {
+        cir.getReturnValue().thenRun(() -> {
+            Pipelines.init();
+            PostShaders.reload();
+        });
     }
-}
+}

src/main/java/me/retucio/sputnik/mixin/mixins/render/SkyRendererMixin.java

@@ -1,6 +1,7 @@
 package me.retucio.sputnik.mixin.mixins.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.renderpearl.api.commands.RenderPass;
 import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.render.NoRender;
 import me.retucio.sputnik.module.modules.world.TimeChanger;
@@ -26,17 +27,17 @@ public abstract class SkyRendererMixin {
     }
 
     @Inject(method = "renderSun", at = @At("HEAD"), cancellable = true)
-    private void onRenderSun(float rainBrightness, PoseStack poseStack, CallbackInfo ci) {
+    private void onRenderSun(RenderPass renderPass, float rainBrightness, PoseStack poseStack, CallbackInfo ci) {
         if (timeChanger.isEnabled() && !timeChanger.renderSun.getValue()) ci.cancel();
     }
 
     @Inject(method = "renderMoon", at = @At("HEAD"), cancellable = true)
-    private void onRenderMoon(MoonPhase moonPhase, float rainBrightness, PoseStack poseStack, CallbackInfo ci) {
+    private void onRenderMoon(RenderPass renderPass, MoonPhase moonPhase, float rainBrightness, PoseStack poseStack, CallbackInfo ci) {
         if (!timeChanger.isEnabled()) return;
         if (!timeChanger.renderMoon.getValue()) ci.cancel();
     }
 
-    @ModifyArg(method = "renderSunMoonAndStars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SkyRenderer;renderMoon(Lnet/minecraft/world/level/MoonPhase;FLcom/mojang/blaze3d/vertex/PoseStack;)V"))
+    @ModifyArg(method = "renderSunMoonAndStars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SkyRenderer;renderMoon(Lcom/mojang/renderpearl/api/commands/RenderPass;Lnet/minecraft/world/level/MoonPhase;FLcom/mojang/blaze3d/vertex/PoseStack;)V"))
     private MoonPhase timeChangerMoonPhase(MoonPhase original) {
         if (!timeChanger.isEnabled() || timeChanger.moonPhase.is(TimeChanger.MoonPhases.DEFAULT)) return original;
         int phase = timeChanger.moonPhase.getIndex();
@@ -45,12 +46,12 @@ public abstract class SkyRendererMixin {
     }
 
     @Inject(method = "renderStars", at = @At("HEAD"), cancellable = true)
-    private void onRenderStars(float starBrightness, PoseStack poseStack, CallbackInfo ci) {
+    private void onRenderStars(RenderPass renderPass, float starBrightness, PoseStack poseStack, CallbackInfo ci) {
         if (timeChanger.isEnabled() && !timeChanger.renderStars.getValue()) ci.cancel();
     }
 
     @Inject(method = "renderEndFlash", at = @At("HEAD"), cancellable = true)
-    private void onEndFlash(PoseStack matrices, float intensity, float xAngle, float yAngle, CallbackInfo ci) {
+    private void onEndFlash(RenderPass renderPass, PoseStack poseStack, float intensity, float xAngle, float yAngle, CallbackInfo ci) {
         NoRender noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
         if (noRender.isEnabled() && !noRender.endFlashes.getValue()) ci.cancel();
     }

src/main/java/me/retucio/sputnik/mixin/mixins/render/WeatherEffectRendererMixin.java

@@ -4,7 +4,7 @@ import me.retucio.sputnik.module.ModuleManager;
 import me.retucio.sputnik.module.modules.render.NoRender;
 import net.minecraft.client.renderer.WeatherEffectRenderer;
 import net.minecraft.client.renderer.state.level.WeatherRenderState;
-import net.minecraft.world.phys.Vec3;
+import com.mojang.renderpearl.api.commands.RenderPass;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -24,7 +24,7 @@ public abstract class WeatherEffectRendererMixin {
     }
 
     @Inject(method = "render", at = @At("HEAD"))
-    private void noRenderRainAndSnow(Vec3 cameraPos, WeatherRenderState renderState, CallbackInfo ci) {
+    private void noRenderRainAndSnow(WeatherRenderState renderState, RenderPass renderPass, CallbackInfo ci) {
         if (noRender.isEnabled()) {
             if (!noRender.rain.getValue()) renderState.rainColumns.clear();
             if (!noRender.snow.getValue()) renderState.snowColumns.clear();

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

@@ -1,6 +1,7 @@
 package me.retucio.sputnik.module;
 
 import com.github.retucio.neutrino.EventListener;
+import com.mojang.blaze3d.platform.InputConstants;
 import me.retucio.sputnik.Sputnik;
 import me.retucio.sputnik.config.ConfigManager;
 import me.retucio.sputnik.event.sputnik.ToggleModuleEvent;
@@ -16,7 +17,6 @@ import me.retucio.sputnik.util.Colors;
 import me.retucio.sputnik.util.I18nUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
 import java.lang.reflect.Method;
@@ -41,7 +41,7 @@ public class Module {
     protected KeySetting bind = new KeySetting(
             "tecla",
             "tecla asignada al módulo, ESC para desactivar",
-            GLFW.GLFW_KEY_UNKNOWN
+            InputConstants.UNKNOWN.getValue()
     ).translationKey("sputnik.setting.common.bind");
 
     // dejar al usuario elegir si el módulo debería apagarse tras soltar su tecla asignada, o si la tecla debería alternar su estado

src/main/java/me/retucio/sputnik/module/modules/camera/CrosshairPlus.java

@@ -1,6 +1,6 @@
 package me.retucio.sputnik.module.modules.camera;
 
-import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.renderpearl.api.pipeline.RenderPipeline;
 import me.retucio.sputnik.module.Category;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.setting.settings.ColorSetting;

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

@@ -31,7 +31,7 @@ import net.minecraft.network.protocol.game.*;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Vector3d;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 /** continúa en:
  * @see CameraMixin
@@ -104,7 +104,7 @@ public class Freecam extends Module {
     private final KeySetting scrollKey = sgSpeed.add(new KeySetting(
             "tecla del scroll",
             "tecla a mantener pulsada para cambiar velocidad con el scroll",
-            GLFW.GLFW_KEY_LEFT_CONTROL
+            InputConstants.KEY_LCONTROL
     ));
 
     private final NumberSetting scrollSens = sgSpeed.add(new NumberSetting(
@@ -128,7 +128,7 @@ public class Freecam extends Module {
         super("cámara libre",
                 "permite a la cámara moverse independientemente del jugador. útil para explorar alrededores",
                 Category.CAMERA,
-                GLFW.GLFW_KEY_V);
+                InputConstants.KEY_V);
 
         speedSetting.onUpdate(newSpeed -> speed = newSpeed);
     }
@@ -262,37 +262,36 @@ public class Freecam extends Module {
         Packet<?> packet = event.getPacket();
         if (packet instanceof ServerboundPlayerActionPacket
                 || packet instanceof ServerboundUseItemOnPacket
-                || packet instanceof ServerboundUseItemPacket
-                || packet instanceof ServerboundSwingPacket) {
+                || packet instanceof ServerboundUseItemPacket) {
             event.cancel();
         }
     }
 
     @EventListener
     private void onKey(KeyEvent event) {
-        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_F3)) return;
+        if (KeyUtil.isKeyDown(InputConstants.KEY_F3)) return;
         if (mc.gui.screen() != null) return;
 
         net.minecraft.client.input.KeyEvent key = new net.minecraft.client.input.KeyEvent(event.getKey(), event.getScancode(), 0);
 
         boolean shouldCancel = true;
         if (mc.options.keyUp.matches(key)) {
-            forward = event.getAction() != GLFW.GLFW_RELEASE;
+            forward = event.getAction() != InputConstants.RELEASE;
             mc.options.keyUp.setDown(false);
         } else if (mc.options.keyDown.matches(key)) {
-            backward = event.getAction() != GLFW.GLFW_RELEASE;
+            backward = event.getAction() != InputConstants.RELEASE;
             mc.options.keyDown.setDown(false);
         } else if (mc.options.keyRight.matches(key)) {
-            right = event.getAction() != GLFW.GLFW_RELEASE;
+            right = event.getAction() != InputConstants.RELEASE;
             mc.options.keyRight.setDown(false);
         } else if (mc.options.keyLeft.matches(key)) {
-            left = event.getAction() != GLFW.GLFW_RELEASE;
+            left = event.getAction() != InputConstants.RELEASE;
             mc.options.keyLeft.setDown(false);
         } else if (mc.options.keyJump.matches(key)) {
-            up = event.getAction() != GLFW.GLFW_RELEASE;
+            up = event.getAction() != InputConstants.RELEASE;
             mc.options.keyJump.setDown(false);
         } else if (mc.options.keyShift.matches(key)) {
-            down = event.getAction() != GLFW.GLFW_RELEASE;
+            down = event.getAction() != InputConstants.RELEASE;
             mc.options.keyShift.setDown(false);
         } else {
             shouldCancel = false;
@@ -303,29 +302,29 @@ public class Freecam extends Module {
 
     @EventListener
     private void onMouseClick(MouseClickEvent event) {  // por si el restrasado del usuario usa el ratón para moverse
-        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_F3)) return;
+        if (KeyUtil.isKeyDown(InputConstants.KEY_F3)) return;
         if (mc.gui.screen() != null) return;
 
         MouseButtonEvent click = new MouseButtonEvent(0, 0, new MouseButtonInfo(event.getButton(), 0));
 
         boolean shouldCancel = true;
         if (mc.options.keyUp.matchesMouse(click)) {
-            forward = event.getAction() != GLFW.GLFW_RELEASE;
+            forward = event.getAction() != InputConstants.RELEASE;
             mc.options.keyUp.setDown(false);
         } else if (mc.options.keyDown.matchesMouse(click)) {
-            backward = event.getAction() != GLFW.GLFW_RELEASE;
+            backward = event.getAction() != InputConstants.RELEASE;
             mc.options.keyDown.setDown(false);
         } else if (mc.options.keyRight.matchesMouse(click)) {
-            right = event.getAction() != GLFW.GLFW_RELEASE;
+            right = event.getAction() != InputConstants.RELEASE;
             mc.options.keyRight.setDown(false);
         } else if (mc.options.keyLeft.matchesMouse(click)) {
-            left = event.getAction() != GLFW.GLFW_RELEASE;
+            left = event.getAction() != InputConstants.RELEASE;
             mc.options.keyLeft.setDown(false);
         } else if (mc.options.keyJump.matchesMouse(click)) {
-            up = event.getAction() != GLFW.GLFW_RELEASE;
+            up = event.getAction() != InputConstants.RELEASE;
             mc.options.keyJump.setDown(false);
         } else if (mc.options.keyShift.matchesMouse(click)) {
-            down = event.getAction() != GLFW.GLFW_RELEASE;
+            down = event.getAction() != InputConstants.RELEASE;
             mc.options.keyShift.setDown(false);
         } else {
             shouldCancel = false;

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

@@ -9,7 +9,7 @@ import me.retucio.sputnik.module.setting.settings.NumberSetting;
 import me.retucio.sputnik.util.KeyUtil;
 import net.minecraft.client.CameraType;
 import net.minecraft.util.Mth;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 /** continúa en:
  * @see CameraMixin
@@ -37,7 +37,7 @@ public class Freelook extends Module {
         super("perspectiva libre",
                 "te permite mover la cámara de la perspectiva sin mover la del jugador, o vice versa",
                 Category.CAMERA,
-                GLFW.GLFW_KEY_B);
+                InputConstants.KEY_B);
 
         keyMode.setDefaultValue(KeyMode.HOLD);
         keyMode.setValue(KeyMode.HOLD);
@@ -75,18 +75,18 @@ public class Freelook extends Module {
             for (int i = 0; i < (arrowSens.getValue() * 2); i++) {
                 switch (mode.getValue()) {
                     case PLAYER -> {
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT)) yaw -= 0.5f;
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_RIGHT)) yaw += 0.5f;
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_UP)) pitch -= 0.5f;
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_DOWN)) pitch += 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_LEFT)) yaw -= 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_RIGHT)) yaw += 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_UP)) pitch -= 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_DOWN)) pitch += 0.5f;
                     } case CAMERA -> {
                         float yaw = mc.player.getYRot();
                         float pitch = mc.player.getXRot();
 
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT)) yaw -= 0.5f;
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_RIGHT)) yaw += 0.5f;
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_UP)) pitch -= 0.5f;
-                        if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_DOWN)) pitch += 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_LEFT)) yaw -= 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_RIGHT)) yaw += 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_UP)) pitch -= 0.5f;
+                        if (KeyUtil.isKeyDown(InputConstants.KEY_DOWN)) pitch += 0.5f;
 
                         mc.player.setYRot(yaw);
                         mc.player.setXRot(pitch);

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

@@ -9,7 +9,7 @@ import me.retucio.sputnik.module.setting.settings.EnumSetting;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.awt.*;
 
@@ -39,7 +39,7 @@ public class Fullbright extends Module {
         super("brilli brilli",
                 "deshabilita la oscuridad (y aplica colores a los shaders)",
                 Category.CAMERA,
-                GLFW.GLFW_KEY_K);
+                InputConstants.KEY_K);
 
         mode.onUpdate(mode -> { if (mode != Modes.POTION) disableNightVision(); });
     }

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

@@ -10,7 +10,7 @@ import me.retucio.sputnik.module.setting.settings.BooleanSetting;
 import me.retucio.sputnik.module.setting.settings.KeySetting;
 import me.retucio.sputnik.module.setting.settings.NumberSetting;
 import net.minecraft.client.CameraType;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 /** continúa en:
@@ -36,7 +36,7 @@ public class PerspectivePlus extends Module {
             1, 0, 8, 0.1));
 
     private final KeySetting scrollKey = sgScroll.add(new KeySetting("tecla del scroll", "qué tecla mantener para usar la rueda del ratón",
-            GLFW.GLFW_KEY_LEFT_ALT));
+            InputConstants.KEY_LALT));
 
     private double distance;
 

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

@@ -9,7 +9,7 @@ import me.retucio.sputnik.module.setting.SettingGroup;
 import me.retucio.sputnik.module.setting.settings.BooleanSetting;
 import me.retucio.sputnik.module.setting.settings.KeySetting;
 import me.retucio.sputnik.module.setting.settings.NumberSetting;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 /** continúa en:
@@ -33,7 +33,7 @@ public class Zoom extends Module {
     private final NumberSetting scrollSens = sgScroll.add(new NumberSetting("sensibilidad del scroll", "sensibilidad de la rueda del ratón (0 para desactivar)",
             0.4, 0, 8, 0.1));
     private final KeySetting scrollKey = sgScroll.add(new KeySetting("tecla del scroll", "qué tecla mantener para usar la rueda del ratón",
-            GLFW.GLFW_KEY_LEFT_CONTROL));
+            InputConstants.KEY_LCONTROL));
 
     private final NumberSetting mouseSensMultiplier = sgCam.add(new NumberSetting("sensibilidad", "multiplicador de la sensibilidad del ratón",
             0.4, 0, 1, 0.05));
@@ -49,7 +49,7 @@ public class Zoom extends Module {
         super("zoom",
                 "lupa",
                 Category.CAMERA,
-                GLFW.GLFW_KEY_F);
+                InputConstants.KEY_F);
 
         keyMode.setDefaultValue(KeyMode.HOLD);
         keyMode.setValue(KeyMode.HOLD);
@@ -103,7 +103,7 @@ public class Zoom extends Module {
 
     @EventListener
     private void onMouseScroll(MouseScrollEvent event) {
-        boolean key = scrollKey.getValue() == GLFW.GLFW_KEY_UNKNOWN || scrollKey.isDown();
+        boolean key = scrollKey.getValue() == InputConstants.UNKNOWN.getValue() || scrollKey.isDown();
         if (isEnabled() && scrollSens.getValue() > 0 && key) {
             value += event.getVertical() * 0.25 * (scrollSens.getValue() * value);
             if (value < 1) value = 1;

src/main/java/me/retucio/sputnik/module/modules/client/ClientSettingsModule.java

@@ -1,6 +1,7 @@
 package me.retucio.sputnik.module.modules.client;
 
 import com.github.retucio.neutrino.EventListener;
+import com.mojang.blaze3d.platform.InputConstants;
 import me.retucio.sputnik.Sputnik;
 import me.retucio.sputnik.command.CommandManager;
 import me.retucio.sputnik.event.TickEvent;
@@ -17,7 +18,6 @@ import me.retucio.sputnik.module.setting.settings.NumberSetting;
 import me.retucio.sputnik.module.setting.settings.StringSetting;
 import me.retucio.sputnik.util.ChatUtil;
 import me.retucio.sputnik.util.Colors;
-import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
 
@@ -130,7 +130,7 @@ public class ClientSettingsModule extends Module {
         super("interfaz",
                 "ajustes de la interfaz, y otros misceláneos",
                 Category.CLIENT,
-                GLFW.GLFW_KEY_RIGHT_SHIFT);
+                InputConstants.KEY_RSHIFT);
 
         Sputnik.EVENT_BUS.subscribe(this);
 

src/main/java/me/retucio/sputnik/module/modules/client/Friends.java

@@ -11,7 +11,7 @@ import me.retucio.sputnik.util.ChatUtil;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 public class Friends extends Module {
@@ -34,8 +34,8 @@ public class Friends extends Module {
 
     @EventListener
     public void onMouseClick(MouseClickEvent event) {
-        if (event.getButton() == GLFW.GLFW_MOUSE_BUTTON_MIDDLE
-                && event.getAction() == GLFW.GLFW_PRESS
+        if (event.getButton() == InputConstants.MOUSE_BUTTON_MIDDLE
+                && event.getAction() == InputConstants.PRESS
                 && middleClick.getValue())
         {
             Entity target = mc.crosshairPickEntity;

src/main/java/me/retucio/sputnik/module/modules/client/Hud.java

@@ -9,7 +9,7 @@ import me.retucio.sputnik.ui.hud.HudRenderer;
 import me.retucio.sputnik.ui.hud.HudEditorScreen;
 import me.retucio.sputnik.ui.hud.elements.CustomImageElement;
 import me.retucio.sputnik.ui.hud.elements.DynoElement;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.awt.*;
 
@@ -32,7 +32,7 @@ public class Hud extends Module {
     public KeySetting editorKey = sgEditor.add(new KeySetting(
             "tecla del editor",
             "tecla asignada al editor de elementos del hud",
-            GLFW.GLFW_KEY_INSERT
+            InputConstants.KEY_INSERT
     ));
 
     public BooleanSetting axialMovement = sgEditor.add(new BooleanSetting(
@@ -144,7 +144,7 @@ public class Hud extends Module {
         super("HUD",
                 "superposición de la pantalla con info. adicional",
                 Category.CLIENT,
-                GLFW.GLFW_KEY_F12
+                InputConstants.KEY_F12
         );
 
         dyno.onUpdate(v -> {

src/main/java/me/retucio/sputnik/module/modules/combat/KillAura.java

@@ -93,7 +93,7 @@ public class KillAura extends Module {
         if (!mc.level.isTickingEntity(entity)) return;
 
         if (swingHand.getValue()) {
-            mc.player.swing(InteractionHand.MAIN_HAND);
+            mc.player.swing(InteractionHand.MAIN_HAND, net.minecraft.world.item.component.SwingAnimation.DEFAULT, false);
         }
 
         mc.gameMode.attack(mc.player, entity);

src/main/java/me/retucio/sputnik/module/modules/inventory/Burglar.java

@@ -15,7 +15,7 @@ import net.minecraft.world.Container;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import org.jspecify.annotations.NonNull;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.List;
 
@@ -31,19 +31,19 @@ public class Burglar extends Module {
     private final KeySetting triggerKey = sgKeys.add(new KeySetting(
             "tecla activadora",
             "tecla a mantener para que las otras teclas funcionen",
-            GLFW.GLFW_KEY_LEFT_CONTROL
+            InputConstants.KEY_LCONTROL
     ));
 
     private final KeySetting stealKey = sgKeys.add(new KeySetting(
             "robar",
             "tecla para robar todo",
-            GLFW.GLFW_KEY_S
+            InputConstants.KEY_S
     ));
 
     private final KeySetting dumpKey = sgKeys.add(new KeySetting(
             "dejar",
             "tecla para dejar todo",
-            GLFW.GLFW_KEY_D
+            InputConstants.KEY_D
     ));
 
 
@@ -67,7 +67,7 @@ public class Burglar extends Module {
 
     @EventListener
     private void onKey(KeyEvent event) {
-        if (!triggerKey.isDown() || event.getAction() != GLFW.GLFW_PRESS
+        if (!triggerKey.isDown() || event.getAction() != InputConstants.PRESS
                 || !(mc.gui.screen() instanceof AbstractContainerScreen<?> container)) return;
         if (event.getKey() == stealKey.getValue()) steal(container);
         if (event.getKey() == dumpKey.getValue()) dump(container);

src/main/java/me/retucio/sputnik/module/modules/inventory/InventoryPlus.java

@@ -12,7 +12,7 @@ import me.retucio.sputnik.util.InventoryUtil;
 import me.retucio.sputnik.util.KeyUtil;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.world.inventory.Slot;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 /**
@@ -21,9 +21,9 @@ import org.lwjgl.glfw.GLFW;
 
 public class InventoryPlus extends Module {
 
-    private final KeySetting row1key = sgGeneral.add(new KeySetting("fila 1", "tecla para mover items a la primera fila", GLFW.GLFW_KEY_A));
-    private final KeySetting row2key = sgGeneral.add(new KeySetting("fila 2", "tecla para mover items a la segunda fila", GLFW.GLFW_KEY_S));
-    private final KeySetting row3key = sgGeneral.add(new KeySetting("fila 3", "tecla para mover items a la tercera fila", GLFW.GLFW_KEY_D));
+    private final KeySetting row1key = sgGeneral.add(new KeySetting("fila 1", "tecla para mover items a la primera fila", InputConstants.KEY_A));
+    private final KeySetting row2key = sgGeneral.add(new KeySetting("fila 2", "tecla para mover items a la segunda fila", InputConstants.KEY_S));
+    private final KeySetting row3key = sgGeneral.add(new KeySetting("fila 3", "tecla para mover items a la tercera fila", InputConstants.KEY_D));
 
     public InventoryPlus() {
         super("inventario plus",
@@ -33,13 +33,13 @@ public class InventoryPlus extends Module {
 
     @EventListener
     private void onKey(KeyEvent event) {
-        if (event.getAction() == GLFW.GLFW_RELEASE) return;
+        if (event.getAction() == InputConstants.RELEASE) return;
         processInput(event.getKey(), event);
     }
 
     @EventListener
     private void onMouseButton(MouseClickEvent event) {
-        if (event.getAction() == GLFW.GLFW_RELEASE) return;
+        if (event.getAction() == InputConstants.RELEASE) return;
         processInput(event.getButton(), event);
     }
 

src/main/java/me/retucio/sputnik/module/modules/inventory/ShulkerPeek.java

@@ -22,7 +22,7 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.component.ItemContainerContents;
 import net.minecraft.world.level.block.ShulkerBoxBlock;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.awt.*;
 import java.util.HashMap;
@@ -30,7 +30,7 @@ import java.util.HashMap;
 
 public class ShulkerPeek extends Module {
 
-    public final KeySetting previewKey = sgGeneral.add(new KeySetting("tecla de previsualización", "tecla a mantener para previsualizar", GLFW.GLFW_KEY_LEFT_ALT));
+    public final KeySetting previewKey = sgGeneral.add(new KeySetting("tecla de previsualización", "tecla a mantener para previsualizar", InputConstants.KEY_LALT));
     public final BooleanSetting showTooltips = sgGeneral.add(new BooleanSetting("mostrar tooltips", "añadir texto a los tooltips (cajas de texto) de los shulkers", true));
 
     public static final HashMap<Item, Color> SHULKER_COLORS = new HashMap<>();
@@ -65,12 +65,12 @@ public class ShulkerPeek extends Module {
         if (mc.player == null) return;
         if (event.getKey() != previewKey.getValue()) return;
 
-        if (event.getAction() == GLFW.GLFW_PRESS) {
+        if (event.getAction() == InputConstants.PRESS) {
             openPreviewScreen();
             return;
         }
 
-        if (event.getAction() == GLFW.GLFW_REPEAT) {
+        if (event.getAction() == InputConstants.REPEAT) {
             if (mc.gui.screen() instanceof PreviewScreen preview) {
                 if (preview.getType() != PreviewScreen.PreviewType.SHULKER)
                     openPreviewScreen();
@@ -78,7 +78,7 @@ public class ShulkerPeek extends Module {
             return;
         }
 
-        if (event.getAction() == GLFW.GLFW_RELEASE) {
+        if (event.getAction() == InputConstants.RELEASE) {
             if (mc.gui.screen() instanceof PreviewScreen preview)
                 preview.onClose();
         }
@@ -117,6 +117,6 @@ public class ShulkerPeek extends Module {
         if (container == null) return true;
 
         // .stream()?
-        return container.allItemsCopyStream().allMatch(ItemStack::isEmpty);
+        return container.nonEmptyItemCopyStream().allMatch(ItemStack::isEmpty);
     }
 }

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

@@ -14,8 +14,12 @@ import java.util.UUID;
 
 public class FakePlayer extends Module {
 
-    private final StringSetting name = sgGeneral.add(new StringSetting("nombre", "qué nombre asignarle al jugador", "apio boy", 22));
+    private final StringSetting name = sgGeneral.add(new StringSetting(
+            "nombre", "qué nombre asignarle al jugador",
+            "apio boy", 22
+    ));
 
+    private static int nextFakeId = -2;
     private RemotePlayer player = null;
 
     public FakePlayer() {
@@ -27,7 +31,7 @@ public class FakePlayer extends Module {
     @Override
     public void onEnable() {
         if (mc.level == null) return;
-        addPlayer(mc.player, name.getValue());
+        player = addPlayer(mc.player, name.getValue());
         super.onEnable();
     }
 
@@ -40,20 +44,23 @@ public class FakePlayer extends Module {
 
     // intento miserable de hacer que no colisione con jugadores
     public RemotePlayer addPlayer(Player playerToCopy, String dummyName) {
-        player = new RemotePlayer(mc.level, new GameProfile(UUID.randomUUID(), dummyName)) {
-            @Override public void playerTouch(@NonNull Player player) {}
+        RemotePlayer fake = new RemotePlayer(mc.level, new GameProfile(UUID.randomUUID(), dummyName)) {
+            @Override public void playerTouch(@NonNull Player p) {}
         };
 
-        player.restoreFrom(playerToCopy);
-        player.setCustomNameVisible(true);
-        player.noPhysics = true;
-        player.horizontalCollision = false;
-        player.verticalCollision = false;
-        mc.level.addEntity(player);
-        return player;
+        fake.restoreFrom(playerToCopy);
+        fake.setCustomNameVisible(true);
+        fake.noPhysics = true;
+        fake.horizontalCollision = false;
+        fake.verticalCollision = false;
+
+        fake.setId(nextFakeId--);
+        mc.level.addEntity(fake);
+        return fake;
     }
 
     public void removePlayer() {
+        if (player == null) return;
         player.setRemoved(Entity.RemovalReason.KILLED);
         player.onClientRemoval();
         player = null;

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

@@ -257,12 +257,16 @@ public class LogoutSpots extends Module {
                 if (outlines.getValue()) {
                     RenderUtil.drawBlockFaceOutlines(matrices,
                             BlockPos.containing(x + halfWidth, y, z + halfWidth),
-                            Direction.UP, outlineColor.getValue(), lineWidth.getFloatValue(), true);
+                            Direction.UP, outlineColor.getValue(), lineWidth.getFloatValue(),
+                            true
+                    );
                 }
                 if (filling.getValue()) {
                     RenderUtil.drawBlockFaceFilled(matrices,
                             BlockPos.containing(x + halfWidth, y, z + halfWidth),
-                            Direction.UP, fillingColor.getValue(), 0.001f, true);
+                            Direction.UP, fillingColor.getValue(), 0.001f,
+                            true
+                    );
                 }
             }
         }

src/main/java/me/retucio/sputnik/module/modules/player/AirPlace.java

@@ -20,7 +20,7 @@ import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 public class AirPlace extends Module {
@@ -52,7 +52,7 @@ public class AirPlace extends Module {
     private final KeySetting scrollKey = sgScroll.add(new KeySetting(
             "tecla del scroll",
             "tecla a mantener para que el scroll funcione",
-            GLFW.GLFW_KEY_LEFT_CONTROL
+            InputConstants.KEY_LCONTROL
     ));
 
     private final NumberSetting scrollSens = sgScroll.add(new NumberSetting(
@@ -138,7 +138,7 @@ public class AirPlace extends Module {
 
     @EventListener
     private void onKey(KeyEvent event) {
-        if (event.getKey() == scrollKey.getValue() && event.getAction() == GLFW.GLFW_RELEASE) {
+        if (event.getKey() == scrollKey.getValue() && event.getAction() == InputConstants.RELEASE) {
             rangeValue = (int) Math.clamp(rangeValue, range.getMin(), range.getMax());
         }
     }

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

@@ -7,7 +7,7 @@ import me.retucio.sputnik.module.setting.settings.NumberSetting;
 
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 public class FastUse extends Module {
@@ -61,7 +61,7 @@ public class FastUse extends Module {
         super("precoz",
                 "hace cosas como usar items o colocar bloques más rápido",
                 Category.PLAYER,
-                GLFW.GLFW_KEY_F6);
+                InputConstants.KEY_F6);
 
         items.onUpdate(itemCooldown::visibility);
         blocks.onUpdate(blockCooldown::visibility);

src/main/java/me/retucio/sputnik/module/modules/render/BreakingProgress.java

@@ -26,6 +26,12 @@ public class BreakingProgress extends Module {
     private final EnumSetting<BreakMode> breakMode = sgGeneral.add(new EnumSetting<>("modo de minado", "elige si el cubo se encoge o se dilata",
             BreakMode.class, BreakMode.INWARDS));
 
+    public final BooleanSetting cancelAnim = sgGeneral.add(new BooleanSetting(
+            "cancelar animación",
+            "no renderizar la anim. original",
+            true
+    ));
+
     private final BooleanSetting outlines = sgOutlines.add(new BooleanSetting("contorno", "renderizar contorno", true));
     private final ColorSetting outlineColor = sgOutlines.add(new ColorSetting("color del contorno", "color del contorno",
             new Color(0, 255, 0, 200), false));

src/main/java/me/retucio/sputnik/module/modules/render/GlintPlus.java

@@ -8,9 +8,11 @@ import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.setting.settings.BooleanSetting;
 import me.retucio.sputnik.module.setting.settings.EnumSetting;
 import me.retucio.sputnik.util.render.GlintRenderType;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
 import net.minecraft.client.renderer.rendertype.RenderType;
 import net.minecraft.client.renderer.rendertype.RenderTypes;
 import net.minecraft.world.item.DyeColor;
+import net.minecraft.resources.Identifier;
 
 /** continúa en:
  * @see RenderBuffersMixin
@@ -45,28 +47,22 @@ public class GlintPlus extends Module {
                 Category.RENDER);
     }
 
-    public RenderType getGlint() {
-        int color = getGlintColor();
-        if (!isEnabled() || !items.getValue()) return RenderTypes.glint();
-        return GlintRenderType.glintColor.get(color);
-    }
-
-    public RenderType getGlintTranslucent() {
-        int color = getGlintColor();
-        if (!isEnabled() || !items.getValue()) return RenderTypes.glintTranslucent();
-        return GlintRenderType.glintTranslucentColor.get(color);
+    public RenderType getGlint(RenderType vanilla, BakedQuad.MaterialInfo materialInfo) {
+        if (!isEnabled() || !items.getValue()) return vanilla;
+        return GlintRenderType.itemGlint(glintColor.getValue().getRealName(), vanilla,
+                materialInfo.sprite().atlasLocation());
     }
 
     public RenderType getEntityGlint() {
         int color = getGlintColor();
-        if (!isEnabled() || !items.getValue()) return RenderTypes.entityGlint();
+        if (!isEnabled() || !items.getValue()) return RenderTypes.entitySolidGlint(net.minecraft.client.renderer.texture.TextureAtlas.LOCATION_BLOCKS);
         return GlintRenderType.entityGlintColor.get(color);
     }
 
-    public RenderType getArmorEntityGlint() {
+    public RenderType getArmorEntityGlint(Identifier armorTexture) {
         int color = getGlintColor();
-        if (!isEnabled() || !armor.getValue()) return RenderTypes.armorEntityGlint();
-        return GlintRenderType.armorEntityGlintColor.get(color);
+        if (!isEnabled() || !armor.getValue()) return RenderTypes.armorCutoutNoCullGlint(armorTexture);
+        return GlintRenderType.armorEntityGlint(glintColor.getValue().getRealName(), armorTexture);
     }
 
     public int getGlintColor() {

src/main/java/me/retucio/sputnik/module/modules/render/HandView.java

@@ -128,9 +128,9 @@ public class HandView extends Module {
     }
 
     private void rotate(PoseStack matrix, Vec3 rotation) {
-        matrix.mulPose(Axis.XP.rotationDegrees((float) rotation.x));
-        matrix.mulPose(Axis.YP.rotationDegrees((float) rotation.y));
-        matrix.mulPose(Axis.ZP.rotationDegrees((float) rotation.z));
+        matrix.rotate(Axis.XP.rotationDegrees((float) rotation.x));
+        matrix.rotate(Axis.YP.rotationDegrees((float) rotation.y));
+        matrix.rotate(Axis.ZP.rotationDegrees((float) rotation.z));
     }
 
     private void scale(PoseStack matrix, Vec3 scale) {

src/main/java/me/retucio/sputnik/module/modules/render/ItemPhysics.java

@@ -50,7 +50,7 @@ public class ItemPhysics extends Module {
         var accessor = (ItemStackRenderStateAccessor) event.renderState.item;
         for (int i = 0; i < accessor.getActiveLayerCount(); i++) {
             ItemStackRenderState.LayerRenderState layer = accessor.getLayers()[i];
-            ModelInfo info = getInfo(layer.prepareQuadList());
+            ModelInfo info = getInfo(((LayerRenderStateAccessor) layer).sputnik$getQuads().all());
 
             matrices.pushPose();
             applyTransformation(matrices, ((LayerRenderStateAccessor) layer).sputnik$getTransform());
@@ -58,7 +58,7 @@ public class ItemPhysics extends Module {
             offsetInWater(matrices, event.itemEntity);
 
             if (info.flat) {
-                matrices.mulPose(Axis.XP.rotationDegrees(90));
+                matrices.rotate(Axis.XP.rotationDegrees(90));
                 matrices.translate(0, 0, info.offsetZ);
             }
 
@@ -73,7 +73,7 @@ public class ItemPhysics extends Module {
 
                 float degrees = (random.nextFloat() * 2 - 1) * 90;
                 matrices.translate(x, y, z);
-                matrices.mulPose(axis.rotationDegrees(degrees));
+                matrices.rotate(axis.rotationDegrees(degrees));
                 matrices.translate(-x, -y, -z);
             }
 

src/main/java/me/retucio/sputnik/module/modules/render/Lsd.java

@@ -7,6 +7,7 @@ import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
 import me.retucio.sputnik.Sputnik;
 import me.retucio.sputnik.module.Category;
 import me.retucio.sputnik.module.Module;
+import me.retucio.sputnik.module.setting.settings.EnumSetting;
 import me.retucio.sputnik.module.setting.settings.NumberSetting;
 import me.retucio.sputnik.util.render.PostShader;
 
@@ -43,10 +44,11 @@ public class Lsd extends Module {
             1, 0, 10, 0.1
     ));
 
-    private final NumberSetting seed = sgGeneral.add(new NumberSetting(
-            "tono",
-            "desplazamiento de tono que se aplica sobre la imagen",
-            0.3, 0, 1, 0.01
+    private final EnumSetting<ColorMode> color = sgGeneral.add(new EnumSetting<>(
+            "color",
+            "elige el color del efecto",
+            ColorMode.class,
+            ColorMode.RAINBOW
     ));
 
     private final NumberSetting speed = sgGeneral.add(new NumberSetting(
@@ -71,7 +73,7 @@ public class Lsd extends Module {
     public void apply(RenderTarget target, GraphicsResourceAllocator pool) {
         SHADER.render(target, pool, b -> b
                 .putFloat(strength.getFloatValue())
-                .putFloat(seed.getFloatValue())
+                .putFloat(color.getValue().hue)
                 .putFloat(rotations.getFloatValue())
                 .putFloat(getTime()));
     }
@@ -82,4 +84,28 @@ public class Lsd extends Module {
         double elapsed = (System.nanoTime() - startNanos) / 1_000_000_000.0;
         return (float) ((elapsed * speed.getValue()) % 100_000.0);
     }
+
+    public enum ColorMode {
+        RAINBOW("gay", -1.0F),
+        RED("psoe", 0.0F),
+        ORANGE("ciudadanos", 0.08F),
+        YELLOW("d21", 0.16F),
+        GREEN("vox", 0.33F),
+        CYAN("eh bildu", 0.5F),
+        BLUE("pp", 0.66F),
+        PURPLE("podemos", 0.78F),
+        PINK("sumar", 0.92F);
+
+        private final String name;
+        private final float hue;
+
+        ColorMode(String name, float hue) {
+            this.name = name; this.hue = hue;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
 }

src/main/java/me/retucio/sputnik/module/modules/render/Nametags.java

@@ -3,6 +3,7 @@ package me.retucio.sputnik.module.modules.render;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import me.retucio.sputnik.Sputnik;
+import me.retucio.sputnik.config.ConfigManager;
 import me.retucio.sputnik.mixin.mixins.entity.EntityMixin;
 import me.retucio.sputnik.mixin.mixins.entity.ItemEntityMixin;
 import me.retucio.sputnik.mixin.mixins.player.PlayerMixin;
@@ -90,7 +91,7 @@ public class Nametags extends Module {
         defaultEntities.replace(EntityTypes.TNT, true);
         entities.setDefaultValue(defaultEntities);
 
-        health.onUpdate(v -> healthMode.visibility(v));
+        health.onUpdate(healthMode::visibility);
 
         entities.onUpdate(entities -> {
             items.visibility(entities.get(EntityTypes.ITEM));
@@ -131,7 +132,7 @@ public class Nametags extends Module {
     @SuppressWarnings("deprecation")
     public String getOwnerName(EntityReference<LivingEntity> owner) {
         // si el dueño está en línea (de manera segura)
-        if (mc.level instanceof UniquelyIdentifyable queriableWorld) {  // UUIDLookup<?> ??
+        if (mc.level instanceof UniquelyIdentifyable queriableWorld) {
             LivingEntity ownerEntity = owner.resolve(queriableWorld, LivingEntity.class);
             if (ownerEntity instanceof Player playerEntity) return playerEntity.getName().getString();
         }

src/main/java/me/retucio/sputnik/module/modules/render/Stylish.java

@@ -12,7 +12,7 @@ import me.retucio.sputnik.module.setting.settings.KeySetting;
 import me.retucio.sputnik.module.setting.settings.NumberSetting;
 import net.minecraft.world.InteractionHand;
 import org.joml.Quaternionf;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@ public class Stylish extends Module {
 
     private final KeySetting key = sgGeneral.add(new KeySetting(
             "tecla", "tecla a pulsar para hacer el truco",
-            GLFW.GLFW_KEY_Y
+            InputConstants.KEY_Y
     ));
 
     private final EnumSetting<TrickType> trick = sgGeneral.add(new EnumSetting<>(
@@ -87,7 +87,7 @@ public class Stylish extends Module {
     @EventListener
     private void onKey(KeyEvent event) {
         if (event.getKey() != key.getValue()) return;
-        if (event.getAction() != GLFW.GLFW_PRESS) return;
+        if (event.getAction() != InputConstants.PRESS) return;
         if (spinning) return;
 
         long now = System.currentTimeMillis();
@@ -175,41 +175,41 @@ public class Stylish extends Module {
         float angleRad = (float) Math.toRadians(degrees * directionSign);
 
         switch (type) {
-            case SPIN -> matrices.mulPose(new Quaternionf().rotationZ(angleRad));
+            case SPIN -> matrices.rotate(new Quaternionf().rotationZ(angleRad));
 
-            case FLIP -> matrices.mulPose(new Quaternionf().rotationX(angleRad));
+            case FLIP -> matrices.rotate(new Quaternionf().rotationX(angleRad));
 
-            case ROLL -> matrices.mulPose(new Quaternionf().rotationY(angleRad));
+            case ROLL -> matrices.rotate(new Quaternionf().rotationY(angleRad));
 
             case TWIRL -> {
                 // combina spin + flip para un giro más aparatoso
-                matrices.mulPose(new Quaternionf().rotationZ(angleRad));
-                matrices.mulPose(new Quaternionf().rotationX(angleRad * 0.5f));
+                matrices.rotate(new Quaternionf().rotationZ(angleRad));
+                matrices.rotate(new Quaternionf().rotationX(angleRad * 0.5f));
             }
 
             case WAVE -> {
                 // bamboleo tipo saludo, sin vuelta completa
                 float waveAngle = (float) Math.sin(fraction * Math.PI * spins.getIntValue()) * 25f;
-                matrices.mulPose(new Quaternionf().rotationZ((float) Math.toRadians(waveAngle * directionSign)));
+                matrices.rotate(new Quaternionf().rotationZ((float) Math.toRadians(waveAngle * directionSign)));
             }
 
             case POP -> {
                 // pequeño pulso de escala, como si el ítem "respirara"
                 float scalePulse = 1f + (float) Math.sin(fraction * Math.PI) * 0.25f;
                 matrices.scale(scalePulse, scalePulse, scalePulse);
-                matrices.mulPose(new Quaternionf().rotationZ(angleRad * 0.3f));
+                matrices.rotate(new Quaternionf().rotationZ(angleRad * 0.3f));
             }
 
             case THROW_CATCH -> {
                 // el ítem "sube", gira en el aire y "cae" de vuelta
                 float height = (float) Math.sin(fraction * Math.PI) * 0.35f;
                 matrices.translate(0f, height, 0f);
-                matrices.mulPose(new Quaternionf().rotationX(angleRad * 2f));
+                matrices.rotate(new Quaternionf().rotationX(angleRad * 2f));
             }
 
             case RANDOM -> {
                 // no debería llegar aquí, resolveTrick lo reemplaza antes
-                matrices.mulPose(new Quaternionf().rotationZ(angleRad));
+                matrices.rotate(new Quaternionf().rotationZ(angleRad));
             }
         }
     }

src/main/java/me/retucio/sputnik/module/modules/world/AutoMine.java

@@ -34,7 +34,7 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.awt.*;
 import java.util.ArrayDeque;
@@ -204,8 +204,8 @@ public class AutoMine extends Module {
     private void onClick(MouseClickEvent event) {
         if (mc.gui.screen() != null) return;
         if (mc.level == null || mc.hitResult == null) return;
-        if (event.getAction() != GLFW.GLFW_PRESS) return;
-        if (event.getButton() != GLFW.GLFW_MOUSE_BUTTON_1) return;
+        if (event.getAction() != InputConstants.PRESS) return;
+        if (event.getButton() != InputConstants.MOUSE_BUTTON_LEFT) return;
         BlockHitResult bhr;
         if (mc.hitResult.getType() == HitResult.Type.BLOCK) {
             bhr = (BlockHitResult) mc.hitResult;

src/main/java/me/retucio/sputnik/module/modules/world/AutoSign.java

@@ -12,6 +12,10 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
+import net.minecraft.world.level.block.entity.SignTextSlot;
+import me.retucio.sputnik.util.NetworkUtil;
+
+import java.util.List;
 
 
 public class AutoSign extends Module {
@@ -41,21 +45,24 @@ public class AutoSign extends Module {
         if (event.getScreen() instanceof AbstractSignEditScreen screen && text != null && mc != null && mc.player != null) {
             event.cancel();
             SignBlockEntity sign = ((AbstractSignEditScreenAccessor) screen).getBlockEntity();
-            fillText(sign.getBlockPos(), sign.isFacingFrontText(mc.player), text);
+            fillText(sign.getBlockPos(), sign.getSlotPlayerIsFacing(mc.player), text);
         }
     }
 
     @EventListener
     private void onSendPacket(PacketEvent.Send event) {
         if (event.getPacket() instanceof ServerboundSignUpdatePacket packet) {
-            if (text == null) text = packet.getLines().clone();
-            else System.arraycopy(text, 0, packet.getLines(), 0, 4);
+            if (text == null) {
+                text = packet.lines().toArray(String[]::new);
+            } else {
+                event.cancel();
+                NetworkUtil.sendPacketNoEvent(new ServerboundSignUpdatePacket(
+                        packet.pos(), List.of(text), packet.slot()));
+            }
         }
     }
 
-    private void fillText(BlockPos blockPos, boolean front, String[] text) {
-        mc.getConnection().send(new ServerboundSignUpdatePacket(
-            blockPos, front, text[0], text[1], text[2], text[3]
-        ));
+    private void fillText(BlockPos blockPos, SignTextSlot slot, String[] text) {
+        mc.getConnection().send(new ServerboundSignUpdatePacket(blockPos, List.of(text), slot));
     }
-}
+}

src/main/java/me/retucio/sputnik/module/modules/world/AutoTool.java

@@ -19,7 +19,7 @@ import net.minecraft.world.item.component.Tool;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.HashMap;
 import java.util.List;
@@ -96,7 +96,7 @@ public class AutoTool extends Module {
         if (mc.gui.screen() != null) return;
 
         if (mode.is(AutoToolMode.ON_TICK) && mc.options.keyAttack.isDown()) {
-            handle(KeyUtil.getKey(mc.options.keyAttack), GLFW.GLFW_PRESS);
+            handle(KeyUtil.getKey(mc.options.keyAttack), InputConstants.PRESS);
         }
 
         if (startedMining && delaySetting.getIntValue() > 0) {
@@ -132,9 +132,9 @@ public class AutoTool extends Module {
         if (mc.player == null) return;
         if (key != KeyUtil.getKey(mc.options.keyAttack)) return;
 
-        if (action == GLFW.GLFW_PRESS) {
+        if (action == InputConstants.PRESS) {
             onStartMining();
-        } else if (action == GLFW.GLFW_RELEASE) {
+        } else if (action == InputConstants.RELEASE) {
             onFinishMining();
         }
     }

src/main/java/me/retucio/sputnik/module/modules/world/BlockInfo.java

@@ -20,7 +20,7 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -31,7 +31,7 @@ public class BlockInfo extends Module {
     private final KeySetting key = sgGeneral.add(new KeySetting(
             "tecla",
             "tecla a pulsar para obtener la info.",
-            GLFW.GLFW_KEY_CAPS_LOCK
+            InputConstants.KEY_CAPSLOCK
     ));
 
     private final EnumSetting<CopyMode> copy = sgGeneral.add(new EnumSetting<>(
@@ -56,7 +56,7 @@ public class BlockInfo extends Module {
     @EventListener
     private void onKey(KeyEvent event) {
         if (mc.player == null || mc.level == null) return;
-        if (event.getKey() != key.getValue() || event.getAction() != GLFW.GLFW_PRESS) return;
+        if (event.getKey() != key.getValue() || event.getAction() != InputConstants.PRESS) return;
 
         HitResult result = mc.player.pick(
                 mc.player.blockInteractionRange(),

src/main/java/me/retucio/sputnik/module/modules/world/ColoredSigns.java

@@ -6,6 +6,9 @@ import me.retucio.sputnik.module.Category;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.setting.settings.StringSetting;
 import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
+import me.retucio.sputnik.util.NetworkUtil;
+
+import java.util.ArrayList;
 
 
 public class ColoredSigns extends Module {
@@ -26,9 +29,11 @@ public class ColoredSigns extends Module {
     @EventListener
     private void onSendPacket(PacketEvent.Send event) {
         if (event.getPacket() instanceof ServerboundSignUpdatePacket packet) {
-            for (int i = 0; i < 4; i++) {
-                packet.getLines()[i] = packet.getLines()[i].replace(symbol.getValue(), "\247" + "\247a");
-            }
+            event.cancel();
+            NetworkUtil.sendPacketNoEvent(new ServerboundSignUpdatePacket(
+                    packet.pos(), packet.lines().stream()
+                    .map(line -> line.replace(symbol.getValue(), "\247" + "\247a"))
+                    .toList(), packet.slot()));
         }
     }
 }

src/main/java/me/retucio/sputnik/module/modules/world/Racist.java

@@ -5,7 +5,7 @@ import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.util.EntityUtil;
 import me.retucio.sputnik.util.RotationUtil;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.monster.EnderMan;
+import net.minecraft.world.entity.monster.Enderman;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
 public class Racist extends Module {
 
     private int lookTimer;
-    private final List<EnderMan> lookedEndermen = new ArrayList<>();
+    private final List<Enderman> lookedEndermen = new ArrayList<>();
 
     public Racist() {
         super("racismo",
@@ -33,7 +33,7 @@ public class Racist extends Module {
         if (mc.level == null || mc.player == null) return;
 
         for (Entity entity : mc.level.getEntities().getAll()) {
-            if (!(entity instanceof EnderMan enderman)) continue;
+            if (!(entity instanceof Enderman enderman)) continue;
 
             if (shouldLookAt(enderman)) {
                 lookAtEnderman(enderman);
@@ -47,12 +47,12 @@ public class Racist extends Module {
         lookTimer++;
     }
 
-    private boolean shouldLookAt(EnderMan enderman) {
+    private boolean shouldLookAt(Enderman enderman) {
         return !(lookedEndermen.contains(enderman)) && lookTimer >= 10
                 && EntityUtil.hasLineOfSight(mc.player, enderman);
     }
 
-    private void lookAtEnderman(EnderMan enderman) {
+    private void lookAtEnderman(Enderman enderman) {
         RotationUtil.lookAt(RotationUtil.LOW, enderman, EntityUtil.Target.HEAD, 0, RotationUtil.Mode.CLIENT);
     }
 }

src/main/java/me/retucio/sputnik/module/setting/settings/KeySetting.java

@@ -1,5 +1,6 @@
 package me.retucio.sputnik.module.setting.settings;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import me.retucio.sputnik.config.ConfigManager;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.ModuleManager;
@@ -8,7 +9,7 @@ import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
 import me.retucio.sputnik.util.ChatUtil;
 import me.retucio.sputnik.util.KeyUtil;
 import net.minecraft.network.chat.Component;
-import org.lwjgl.glfw.GLFW;
+
 
 public class KeySetting extends Setting<Integer> {
 
@@ -22,32 +23,19 @@ public class KeySetting extends Setting<Integer> {
     public void setValue(Integer value) {
         if (this.value.equals(value)) return;
 
-        if (value == GLFW.GLFW_KEY_ESCAPE) {
-            this.value = GLFW.GLFW_KEY_UNKNOWN;  // asignar la tecla ESC a deshabilitar la tecla
+        if (value == InputConstants.KEY_ESCAPE) {
+            this.value = InputConstants.UNKNOWN.getValue();  // asignar la tecla ESC a deshabilitar la tecla
             fireUpdateEvent();
-            // this.value y no value: lo que se ha guardado es UNKNOWN, no ESC. si no, al
-            // listener se le decía que la tecla era ESC
             if (updateListener != null) updateListener.accept(this.value);
             return;
         }
 
-        // con "teclas multimódulo" puesto se permite repetir tecla, que es justo lo que
-        // dice el ajuste. antes se le quitaba la tecla al otro módulo igualmente, así que
-        // el ajuste sólo servía para las teclas de vanilla.
-        //
-        // mientras se carga la config. no se toca nada: son las teclas que el usuario ya
-        // tenía, y quitárselas aquí se las machacaba (y encima guardaba el -1).
-        //
-        // clientSettings puede ser null: el módulo de ajustes se construye en el
-        // inicializador estático de ClientSettingsPanel, y su propia tecla por defecto pasa
-        // por aquí antes de que el campo esté asignado
-        if (ModuleManager.INSTANCE != null
-                && ClientSettingsPanel.clientSettings != null
-                && !ConfigManager.INSTANCE.isApplying()
-                && !ClientSettingsPanel.clientSettings.multipleKeybinds.getValue()) {
+        if (ModuleManager.INSTANCE != null && !ConfigManager.INSTANCE.isApplying()
+                && !ClientSettingsPanel.clientSettings.multipleKeybinds.getValue()
+        ) {
             for (Module module : ModuleManager.INSTANCE.getModules())
-                if (module.getKey() == value && value != -1) {
-                    module.setKey(-1);
+                if (module.getKey() == value && value != InputConstants.UNKNOWN.getValue()) {
+                    module.setKey(InputConstants.UNKNOWN.getValue());
                     ChatUtil.info(Component.translatable("sputnik.setting.key.reset", module.getDisplayName()));
                 }
         }

src/main/java/me/retucio/sputnik/ui/hud/HudEditor.java

@@ -9,7 +9,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.Nullable;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -120,11 +120,11 @@ public class HudEditor {
 
         int offset = hud.arrowOffset.getIntValue();
         switch (key) {
-            case GLFW.GLFW_KEY_UP -> selected.setY(Math.max(1, selected.getY() - offset));
-            case GLFW.GLFW_KEY_DOWN -> selected.setY(Math.min(
+            case InputConstants.KEY_UP -> selected.setY(Math.max(1, selected.getY() - offset));
+            case InputConstants.KEY_DOWN -> selected.setY(Math.min(
                     mc.getWindow().getGuiScaledHeight() - selected.getH() + 1, selected.getY() + offset));
-            case GLFW.GLFW_KEY_LEFT -> selected.setX(Math.max(1, selected.getX() - offset));
-            case GLFW.GLFW_KEY_RIGHT -> selected.setX(Math.min(
+            case InputConstants.KEY_LEFT -> selected.setX(Math.max(1, selected.getX() - offset));
+            case InputConstants.KEY_RIGHT -> selected.setX(Math.min(
                     mc.getWindow().getGuiScaledWidth() - selected.getW() + 1, selected.getX() + offset));
         }
     }

src/main/java/me/retucio/sputnik/ui/hud/HudEditorScreen.java

@@ -11,7 +11,7 @@ import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import org.jspecify.annotations.NonNull;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 public class HudEditorScreen extends Screen {
@@ -61,10 +61,10 @@ public class HudEditorScreen extends Screen {
     @EventListener
     public void onKey(KeyEvent event) {
         if (mc.gui.screen() != INSTANCE) return;
-        if (event.getAction() == GLFW.GLFW_RELEASE) return;
+        if (event.getAction() == InputConstants.RELEASE) return;
         event.cancel();
 
-        if (event.getKey() == GLFW.GLFW_KEY_ESCAPE) {
+        if (event.getKey() == InputConstants.KEY_ESCAPE) {
             HudEditor.INSTANCE.saveAll();
             HudEditor.INSTANCE.unselect();
             mc.gui.setScreen(null);

src/main/java/me/retucio/sputnik/ui/screen/ClickGui.java

@@ -12,11 +12,10 @@ import me.retucio.sputnik.module.Category;
 import me.retucio.sputnik.module.Module;
 import me.retucio.sputnik.module.setting.Setting;
 import me.retucio.sputnik.module.setting.settings.ColorSetting;
-import me.retucio.sputnik.ui.widgets.buttons.FriendButton;
+import me.retucio.sputnik.ui.screen.tabs.FriendsTab;
 import me.retucio.sputnik.ui.widgets.buttons.settings.ListButton;
 import me.retucio.sputnik.ui.widgets.buttons.ModuleButton;
 import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
-import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
 import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
 import me.retucio.sputnik.ui.widgets.panels.settings.ColorPickerPanel;
 import me.retucio.sputnik.ui.widgets.panels.ModulePanel;
@@ -31,7 +30,6 @@ import me.retucio.sputnik.ui.widgets.misc.ScrollBarWidget;
 import me.retucio.sputnik.ui.widgets.misc.SearchBarWidget;
 import me.retucio.sputnik.ui.widgets.misc.TabBarWidget;
 import me.retucio.sputnik.util.Colors;
-import me.retucio.sputnik.ui.widgets.panels.settings.FriendSettingsPanel;
 import me.retucio.sputnik.util.KeyUtil;
 
 import me.retucio.sputnik.util.MiscUtil;
@@ -44,7 +42,7 @@ import net.minecraft.network.chat.Component;
 
 import org.jetbrains.annotations.Nullable;
 import org.jspecify.annotations.NonNull;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,7 +67,6 @@ public class ClickGui extends Screen {
     private final List<ModulePanel> modulePanels = new ArrayList<>();
     private final List<SettingsPanel> settingsPanels = new ArrayList<>();
     private final ClientSettingsPanel clientSettingsPanel = new ClientSettingsPanel(620, 280, 100, 20);
-    private final FriendsPanel friendsPanel = new FriendsPanel(40, 280, 100, 20);
 
     private final ScrollBarWidget scrollBar = new ScrollBarWidget();
     private final SearchBarWidget searchBar = new SearchBarWidget(320, 10, 320, 20);
@@ -78,6 +75,9 @@ public class ClickGui extends Screen {
     private final TabBarWidget tabBar = new TabBarWidget(this::onTabLeft);
     private final ProfilesTab profilesTab = new ProfilesTab();
     private final MacrosTab macrosTab = new MacrosTab();
+    private final FriendsTab friendsTab = new FriendsTab();
+
+    private static final int PLACEMENT_SEARCH_STEP = 8;
 
     public ClickGui() {
         super(Component.translatable("sputnik.ui.clickgui.title"));
@@ -94,9 +94,11 @@ public class ClickGui extends Screen {
     public void extractRenderState(@NonNull GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
         switch (tabBar.getSelected()) {
             case MODULES -> renderModules(gui, mouseX, mouseY, delta);
+            case CLIENT_SETTINGS -> renderClientSettings(gui, mouseX, mouseY, delta);
             case HUD -> renderHud(gui, mouseX, mouseY);
             case PROFILES -> profilesTab.render(gui, mouseX, mouseY, delta);
             case MACROS -> macrosTab.render(gui, mouseX, mouseY, delta);
+            case FRIENDS -> friendsTab.render(gui, mouseX, mouseY, delta);
         }
 
         tabBar.render(gui, mouseX, mouseY, delta);
@@ -112,6 +114,11 @@ public class ClickGui extends Screen {
         HudEditor.INSTANCE.render(gui, mouseX, mouseY);
     }
 
+    private void renderClientSettings(GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
+        clientSettingsPanel.render(gui, mouseX, mouseY, delta);
+        clientSettingsPanel.drawTooltips(gui, mouseX, mouseY);
+    }
+
     private void renderModules(@NonNull GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
         scrollBar.setWindowHeight(mc.getWindow().getGuiScaledHeight());
         scrollBar.setContentHeight(calculateContentHeight());
@@ -124,7 +131,6 @@ public class ClickGui extends Screen {
         searchBar.updatePosition(mouseX, mouseY);
 
         // actualizar la posición de renderizado vertical de los paneles cada tick
-        friendsPanel.updateRenderY(scrollOffset);
         clientSettingsPanel.updateRenderY(scrollOffset);
         for (ModulePanel mp : modulePanels) {
             mp.updateRenderY(scrollOffset);
@@ -149,12 +155,6 @@ public class ClickGui extends Screen {
             sp.drawTooltips(gui, mouseX, mouseY);
         }
 
-        friendsPanel.render(gui, mouseX, mouseY, delta);
-        friendsPanel.updatePosition(mouseX, mouseY);
-
-        clientSettingsPanel.render(gui, mouseX, mouseY, delta);
-        clientSettingsPanel.updatePosition(mouseX, mouseY);
-
         filterSearchResults();
 
         renderBottomGradient(gui, scrollOffset);
@@ -191,40 +191,75 @@ public class ClickGui extends Screen {
             bottom = Math.max(bottom, sp.getY() + sp.getH() + sp.getTotalHeight());
         }
 
-        int friendsBottom = friendsPanel.getY() + friendsPanel.getH()
-                + (friendsPanel.isExtended() ? friendsPanel.getTotalHeight() : 0);
-        bottom = Math.max(bottom, friendsBottom);
-
-        int clientBottom = clientSettingsPanel.getY() + clientSettingsPanel.getH()
-                + (clientSettingsPanel.isExtended() ? clientSettingsPanel.getTotalHeight() : 0);
-        bottom = Math.max(bottom, clientBottom);
-
         return bottom + 20;  // padding
     }
 
+    private int[] findEmptyPosition(int w, int h, int preferredX, int preferredY) {
+        int screenWidth = mc.getWindow().getGuiScaledWidth();
+        int maxX = Math.max(0, screenWidth - w);
+        int startX = Math.clamp(preferredX, 0, maxX);
+        int startY = Math.max(preferredY, 0);
+
+        int searchBottom = calculateContentHeight() + h;
+
+        for (int y = startY; y <= searchBottom; y += PLACEMENT_SEARCH_STEP) {
+            for (int candidateX = 0; candidateX <= maxX; candidateX += PLACEMENT_SEARCH_STEP) {
+                if (!overlapsAnything(candidateX, y, w, h)) {
+                    return new int[]{candidateX, y};
+                }
+            }
+        }
+
+        // no hay hueco: colocarlo debajo de todo lo demás, para llegar a él haciendo scroll
+        return new int[]{startX, calculateContentHeight()};
+    }
+
+    private boolean overlapsAnything(int x, int y, int w, int h) {
+        for (ModulePanel mp : modulePanels) {
+            int mpHeight = mp.getH() + (mp.isExtended() ? mp.getTotalHeight() : 0);
+            if (rectsOverlap(x, y, w, h, mp.getX(), mp.getY(), mp.getW(), mpHeight)) return true;
+        }
+
+        for (SettingsPanel sp : settingsPanels) {
+            int spHeight = sp.getH() + sp.getTotalHeight();
+            if (rectsOverlap(x, y, w, h, sp.getX(), sp.getY(), sp.getW(), spHeight)) return true;
+        }
+
+        return false;
+    }
+
+    private boolean rectsOverlap(int ax, int ay, int aw, int ah, int bx, int by, int bw, int bh) {
+        return ax < bx + bw && ax + aw > bx
+                && ay < by + bh && ay + ah > by;
+    }
+
     @Override
     public boolean mouseClicked(MouseButtonEvent click, boolean doubled) {
         int x = (int) click.x();
         int y = (int) click.y();
+        int button = KeyUtil.toLegacyMouseButton(click.button());
 
-        if (tabBar.handleClick(x, y, click.button())) return super.mouseClicked(click, doubled);
+        if (tabBar.handleClick(x, y, button)) return super.mouseClicked(click, doubled);
 
         switch (tabBar.getSelected()) {
             case MODULES -> {
-                miscWidgets.forEach(w -> w.mouseClicked(x, y, click.button()));
-
-                friendsPanel.mouseClicked(x, y, click.button());
-                clientSettingsPanel.mouseClicked(x, y, click.button());
+                miscWidgets.forEach(w -> w.mouseClicked(x, y, button));
                 for (ModulePanel mp : modulePanels.reversed()) {
-                    mp.mouseClicked(x, y, click.button());
+                    mp.mouseClicked(x, y, button);
                 }
                 for (SettingsPanel sp : new ArrayList<>(settingsPanels)) {
-                    sp.mouseClicked(x, y, click.button());
+                    sp.mouseClicked(x, y, button);
                 }
             }
-            case HUD -> HudEditor.INSTANCE.mouseClicked(x, y, click.button());
-            case PROFILES -> profilesTab.mouseClicked(x, y, click.button());
-            case MACROS -> macrosTab.mouseClicked(x, y, click.button());
+            case CLIENT_SETTINGS -> {
+                if (!clientSettingsPanel.mouseClickedGroupTab(x, y, button)) {
+                    clientSettingsPanel.mouseClicked(x, y, button);
+                }
+            }
+            case HUD -> HudEditor.INSTANCE.mouseClicked(x, y, button);
+            case PROFILES -> profilesTab.mouseClicked(x, y, button);
+            case MACROS -> macrosTab.mouseClicked(x, y, button);
+            case FRIENDS -> friendsTab.mouseClicked(x, y, button);
         }
 
         return super.mouseClicked(click, doubled);
@@ -234,25 +269,29 @@ public class ClickGui extends Screen {
     public boolean mouseReleased(MouseButtonEvent click) {
         int x = (int) click.x();
         int y = (int) click.y();
+        int button = KeyUtil.toLegacyMouseButton(click.button());
 
         if (tabBar.getSelected() == Tab.HUD) {
-            HudEditor.INSTANCE.mouseReleased(click.button());
+            HudEditor.INSTANCE.mouseReleased(button);
+            return super.mouseReleased(click);
+        }
+
+        if (tabBar.getSelected() == Tab.CLIENT_SETTINGS) {
+            clientSettingsPanel.mouseReleased(x, y, button);
             return super.mouseReleased(click);
         }
 
         if (tabBar.getSelected() != Tab.MODULES) return super.mouseReleased(click);
 
         miscWidgets.forEach(w -> w.mouseReleased(
-                x, y, click.button()));
+                x, y, button));
 
         // registrar cuándo se suelta el clic, en cada panel respectivamente
-        friendsPanel.mouseReleased(x, y, click.button());
-        clientSettingsPanel.mouseReleased(x, y, click.button());
         for (ModulePanel mp : modulePanels.reversed()) {
-            mp.mouseReleased(x, y, click.button());
+            mp.mouseReleased(x, y, button);
         }
         for (SettingsPanel sp : new ArrayList<>(settingsPanels)) {
-            sp.mouseReleased(x, y, click.button());
+            sp.mouseReleased(x, y, button);
         }
 
         return super.mouseReleased(click);
@@ -260,8 +299,14 @@ public class ClickGui extends Screen {
 
     @Override
     public boolean mouseDragged(@NonNull MouseButtonEvent click, double deltaX, double deltaY) {
+        int button = KeyUtil.toLegacyMouseButton(click.button());
         if (tabBar.getSelected() == Tab.HUD) {
-            HudEditor.INSTANCE.mouseDragged((int) click.x(), (int) click.y(), click.button());
+            HudEditor.INSTANCE.mouseDragged((int) click.x(), (int) click.y(), button);
+            return super.mouseDragged(click, deltaX, deltaY);
+        }
+
+        if (tabBar.getSelected() == Tab.CLIENT_SETTINGS) {
+            clientSettingsPanel.mouseDragged((int) click.x(), (int) click.y());
             return super.mouseDragged(click, deltaX, deltaY);
         }
 
@@ -285,11 +330,13 @@ public class ClickGui extends Screen {
 
         switch (tabBar.getSelected()) {
             case MODULES -> searchBar.onKey(event.getKey(), event.getAction());
+            case CLIENT_SETTINGS -> clientSettingsPanel.onKey(event.getKey(), event.getAction());
             case HUD -> {
-                if (event.getAction() != GLFW.GLFW_RELEASE) HudEditor.INSTANCE.onKey(event.getKey());
+                if (event.getAction() != InputConstants.RELEASE) HudEditor.INSTANCE.onKey(event.getKey());
             }
             case PROFILES -> profilesTab.onKey(event.getKey(), event.getAction());
             case MACROS -> macrosTab.onKey(event.getKey(), event.getAction());
+            case FRIENDS -> friendsTab.onKey(event.getKey(), event.getAction());
         }
     }
 
@@ -303,7 +350,7 @@ public class ClickGui extends Screen {
     @EventListener
     public void onMouseMiddleButton(MouseClickEvent event) {
         // mover todos los paneles a un punto visible al presionar shift + la rueda del ratón
-        if (Sputnik.mc.gui.screen() != this || event.getButton() != 2 || !KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_SHIFT)) return;
+        if (Sputnik.mc.gui.screen() != this || event.getButton() != 2 || !KeyUtil.isKeyDown(InputConstants.KEY_LSHIFT)) return;
 
         int h = Sputnik.mc.getWindow().getGuiScaledHeight();
         int minY = Math.min(modulePanels.stream().mapToInt(Panel::getY).min().getAsInt(), settingsPanels.stream().mapToInt(Panel::getY).min().getAsInt());
@@ -313,7 +360,6 @@ public class ClickGui extends Screen {
         if (correction != 0) {
             modulePanels.forEach(mp -> mp.setY(mp.getY() + correction));
             settingsPanels.forEach(sp -> sp.setY(sp.getY() + correction));
-            friendsPanel.setY(friendsPanel.getY() + correction);
             clientSettingsPanel.setY(clientSettingsPanel.getY() + correction);
         }
     }
@@ -382,26 +428,6 @@ public class ClickGui extends Screen {
             }
         }
 
-        for (Button b : friendsPanel.getButtons()) {
-            if (!(b instanceof FriendButton fb)) continue;
-            Friend friend = fb.getFriend();
-
-            if (searchInput.isEmpty()) {
-                friend.setSearchMatch(true);
-                continue;
-            }
-
-            String name = MiscUtil.removeAccentMarks(friend.getName());
-            String uuid = MiscUtil.removeAccentMarks(friend.getUuid().toString());
-
-            if (!clientSettings.matchCase.getValue()) {
-                name = name.toLowerCase();
-                uuid = uuid.toLowerCase();
-            }
-
-            friend.setSearchMatch(name.contains(searchInput) || uuid.contains(searchInput));
-        }
-
         for (Button b : clientSettingsPanel.getButtons()) {
             if (!(b instanceof SettingButton<?> sb)) continue;
             Setting<?> setting = sb.getSetting();
@@ -433,12 +459,18 @@ public class ClickGui extends Screen {
         );
     }
 
-    // abrir un marco donde se encuentran los ajustes del módulo deseado
+    // abrir un marco donde se encuentran los ajustes del módulo deseado, buscando un
+    // hueco libre cerca de (x, y) para que no se solape con otros paneles ya abiertos
     public void openSettingsPanel(Module module, int x, int y) {
-        // asegurarse de que no se sale de la pantalla
-        x = Math.clamp(x, 0, mc.getWindow().getGuiScaledWidth() - 80);
+        SettingsPanel panel = new SettingsPanel(module, 0, 0, 100, 20);
+        panel.updateTotalHeight();  // altura real disponible ya tras el constructor
+
+        int panelHeight = panel.getH() + panel.getTotalHeight();
+        int[] position = findEmptyPosition(panel.getW(), panelHeight, x, y);
+
+        panel.setX(position[0]);
+        panel.setY(position[1]);
 
-        SettingsPanel panel = new SettingsPanel(module, x, y, 100, 20);
         settingsPanels.add(panel);
 
         Sputnik.EVENT_BUS.post(new SettingsPanelEvent.Open(panel));
@@ -499,33 +531,6 @@ public class ClickGui extends Screen {
         }
     }
 
-    public boolean isFriendSettingsPanelOpen(Friend friend) {
-        for (SettingsPanel sp : getSettingsPanels()) {
-            if (sp instanceof FriendSettingsPanel fsp) {
-                if (fsp.getFriend().getUuid().equals(friend.getUuid())) return true;
-            }
-        }
-        return false;
-    }
-
-    public void openFriendSettingsPanel(Friend friend, int x, int y) {
-        FriendSettingsPanel panel = new FriendSettingsPanel(friend, x + 80, y + 5, 153, 20);
-        if (isFriendSettingsPanelOpen(friend)) {
-            closeFriendSettingsPanel(friend);
-            return;
-        }
-        settingsPanels.add(panel);
-    }
-
-    public void closeFriendSettingsPanel(Friend friend) {
-        for (SettingsPanel sp : getSettingsPanels()) {
-            if (sp instanceof FriendSettingsPanel fsp && fsp.getFriend().getUuid().equals(friend.getUuid())) {
-                settingsPanels.remove(fsp);
-                break;
-            }
-        }
-    }
-
     public void refreshListButtons() {
         for (SettingsPanel panel : settingsPanels)
             for (Button button : panel.getButtons())
@@ -546,7 +551,8 @@ public class ClickGui extends Screen {
     // lo miran Sputnik#onInput y el editor del hud para no tratar las teclas que se están
     // escribiendo como atajos de módulos
     public boolean isCapturingInput() {
-        return searchBar.isFocused() || profilesTab.isCapturingInput() || macrosTab.isCapturingInput();
+        return searchBar.isFocused() || profilesTab.isCapturingInput()
+            || macrosTab.isCapturingInput() || friendsTab.isCapturingInput();
     }
 
     public boolean isOnHudTab() {
@@ -599,7 +605,6 @@ public class ClickGui extends Screen {
     public List<ModulePanel> getModulePanels() { return modulePanels; }
     public List<SettingsPanel> getSettingsPanels() { return settingsPanels; }
     public ClientSettingsPanel getClientSettingsPanel() { return clientSettingsPanel; }
-    public FriendsPanel getFriendsPanel() { return friendsPanel; }
     public SearchBarWidget getSearchBar() { return searchBar; }
     public TabBarWidget getTabBar() { return tabBar; }
     public ScrollBarWidget getScrollBar() { return scrollBar; }

src/main/java/me/retucio/sputnik/ui/screen/PreviewScreen.java

@@ -40,7 +40,7 @@ public class PreviewScreen extends Screen {
         super(Component.translatable("sputnik.ui.preview.shulker"));
         this.color = ShulkerPeek.SHULKER_COLORS.get(shulker.getItem());
         this.title = shulker.getHoverName();
-        this.inventory = shulker.get(DataComponents.CONTAINER).allItemsCopyStream().toList();
+        this.inventory = shulker.get(DataComponents.CONTAINER).nonEmptyItemCopyStream().toList();
         this.parent = parent;
         this.type = PreviewType.SHULKER;
     }

src/main/java/me/retucio/sputnik/ui/screen/Tab.java

@@ -6,9 +6,11 @@ import me.retucio.sputnik.util.I18nUtil;
 public enum Tab {
 
     MODULES("módulos"),
+    CLIENT_SETTINGS("ajustes"),
     HUD("hud"),
     PROFILES("perfiles"),
-    MACROS("macros");
+    MACROS("macros"),
+    FRIENDS("amigos");
 
     private final String name;
 

src/main/java/me/retucio/sputnik/ui/screen/tabs/FriendsTab.java

@@ -0,0 +1,101 @@
+package me.retucio.sputnik.ui.screen.tabs;
+
+import me.retucio.sputnik.friend.Friend;
+import me.retucio.sputnik.friend.FriendManager;
+import me.retucio.sputnik.ui.hud.HudRenderer;
+import me.retucio.sputnik.ui.widgets.misc.FriendWidget;
+import me.retucio.sputnik.util.Colors;
+import me.retucio.sputnik.util.I18nUtil;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.network.chat.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+
+public class FriendsTab {
+
+    private static final Minecraft mc = Minecraft.getInstance();
+
+    private static final int COLUMNS = 3;
+    private static final int CARD_HEIGHT = 60;
+    private static final int MARGIN = 6;
+    private static final int TOP = 40;
+
+    // uno por amigo, persistente entre frames para no perder el foco del campo de apodo mientras se edita
+    private final Map<UUID, FriendWidget> widgets = new LinkedHashMap<>();
+
+    public void render(GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
+        List<Friend> friends = FriendManager.INSTANCE.getFriends();
+        syncWidgets(friends);
+
+        int screenWidth = mc.getWindow().getGuiScaledWidth();
+        int cardWidth = screenWidth / COLUMNS;
+
+        gui.centeredText(mc.font, Component.translatable("sputnik.ui.friends.title"),
+                screenWidth / 2, TOP - 14, Colors.mainColor.getRGB());
+
+        if (friends.isEmpty()) {
+            gui.centeredText(mc.font, Component.translatable("sputnik.ui.friends.empty"),
+                    screenWidth / 2, TOP + 20, Colors.instructionsTextColor.getRGB());
+            return;
+        }
+
+        int col = 0;
+        int row = 0;
+        for (Friend friend : friends) {
+            FriendWidget widget = widgets.get(friend.getUuid());
+
+            int cx = col * cardWidth + MARGIN;
+            int cy = TOP + row * (CARD_HEIGHT + MARGIN);
+            int cw = cardWidth - MARGIN * 2;
+
+            widget.updateBounds(cx, cy, cw, CARD_HEIGHT);
+            widget.render(gui, mouseX, mouseY, delta);
+
+            col++;
+            if (col >= COLUMNS) {
+                col = 0;
+                row++;
+            }
+        }
+    }
+
+    // añade widgets para amigos nuevos y elimina los de quienes ya no lo son
+    private void syncWidgets(List<Friend> friends) {
+        widgets.keySet().removeIf(uuid -> friends.stream().noneMatch(f -> f.getUuid().equals(uuid)));
+
+        for (Friend friend : friends) {
+            widgets.computeIfAbsent(friend.getUuid(),
+                    uuid -> new FriendWidget(friend, 0, 0, 0, CARD_HEIGHT, this::remove));
+        }
+    }
+
+    private void remove(Friend friend) {
+        FriendManager.INSTANCE.remove(friend);
+        HudRenderer.INSTANCE.pushNotification(
+                I18nUtil.orElse("sputnik.ui.friends.title", "amigos"),
+                I18nUtil.orElse("sputnik.ui.friends.removed", "sputnik.ui.friends.removed", friend.getName()));
+    }
+
+    public void mouseClicked(int mouseX, int mouseY, int button) {
+        for (FriendWidget widget : widgets.values()) {
+            if (widget.isHovered(mouseX, mouseY) || widget.isCapturingInput()) {
+                widget.mouseClicked(mouseX, mouseY, button);
+            }
+        }
+    }
+
+    public void onKey(int key, int action) {
+        for (FriendWidget widget : widgets.values()) {
+            if (widget.isCapturingInput()) widget.onKey(key, action);
+        }
+    }
+
+    public boolean isCapturingInput() {
+        return widgets.values().stream().anyMatch(FriendWidget::isCapturingInput);
+    }
+}

src/main/java/me/retucio/sputnik/ui/screen/tabs/MacrosTab.java

@@ -10,7 +10,7 @@ import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.FormattedCharSequence;
 import org.jetbrains.annotations.Nullable;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,7 @@ public class MacrosTab {
     private static final int TOP = 46;
 
     private final TextFieldWidget nameField = new TextFieldWidget(
-            () -> "sputnik.ui.macros.nameplaceholder", 0, 0, LIST_WIDTH - 24, ROW_HEIGHT)
+            () -> "sputnik.ui.macros.nameplaceholder", 0, 0, LIST_WIDTH - 44, ROW_HEIGHT)
             .maxLength(32)
             .onSubmit(this::create);
 
@@ -52,10 +52,8 @@ public class MacrosTab {
         nameField.setY(TOP);
         nameField.render(gui, mouseX, mouseY, delta);
 
-        int addX = listX + LIST_WIDTH - 20;
-        gui.fill(addX, TOP, addX + 20, TOP + ROW_HEIGHT,
-                isAddHovered(mouseX, mouseY) ? Colors.buttonColor.brighter().getRGB() : Colors.buttonColor.getRGB());
-        gui.text(mc.font, "+", addX + 8, TOP + ROW_HEIGHT / 2 - mc.font.lineHeight / 2, -1, true);
+        drawAddButton(gui, listX + LIST_WIDTH - 40, "C", isAddChatHovered(mouseX, mouseY));
+        drawAddButton(gui, listX + LIST_WIDTH - 20, "K", isAddKeybindHovered(mouseX, mouseY));
 
         drawHint(gui, Component.translatable("sputnik.ui.macros.instructions"), listX, LIST_WIDTH);
 
@@ -85,12 +83,13 @@ public class MacrosTab {
         renderLines(gui, mouseX, mouseY, delta);
     }
 
+    // el panel de líneas solo aplica a macros de chat; las Keybind no tienen líneas que editar
     private void renderLines(GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
-        if (selected == null) return;
+        if (!(selected instanceof Macro.Chat chat)) return;
 
         int x = linesX();
 
-        gui.text(mc.font, selected.getName(), x, TOP - 14, Colors.mainColor.getRGB(), true);
+        gui.text(mc.font, chat.getName(), x, TOP - 14, Colors.mainColor.getRGB(), true);
 
         lineField.setX(x);
         lineField.setY(TOP);
@@ -104,7 +103,7 @@ public class MacrosTab {
         drawHint(gui, Component.translatable("sputnik.ui.macros.lineinstructions"), x, LINES_WIDTH);
 
         int rowY = listTop();
-        for (String line : selected.getLines()) {
+        for (String line : chat.getLines()) {
             boolean hovered = isHovered(x, rowY, LINES_WIDTH, mouseX, mouseY);
             gui.fill(x, rowY, x + LINES_WIDTH, rowY + ROW_HEIGHT,
                     hovered ? Colors.buttonColor.brighter().getRGB() : Colors.buttonColor.getRGB());
@@ -124,7 +123,13 @@ public class MacrosTab {
             return;
         }
 
-        if (button == 0 && selected != null && isAddLineHovered(mouseX, mouseY)) {
+        if (button == 0 && isAddKeybindHovered(mouseX, mouseY)) {
+            createKeybind(nameField.getText().trim());
+            nameField.clear();
+            return;
+        }
+
+        if (button == 0 && selected instanceof Macro.Chat && isAddLineHovered(mouseX, mouseY)) {
             addLine(lineField.getText().trim());
             lineField.clear();
             return;
@@ -139,13 +144,13 @@ public class MacrosTab {
             rowY += ROW_HEIGHT + 2;
         }
 
-        if (selected == null) return;
+        if (!(selected instanceof Macro.Chat chat)) return;
 
         rowY = listTop();
-        for (String line : new ArrayList<>(selected.getLines())) {
+        for (String line : new ArrayList<>(chat.getLines())) {
             if (isHovered(linesX(), rowY, LINES_WIDTH, mouseX, mouseY)) {
                 if (button == 1 && KeyUtil.isShiftDown()) {
-                    selected.getLines().remove(line);
+                    chat.getLines().remove(line);
                     MacroManager.INSTANCE.save();
                 }
                 return;
@@ -172,19 +177,25 @@ public class MacrosTab {
     private void create(String name) {
         if (name.isEmpty()) return;
 
-        Macro macro = new Macro(name);
+        Macro macro = new Macro.Chat(name);
+        if (MacroManager.INSTANCE.add(macro)) selected = macro;
+    }
+
+    private void createKeybind(String name) {
+        if (name.isEmpty()) return;
+        Macro macro = new Macro.Keybind(name);
         if (MacroManager.INSTANCE.add(macro)) selected = macro;
     }
 
     private void addLine(String line) {
-        if (selected == null || line.isEmpty()) return;
-        selected.getLines().add(line);
+        if (!(selected instanceof Macro.Chat chat) || line.isEmpty()) return;
+        chat.getLines().add(line);
         MacroManager.INSTANCE.save();
     }
 
     public void onKey(int key, int action) {
-        if (listening != null && action != GLFW.GLFW_RELEASE) {
-            listening.setKey(key == GLFW.GLFW_KEY_ESCAPE ? GLFW.GLFW_KEY_UNKNOWN : key);
+        if (listening != null && action != InputConstants.RELEASE) {
+            listening.setKey(key == InputConstants.KEY_ESCAPE ? InputConstants.UNKNOWN.getValue() : key);
             listening = null;
             MacroManager.INSTANCE.save();
             return;
@@ -236,10 +247,26 @@ public class MacrosTab {
     }
 
     private static boolean isAddHovered(int mouseX, int mouseY) {
+        return isAddChatHovered(mouseX, mouseY);
+    }
+
+    private static boolean isAddChatHovered(int mouseX, int mouseY) {
+        int addX = listX() + LIST_WIDTH - 40;
+        return mouseX >= addX && mouseX < addX + 20 && mouseY >= TOP && mouseY < TOP + ROW_HEIGHT;
+    }
+
+    private static boolean isAddKeybindHovered(int mouseX, int mouseY) {
         int addX = listX() + LIST_WIDTH - 20;
         return mouseX >= addX && mouseX < addX + 20 && mouseY >= TOP && mouseY < TOP + ROW_HEIGHT;
     }
 
+    private static void drawAddButton(GuiGraphicsExtractor gui, int x, String label, boolean hovered) {
+        gui.fill(x, TOP, x + 20, TOP + ROW_HEIGHT,
+                hovered ? Colors.buttonColor.brighter().getRGB() : Colors.buttonColor.getRGB());
+        gui.text(mc.font, label, x + (20 - mc.font.width(label)) / 2,
+                TOP + ROW_HEIGHT / 2 - mc.font.lineHeight / 2, -1, true);
+    }
+
     private static boolean isAddLineHovered(int mouseX, int mouseY) {
         int addX = linesX() + LINES_WIDTH - 20;
         return mouseX >= addX && mouseX < addX + 20 && mouseY >= TOP && mouseY < TOP + ROW_HEIGHT;

src/main/java/me/retucio/sputnik/ui/widgets/Panel.java

@@ -9,10 +9,6 @@ import java.util.function.Supplier;
 
 public abstract class Panel<B extends Button> extends Widget  {
 
-    // el título se resuelve al pintarlo, no al construir el marco: los marcos se crean en
-    // la inicialización del mod, cuando el idioma todavía no ha cargado, así que guardar el
-    // texto ya traducido dejaba los títulos en español para siempre (y no cambiaban aunque
-    // se cambiara el idioma del juego en marcha)
     private Supplier<String> title;
 
     protected final List<B> buttons = new ArrayList<>();

src/main/java/me/retucio/sputnik/ui/widgets/buttons/FriendButton.java

@@ -1,75 +0,0 @@
-package me.retucio.sputnik.ui.widgets.buttons;
-
-import me.retucio.sputnik.friend.Friend;
-import me.retucio.sputnik.module.Module;
-import me.retucio.sputnik.ui.screen.ClickGui;
-import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
-import me.retucio.sputnik.ui.widgets.panels.ModulePanel;
-import me.retucio.sputnik.ui.widgets.Button;
-import me.retucio.sputnik.util.Colors;
-import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.network.chat.Component;
-
-
-// clase para el botón para cada módulo
-public class FriendButton extends Button {
-
-    private final Friend friend;
-    public final int height = 18;
-
-    public FriendButton(Friend friend, FriendsPanel parent, int offset) {
-        super(parent, offset);
-        this.friend = friend;
-    }
-
-    @Override
-    public void render(GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
-        gui.fill( // dibujar el contorno del botón
-                parent.getX() + 2, parent.getRenderY() + offset + 3,
-                parent.getX() + parent.getW() - 2 , parent.getRenderY() + height + offset,
-                determineColor(mouseX, mouseY));
-
-        gui.text( // dibujar el nombre del amigo
-                mc.font, friend.getName(),
-                parent.getX() + 5, parent.getRenderY() + offset + (height / 2) - (mc.font.lineHeight / 2) + 2,
-                -1, true);
-
-        // dibujar "tooltips" (cajas de texto) al pasar el puntero encima del botón, para mostrar su UUID
-        if (isHovered(mouseX, mouseY)) {
-            drawTooltip(gui, mouseX, mouseY);
-        }
-    }
-
-    @Override
-    public void drawTooltip(GuiGraphicsExtractor gui, int mouseX, int mouseY) {
-        gui.setTooltipForNextFrame(Component.literal(friend.getUuid().toString()), mouseX, mouseY + 20);
-    }
-
-    @Override
-    public void mouseClicked(int mouseX, int mouseY, int button) {
-        if (isHovered(mouseX, mouseY) && ClickGui.INSTANCE.trySelect(this)) {
-            ClickGui.INSTANCE.openFriendSettingsPanel(friend, mouseX, mouseY);
-        }
-    }
-
-    // verifica si el puntero del ratón se encuentra sobre el botón
-    @Override
-    public boolean isHovered(int mouseX, int mouseY) {
-        return ClickGui.INSTANCE.canSelect(this)
-                && mouseX > parent.getX()
-                && mouseX < parent.getX() + parent.getW()
-                && mouseY > parent.getRenderY() + offset
-                && mouseY < parent.getRenderY() + height + offset;
-    }
-
-    public int determineColor(double mouseX, double mouseY) {
-        // determina el color del botón, dependiendo de si está el puntero encima
-        return isHovered((int) mouseX, (int) mouseY)
-                ? Colors.buttonColor.brighter().getRGB()
-                : Colors.buttonColor.getRGB();
-    }
-
-    public Friend getFriend() {
-        return friend;
-    }
-}

src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/BindButton.java

@@ -12,9 +12,11 @@ import net.minecraft.ChatFormatting;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
+import net.minecraft.client.input.MouseButtonInfo;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,12 +51,13 @@ public class BindButton extends SettingButton<KeySetting> {
 
         if (hovered && ClickGui.INSTANCE.trySelect(this)) {
             if (listening) {
+                int key = KeyUtil.fromLegacyGlfwKey(button);
                 List<KeyMapping> keys = new ArrayList<>(List.of(mc.options.keyMappings));
                 keys.removeAll(List.of(mc.options.debugKeys));
                 boolean allowMultiple = ClientSettingsPanel.clientSettings.multipleKeybinds.getValue();
 
                 for (KeyMapping bind : keys) {
-                    if (bind.matches(new KeyEvent(button, 0, 0))) {
+                    if (bind.matches(new KeyEvent(key, 0, 0))) {
                         if (!allowMultiple) {
                             ChatUtil.warn(Component.translatable("sputnik.commands.bind.keytaken",
                                     ChatFormatting.GREEN + "\"" + I18n.get(bind.getName()) + "\""));
@@ -64,7 +67,7 @@ public class BindButton extends SettingButton<KeySetting> {
                     }
                 }
 
-                setting.setValue(button);
+                setting.setValue(key);
                 listening = false;
             } else {
                 if (button == 0) {
@@ -81,10 +84,10 @@ public class BindButton extends SettingButton<KeySetting> {
     }
 
     public void onKey(int key, int action) {
-        if (!listening || action != GLFW.GLFW_PRESS) return;
+        if (!listening || action != InputConstants.PRESS) return;
 
-        if (key == GLFW.GLFW_KEY_ESCAPE) {
-            setting.setValue(GLFW.GLFW_KEY_UNKNOWN);
+        if (key == InputConstants.KEY_ESCAPE) {
+            setting.setValue(InputConstants.UNKNOWN.getValue());
         } else {
             List<KeyMapping> keys = new ArrayList<>(List.of(mc.options.keyMappings));
             keys.removeAll(List.of(mc.options.debugKeys));
@@ -106,7 +109,28 @@ public class BindButton extends SettingButton<KeySetting> {
         listening = false;
     }
 
+    public void onMouse(int button, int action) {
+        if (!listening || action != InputConstants.PRESS) return;
+
+        List<KeyMapping> keys = new ArrayList<>(List.of(mc.options.keyMappings));
+        keys.removeAll(List.of(mc.options.debugKeys));
+        boolean allowMultiple = ClientSettingsPanel.clientSettings.multipleKeybinds.getValue();
+        MouseButtonEvent mouseEvent = new MouseButtonEvent(0, 0, new MouseButtonInfo(button, 0));
+
+        for (KeyMapping bind : keys) {
+            if (bind.matchesMouse(mouseEvent) && !allowMultiple) {
+                ChatUtil.warn(Component.translatable("sputnik.commands.bind.keytaken",
+                        ChatFormatting.GREEN + "\"" + I18n.get(bind.getName()) + "\""));
+                listening = false;
+                return;
+            }
+        }
+
+        setting.setValue(KeyUtil.encodeMouseButton(button));
+        listening = false;
+    }
+
     public boolean isFocused() {
         return listening;
     }
-}
+}

src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/FileButton.java

@@ -13,8 +13,9 @@ import net.minecraft.client.resources.language.I18n;
 
 import org.jetbrains.annotations.Nullable;
 
-import org.lwjgl.glfw.GLFW;
-import org.lwjgl.util.tinyfd.TinyFileDialogs;
+import com.mojang.blaze3d.platform.InputConstants;
+import java.awt.FileDialog;
+import java.awt.Frame;
 
 import java.awt.*;
 import java.nio.file.Path;
@@ -75,23 +76,23 @@ public class FileButton extends SettingButton<FileSetting> {
 
     @Override
     public void onKey(int key, int action) {
-        if (!typing || action == GLFW.GLFW_RELEASE) return;
+        if (!typing || action == InputConstants.RELEASE) return;
 
         // pegar con ctrl + v
-        if (key == GLFW.GLFW_KEY_V && KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_CONTROL)) {
+        if (key == InputConstants.KEY_V && KeyUtil.isKeyDown(InputConstants.KEY_LCONTROL)) {
             paste();
             return;
         }
 
         switch (key) {  // casos para teclas especiales como enter, escape o borrar
-            case GLFW.GLFW_KEY_ENTER -> {
+            case InputConstants.KEY_RETURN -> {
                 setting.setValue(buffer.toString());
                 typing = false;
-            } case GLFW.GLFW_KEY_BACKSPACE -> {
+            } case InputConstants.KEY_BACKSPACE -> {
                 onBackspace();
-            } case GLFW.GLFW_KEY_ESCAPE -> {
+            } case InputConstants.KEY_ESCAPE -> {
                 typing = false;
-            } case GLFW.GLFW_KEY_SPACE -> {
+            } case InputConstants.KEY_SPACE -> {
                 charTyped(' ');
             } default -> {
                 String c = KeyUtil.getKeyName(key);
@@ -139,14 +140,14 @@ public class FileButton extends SettingButton<FileSetting> {
 
     @Nullable
     public Path pickFile() {
-            String result = TinyFileDialogs.tinyfd_openFileDialog(
-                    I18n.get("sputnik.filesetting.choose"),
-                    setting.isDirectory()
-                            ? setting.getValue()
-                            : setting.getPath().getParent().toString(),
-                    null,
-                    I18n.get("sputnik.filesetting.supportedfiles"),
-                    false);
-            return result == null ? null : Path.of(result);
+        FileDialog dialog = new FileDialog((Frame) null,
+                I18n.get("sputnik.filesetting.choose"), FileDialog.LOAD);
+        String initial = setting.isDirectory()
+                ? setting.getValue()
+                : setting.getPath().getParent().toString();
+        dialog.setDirectory(initial);
+        dialog.setVisible(true);
+        String file = dialog.getFile();
+        return file == null ? null : Path.of(dialog.getDirectory(), file);
     }
 }

src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/SliderButton.java

@@ -8,7 +8,7 @@ import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
 import me.retucio.sputnik.util.Colors;
 import me.retucio.sputnik.util.KeyUtil;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.awt.*;
 import java.text.DecimalFormat;
@@ -60,7 +60,7 @@ public class SliderButton extends SettingButton<NumberSetting> {
     public void onKey(int key, int action) {
         // de no ser de esto, si se cierra la interfaz sin haber soltado el ratón mientras se arrastraba el valor,
         // al reabrir la interfaz se seguía arrastrando, aun habiendo soltado ya el clic
-        if (key == GLFW.GLFW_KEY_ESCAPE
+        if (key == InputConstants.KEY_ESCAPE
                 || key == ClientSettingsPanel.clientSettings.getKey())
             dragging = false;
     }

src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/TextButton.java

@@ -8,7 +8,7 @@ import me.retucio.sputnik.util.Colors;
 import me.retucio.sputnik.util.KeyUtil;
 import me.retucio.sputnik.util.MiscUtil;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 
 // botón para los ajustes que requieran introducir texto
@@ -55,23 +55,23 @@ public class TextButton extends SettingButton<StringSetting> {
 
     @Override
     public void onKey(int key, int action) {
-        if (!typing || action == GLFW.GLFW_RELEASE) return;
+        if (!typing || action == InputConstants.RELEASE) return;
 
         // pegar con ctrl + v
-        if (key == GLFW.GLFW_KEY_V && KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_CONTROL)) {
+        if (key == InputConstants.KEY_V && KeyUtil.isKeyDown(InputConstants.KEY_LCONTROL)) {
             paste();
             return;
         }
 
         switch (key) {  // casos para teclas especiales como enter, escape o borrar
-            case GLFW.GLFW_KEY_ENTER -> {
+            case InputConstants.KEY_RETURN -> {
                 setting.setValue(buffer.toString());
                 typing = false;
-            } case GLFW.GLFW_KEY_BACKSPACE -> {
+            } case InputConstants.KEY_BACKSPACE -> {
                 onBackspace();
-            } case GLFW.GLFW_KEY_ESCAPE -> {
+            } case InputConstants.KEY_ESCAPE -> {
                 typing = false;
-            } case GLFW.GLFW_KEY_SPACE -> {
+            } case InputConstants.KEY_SPACE -> {
                 charTyped(' ');
             } default -> {
                 String c = KeyUtil.getKeyName(key);

src/main/java/me/retucio/sputnik/ui/widgets/misc/FriendWidget.java

@@ -0,0 +1,156 @@
+package me.retucio.sputnik.ui.widgets.misc;
+
+import me.retucio.sputnik.friend.Friend;
+import me.retucio.sputnik.friend.FriendManager;
+import me.retucio.sputnik.ui.widgets.Widget;
+import me.retucio.sputnik.util.Colors;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.PlayerFaceExtractor;
+import net.minecraft.client.multiplayer.PlayerInfo;
+import net.minecraft.network.chat.Component;
+
+import java.awt.Color;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.function.Consumer;
+
+
+public class FriendWidget extends Widget {
+
+    private static final int PADDING = 6;
+    private static final int HEAD_SIZE = 28;
+    private static final int REMOVE_SIZE = 14;
+    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
+
+    private final Friend friend;
+    private final Consumer<Friend> onRemove;
+    private final TextFieldWidget nickField;
+
+    public FriendWidget(Friend friend, int x, int y, int w, int h, Consumer<Friend> onRemove) {
+        super(x, y, w, h);
+        this.friend = friend;
+        this.onRemove = onRemove;
+
+        this.nickField = new TextFieldWidget(() -> "sputnik.ui.friends.nickplaceholder", 0, 0, 0, 14)
+                .maxLength(32)
+                .onSubmit(nick -> FriendManager.INSTANCE.rename(friend, nick));
+    }
+
+    // recalcula la posición/tamaño cada frame, para que la rejilla se adapte al ancho de pantalla
+    public void updateBounds(int x, int y, int w, int h) {
+        this.x = x;
+        this.y = y;
+        this.w = w;
+        this.h = h;
+    }
+
+    @Override
+    public void render(GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
+        boolean hovered = isHovered(mouseX, mouseY);
+        gui.fill(x, y, x + w, y + h, hovered ? Colors.buttonColor.brighter().getRGB() : Colors.buttonColor.getRGB());
+
+        int headX = x + PADDING;
+        int headY = y + (h - HEAD_SIZE) / 2;
+        drawHead(gui, headX, headY);
+
+        int textX = headX + HEAD_SIZE + 8;
+        int textW = x + w - REMOVE_SIZE - 10 - textX;
+
+        gui.text(mc.font, friend.getName(), textX, y + 6, -1, true);
+
+        int nickY = y + 6 + mc.font.lineHeight + 2;
+        if (nickField.isFocused()) {
+            nickField.setX(textX);
+            nickField.setY(nickY);
+            nickField.setW(textW);
+            nickField.render(gui, mouseX, mouseY, delta);
+        } else {
+            gui.text(mc.font, friend.getDisplayName(), textX, nickY, Colors.mainColor.getRGB(), true);
+        }
+
+        String date = DATE_FORMAT.format(new Date(friend.getBefriendedAt()));
+        gui.text(mc.font, Component.translatable("sputnik.ui.friends.befriendedon", date),
+                textX, y + h - mc.font.lineHeight - 5, Colors.instructionsTextColor.getRGB(), true
+        );
+
+        String uuid = friend.getUuid().toString();
+        gui.text(mc.font, Component.translatable("sputnik.ui.friends.uuid", uuid),
+                textX, y + 24 + mc.font.lineHeight, Colors.instructionsTextColor.getRGB(), true
+        );
+
+        drawRemoveButton(gui, mouseX, mouseY);
+    }
+
+    private void drawHead(GuiGraphicsExtractor gui, int hx, int hy) {
+        PlayerInfo info = friend.getPlayerInfo();
+        if (info != null) {
+            PlayerFaceExtractor.extractRenderState(gui, info.getSkin(), hx, hy, HEAD_SIZE, -1);
+        } else {
+            // sin conexión al jugador (offline / no en el mismo server): placeholder gris
+            gui.fill(hx, hy, hx + HEAD_SIZE, hy + HEAD_SIZE, Colors.panelBgColor.getRGB());
+        }
+    }
+
+    private void drawRemoveButton(GuiGraphicsExtractor gui, int mouseX, int mouseY) {
+        int rx = x + w - REMOVE_SIZE - 5;
+        int ry = y + 5;
+        boolean hovered = isRemoveHovered(mouseX, mouseY);
+
+        gui.fill(rx, ry, rx + REMOVE_SIZE, ry + REMOVE_SIZE,
+                hovered ? new Color(200, 60, 60).brighter().getRGB() : new Color(150, 40, 40).getRGB());
+        gui.text(mc.font, "x", rx + REMOVE_SIZE / 2 - 2, ry + REMOVE_SIZE / 2 - mc.font.lineHeight / 2, -1, true);
+    }
+
+    @Override
+    public void mouseClicked(int mouseX, int mouseY, int button) {
+        if (button == 0 && isRemoveHovered(mouseX, mouseY)) {
+            onRemove.accept(friend);
+            return;
+        }
+
+        if (nickField.isFocused()) {
+            nickField.mouseClicked(mouseX, mouseY, button);
+            return;
+        }
+
+        if (button == 0 && isNickHovered(mouseX, mouseY)) {
+            nickField.setText(friend.getDisplayName());
+            nickField.setFocused(true);
+        }
+    }
+
+    @Override
+    public void mouseReleased(int mouseX, int mouseY, int button) {
+        nickField.mouseReleased(mouseX, mouseY, button);
+    }
+
+    public void onKey(int key, int action) {
+        if (nickField.isFocused()) nickField.onKey(key, action);
+    }
+
+    public boolean isCapturingInput() {
+        return nickField.isFocused();
+    }
+
+    private boolean isNickHovered(int mouseX, int mouseY) {
+        int textX = x + PADDING + HEAD_SIZE + 8;
+        int nickY = y + 6 + mc.font.lineHeight + 2;
+        return mouseX >= textX && mouseX < x + w - REMOVE_SIZE - 10
+                && mouseY >= nickY && mouseY < nickY + 14;
+    }
+
+    private boolean isRemoveHovered(int mouseX, int mouseY) {
+        int rx = x + w - REMOVE_SIZE - 5;
+        int ry = y + 5;
+        return mouseX >= rx && mouseX < rx + REMOVE_SIZE && mouseY >= ry && mouseY < ry + REMOVE_SIZE;
+    }
+
+    @Override
+    public boolean isHovered(int mouseX, int mouseY) {
+        return mouseX >= x && mouseX < x + w && mouseY >= y && mouseY < y + h;
+    }
+
+    public Friend getFriend() {
+        return friend;
+    }
+}

src/main/java/me/retucio/sputnik/ui/widgets/misc/SearchBarWidget.java

@@ -17,7 +17,7 @@ import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
-import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
 
 import java.awt.Color;
 import java.util.List;
@@ -99,25 +99,25 @@ public class SearchBarWidget extends Widget {
     @Override
     public void onKey(int key, int action) {
         if (!ClientSettingsPanel.clientSettings.searchBar.getValue()) return;
-        if (!focused || action == GLFW.GLFW_RELEASE) return;
+        if (!focused || action == InputConstants.RELEASE) return;
 
-        if (key == GLFW.GLFW_KEY_V && KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_CONTROL)) {
+        if (key == InputConstants.KEY_V && KeyUtil.isKeyDown(InputConstants.KEY_LCONTROL)) {
             paste();
             return;
         }
 
         switch (key) {
-            case GLFW.GLFW_KEY_ENTER -> focused = false;
-            case GLFW.GLFW_KEY_ESCAPE -> {
+            case InputConstants.KEY_RETURN -> focused = false;
+            case InputConstants.KEY_ESCAPE -> {
                 buffer.setLength(0);
                 focused = false;
             }
-            case GLFW.GLFW_KEY_SPACE -> charTyped(' ');
-            case GLFW.GLFW_KEY_BACKSPACE -> onBackspace();
+            case InputConstants.KEY_SPACE -> charTyped(' ');
+            case InputConstants.KEY_BACKSPACE -> onBackspace();
             default -> {
                 String c = KeyUtil.getKeyName(key);
                 if (c.length() == 1) {
-                    if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_SHIFT) || KeyUtil.isKeyDown(GLFW.GLFW_KEY_RIGHT_SHIFT))
+                    if (KeyUtil.isKeyDown(InputConstants.KEY_LSHIFT) || KeyUtil.isKeyDown(InputConstants.KEY_RSHIFT))
                         charTyped(KeyUtil.shiftKey(c).charAt(0));
                     else
                         charTyped(c.toLowerCase().charAt(0));