Compare commits

...
4 Commits
Author SHA1 Message Date
retucio ab191a9016 v6.6 2026-10-11 11:56:22 +02:00
retucio 629d03ff92 v6.5 2026-09-14 19:17:07 +02:00
retucio c1a03f3ddb v6.4 2026-09-06 11:55:58 +02:00
retucio 44494830be v6.3 2026-09-04 12:58:41 +02:00
130 changed files with 2976 additions and 1209 deletions

No files matched your search

+82
View File
@@ -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://codeberg.org/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://codeberg.org/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.
+28 -36
View File
@@ -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 # 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 ## instalación
### para gente normal: ### para gente normal:
1. ir a [lanzamientos](https://codeberg.org/retucio/sputnik/releases) 1. ir a [lanzamientos](https://codeberg.org/retucio/sputnik/releases)
2. selecionar la versión más reciente 2. seleccionar la versión más reciente
3. descargar el .jar 3. descargar el .jar
4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`) 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. 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 ### para frikis de 200 de iq
1. clona el respositorio (`git clone https://github.com/retuci0/sputnik`) 1. clona el respositorio (`git clone https://codeberg.org/retucio/sputnik`)
2. entra al directorio del repositorio (`cd 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) 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` (el que no lleva "sources" en el nombre) 4. el resultado estará en `/build/libs/sputnik-X.X.jar`
## uso ## 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 izquierdo para activar / desactivar módulos
- clic derecho para abrir sus ajustes - 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 derecho en la cabeza del marco para expandirlo / contraerlo o para cerrarlo
- clic izquierdo sobre ajustes para modificarlos - clic izquierdo sobre ajustes para modificarlos
- shift + clic derecho sobre ajustes para restablecerlos - shift + clic derecho sobre ajustes para restablecerlos
- posiciona el puntero del ratón sobre un módulo o ajuste para leer su descripción - 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 ## capturas
<img src="screenshots/ui.png" alt="interfaz"> <img src="screenshots/automine.png" alt="auto minado">
<img src="screenshots/nametags.png" alt="nametags mostrando daño de un tridente"> <img src="screenshots/blockesp.png" alt="resaltado de bloques + superposición de luz">
<img src="screenshots/chatplus.png" alt="chatplus y capturas en uso"> <img src="screenshots/camtweaks.png" alt="perspectiva plus">
<img src="screenshots/crits.png" alt="críticos"> <img src="screenshots/chatplus.png" alt="chatplus + nametags + capturas">
<img src="screenshots/fullbright.png" alt="fullbright en modo gamma cambiando el color de los shaders"> <img src="screenshots/clickgui.png" alt="interfaz">
<img src="screenshots/hud.png" alt="HUD"> <img src="screenshots/freecam.png" alt="cámara libre + trazos">
<img src="screenshots/hudeditor.png" alt="editor de HUD"> <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 ## contribuciones
@@ -62,26 +64,16 @@ sí por favor
## licencia ## licencia
no sé, haz lo que quieras con esto, es puta basura xd [licencia CC0](LICENSE)
aunque estaría guay que acreditases
pero bueno
## descargo de responsabilidad ## descargo de responsabilidad
me importa una puta mierda lo que pase al usar este mod en servers donde es baneable y así. 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 ## notas
- [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 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é.
- [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
+9 -7
View File
@@ -1,18 +1,20 @@
# v6.2 # v6.6
## novedades ## novedades
- actualizado a 26.3, un verdadero grano en el culo
### adiciones ### adiciones
#### elementos del HUD nuevos: - pestaña de ajustes del mod
- macros de tecla
- arraylist: lista de los módulos activados
### arreglos / mejoras ### arreglos / mejoras
- ahora puedes hacer puentes de varios bloques de ancho con `andamios` - algún que otro bugfix
- unidades distintas para el elemento del HUD `velocidad`
## problemas reconocidos ## problemas reconocidos
- lo de siempre. - `reponer` no funciona
- `copiar` tras sacar una captura con `capturas` no funciona correctamente
- \+ lo de siempre.
+6 -6
View File
@@ -1,15 +1,15 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
org.gradle.parallel=true org.gradle.parallel=true
minecraft_version=26.2 minecraft_version=26.3
loader_version=0.19.3 loader_version=0.19.5
loom_version=1.17-SNAPSHOT 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 discord_rpc_version=1.0.3
neutrino_version=1.1.0 neutrino_version=1.1.0
jdk_version=25 jdk_version=25
mod_version=6.2 mod_version=6.6
maven_group=me.retucio maven_group=me.retucio
archives_base_name=sputnik archives_base_name=sputnik
+2 -3
View File
@@ -1,7 +1,6 @@
#Sat Aug 29 22:10:52 CEST 2026
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 864 KiB

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 796 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 915 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 700 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 506 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 691 KiB

+45 -13
View File
@@ -2,6 +2,7 @@ package me.retucio.sputnik;
import com.github.retucio.neutrino.EventBus; import com.github.retucio.neutrino.EventBus;
import com.github.retucio.neutrino.EventListener; import com.github.retucio.neutrino.EventListener;
import com.mojang.blaze3d.platform.InputConstants;
import me.retucio.sputnik.cape.CapeManager; import me.retucio.sputnik.cape.CapeManager;
import me.retucio.sputnik.command.CommandManager; import me.retucio.sputnik.command.CommandManager;
import me.retucio.sputnik.command.commands.BindCommand; 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.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.lwjgl.glfw.GLFW;
public class Sputnik implements ClientModInitializer { public class Sputnik implements ClientModInitializer {
@@ -118,7 +117,7 @@ public class Sputnik implements ClientModInitializer {
CapeManager.INSTANCE = new CapeManager(); CapeManager.INSTANCE = new CapeManager();
EVENT_BUS.post(new LoadCapeManagerEvent()); EVENT_BUS.post(new LoadCapeManagerEvent());
ModuleManager.INSTANCE = new ModuleManager(); ModuleManager.INSTANCE = new ModuleManager();
EVENT_BUS.post(new LoadModuleManagerEvent()); EVENT_BUS.post(new LoadModuleManagerEvent());
CommandManager.INSTANCE = new CommandManager(); CommandManager.INSTANCE = new CommandManager();
@@ -157,32 +156,64 @@ public class Sputnik implements ClientModInitializer {
// se ejecuta cada vez que se presiona una tecla // se ejecuta cada vez que se presiona una tecla
public void onInput(int key, int action) { 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 // prevenir interrumpir combos de F3
if (key == GLFW.GLFW_KEY_F3) return; if (key == InputConstants.KEY_F3) return;
boolean anyFocused = isAnySettingButtonFocused() || ClickGui.INSTANCE.isCapturingInput(); boolean anyFocused = isAnySettingButtonFocused() || ClickGui.INSTANCE.isCapturingInput();
ClickGui.INSTANCE.setAnyFocused(anyFocused); 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 (BindCommand.onKeyPress(key)) return;
if (action == GLFW.GLFW_PRESS && MacroManager.INSTANCE.onKeyPress(key)) return; if (action == InputConstants.PRESS && MacroManager.INSTANCE.onKeyPress(key)) return;
if (action == GLFW.GLFW_PRESS) { if (action == InputConstants.PRESS) {
handleModuleToggle(key, anyFocused); handleModuleToggle(key, anyFocused);
handleClickGuiKey(key, anyFocused); handleClickGuiKey(key, anyFocused);
handleHudEditorKey(key, anyFocused); handleHudEditorKey(key, anyFocused);
} }
// solo reenviar teclas del teclado
if (key >= 32) {
handleSettingButtonsKey(key, action);
}
} else if (!anyFocused) { } else if (!anyFocused) {
handleModuleRelease(key); 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 // verifica si algún botón de ajustes está escuchando
private boolean isAnySettingButtonFocused() { private boolean isAnySettingButtonFocused() {
if (ClickGui.INSTANCE == null) return false; 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 (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels())
for (Button sb : sf.getButtons()) for (Button sb : sf.getButtons())
if ((sb instanceof BindButton b && b.isFocused()) if ((sb instanceof BindButton b && b.isFocused())
@@ -200,7 +231,7 @@ public class Sputnik implements ClientModInitializer {
for (Module module : ModuleManager.INSTANCE.getModules()) { for (Module module : ModuleManager.INSTANCE.getModules()) {
// evitar interrumpir combinaciones de teclas del F3 // evitar interrumpir combinaciones de teclas del F3
if (key != module.getKey() || anyFocused || KeyUtil.isKeyDown(GLFW.GLFW_KEY_F3)) continue; if (key != module.getKey() || anyFocused || KeyUtil.isKeyDown(InputConstants.KEY_F3)) continue;
if (module.shouldToggleOnBindRelease() && !module.isEnabled()) if (module.shouldToggleOnBindRelease() && !module.isEnabled())
module.setEnabled(true); 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 // se ocupa de hacer los botones de ajustes que lo necesiten escuchar teclas
private void handleSettingButtonsKey(int key, int action) { private void handleSettingButtonsKey(int key, int action) {
ClickGui.INSTANCE.getClientSettingsPanel().onKey(key, action);
for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) { for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) {
for (SettingButton<?> sb : sf.getButtons()) { for (SettingButton<?> sb : sf.getButtons()) {
if (sb instanceof BindButton bb) bb.onKey(key, action); if (sb instanceof BindButton bb) bb.onKey(key, action);
@@ -296,4 +328,4 @@ public class Sputnik implements ClientModInitializer {
public static String getVersionName() { public static String getVersionName() {
return MOD_ID + "_v" + MOD_VERSION + "_" + SharedConstants.getCurrentVersion().name(); return MOD_ID + "_v" + MOD_VERSION + "_" + SharedConstants.getCurrentVersion().name();
} }
} }
@@ -16,7 +16,7 @@ import java.util.List;
public abstract class Command { public abstract class Command {
// utilizar los "registries" ya existentes de Brigadier para el autocompletado // 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 int SUCCESS = com.mojang.brigadier.Command.SINGLE_SUCCESS;
protected static final Minecraft mc = Minecraft.getInstance(); protected static final Minecraft mc = Minecraft.getInstance();
@@ -36,11 +36,12 @@ public class MacroCommand extends Command {
list(); list();
return SUCCESS; return SUCCESS;
})) }))
// por ahora "add" solo crea macros de chat
.then(literal("add") .then(literal("add")
.then(argument("nombre", StringArgumentType.word()).executes(ctx -> { .then(argument("nombre", StringArgumentType.word()).executes(ctx -> {
String name = ctx.getArgument("nombre", String.class); 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", ChatUtil.info(Component.translatable("sputnik.commands.macro.added",
ChatFormatting.AQUA + name)); ChatFormatting.AQUA + name));
else else
@@ -60,7 +61,7 @@ public class MacroCommand extends Command {
.then(literal("line") .then(literal("line")
.then(argument("nombre", StringArgumentType.word()).suggests(MACROS) .then(argument("nombre", StringArgumentType.word()).suggests(MACROS)
.then(argument("línea", StringArgumentType.greedyString()).executes(ctx -> { .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; if (macro == null) return SUCCESS;
String line = ctx.getArgument("línea", String.class); String line = ctx.getArgument("línea", String.class);
@@ -73,7 +74,7 @@ public class MacroCommand extends Command {
})))) }))))
.then(literal("clear") .then(literal("clear")
.then(argument("nombre", StringArgumentType.word()).suggests(MACROS).executes(ctx -> { .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; if (macro == null) return SUCCESS;
macro.getLines().clear(); macro.getLines().clear();
@@ -97,6 +98,19 @@ public class MacroCommand extends Command {
return macro; 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() { private static void list() {
List<Macro> macros = MacroManager.INSTANCE.getMacros(); 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())); 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() ChatUtil.addMessage(ChatFormatting.GRAY + " - " + macro.getName()
+ ChatFormatting.DARK_GRAY + " [" + KeyUtil.getKeyName(macro.getKey()) + "] " + ChatFormatting.DARK_GRAY + " [" + KeyUtil.getKeyName(macro.getKey()) + "] "
+ macro.getLines().size()); + count);
}
} }
} }
@@ -50,7 +50,7 @@ public class SendCommand extends Command {
message, message,
instant, instant,
salt, salt,
messageSignature, java.util.Optional.ofNullable(messageSignature),
lastSeenMessages.update() lastSeenMessages.update()
)); ));
} }
@@ -58,4 +58,4 @@ public class SendCommand extends Command {
return SUCCESS; return SUCCESS;
})); }));
} }
} }
@@ -8,7 +8,7 @@ import me.retucio.sputnik.event.input.KeyEvent;
import me.retucio.sputnik.util.EntityUtil; import me.retucio.sputnik.util.EntityUtil;
import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.commands.SharedSuggestionProvider;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.awt.*; import java.awt.*;
@@ -43,7 +43,7 @@ public class SpectateCommand extends Command {
@EventListener @EventListener
public void onKey(KeyEvent event) { public void onKey(KeyEvent event) {
if (mc.getCameraEntity() != mc.player && mc.gui.screen() == null 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(); event.cancel();
mc.setCameraEntity(mc.player); mc.setCameraEntity(mc.player);
} }
@@ -1,6 +1,7 @@
package me.retucio.sputnik.config; package me.retucio.sputnik.config;
import me.retucio.sputnik.util.I18nUtil; import me.retucio.sputnik.util.I18nUtil;
import me.retucio.sputnik.util.KeyUtil;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@@ -14,7 +15,7 @@ import java.util.Map;
public class BinarySerializer { public class BinarySerializer {
private static final int MAGIC_NUMBER = 0x53505554; // "SPUT" 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 int MIN_VERSION = 2;
private static final byte TYPE_NULL = 0; 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_INT_ARRAY = 6;
private static final byte TYPE_FRAME_DATA = 7; 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 { public static void writeConfig(ClientConfig config, File file) throws IOException {
byte[] bytes = toBytes(config); byte[] bytes = toBytes(config);
writeBytes(bytes, file); writeBytes(bytes, file);
@@ -72,7 +76,7 @@ public class BinarySerializer {
writeStringIntArrayMap(out, config.hudPositions); writeStringIntArrayMap(out, config.hudPositions);
writeStringBooleanMap(out, config.hudVisibilities); writeStringBooleanMap(out, config.hudVisibilities);
writeStringStringMap(out, config.hudImagePaths); writeStringStringMap(out, config.hudImagePaths);
writeStringStringMap(out, config.friends); writeFriendsMap(out, config.friends);
writeMacros(out, config.macros); writeMacros(out, config.macros);
writeString(out, config.currentProfile); writeString(out, config.currentProfile);
@@ -123,9 +127,16 @@ public class BinarySerializer {
Map<String, int[]> hudPositions = readStringIntArrayMap(in); Map<String, int[]> hudPositions = readStringIntArrayMap(in);
Map<String, Boolean> hudVisibilities = readStringBooleanMap(in); Map<String, Boolean> hudVisibilities = readStringBooleanMap(in);
Map<String, String> hudImagePaths = readStringStringMap(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) : ""; String currentProfile = version >= 3 ? readString(in) : "";
// leer pos. de la barra de búsqueda // leer pos. de la barra de búsqueda
@@ -145,11 +156,22 @@ public class BinarySerializer {
config.macros = macros; config.macros = macros;
config.currentProfile = currentProfile == null ? "" : currentProfile; config.currentProfile = currentProfile == null ? "" : currentProfile;
if (searchBarPosition != null) config.searchBarPosition = searchBarPosition; if (searchBarPosition != null) config.searchBarPosition = searchBarPosition;
config.legacyKeyCodes = version < 6;
return config; 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) private static void writeStringBooleanMap(DataOutputStream out, Map<String, Boolean> map)
throws IOException { throws IOException {
if (map == null) { if (map == null) {
@@ -369,7 +391,7 @@ public class BinarySerializer {
} }
private static void writeStringStringMap(DataOutputStream out, Map<String, String> map) private static void writeStringStringMap(DataOutputStream out, Map<String, String> map)
throws IOException { throws IOException {
if (map == null) { if (map == null) {
out.writeInt(0); out.writeInt(0);
return; return;
@@ -382,7 +404,7 @@ public class BinarySerializer {
} }
private static Map<String, String> readStringStringMap(DataInputStream in) private static Map<String, String> readStringStringMap(DataInputStream in)
throws IOException { throws IOException {
int size = in.readInt(); int size = in.readInt();
Map<String, String> map = new HashMap<>(size); Map<String, String> map = new HashMap<>(size);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
@@ -393,6 +415,9 @@ public class BinarySerializer {
return map; 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) private static void writeMacros(DataOutputStream out, List<ClientConfig.MacroData> macros)
throws IOException { throws IOException {
if (macros == null) { if (macros == null) {
@@ -401,14 +426,59 @@ public class BinarySerializer {
} }
out.writeInt(macros.size()); out.writeInt(macros.size());
for (ClientConfig.MacroData macro : macros) { for (ClientConfig.MacroData macro : macros) {
boolean keybind = macro.type() == ClientConfig.MacroType.KEYBIND;
out.writeByte(keybind ? MACRO_KEYBIND : MACRO_CHAT);
writeString(out, macro.name()); writeString(out, macro.name());
out.writeInt(macro.key()); 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 { 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(); int size = in.readInt();
List<ClientConfig.MacroData> macros = new ArrayList<>(size); List<ClientConfig.MacroData> macros = new ArrayList<>(size);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
@@ -417,11 +487,50 @@ public class BinarySerializer {
int lineCount = in.readInt(); int lineCount = in.readInt();
List<String> lines = new ArrayList<>(lineCount); List<String> lines = new ArrayList<>(lineCount);
for (int j = 0; j < lineCount; j++) lines.add(readString(in)); 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; 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 { private static void writeString(DataOutputStream out, String str) throws IOException {
if (str == null) { if (str == null) {
out.writeInt(-1); out.writeInt(-1);
@@ -4,8 +4,6 @@ import com.github.retucio.neutrino.EventListener;
import me.retucio.sputnik.event.sputnik.*; import me.retucio.sputnik.event.sputnik.*;
import me.retucio.sputnik.module.setting.settings.*; import me.retucio.sputnik.module.setting.settings.*;
import me.retucio.sputnik.ui.screen.ClickGui; import me.retucio.sputnik.ui.screen.ClickGui;
import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
import me.retucio.sputnik.util.ChatUtil;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@@ -44,14 +42,18 @@ public class ClientConfig {
// posición de la barra de búsqueda (x, y) // posición de la barra de búsqueda (x, y)
public int[] searchBarPosition = new int[] { 340, 16 }; public int[] searchBarPosition = new int[] { 340, 16 };
// amigos: uuid -> nombre // amigos: uuid -> FriendData (nombre, apodo, fecha)
public Map<String, String> friends = new HashMap<>(); public Map<String, FriendData> friends = new HashMap<>();
// macros, de cualquier tipo (ver MacroData)
public List<MacroData> macros = new ArrayList<>(); public List<MacroData> macros = new ArrayList<>();
// perfil cargado actualmente, vacío si es la config. suelta // perfil cargado actualmente, vacío si es la config. suelta
public String currentProfile = ""; public String currentProfile = "";
// Set only when loading a config written with GLFW keycodes (pre-26.3).
public transient boolean legacyKeyCodes;
public ClientConfig() { public ClientConfig() {
EVENT_BUS.subscribe(this); EVENT_BUS.subscribe(this);
} }
@@ -146,31 +148,15 @@ public class ClientConfig {
ConfigManager.INSTANCE.markDirty(); 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 @EventListener
public void onAddFriend(FriendEvent.Add event) { public void onAddFriend(FriendEvent.Add event) {
if (isApplying()) return; if (isApplying()) return;
String uuid = event.getFriend().getUuid().toString(); String uuid = event.getFriend().getUuid().toString();
String name = event.getFriend().getName();
if (!friends.containsKey(uuid)) { 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(); ConfigManager.INSTANCE.markDirty();
} }
@@ -182,11 +168,42 @@ public class ClientConfig {
ConfigManager.INSTANCE.markDirty(); 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 { public record PanelData(int x, int y, boolean extended) implements Serializable {
@Serial private static final long serialVersionUID = 1L; @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; @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));
}
}
} }
@@ -16,13 +16,12 @@ import me.retucio.sputnik.ui.hud.HudElement;
import me.retucio.sputnik.ui.hud.HudRenderer; import me.retucio.sputnik.ui.hud.HudRenderer;
import me.retucio.sputnik.ui.widgets.Panel; import me.retucio.sputnik.ui.widgets.Panel;
import me.retucio.sputnik.ui.widgets.panels.ExtendablePanel; 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.widgets.panels.ModulePanel;
import me.retucio.sputnik.ui.screen.ClickGui; import me.retucio.sputnik.ui.screen.ClickGui;
import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel; import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
import me.retucio.sputnik.ui.widgets.panels.SettingsPanel; 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.I18nUtil;
import me.retucio.sputnik.util.KeyUtil;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import java.io.File; import java.io.File;
@@ -153,6 +152,7 @@ public class ConfigManager {
try (FileReader reader = new FileReader(LEGACY_JSON_FILE)) { try (FileReader reader = new FileReader(LEGACY_JSON_FILE)) {
Gson gson = new GsonBuilder().setPrettyPrinting().create(); Gson gson = new GsonBuilder().setPrettyPrinting().create();
setConfig(gson.fromJson(reader, ClientConfig.class)); setConfig(gson.fromJson(reader, ClientConfig.class));
config.legacyKeyCodes = true;
Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.json", Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.json",
"ajustes json cargados (migración)")); "ajustes json cargados (migración)"));
@@ -177,7 +177,9 @@ public class ConfigManager {
if (!shouldApply()) return false; if (!shouldApply()) return false;
applying = true; applying = true;
boolean migratedKeys = config.legacyKeyCodes;
try { try {
migrateLegacyKeyCodes();
// los del mod primero: entre ellos está "teclas multimódulo", que decide si al // 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, // 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 // 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; loaded = true;
} }
if (migratedKeys) writeSnapshot(true);
return 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 // 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 // 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 // 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) { public void setMacros(List<Macro> macros) {
ensureConfig(); ensureConfig();
config.macros = macros.stream() config.macros = macros.stream()
.map(macro -> new ClientConfig.MacroData(macro.getName(), macro.getKey(), List.copyOf(macro.getLines()))) .map(ConfigManager::toMacroData)
.toList(); .toList();
markDirty(); markDirty();
} }
@@ -316,9 +341,10 @@ public class ConfigManager {
// ------------------ APLICAR AJUSTES ------------------ // ------------------ APLICAR AJUSTES ------------------
public void applyFriends() { public void applyFriends() {
config.friends.forEach((uuid, name) -> { config.friends.forEach((uuid, data) -> {
Friend friend = new Friend(UUID.fromString(uuid)); Friend friend = new Friend(UUID.fromString(uuid), data.befriendedAt());
friend.setName(name); friend.setName(data.name());
friend.setNick(data.nick());
FriendManager.INSTANCE.add(friend); FriendManager.INSTANCE.add(friend);
}); });
Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.friends", Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.friends",
@@ -327,10 +353,37 @@ public class ConfigManager {
public void applyMacros() { public void applyMacros() {
MacroManager.INSTANCE.setMacros(config.macros.stream() MacroManager.INSTANCE.setMacros(config.macros.stream()
.map(data -> new Macro(data.name(), data.key(), data.lines())) .map(ConfigManager::fromMacroData)
.toList()); .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 // el HudRenderer coloca sus elementos al construirse, pero al cambiar de perfil ya existen
public void applyHudElements() { public void applyHudElements() {
if (HudRenderer.INSTANCE == null) return; if (HudRenderer.INSTANCE == null) return;
@@ -424,7 +477,6 @@ public class ConfigManager {
applyExtendablePanel(panel); applyExtendablePanel(panel);
} }
applyExtendablePanel(ClickGui.INSTANCE.getClientSettingsPanel()); applyExtendablePanel(ClickGui.INSTANCE.getClientSettingsPanel());
applyExtendablePanel(ClickGui.INSTANCE.getFriendsPanel());
Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.extendablepanels", Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.extendablepanels",
"posiciones de marcos extendibles aplicadas")); "posiciones de marcos extendibles aplicadas"));
@@ -440,9 +492,6 @@ public class ConfigManager {
if (panel instanceof ClientSettingsPanel) { if (panel instanceof ClientSettingsPanel) {
panelData = config.extendablePanels.get("ajustes"); panelData = config.extendablePanels.get("ajustes");
} }
if (panel instanceof FriendsPanel) {
panelData = config.extendablePanels.get("amigos");
}
if (panelData != null) { if (panelData != null) {
panel.setX(panelData.x()); panel.setX(panelData.x());
@@ -598,8 +647,6 @@ public class ConfigManager {
ClientSettingsModule settings = ClientSettingsPanel.clientSettings; ClientSettingsModule settings = ClientSettingsPanel.clientSettings;
if (!settings.autosave.getValue()) return; 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); long intervalMs = (long) (settings.autosaveInterval.getValue() * 1000);
if (System.currentTimeMillis() - lastSaveTime < intervalMs) return; if (System.currentTimeMillis() - lastSaveTime < intervalMs) return;
@@ -608,4 +655,4 @@ public class ConfigManager {
Component.translatable("sputnik.config.autosaving.desc").getString()); Component.translatable("sputnik.config.autosaving.desc").getString());
save(); save();
} }
} }
@@ -3,7 +3,8 @@ package me.retucio.sputnik.event.sputnik;
import com.github.retucio.neutrino.Event; import com.github.retucio.neutrino.Event;
import me.retucio.sputnik.friend.Friend; 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 { public class FriendEvent extends Event {
private final Friend friend; private final Friend friend;
@@ -23,4 +24,8 @@ public class FriendEvent extends Event {
public static class Remove extends FriendEvent { public static class Remove extends FriendEvent {
public Remove(Friend friend) { super(friend); } public Remove(Friend friend) { super(friend); }
} }
}
public static class Rename extends FriendEvent {
public Rename(Friend friend) { super(friend); }
}
}
@@ -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
}
@@ -1,6 +1,7 @@
package me.retucio.sputnik.friend; package me.retucio.sputnik.friend;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.PlayerInfo;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -13,12 +14,20 @@ public class Friend {
private static final Minecraft mc = Minecraft.getInstance(); private static final Minecraft mc = Minecraft.getInstance();
private String name; private String name;
private String nick;
private final UUID uuid; private final UUID uuid;
private final long befriendedAt;
private boolean searchMatch; private boolean searchMatch;
public Friend(UUID uuid) { public Friend(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
this.befriendedAt = System.currentTimeMillis();
}
public Friend(UUID uuid, long befriendedAt) {
this.uuid = uuid;
this.befriendedAt = befriendedAt;
} }
public String getName() { public String getName() {
@@ -29,10 +38,27 @@ public class Friend {
this.name = name; 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() { public UUID getUuid() {
return uuid; return uuid;
} }
public long getBefriendedAt() {
return befriendedAt;
}
public @Nullable Player getPlayer() { public @Nullable Player getPlayer() {
if (mc.level == null) return null; if (mc.level == null) return null;
Entity entity = mc.level.getEntity(uuid); Entity entity = mc.level.getEntity(uuid);
@@ -40,6 +66,11 @@ public class Friend {
return player; return player;
} }
public @Nullable PlayerInfo getPlayerInfo() {
if (mc.getConnection() == null) return null;
return mc.getConnection().getPlayerInfo(uuid);
}
public boolean isSearchMatch() { public boolean isSearchMatch() {
return searchMatch; return searchMatch;
} }
@@ -56,4 +87,4 @@ public class Friend {
NOT_BEFRIENDED, NOT_BEFRIENDED,
NO_FRIENDS; // :( NO_FRIENDS; // :(
} }
} }
@@ -29,6 +29,7 @@ public class FriendManager {
public void add(UUID uuid) { public void add(UUID uuid) {
Friend friend = new Friend(uuid); Friend friend = new Friend(uuid);
friend.setName(friend.getPlayer().getName().getString()); friend.setName(friend.getPlayer().getName().getString());
friend.setNick(friend.getName());
add(friend); add(friend);
} }
@@ -61,6 +62,11 @@ public class FriendManager {
return Friend.Status.SUCCESS; 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) { public Friend get(UUID uuid) {
for (Friend friend : friends) { for (Friend friend : friends) {
if (friend.getUuid().equals(uuid)) { if (friend.getUuid().equals(uuid)) {
@@ -1,38 +1,22 @@
package me.retucio.sputnik.macro; package me.retucio.sputnik.macro;
import me.retucio.sputnik.util.ChatUtil; import me.retucio.sputnik.util.ChatUtil;
import me.retucio.sputnik.util.KeyUtil;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class Macro { public abstract class Macro {
private String name; protected String name;
private int key; protected int key;
private final List<String> lines = new ArrayList<>();
private boolean searchMatch = true; protected Macro(String name, int key) {
public Macro(String name) {
this(name, GLFW.GLFW_KEY_UNKNOWN, List.of());
}
public Macro(String name, int key, List<String> lines) {
this.name = name; this.name = name;
this.key = key; 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; } public String getName() { return name; }
@@ -41,13 +25,80 @@ public class Macro {
public int getKey() { return key; } public int getKey() { return key; }
public void setKey(int key) { this.key = key; } public void setKey(int key) { this.key = key; }
public List<String> getLines() { return lines; } private boolean searchMatch = true;
public void setLines(List<String> lines) {
this.lines.clear();
this.lines.addAll(lines);
}
public boolean isSearchMatch() { return searchMatch; } public boolean isSearchMatch() { return searchMatch; }
public void setSearchMatch(boolean searchMatch) { this.searchMatch = 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);
}
}
}
}
@@ -2,7 +2,7 @@ package me.retucio.sputnik.macro;
import me.retucio.sputnik.config.ConfigManager; import me.retucio.sputnik.config.ConfigManager;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -14,6 +14,9 @@ public class MacroManager {
private final List<Macro> macros = new ArrayList<>(); 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) { public boolean add(Macro macro) {
if (getByName(macro.getName()) != null) return false; if (getByName(macro.getName()) != null) return false;
macros.add(macro); macros.add(macro);
@@ -34,15 +37,20 @@ public class MacroManager {
} }
public boolean onKeyPress(int key) { 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; running = true;
for (Macro macro : new ArrayList<>(macros)) { try {
if (macro.getKey() != key) continue; boolean ran = false;
macro.run(); for (Macro macro : new ArrayList<>(macros)) {
ran = true; if (macro.getKey() != key) continue;
macro.run();
ran = true;
}
return ran;
} finally {
running = false;
} }
return ran;
} }
public void setMacros(List<Macro> macros) { public void setMacros(List<Macro> macros) {
@@ -1,6 +1,7 @@
package me.retucio.sputnik.mixin.accessors; package me.retucio.sputnik.mixin.accessors;
import net.minecraft.client.renderer.item.ItemStackRenderState; import net.minecraft.client.renderer.item.ItemStackRenderState;
import net.minecraft.client.resources.model.geometry.ItemQuads;
import net.minecraft.client.resources.model.cuboid.ItemTransform; import net.minecraft.client.resources.model.cuboid.ItemTransform;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
@@ -11,4 +12,7 @@ public interface LayerRenderStateAccessor {
@Accessor("itemTransform") @Accessor("itemTransform")
ItemTransform sputnik$getTransform(); ItemTransform sputnik$getTransform();
}
@Accessor("quads")
ItemQuads sputnik$getQuads();
}
@@ -8,8 +8,10 @@ import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -1,7 +1,7 @@
package me.retucio.sputnik.mixin.mixins.hud; package me.retucio.sputnik.mixin.mixins.hud;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue; 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.Sputnik;
import me.retucio.sputnik.event.render.Render2DEvent; import me.retucio.sputnik.event.render.Render2DEvent;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
@@ -79,7 +79,7 @@ public abstract class HudMixin {
HudRenderer.INSTANCE.render(gui, dt); 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) { private void onRenderCrosshair(GuiGraphicsExtractor gui, RenderPipeline pipeline, Identifier id, int x, int y, int width, int height) {
// dangerous abbreviation // dangerous abbreviation
CrosshairPlus cp = ModuleManager.INSTANCE.getModuleByClass(CrosshairPlus.class); CrosshairPlus cp = ModuleManager.INSTANCE.getModuleByClass(CrosshairPlus.class);
@@ -2,6 +2,7 @@ package me.retucio.sputnik.mixin.mixins.io;
import me.retucio.sputnik.Sputnik; import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.event.input.KeyEvent; import me.retucio.sputnik.event.input.KeyEvent;
import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.KeyboardHandler; import net.minecraft.client.KeyboardHandler;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@@ -14,9 +15,9 @@ public abstract class KeyboardHandlerMixin {
@Inject(method = "keyPress", at = @At("HEAD"), cancellable = true) @Inject(method = "keyPress", at = @At("HEAD"), cancellable = true)
private void onKeyPress(long handle, int action, net.minecraft.client.input.KeyEvent input, CallbackInfo ci) { 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); 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(); if (event.isCancelled()) ci.cancel();
} }
} }
@@ -16,7 +16,10 @@ public abstract class MouseHandlerMixin {
@Inject(method = "onButton", at = @At("HEAD"), cancellable = true) @Inject(method = "onButton", at = @At("HEAD"), cancellable = true)
private void onMouseButton(long handle, MouseButtonInfo input, int action, CallbackInfo ci) { 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())); MouseClickEvent event = Sputnik.EVENT_BUS.post(new MouseClickEvent(action, input.button()));
if (event.isCancelled()) ci.cancel(); if (event.isCancelled()) ci.cancel();
} }
@@ -0,0 +1,33 @@
package me.retucio.sputnik.mixin.mixins.misc;
import me.retucio.sputnik.util.Lists;
import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponentMap;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.Item;
import org.jspecify.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Holder.Reference.class)
public abstract class ReferenceMixin<T> {
@Shadow
private @Nullable DataComponentMap components;
@Shadow
private @Nullable T value;
@Inject(method = "bindComponents", at = @At("TAIL"))
private void onBindComponents(DataComponentMap components, CallbackInfo ci) {
if (this.components == null || !this.components.has(DataComponents.FOOD)) return;
if (!(this.value instanceof Item item)) return;
Lists.foodList.add(item);
Lists.foodNames.put(item, BuiltInRegistries.ITEM.getKey(item).toLanguageKey());
}
}
@@ -3,18 +3,13 @@ package me.retucio.sputnik.mixin.mixins.network;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import me.retucio.sputnik.command.CommandManager; import me.retucio.sputnik.command.CommandManager;
import me.retucio.sputnik.event.network.SendMessageEvent; 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 me.retucio.sputnik.util.ChatUtil;
import net.minecraft.client.multiplayer.ClientPacketListener; 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.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static me.retucio.sputnik.Sputnik.*; import static me.retucio.sputnik.Sputnik.*;
@@ -51,11 +46,4 @@ public abstract class ClientPacketListenerMixin {
mc.gui.hud.getChat().addRecentChat(content); mc.gui.hud.getChat().addRecentChat(content);
ci.cancel(); 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);
}
} }
@@ -1,17 +1,17 @@
package me.retucio.sputnik.mixin.mixins.network; package me.retucio.sputnik.mixin.mixins.network;
import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; import com.mojang.authlib.services.MinecraftServicesUserApiService;
import com.mojang.authlib.yggdrasil.response.UserAttributesResponse; import com.mojang.authlib.services.response.UserAttributesResponse;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
// código robado de: https://github.com/kb-1000/no-telemetry // código robado de: https://github.com/kb-1000/no-telemetry
@Mixin(YggdrasilUserApiService.class) @Mixin(MinecraftServicesUserApiService.class)
public abstract class YggdrasilUserApiServiceMixin { 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) { private boolean getTelemetry(UserAttributesResponse.Privileges instance) {
return false; return false;
} }
@@ -4,6 +4,7 @@ import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.render.GlintPlus; import me.retucio.sputnik.module.modules.render.GlintPlus;
import net.minecraft.client.renderer.entity.layers.EquipmentLayerRenderer; import net.minecraft.client.renderer.entity.layers.EquipmentLayerRenderer;
import net.minecraft.client.renderer.rendertype.RenderType; import net.minecraft.client.renderer.rendertype.RenderType;
import net.minecraft.resources.Identifier;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.ModifyVariable;
@@ -12,9 +13,9 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(EquipmentLayerRenderer.class) @Mixin(EquipmentLayerRenderer.class)
public abstract class EquipmentLayerRendererMixin { 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;")) @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() { private RenderType redirectArmorEntityGlint(Identifier texture) {
GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class); GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
return glintPlus.getArmorEntityGlint(); return glintPlus.getArmorEntityGlint(texture);
} }
} }
@@ -15,8 +15,11 @@ import com.mojang.blaze3d.resource.CrossFrameResourcePool;
import net.minecraft.client.DeltaTracker; import net.minecraft.client.DeltaTracker;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GameRenderer; 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.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 net.minecraft.client.resources.model.ModelManager;
import org.joml.Matrix4fc; import org.joml.Matrix4fc;
@@ -52,23 +55,20 @@ public abstract class GameRendererMixin {
private CrossFrameResourcePool resourcePool; private CrossFrameResourcePool resourcePool;
@Inject(method = "<init>", at = @At("TAIL")) @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);; zoom = ModuleManager.INSTANCE.getModuleByClass(Zoom.class);;
freecam = ModuleManager.INSTANCE.getModuleByClass(Freecam.class); freecam = ModuleManager.INSTANCE.getModuleByClass(Freecam.class);
noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class); noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
lsd = ModuleManager.INSTANCE.getModuleByClass(Lsd.class); lsd = ModuleManager.INSTANCE.getModuleByClass(Lsd.class);
} }
// se aplica justo donde vanilla mete sus efectos de post (nausea, etc.): el mundo ya está @Inject(method = "render", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/client/renderer/LevelRenderer;blitEntityOutline()V"))
// en mainRenderTarget y el HUD todavía no, así que sólo distorsiona la escena 3D private void applyLsd(CallbackInfo ci) {
@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) {
if (lsd.isEnabled()) lsd.apply(mainRenderTarget, resourcePool); if (lsd.isEnabled()) lsd.apply(mainRenderTarget, resourcePool);
} }
@Inject(method = "render", at = @At("HEAD"), cancellable = true) @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()) { if (ModuleManager.INSTANCE.getModuleByClass(UnfocusedCpu.class).isEnabled() && !mc.isWindowActive()) {
ci.cancel(); ci.cancel();
} }
@@ -81,7 +81,7 @@ public abstract class GameRendererMixin {
@Inject(method = "renderItemInHand", at = @At("HEAD"), cancellable = true) @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()) if ((zoom.isEnabled() && !zoom.showHands.getValue())
|| (freecam.isEnabled() && !freecam.renderHands.getValue())) || (freecam.isEnabled() && !freecam.renderHands.getValue()))
ci.cancel(); ci.cancel();
@@ -3,11 +3,12 @@ package me.retucio.sputnik.mixin.mixins.render;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.render.GlintPlus; import me.retucio.sputnik.module.modules.render.GlintPlus;
import net.minecraft.client.renderer.feature.ItemFeatureRenderer; 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.RenderType;
import net.minecraft.client.renderer.rendertype.RenderTypes;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; 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) @Mixin(ItemFeatureRenderer.class)
@@ -15,17 +16,15 @@ public abstract class ItemFeatureRendererMixin {
// obtener módulo en cada redirect, ya que tiene un inicializador estático // 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;")) @ModifyExpressionValue(method = "prepareMainSubmit", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/geometry/BakedQuad$MaterialInfo;itemGlintRenderType()Lnet/minecraft/client/renderer/rendertype/RenderType;"))
private static RenderType redirectGlint() { private RenderType sputnik$colorGlint(RenderType original, @Local BakedQuad.MaterialInfo materialInfo) {
GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class); GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
if (glintPlus == null) return RenderTypes.glint(); return glintPlus == null ? original : glintPlus.getGlint(original, materialInfo);
return glintPlus.getGlint();
} }
@Redirect(method = "getFoilBuffer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/rendertype/RenderTypes;glintTranslucent()Lnet/minecraft/client/renderer/rendertype/RenderType;")) @ModifyExpressionValue(method = "prepareMainSubmit", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/geometry/BakedQuad$MaterialInfo;itemGlintSpecialRenderType()Lnet/minecraft/client/renderer/rendertype/RenderType;"))
private static RenderType redirectGlintTranslucent() { private RenderType sputnik$colorSpecialGlint(RenderType original, @Local BakedQuad.MaterialInfo materialInfo) {
GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class); GlintPlus glintPlus = ModuleManager.INSTANCE.getModuleByClass(GlintPlus.class);
if (glintPlus == null) return RenderTypes.glintTranslucent(); return glintPlus == null ? original : glintPlus.getGlint(original, materialInfo);
return glintPlus.getGlintTranslucent();
} }
} }
@@ -7,7 +7,7 @@ import me.retucio.sputnik.event.render.RenderArmEvent;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.render.HandView; import me.retucio.sputnik.module.modules.render.HandView;
import net.minecraft.client.player.AbstractClientPlayer; 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.client.renderer.SubmitNodeCollector;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.HumanoidArm; import net.minecraft.world.entity.HumanoidArm;
@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static me.retucio.sputnik.Sputnik.*; import static me.retucio.sputnik.Sputnik.*;
@Mixin(ItemInHandRenderer.class) @Mixin(FirstPersonHandsAndItemsRenderer.class)
public abstract class ItemInHandRendererMixin { public abstract class ItemInHandRendererMixin {
@Unique @Unique
@@ -49,12 +49,12 @@ public abstract class ItemInHandRendererMixin {
handView = ModuleManager.INSTANCE.getModuleByClass(HandView.class); 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) { 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)); 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) { 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)); EVENT_BUS.post(new RenderArmEvent(matrices, hand));
} }
@@ -1,7 +1,6 @@
package me.retucio.sputnik.mixin.mixins.render; package me.retucio.sputnik.mixin.mixins.render;
import com.llamalad7.mixinextras.sugar.Local; import com.mojang.renderpearl.api.buffers.GpuBufferSlice;
import com.mojang.blaze3d.buffers.GpuBufferSlice;
import com.mojang.blaze3d.resource.GraphicsResourceAllocator; import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis; 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.event.render.RenderBlockOutlineEvent;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.camera.Freecam; import me.retucio.sputnik.module.modules.camera.Freecam;
import me.retucio.sputnik.module.modules.render.BreakingProgress;
import me.retucio.sputnik.util.render.SputnikBuffers; 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.LevelRenderer;
import net.minecraft.client.renderer.ShaderManager;
import net.minecraft.client.renderer.SubmitNodeCollector; 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.CameraRenderState;
import net.minecraft.client.renderer.state.level.LevelRenderState; 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.ProfilerFiller;
import net.minecraft.util.profiling.Profiler;
import org.joml.Matrix4fc; import org.joml.Matrix4fc;
import org.joml.Vector4f; import org.joml.Vector4f;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.invoke.arg.Args; import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
@@ -31,18 +39,29 @@ import static me.retucio.sputnik.Sputnik.mc;
@Mixin(LevelRenderer.class) @Mixin(LevelRenderer.class)
public abstract class LevelRendererMixin { 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")) @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; if (mc == null || mc.level == null) return;
ProfilerFiller profiler = Profiler.get();
PoseStack matrices = new PoseStack(); PoseStack matrices = new PoseStack();
matrices.pushPose(); matrices.pushPose();
matrices.mulPose(Axis.XP.rotationDegrees(cameraState.xRot)); matrices.rotate(Axis.XP.rotationDegrees(cameraState.xRot));
matrices.mulPose(Axis.YP.rotationDegrees(cameraState.yRot + 180f)); matrices.rotate(Axis.YP.rotationDegrees(cameraState.yRot + 180f));
profiler.push(Sputnik.MOD_ID + "-3d"); 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 SputnikBuffers.flush(); // antes de que empiece el hud
profiler.pop(); profiler.pop();
@@ -55,13 +74,6 @@ public abstract class LevelRendererMixin {
if (freecam.isEnabled() && !freecam.blockOutlines.getValue()) ci.cancel(); 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 // 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")) @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) { private void modifyBlockOutline(Args args) {
@@ -72,4 +84,12 @@ public abstract class LevelRendererMixin {
if (event.getLineWidth() != (float) args.get(5)) if (event.getLineWidth() != (float) args.get(5))
args.set(5, event.getLineWidth()); 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();
}
}
}
@@ -1,7 +1,7 @@
package me.retucio.sputnik.mixin.mixins.render; package me.retucio.sputnik.mixin.mixins.render;
import com.mojang.blaze3d.systems.RenderSystem; 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.ModuleManager;
import me.retucio.sputnik.module.modules.camera.Fullbright; import me.retucio.sputnik.module.modules.camera.Fullbright;
import net.minecraft.client.renderer.Lightmap; import net.minecraft.client.renderer.Lightmap;
@@ -8,7 +8,6 @@ import me.retucio.sputnik.module.modules.camera.Freecam;
import me.retucio.sputnik.module.modules.render.Nametags; import me.retucio.sputnik.module.modules.render.Nametags;
import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EntityTypes; import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
@@ -16,6 +15,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -49,19 +49,27 @@ public abstract class LivingEntityRendererMixin<T extends LivingEntity> {
} }
@ModifyReturnValue(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN")) @ModifyReturnValue(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN"))
private boolean shouldRenderPlayerNametag(boolean original, @Local(argsOnly = true) T livingEntity) { private boolean shouldRenderPlayerNametag(boolean original, @Local(argsOnly = true, name = "entity") T entity) {
if (nametags.isEnabled() && livingEntity instanceof Player) if (nametags.isEnabled() && entity instanceof Player)
return nametags.entities.isEnabled(EntityTypes.PLAYER) && original; return nametags.entities.isEnabled(EntityTypes.PLAYER) && original;
return original; return original;
} }
@Inject(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN"), cancellable = true) @Inject(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN"), cancellable = true)
private void renderSelfNametag(T livingEntity, double d, CallbackInfoReturnable<Boolean> cir) { private void renderSelfNametag(T entity, double distanceToCameraSq, CallbackInfoReturnable<Boolean> cir) {
if (livingEntity instanceof Player player) { if (entity instanceof Player player) {
if (player == mc.player && nametags.showSelf.getValue()) { if (player == mc.player && nametags.showSelf.getValue()) {
cir.setReturnValue(true); cir.setReturnValue(true);
cir.cancel(); cir.cancel();
} }
} }
} }
@ModifyArg(method = "extractNameTags(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/EntityRenderer;extractNameTags(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;FDD)V"), index = 3)
private double modifyNametagRenderDistance(double original) {
if (nametags.isEnabled()) {
return nametags.distance.getValue();
}
return original;
}
} }
@@ -3,9 +3,9 @@ package me.retucio.sputnik.mixin.mixins.render;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.render.NoRender; import me.retucio.sputnik.module.modules.render.NoRender;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ScreenEffectRenderer; import net.minecraft.client.renderer.ScreenEffectRenderer;
import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.state.level.PlayerRenderState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
@@ -31,7 +31,7 @@ public abstract class ScreenEffectRendererMixin {
} }
@Inject(method = "submitWater", at = @At("HEAD"), cancellable = true) @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(); if (noRender.isEnabled() && !noRender.fluidOverlay.getValue()) ci.cancel();
} }
} }
@@ -6,14 +6,23 @@ import net.minecraft.client.renderer.ShaderManager;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; 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) @Mixin(ShaderManager.class)
public abstract class ShaderManagerMixin { 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")) @Inject(method = "reload", at = @At("RETURN"))
private void onReload(CallbackInfo ci) { private void onReload(PreparableReloadListener.SharedState state, Executor preparationExecutor,
Pipelines.init(); PreparableReloadListener.PreparationBarrier barrier, Executor applyExecutor,
PostShaders.reload(); CallbackInfoReturnable<CompletableFuture<Void>> cir) {
cir.getReturnValue().thenRun(() -> {
Pipelines.init();
PostShaders.reload();
});
} }
} }
@@ -1,6 +1,7 @@
package me.retucio.sputnik.mixin.mixins.render; package me.retucio.sputnik.mixin.mixins.render;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.renderpearl.api.commands.RenderPass;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.render.NoRender; import me.retucio.sputnik.module.modules.render.NoRender;
import me.retucio.sputnik.module.modules.world.TimeChanger; import me.retucio.sputnik.module.modules.world.TimeChanger;
@@ -26,17 +27,17 @@ public abstract class SkyRendererMixin {
} }
@Inject(method = "renderSun", at = @At("HEAD"), cancellable = true) @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(); if (timeChanger.isEnabled() && !timeChanger.renderSun.getValue()) ci.cancel();
} }
@Inject(method = "renderMoon", at = @At("HEAD"), cancellable = true) @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.isEnabled()) return;
if (!timeChanger.renderMoon.getValue()) ci.cancel(); 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) { private MoonPhase timeChangerMoonPhase(MoonPhase original) {
if (!timeChanger.isEnabled() || timeChanger.moonPhase.is(TimeChanger.MoonPhases.DEFAULT)) return original; if (!timeChanger.isEnabled() || timeChanger.moonPhase.is(TimeChanger.MoonPhases.DEFAULT)) return original;
int phase = timeChanger.moonPhase.getIndex(); int phase = timeChanger.moonPhase.getIndex();
@@ -45,12 +46,12 @@ public abstract class SkyRendererMixin {
} }
@Inject(method = "renderStars", at = @At("HEAD"), cancellable = true) @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(); if (timeChanger.isEnabled() && !timeChanger.renderStars.getValue()) ci.cancel();
} }
@Inject(method = "renderEndFlash", at = @At("HEAD"), cancellable = true) @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); NoRender noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
if (noRender.isEnabled() && !noRender.endFlashes.getValue()) ci.cancel(); if (noRender.isEnabled() && !noRender.endFlashes.getValue()) ci.cancel();
} }
@@ -4,7 +4,7 @@ import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.render.NoRender; import me.retucio.sputnik.module.modules.render.NoRender;
import net.minecraft.client.renderer.WeatherEffectRenderer; import net.minecraft.client.renderer.WeatherEffectRenderer;
import net.minecraft.client.renderer.state.level.WeatherRenderState; 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.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@@ -24,7 +24,7 @@ public abstract class WeatherEffectRendererMixin {
} }
@Inject(method = "render", at = @At("HEAD")) @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.isEnabled()) {
if (!noRender.rain.getValue()) renderState.rainColumns.clear(); if (!noRender.rain.getValue()) renderState.rainColumns.clear();
if (!noRender.snow.getValue()) renderState.snowColumns.clear(); if (!noRender.snow.getValue()) renderState.snowColumns.clear();
@@ -1,6 +1,7 @@
package me.retucio.sputnik.module; package me.retucio.sputnik.module;
import com.github.retucio.neutrino.EventListener; import com.github.retucio.neutrino.EventListener;
import com.mojang.blaze3d.platform.InputConstants;
import me.retucio.sputnik.Sputnik; import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.config.ConfigManager; import me.retucio.sputnik.config.ConfigManager;
import me.retucio.sputnik.event.sputnik.ToggleModuleEvent; import me.retucio.sputnik.event.sputnik.ToggleModuleEvent;
@@ -16,7 +17,6 @@ import me.retucio.sputnik.util.Colors;
import me.retucio.sputnik.util.I18nUtil; import me.retucio.sputnik.util.I18nUtil;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.lwjgl.glfw.GLFW;
import java.awt.*; import java.awt.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@@ -41,7 +41,7 @@ public class Module {
protected KeySetting bind = new KeySetting( protected KeySetting bind = new KeySetting(
"tecla", "tecla",
"tecla asignada al módulo, ESC para desactivar", "tecla asignada al módulo, ESC para desactivar",
GLFW.GLFW_KEY_UNKNOWN InputConstants.UNKNOWN.getValue()
).translationKey("sputnik.setting.common.bind"); ).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 // 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
@@ -185,8 +185,6 @@ public class Module {
// getters y setters // getters y setters
// OJO: nombre interno. es la clave de la config. (moduleStates, getSettingKey, settingsPanels)
// y no se traduce nunca. para mostrarlo al usuario usar getDisplayName()
public String getName() { public String getName() {
return name; return name;
} }
@@ -182,10 +182,12 @@ public class ModuleManager {
add(new Nametags()); add(new Nametags());
add(new NoRender()); add(new NoRender());
add(new Particles()); add(new Particles());
add(new Stylish());
add(new Tracers()); add(new Tracers());
} }
private void addWorld() { private void addWorld() {
add(new AutoMine());
add(new AutoSign()); add(new AutoSign());
add(new AutoTool()); add(new AutoTool());
add(new BlockInfo()); add(new BlockInfo());
@@ -1,6 +1,6 @@
package me.retucio.sputnik.module.modules.camera; 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.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.setting.settings.ColorSetting; import me.retucio.sputnik.module.setting.settings.ColorSetting;
@@ -31,7 +31,7 @@ import net.minecraft.network.protocol.game.*;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
/** continúa en: /** continúa en:
* @see CameraMixin * @see CameraMixin
@@ -104,7 +104,7 @@ public class Freecam extends Module {
private final KeySetting scrollKey = sgSpeed.add(new KeySetting( private final KeySetting scrollKey = sgSpeed.add(new KeySetting(
"tecla del scroll", "tecla del scroll",
"tecla a mantener pulsada para cambiar velocidad con el 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( private final NumberSetting scrollSens = sgSpeed.add(new NumberSetting(
@@ -128,7 +128,7 @@ public class Freecam extends Module {
super("cámara libre", super("cámara libre",
"permite a la cámara moverse independientemente del jugador. útil para explorar alrededores", "permite a la cámara moverse independientemente del jugador. útil para explorar alrededores",
Category.CAMERA, Category.CAMERA,
GLFW.GLFW_KEY_V); InputConstants.KEY_V);
speedSetting.onUpdate(newSpeed -> speed = newSpeed); speedSetting.onUpdate(newSpeed -> speed = newSpeed);
} }
@@ -262,37 +262,36 @@ public class Freecam extends Module {
Packet<?> packet = event.getPacket(); Packet<?> packet = event.getPacket();
if (packet instanceof ServerboundPlayerActionPacket if (packet instanceof ServerboundPlayerActionPacket
|| packet instanceof ServerboundUseItemOnPacket || packet instanceof ServerboundUseItemOnPacket
|| packet instanceof ServerboundUseItemPacket || packet instanceof ServerboundUseItemPacket) {
|| packet instanceof ServerboundSwingPacket) {
event.cancel(); event.cancel();
} }
} }
@EventListener @EventListener
private void onKey(KeyEvent event) { 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; if (mc.gui.screen() != null) return;
net.minecraft.client.input.KeyEvent key = new net.minecraft.client.input.KeyEvent(event.getKey(), event.getScancode(), 0); net.minecraft.client.input.KeyEvent key = new net.minecraft.client.input.KeyEvent(event.getKey(), event.getScancode(), 0);
boolean shouldCancel = true; boolean shouldCancel = true;
if (mc.options.keyUp.matches(key)) { if (mc.options.keyUp.matches(key)) {
forward = event.getAction() != GLFW.GLFW_RELEASE; forward = event.getAction() != InputConstants.RELEASE;
mc.options.keyUp.setDown(false); mc.options.keyUp.setDown(false);
} else if (mc.options.keyDown.matches(key)) { } else if (mc.options.keyDown.matches(key)) {
backward = event.getAction() != GLFW.GLFW_RELEASE; backward = event.getAction() != InputConstants.RELEASE;
mc.options.keyDown.setDown(false); mc.options.keyDown.setDown(false);
} else if (mc.options.keyRight.matches(key)) { } else if (mc.options.keyRight.matches(key)) {
right = event.getAction() != GLFW.GLFW_RELEASE; right = event.getAction() != InputConstants.RELEASE;
mc.options.keyRight.setDown(false); mc.options.keyRight.setDown(false);
} else if (mc.options.keyLeft.matches(key)) { } else if (mc.options.keyLeft.matches(key)) {
left = event.getAction() != GLFW.GLFW_RELEASE; left = event.getAction() != InputConstants.RELEASE;
mc.options.keyLeft.setDown(false); mc.options.keyLeft.setDown(false);
} else if (mc.options.keyJump.matches(key)) { } else if (mc.options.keyJump.matches(key)) {
up = event.getAction() != GLFW.GLFW_RELEASE; up = event.getAction() != InputConstants.RELEASE;
mc.options.keyJump.setDown(false); mc.options.keyJump.setDown(false);
} else if (mc.options.keyShift.matches(key)) { } else if (mc.options.keyShift.matches(key)) {
down = event.getAction() != GLFW.GLFW_RELEASE; down = event.getAction() != InputConstants.RELEASE;
mc.options.keyShift.setDown(false); mc.options.keyShift.setDown(false);
} else { } else {
shouldCancel = false; shouldCancel = false;
@@ -303,29 +302,29 @@ public class Freecam extends Module {
@EventListener @EventListener
private void onMouseClick(MouseClickEvent event) { // por si el restrasado del usuario usa el ratón para moverse 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; if (mc.gui.screen() != null) return;
MouseButtonEvent click = new MouseButtonEvent(0, 0, new MouseButtonInfo(event.getButton(), 0)); MouseButtonEvent click = new MouseButtonEvent(0, 0, new MouseButtonInfo(event.getButton(), 0));
boolean shouldCancel = true; boolean shouldCancel = true;
if (mc.options.keyUp.matchesMouse(click)) { if (mc.options.keyUp.matchesMouse(click)) {
forward = event.getAction() != GLFW.GLFW_RELEASE; forward = event.getAction() != InputConstants.RELEASE;
mc.options.keyUp.setDown(false); mc.options.keyUp.setDown(false);
} else if (mc.options.keyDown.matchesMouse(click)) { } else if (mc.options.keyDown.matchesMouse(click)) {
backward = event.getAction() != GLFW.GLFW_RELEASE; backward = event.getAction() != InputConstants.RELEASE;
mc.options.keyDown.setDown(false); mc.options.keyDown.setDown(false);
} else if (mc.options.keyRight.matchesMouse(click)) { } else if (mc.options.keyRight.matchesMouse(click)) {
right = event.getAction() != GLFW.GLFW_RELEASE; right = event.getAction() != InputConstants.RELEASE;
mc.options.keyRight.setDown(false); mc.options.keyRight.setDown(false);
} else if (mc.options.keyLeft.matchesMouse(click)) { } else if (mc.options.keyLeft.matchesMouse(click)) {
left = event.getAction() != GLFW.GLFW_RELEASE; left = event.getAction() != InputConstants.RELEASE;
mc.options.keyLeft.setDown(false); mc.options.keyLeft.setDown(false);
} else if (mc.options.keyJump.matchesMouse(click)) { } else if (mc.options.keyJump.matchesMouse(click)) {
up = event.getAction() != GLFW.GLFW_RELEASE; up = event.getAction() != InputConstants.RELEASE;
mc.options.keyJump.setDown(false); mc.options.keyJump.setDown(false);
} else if (mc.options.keyShift.matchesMouse(click)) { } else if (mc.options.keyShift.matchesMouse(click)) {
down = event.getAction() != GLFW.GLFW_RELEASE; down = event.getAction() != InputConstants.RELEASE;
mc.options.keyShift.setDown(false); mc.options.keyShift.setDown(false);
} else { } else {
shouldCancel = false; shouldCancel = false;
@@ -358,8 +357,9 @@ public class Freecam extends Module {
if (mc.player == null) return; // el jugador probablemente nunca sea nulo bajo estas circunstancias pero quién sabe if (mc.player == null) return; // el jugador probablemente nunca sea nulo bajo estas circunstancias pero quién sabe
if (event.getPacket() instanceof ClientboundPlayerCombatKillPacket packet) { if (event.getPacket() instanceof ClientboundPlayerCombatKillPacket packet) {
if (mc.player.getId() == packet.playerId()) if (mc.player.getId() == packet.playerId()) {
toggle(); toggle();
}
} else if (event.getPacket() instanceof ClientboundSetHealthPacket packet) { } else if (event.getPacket() instanceof ClientboundSetHealthPacket packet) {
if (mc.player.getHealth() - packet.getHealth() > 0 && toggleOnDamage.getValue()) { if (mc.player.getHealth() - packet.getHealth() > 0 && toggleOnDamage.getValue()) {
ChatUtil.info(Component.translatable("sputnik.module.freecam.damagedisable")); ChatUtil.info(Component.translatable("sputnik.module.freecam.damagedisable"));
@@ -9,7 +9,7 @@ import me.retucio.sputnik.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.KeyUtil; import me.retucio.sputnik.util.KeyUtil;
import net.minecraft.client.CameraType; import net.minecraft.client.CameraType;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
/** continúa en: /** continúa en:
* @see CameraMixin * @see CameraMixin
@@ -37,7 +37,7 @@ public class Freelook extends Module {
super("perspectiva libre", super("perspectiva libre",
"te permite mover la cámara de la perspectiva sin mover la del jugador, o vice versa", "te permite mover la cámara de la perspectiva sin mover la del jugador, o vice versa",
Category.CAMERA, Category.CAMERA,
GLFW.GLFW_KEY_B); InputConstants.KEY_B);
keyMode.setDefaultValue(KeyMode.HOLD); keyMode.setDefaultValue(KeyMode.HOLD);
keyMode.setValue(KeyMode.HOLD); keyMode.setValue(KeyMode.HOLD);
@@ -75,18 +75,18 @@ public class Freelook extends Module {
for (int i = 0; i < (arrowSens.getValue() * 2); i++) { for (int i = 0; i < (arrowSens.getValue() * 2); i++) {
switch (mode.getValue()) { switch (mode.getValue()) {
case PLAYER -> { case PLAYER -> {
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT)) yaw -= 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_LEFT)) yaw -= 0.5f;
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_RIGHT)) yaw += 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_RIGHT)) yaw += 0.5f;
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_UP)) pitch -= 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_UP)) pitch -= 0.5f;
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_DOWN)) pitch += 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_DOWN)) pitch += 0.5f;
} case CAMERA -> { } case CAMERA -> {
float yaw = mc.player.getYRot(); float yaw = mc.player.getYRot();
float pitch = mc.player.getXRot(); float pitch = mc.player.getXRot();
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT)) yaw -= 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_LEFT)) yaw -= 0.5f;
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_RIGHT)) yaw += 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_RIGHT)) yaw += 0.5f;
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_UP)) pitch -= 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_UP)) pitch -= 0.5f;
if (KeyUtil.isKeyDown(GLFW.GLFW_KEY_DOWN)) pitch += 0.5f; if (KeyUtil.isKeyDown(InputConstants.KEY_DOWN)) pitch += 0.5f;
mc.player.setYRot(yaw); mc.player.setYRot(yaw);
mc.player.setXRot(pitch); mc.player.setXRot(pitch);
@@ -9,7 +9,7 @@ import me.retucio.sputnik.module.setting.settings.EnumSetting;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects; import net.minecraft.world.effect.MobEffects;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.awt.*; import java.awt.*;
@@ -39,7 +39,7 @@ public class Fullbright extends Module {
super("brilli brilli", super("brilli brilli",
"deshabilita la oscuridad (y aplica colores a los shaders)", "deshabilita la oscuridad (y aplica colores a los shaders)",
Category.CAMERA, Category.CAMERA,
GLFW.GLFW_KEY_K); InputConstants.KEY_K);
mode.onUpdate(mode -> { if (mode != Modes.POTION) disableNightVision(); }); mode.onUpdate(mode -> { if (mode != Modes.POTION) disableNightVision(); });
} }
@@ -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.KeySetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting; import me.retucio.sputnik.module.setting.settings.NumberSetting;
import net.minecraft.client.CameraType; import net.minecraft.client.CameraType;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
/** continúa en: /** continúa en:
@@ -36,7 +36,7 @@ public class PerspectivePlus extends Module {
1, 0, 8, 0.1)); 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", 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; private double distance;
@@ -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.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.KeySetting; import me.retucio.sputnik.module.setting.settings.KeySetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting; import me.retucio.sputnik.module.setting.settings.NumberSetting;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
/** continúa en: /** 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)", 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)); 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", 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", private final NumberSetting mouseSensMultiplier = sgCam.add(new NumberSetting("sensibilidad", "multiplicador de la sensibilidad del ratón",
0.4, 0, 1, 0.05)); 0.4, 0, 1, 0.05));
@@ -49,7 +49,7 @@ public class Zoom extends Module {
super("zoom", super("zoom",
"lupa", "lupa",
Category.CAMERA, Category.CAMERA,
GLFW.GLFW_KEY_F); InputConstants.KEY_F);
keyMode.setDefaultValue(KeyMode.HOLD); keyMode.setDefaultValue(KeyMode.HOLD);
keyMode.setValue(KeyMode.HOLD); keyMode.setValue(KeyMode.HOLD);
@@ -103,7 +103,7 @@ public class Zoom extends Module {
@EventListener @EventListener
private void onMouseScroll(MouseScrollEvent event) { 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) { if (isEnabled() && scrollSens.getValue() > 0 && key) {
value += event.getVertical() * 0.25 * (scrollSens.getValue() * value); value += event.getVertical() * 0.25 * (scrollSens.getValue() * value);
if (value < 1) value = 1; if (value < 1) value = 1;
@@ -1,6 +1,7 @@
package me.retucio.sputnik.module.modules.client; package me.retucio.sputnik.module.modules.client;
import com.github.retucio.neutrino.EventListener; import com.github.retucio.neutrino.EventListener;
import com.mojang.blaze3d.platform.InputConstants;
import me.retucio.sputnik.Sputnik; import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.command.CommandManager; import me.retucio.sputnik.command.CommandManager;
import me.retucio.sputnik.event.TickEvent; 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.module.setting.settings.StringSetting;
import me.retucio.sputnik.util.ChatUtil; import me.retucio.sputnik.util.ChatUtil;
import me.retucio.sputnik.util.Colors; import me.retucio.sputnik.util.Colors;
import org.lwjgl.glfw.GLFW;
import java.awt.*; import java.awt.*;
@@ -130,7 +130,7 @@ public class ClientSettingsModule extends Module {
super("interfaz", super("interfaz",
"ajustes de la interfaz, y otros misceláneos", "ajustes de la interfaz, y otros misceláneos",
Category.CLIENT, Category.CLIENT,
GLFW.GLFW_KEY_RIGHT_SHIFT); InputConstants.KEY_RSHIFT);
Sputnik.EVENT_BUS.subscribe(this); Sputnik.EVENT_BUS.subscribe(this);
@@ -11,7 +11,7 @@ import me.retucio.sputnik.util.ChatUtil;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
public class Friends extends Module { public class Friends extends Module {
@@ -34,8 +34,8 @@ public class Friends extends Module {
@EventListener @EventListener
public void onMouseClick(MouseClickEvent event) { public void onMouseClick(MouseClickEvent event) {
if (event.getButton() == GLFW.GLFW_MOUSE_BUTTON_MIDDLE if (event.getButton() == InputConstants.MOUSE_BUTTON_MIDDLE
&& event.getAction() == GLFW.GLFW_PRESS && event.getAction() == InputConstants.PRESS
&& middleClick.getValue()) && middleClick.getValue())
{ {
Entity target = mc.crosshairPickEntity; Entity target = mc.crosshairPickEntity;
@@ -9,7 +9,7 @@ import me.retucio.sputnik.ui.hud.HudRenderer;
import me.retucio.sputnik.ui.hud.HudEditorScreen; import me.retucio.sputnik.ui.hud.HudEditorScreen;
import me.retucio.sputnik.ui.hud.elements.CustomImageElement; import me.retucio.sputnik.ui.hud.elements.CustomImageElement;
import me.retucio.sputnik.ui.hud.elements.DynoElement; import me.retucio.sputnik.ui.hud.elements.DynoElement;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.awt.*; import java.awt.*;
@@ -32,7 +32,7 @@ public class Hud extends Module {
public KeySetting editorKey = sgEditor.add(new KeySetting( public KeySetting editorKey = sgEditor.add(new KeySetting(
"tecla del editor", "tecla del editor",
"tecla asignada al editor de elementos del hud", "tecla asignada al editor de elementos del hud",
GLFW.GLFW_KEY_INSERT InputConstants.KEY_INSERT
)); ));
public BooleanSetting axialMovement = sgEditor.add(new BooleanSetting( public BooleanSetting axialMovement = sgEditor.add(new BooleanSetting(
@@ -144,7 +144,7 @@ public class Hud extends Module {
super("HUD", super("HUD",
"superposición de la pantalla con info. adicional", "superposición de la pantalla con info. adicional",
Category.CLIENT, Category.CLIENT,
GLFW.GLFW_KEY_F12 InputConstants.KEY_F12
); );
dyno.onUpdate(v -> { dyno.onUpdate(v -> {
@@ -93,7 +93,7 @@ public class KillAura extends Module {
if (!mc.level.isTickingEntity(entity)) return; if (!mc.level.isTickingEntity(entity)) return;
if (swingHand.getValue()) { 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); mc.gameMode.attack(mc.player, entity);
@@ -15,7 +15,7 @@ import net.minecraft.world.Container;
import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NonNull;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.util.List; import java.util.List;
@@ -31,19 +31,19 @@ public class Burglar extends Module {
private final KeySetting triggerKey = sgKeys.add(new KeySetting( private final KeySetting triggerKey = sgKeys.add(new KeySetting(
"tecla activadora", "tecla activadora",
"tecla a mantener para que las otras teclas funcionen", "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( private final KeySetting stealKey = sgKeys.add(new KeySetting(
"robar", "robar",
"tecla para robar todo", "tecla para robar todo",
GLFW.GLFW_KEY_S InputConstants.KEY_S
)); ));
private final KeySetting dumpKey = sgKeys.add(new KeySetting( private final KeySetting dumpKey = sgKeys.add(new KeySetting(
"dejar", "dejar",
"tecla para dejar todo", "tecla para dejar todo",
GLFW.GLFW_KEY_D InputConstants.KEY_D
)); ));
@@ -67,7 +67,7 @@ public class Burglar extends Module {
@EventListener @EventListener
private void onKey(KeyEvent event) { 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; || !(mc.gui.screen() instanceof AbstractContainerScreen<?> container)) return;
if (event.getKey() == stealKey.getValue()) steal(container); if (event.getKey() == stealKey.getValue()) steal(container);
if (event.getKey() == dumpKey.getValue()) dump(container); if (event.getKey() == dumpKey.getValue()) dump(container);
@@ -12,7 +12,7 @@ import me.retucio.sputnik.util.InventoryUtil;
import me.retucio.sputnik.util.KeyUtil; import me.retucio.sputnik.util.KeyUtil;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.world.inventory.Slot; 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 { 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 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", GLFW.GLFW_KEY_S)); 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", GLFW.GLFW_KEY_D)); private final KeySetting row3key = sgGeneral.add(new KeySetting("fila 3", "tecla para mover items a la tercera fila", InputConstants.KEY_D));
public InventoryPlus() { public InventoryPlus() {
super("inventario plus", super("inventario plus",
@@ -33,13 +33,13 @@ public class InventoryPlus extends Module {
@EventListener @EventListener
private void onKey(KeyEvent event) { private void onKey(KeyEvent event) {
if (event.getAction() == GLFW.GLFW_RELEASE) return; if (event.getAction() == InputConstants.RELEASE) return;
processInput(event.getKey(), event); processInput(event.getKey(), event);
} }
@EventListener @EventListener
private void onMouseButton(MouseClickEvent event) { private void onMouseButton(MouseClickEvent event) {
if (event.getAction() == GLFW.GLFW_RELEASE) return; if (event.getAction() == InputConstants.RELEASE) return;
processInput(event.getButton(), event); processInput(event.getButton(), event);
} }
@@ -22,7 +22,7 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.item.component.ItemContainerContents; import net.minecraft.world.item.component.ItemContainerContents;
import net.minecraft.world.level.block.ShulkerBoxBlock; import net.minecraft.world.level.block.ShulkerBoxBlock;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.awt.*; import java.awt.*;
import java.util.HashMap; import java.util.HashMap;
@@ -30,7 +30,7 @@ import java.util.HashMap;
public class ShulkerPeek extends Module { 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 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<>(); 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 (mc.player == null) return;
if (event.getKey() != previewKey.getValue()) return; if (event.getKey() != previewKey.getValue()) return;
if (event.getAction() == GLFW.GLFW_PRESS) { if (event.getAction() == InputConstants.PRESS) {
openPreviewScreen(); openPreviewScreen();
return; return;
} }
if (event.getAction() == GLFW.GLFW_REPEAT) { if (event.getAction() == InputConstants.REPEAT) {
if (mc.gui.screen() instanceof PreviewScreen preview) { if (mc.gui.screen() instanceof PreviewScreen preview) {
if (preview.getType() != PreviewScreen.PreviewType.SHULKER) if (preview.getType() != PreviewScreen.PreviewType.SHULKER)
openPreviewScreen(); openPreviewScreen();
@@ -78,7 +78,7 @@ public class ShulkerPeek extends Module {
return; return;
} }
if (event.getAction() == GLFW.GLFW_RELEASE) { if (event.getAction() == InputConstants.RELEASE) {
if (mc.gui.screen() instanceof PreviewScreen preview) if (mc.gui.screen() instanceof PreviewScreen preview)
preview.onClose(); preview.onClose();
} }
@@ -117,6 +117,6 @@ public class ShulkerPeek extends Module {
if (container == null) return true; if (container == null) return true;
// .stream()? // .stream()?
return container.allItemsCopyStream().allMatch(ItemStack::isEmpty); return container.nonEmptyItemCopyStream().allMatch(ItemStack::isEmpty);
} }
} }
@@ -14,8 +14,12 @@ import java.util.UUID;
public class FakePlayer extends Module { 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; private RemotePlayer player = null;
public FakePlayer() { public FakePlayer() {
@@ -27,7 +31,7 @@ public class FakePlayer extends Module {
@Override @Override
public void onEnable() { public void onEnable() {
if (mc.level == null) return; if (mc.level == null) return;
addPlayer(mc.player, name.getValue()); player = addPlayer(mc.player, name.getValue());
super.onEnable(); super.onEnable();
} }
@@ -40,20 +44,23 @@ public class FakePlayer extends Module {
// intento miserable de hacer que no colisione con jugadores // intento miserable de hacer que no colisione con jugadores
public RemotePlayer addPlayer(Player playerToCopy, String dummyName) { public RemotePlayer addPlayer(Player playerToCopy, String dummyName) {
player = new RemotePlayer(mc.level, new GameProfile(UUID.randomUUID(), dummyName)) { RemotePlayer fake = new RemotePlayer(mc.level, new GameProfile(UUID.randomUUID(), dummyName)) {
@Override public void playerTouch(@NonNull Player player) {} @Override public void playerTouch(@NonNull Player p) {}
}; };
player.restoreFrom(playerToCopy); fake.restoreFrom(playerToCopy);
player.setCustomNameVisible(true); fake.setCustomNameVisible(true);
player.noPhysics = true; fake.noPhysics = true;
player.horizontalCollision = false; fake.horizontalCollision = false;
player.verticalCollision = false; fake.verticalCollision = false;
mc.level.addEntity(player);
return player; fake.setId(nextFakeId--);
mc.level.addEntity(fake);
return fake;
} }
public void removePlayer() { public void removePlayer() {
if (player == null) return;
player.setRemoved(Entity.RemovalReason.KILLED); player.setRemoved(Entity.RemovalReason.KILLED);
player.onClientRemoval(); player.onClientRemoval();
player = null; player = null;
@@ -34,8 +34,10 @@ public class ScreenshotPlus extends Module {
private final SettingGroup sgButtons = addSg(new SettingGroup("botones", true)); private final SettingGroup sgButtons = addSg(new SettingGroup("botones", true));
public final EnumSetting<ScreenshotActions> defaultAction = sgGeneral.add(new EnumSetting<>("por defecto", "qué acción tomar por defecto", public final EnumSetting<ScreenshotActions> defaultAction = sgGeneral.add(new EnumSetting<>(
ScreenshotActions.class, ScreenshotActions.NONE)); "por defecto", "qué acción tomar por defecto",
ScreenshotActions.class, ScreenshotActions.NONE)
);
private final BooleanSetting saveButton = sgButtons.add(new BooleanSetting("botón de guardar", "mostrar botón para guardar la captura localmente", true)); private final BooleanSetting saveButton = sgButtons.add(new BooleanSetting("botón de guardar", "mostrar botón para guardar la captura localmente", true));
private final BooleanSetting copyButton = sgButtons.add(new BooleanSetting("botón de copiar", "mostrar botón para copiar la captura al portapapeles", true)); private final BooleanSetting copyButton = sgButtons.add(new BooleanSetting("botón de copiar", "mostrar botón para copiar la captura al portapapeles", true));
@@ -257,12 +257,16 @@ public class LogoutSpots extends Module {
if (outlines.getValue()) { if (outlines.getValue()) {
RenderUtil.drawBlockFaceOutlines(matrices, RenderUtil.drawBlockFaceOutlines(matrices,
BlockPos.containing(x + halfWidth, y, z + halfWidth), BlockPos.containing(x + halfWidth, y, z + halfWidth),
Direction.UP, outlineColor.getValue(), lineWidth.getFloatValue(), true); Direction.UP, outlineColor.getValue(), lineWidth.getFloatValue(),
true
);
} }
if (filling.getValue()) { if (filling.getValue()) {
RenderUtil.drawBlockFaceFilled(matrices, RenderUtil.drawBlockFaceFilled(matrices,
BlockPos.containing(x + halfWidth, y, z + halfWidth), BlockPos.containing(x + halfWidth, y, z + halfWidth),
Direction.UP, fillingColor.getValue(), 0.001f, true); Direction.UP, fillingColor.getValue(), 0.001f,
true
);
} }
} }
} }
@@ -13,12 +13,12 @@ import org.jspecify.annotations.NonNull;
public class PacketCanceller extends Module { public class PacketCanceller extends Module {
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> c2s = sgGeneral.add(new ListSetting( private final ListSetting<PacketType<? extends @NonNull Packet<?>>> c2s = sgGeneral.add(new ListSetting<>(
"C2S", "paquetes a cancelar, dirección servidor", "C2S", "paquetes a cancelar, dirección servidor",
Lists.c2sPacketList, Lists.allFalse(Lists.c2sPacketList), Lists.c2sPacketNames Lists.c2sPacketList, Lists.allFalse(Lists.c2sPacketList), Lists.c2sPacketNames
)); ));
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> s2c = sgGeneral.add(new ListSetting( private final ListSetting<PacketType<? extends @NonNull Packet<?>>> s2c = sgGeneral.add(new ListSetting<>(
"S2C", "paquetes a cancelar, dirección cliente", "S2C", "paquetes a cancelar, dirección cliente",
Lists.s2cPacketList, Lists.allFalse(Lists.s2cPacketList), Lists.s2cPacketNames Lists.s2cPacketList, Lists.allFalse(Lists.s2cPacketList), Lists.s2cPacketNames
)); ));
@@ -54,8 +54,6 @@ public class PacketMine extends Module {
ClickAction.ADD_PRIORITY ClickAction.ADD_PRIORITY
)); ));
// el espacio del final es a propósito: compartía clave de config. con retryTime ("delay"),
// así que se pisaban el valor. se muestra igual porque getName() hace strip()
private final NumberSetting selectionDelay = sgGeneral.add(new NumberSetting( private final NumberSetting selectionDelay = sgGeneral.add(new NumberSetting(
"delay ", "delay ",
"delay entre selecciones de bloques", "delay entre selecciones de bloques",
@@ -20,7 +20,7 @@ import net.minecraft.world.item.BlockItem;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
public class AirPlace extends Module { public class AirPlace extends Module {
@@ -52,7 +52,7 @@ public class AirPlace extends Module {
private final KeySetting scrollKey = sgScroll.add(new KeySetting( private final KeySetting scrollKey = sgScroll.add(new KeySetting(
"tecla del scroll", "tecla del scroll",
"tecla a mantener para que el scroll funcione", "tecla a mantener para que el scroll funcione",
GLFW.GLFW_KEY_LEFT_CONTROL InputConstants.KEY_LCONTROL
)); ));
private final NumberSetting scrollSens = sgScroll.add(new NumberSetting( private final NumberSetting scrollSens = sgScroll.add(new NumberSetting(
@@ -138,7 +138,7 @@ public class AirPlace extends Module {
@EventListener @EventListener
private void onKey(KeyEvent event) { 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()); rangeValue = (int) Math.clamp(rangeValue, range.getMin(), range.getMax());
} }
} }
@@ -2,12 +2,18 @@ package me.retucio.sputnik.module.modules.player;
import me.retucio.sputnik.module.Category; import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.ListSetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting; import me.retucio.sputnik.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.InventoryUtil; import me.retucio.sputnik.util.InventoryUtil;
import me.retucio.sputnik.util.Lists;
import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.DataComponents;
import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.component.Consumable;
import net.minecraft.world.item.consume_effects.ApplyStatusEffectsConsumeEffect;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
@@ -20,10 +26,28 @@ public class AutoEat extends Module {
6, 0, 19, 1 6, 0, 19, 1
)); ));
private final NumberSetting whenToStop = sgGeneral.add(new NumberSetting(
"cuándo parar", "cuántos puntos de comida hace falta tener para parar de comer",
20, 1, 20, 1
));
private final ListSetting<Item> blacklist = sgGeneral.add(new ListSetting<>(
"lista negra", "alimentos a NO comer",
() -> Lists.foodList,
() -> Lists.allFalseExcept(Lists.foodList, this::isBad),
() -> Lists.foodNames
));
private boolean eating; private boolean eating;
public AutoEat() { public AutoEat() {
super("puto gordo", "come automáticamente al tener hambre", Category.PLAYER); super("puto gordo", "come aut/omáticamente al tener hambre", Category.PLAYER);
}
@Override
public void onDisable() {
if (eating) stopEating();
super.onDisable();
} }
@Override @Override
@@ -34,7 +58,9 @@ public class AutoEat extends Module {
if (mc.player.getUseItemRemainingTicks() > 0) { if (mc.player.getUseItemRemainingTicks() > 0) {
return; return;
} else { } else {
stopEating(); if (mc.player.getFoodData().getFoodLevel() >= whenToStop.getIntValue()) {
stopEating();
}
} }
} }
@@ -42,15 +68,21 @@ public class AutoEat extends Module {
List<ItemStack> sorted = InventoryUtil.findAllStacks( List<ItemStack> sorted = InventoryUtil.findAllStacks(
stack -> stack.getItem().components().get(DataComponents.FOOD) != null stack -> stack.getItem().components().get(DataComponents.FOOD) != null
); );
sorted.sort(Comparator.comparingInt(stack -> stack.getItem().components().get(DataComponents.FOOD).nutrition())); sorted.sort(Comparator.comparingInt(
(ItemStack s) -> s.getItem().components().get(DataComponents.FOOD).nutrition()
).reversed());
if (sorted.isEmpty()) return; if (sorted.isEmpty()) return;
sorted.removeIf(stack -> blacklist.isEnabled(stack.getItem()));
boolean inHotbar = false; boolean inHotbar = false;
for (ItemStack stack : sorted) { for (ItemStack stack : sorted) {
int slot = InventoryUtil.findSlot(s -> stack == s); int slot = InventoryUtil.findSlot(s -> stack == s);
if (Inventory.isHotbarSlot(slot)) { if (Inventory.isHotbarSlot(slot)) {
mc.player.getInventory().setSelectedSlot(slot); mc.player.getInventory().setSelectedSlot(slot);
inHotbar = true; inHotbar = true;
break;
} }
} }
@@ -79,4 +111,13 @@ public class AutoEat extends Module {
eating = false; eating = false;
mc.options.keyUse.setDown(false); mc.options.keyUse.setDown(false);
} }
private boolean isBad(Item item) {
Consumable consumable = item.components().get(DataComponents.CONSUMABLE);
if (consumable == null) return false;
return consumable.onConsumeEffects().stream()
.anyMatch(effect -> effect instanceof ApplyStatusEffectsConsumeEffect applyEffects
&& applyEffects.effects().stream().anyMatch(mobEffectInstance ->
!mobEffectInstance.getEffect().value().isBeneficial()));
}
} }
@@ -7,7 +7,7 @@ import me.retucio.sputnik.module.setting.settings.NumberSetting;
import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
public class FastUse extends Module { public class FastUse extends Module {
@@ -61,7 +61,7 @@ public class FastUse extends Module {
super("precoz", super("precoz",
"hace cosas como usar items o colocar bloques más rápido", "hace cosas como usar items o colocar bloques más rápido",
Category.PLAYER, Category.PLAYER,
GLFW.GLFW_KEY_F6); InputConstants.KEY_F6);
items.onUpdate(itemCooldown::visibility); items.onUpdate(itemCooldown::visibility);
blocks.onUpdate(blockCooldown::visibility); blocks.onUpdate(blockCooldown::visibility);
@@ -20,16 +20,22 @@ import java.awt.*;
public class BreakingProgress extends Module { public class BreakingProgress extends Module {
private final SettingGroup sgOulines = addSg(new SettingGroup("contorno", true)); private final SettingGroup sgOutlines = addSg(new SettingGroup("contorno", true));
private final SettingGroup sgFilling = addSg(new SettingGroup("relleno", true)); private final SettingGroup sgFilling = addSg(new SettingGroup("relleno", true));
private final EnumSetting<BreakMode> breakMode = sgGeneral.add(new EnumSetting<>("modo de minado", "elige si el cubo se encoge o se dilata", 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)); BreakMode.class, BreakMode.INWARDS));
private final BooleanSetting outlines = sgOulines.add(new BooleanSetting("contorno", "renderizar contorno", true)); public final BooleanSetting cancelAnim = sgGeneral.add(new BooleanSetting(
private final ColorSetting outlineColor = sgOulines.add(new ColorSetting("color del contorno", "color del contorno", "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)); new Color(0, 255, 0, 200), false));
private final NumberSetting lineWidth = sgOulines.add(new NumberSetting("grosor de línea", "grosor de las líneas del contorno", 1, 1, 5, 0.1)); private final NumberSetting lineWidth = sgOutlines.add(new NumberSetting("grosor de línea", "grosor de las líneas del contorno", 1, 1, 5, 0.1));
private final BooleanSetting fillings = sgFilling.add(new BooleanSetting("relleno", "renderizar relleno", true)); private final BooleanSetting fillings = sgFilling.add(new BooleanSetting("relleno", "renderizar relleno", true));
private final ColorSetting fillingColor = sgFilling.add(new ColorSetting("color del relleno", "color del relleno", private final ColorSetting fillingColor = sgFilling.add(new ColorSetting("color del relleno", "color del relleno",
@@ -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.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.EnumSetting; import me.retucio.sputnik.module.setting.settings.EnumSetting;
import me.retucio.sputnik.util.render.GlintRenderType; 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.RenderType;
import net.minecraft.client.renderer.rendertype.RenderTypes; import net.minecraft.client.renderer.rendertype.RenderTypes;
import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeColor;
import net.minecraft.resources.Identifier;
/** continúa en: /** continúa en:
* @see RenderBuffersMixin * @see RenderBuffersMixin
@@ -45,28 +47,22 @@ public class GlintPlus extends Module {
Category.RENDER); Category.RENDER);
} }
public RenderType getGlint() { public RenderType getGlint(RenderType vanilla, BakedQuad.MaterialInfo materialInfo) {
int color = getGlintColor(); if (!isEnabled() || !items.getValue()) return vanilla;
if (!isEnabled() || !items.getValue()) return RenderTypes.glint(); return GlintRenderType.itemGlint(glintColor.getValue().getRealName(), vanilla,
return GlintRenderType.glintColor.get(color); materialInfo.sprite().atlasLocation());
}
public RenderType getGlintTranslucent() {
int color = getGlintColor();
if (!isEnabled() || !items.getValue()) return RenderTypes.glintTranslucent();
return GlintRenderType.glintTranslucentColor.get(color);
} }
public RenderType getEntityGlint() { public RenderType getEntityGlint() {
int color = getGlintColor(); 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); return GlintRenderType.entityGlintColor.get(color);
} }
public RenderType getArmorEntityGlint() { public RenderType getArmorEntityGlint(Identifier armorTexture) {
int color = getGlintColor(); int color = getGlintColor();
if (!isEnabled() || !armor.getValue()) return RenderTypes.armorEntityGlint(); if (!isEnabled() || !armor.getValue()) return RenderTypes.armorCutoutNoCullGlint(armorTexture);
return GlintRenderType.armorEntityGlintColor.get(color); return GlintRenderType.armorEntityGlint(glintColor.getValue().getRealName(), armorTexture);
} }
public int getGlintColor() { public int getGlintColor() {
@@ -128,9 +128,9 @@ public class HandView extends Module {
} }
private void rotate(PoseStack matrix, Vec3 rotation) { private void rotate(PoseStack matrix, Vec3 rotation) {
matrix.mulPose(Axis.XP.rotationDegrees((float) rotation.x)); matrix.rotate(Axis.XP.rotationDegrees((float) rotation.x));
matrix.mulPose(Axis.YP.rotationDegrees((float) rotation.y)); matrix.rotate(Axis.YP.rotationDegrees((float) rotation.y));
matrix.mulPose(Axis.ZP.rotationDegrees((float) rotation.z)); matrix.rotate(Axis.ZP.rotationDegrees((float) rotation.z));
} }
private void scale(PoseStack matrix, Vec3 scale) { private void scale(PoseStack matrix, Vec3 scale) {
@@ -50,7 +50,7 @@ public class ItemPhysics extends Module {
var accessor = (ItemStackRenderStateAccessor) event.renderState.item; var accessor = (ItemStackRenderStateAccessor) event.renderState.item;
for (int i = 0; i < accessor.getActiveLayerCount(); i++) { for (int i = 0; i < accessor.getActiveLayerCount(); i++) {
ItemStackRenderState.LayerRenderState layer = accessor.getLayers()[i]; ItemStackRenderState.LayerRenderState layer = accessor.getLayers()[i];
ModelInfo info = getInfo(layer.prepareQuadList()); ModelInfo info = getInfo(((LayerRenderStateAccessor) layer).sputnik$getQuads().all());
matrices.pushPose(); matrices.pushPose();
applyTransformation(matrices, ((LayerRenderStateAccessor) layer).sputnik$getTransform()); applyTransformation(matrices, ((LayerRenderStateAccessor) layer).sputnik$getTransform());
@@ -58,7 +58,7 @@ public class ItemPhysics extends Module {
offsetInWater(matrices, event.itemEntity); offsetInWater(matrices, event.itemEntity);
if (info.flat) { if (info.flat) {
matrices.mulPose(Axis.XP.rotationDegrees(90)); matrices.rotate(Axis.XP.rotationDegrees(90));
matrices.translate(0, 0, info.offsetZ); matrices.translate(0, 0, info.offsetZ);
} }
@@ -73,7 +73,7 @@ public class ItemPhysics extends Module {
float degrees = (random.nextFloat() * 2 - 1) * 90; float degrees = (random.nextFloat() * 2 - 1) * 90;
matrices.translate(x, y, z); matrices.translate(x, y, z);
matrices.mulPose(axis.rotationDegrees(degrees)); matrices.rotate(axis.rotationDegrees(degrees));
matrices.translate(-x, -y, -z); matrices.translate(-x, -y, -z);
} }
@@ -7,6 +7,7 @@ import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
import me.retucio.sputnik.Sputnik; import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.module.Category; import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; 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.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.render.PostShader; import me.retucio.sputnik.util.render.PostShader;
@@ -43,10 +44,11 @@ public class Lsd extends Module {
1, 0, 10, 0.1 1, 0, 10, 0.1
)); ));
private final NumberSetting seed = sgGeneral.add(new NumberSetting( private final EnumSetting<ColorMode> color = sgGeneral.add(new EnumSetting<>(
"tono", "color",
"desplazamiento de tono que se aplica sobre la imagen", "elige el color del efecto",
0.3, 0, 1, 0.01 ColorMode.class,
ColorMode.RAINBOW
)); ));
private final NumberSetting speed = sgGeneral.add(new NumberSetting( private final NumberSetting speed = sgGeneral.add(new NumberSetting(
@@ -71,7 +73,7 @@ public class Lsd extends Module {
public void apply(RenderTarget target, GraphicsResourceAllocator pool) { public void apply(RenderTarget target, GraphicsResourceAllocator pool) {
SHADER.render(target, pool, b -> b SHADER.render(target, pool, b -> b
.putFloat(strength.getFloatValue()) .putFloat(strength.getFloatValue())
.putFloat(seed.getFloatValue()) .putFloat(color.getValue().hue)
.putFloat(rotations.getFloatValue()) .putFloat(rotations.getFloatValue())
.putFloat(getTime())); .putFloat(getTime()));
} }
@@ -82,4 +84,28 @@ public class Lsd extends Module {
double elapsed = (System.nanoTime() - startNanos) / 1_000_000_000.0; double elapsed = (System.nanoTime() - startNanos) / 1_000_000_000.0;
return (float) ((elapsed * speed.getValue()) % 100_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;
}
}
} }
@@ -3,6 +3,7 @@ package me.retucio.sputnik.module.modules.render;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import me.retucio.sputnik.Sputnik; 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.EntityMixin;
import me.retucio.sputnik.mixin.mixins.entity.ItemEntityMixin; import me.retucio.sputnik.mixin.mixins.entity.ItemEntityMixin;
import me.retucio.sputnik.mixin.mixins.player.PlayerMixin; import me.retucio.sputnik.mixin.mixins.player.PlayerMixin;
@@ -13,6 +14,7 @@ import me.retucio.sputnik.module.setting.SettingGroup;
import me.retucio.sputnik.module.setting.settings.BooleanSetting; import me.retucio.sputnik.module.setting.settings.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.EnumSetting; import me.retucio.sputnik.module.setting.settings.EnumSetting;
import me.retucio.sputnik.module.setting.settings.ListSetting; import me.retucio.sputnik.module.setting.settings.ListSetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.Lists; import me.retucio.sputnik.util.Lists;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
@@ -64,6 +66,7 @@ public class Nametags extends Module {
public final BooleanSetting alwaysVisible = sgGeneral.add(new BooleanSetting("siempre mostrar nametags", "mostrar nametag cuando el jugador está agachado o es invisible", false)); public final BooleanSetting alwaysVisible = sgGeneral.add(new BooleanSetting("siempre mostrar nametags", "mostrar nametag cuando el jugador está agachado o es invisible", false));
public final BooleanSetting showSelf = sgGeneral.add(new BooleanSetting("mostrar propio", "mostrar nametag propio", false)); public final BooleanSetting showSelf = sgGeneral.add(new BooleanSetting("mostrar propio", "mostrar nametag propio", false));
public final BooleanSetting friendNick = sgGeneral.add(new BooleanSetting("motes", "usar los motes de amigos", true)); public final BooleanSetting friendNick = sgGeneral.add(new BooleanSetting("motes", "usar los motes de amigos", true));
public final NumberSetting distance = sgGeneral.add(new NumberSetting("distancia", "distancia máxima para renderizar nametags", 1024, 1, 1024, 1));
public final BooleanSetting countItems = sgInfo.add(new BooleanSetting("contar items", "muestra cuánto de un item hay en un stack dropeado", true)); public final BooleanSetting countItems = sgInfo.add(new BooleanSetting("contar items", "muestra cuánto de un item hay en un stack dropeado", true));
public final BooleanSetting showProjectileDamage = sgInfo.add(new BooleanSetting("daño del proyectil", "muestra cuánto daño hace un proyectil en su nametag", true)); public final BooleanSetting showProjectileDamage = sgInfo.add(new BooleanSetting("daño del proyectil", "muestra cuánto daño hace un proyectil en su nametag", true));
@@ -88,7 +91,7 @@ public class Nametags extends Module {
defaultEntities.replace(EntityTypes.TNT, true); defaultEntities.replace(EntityTypes.TNT, true);
entities.setDefaultValue(defaultEntities); entities.setDefaultValue(defaultEntities);
health.onUpdate(v -> healthMode.visibility(v)); health.onUpdate(healthMode::visibility);
entities.onUpdate(entities -> { entities.onUpdate(entities -> {
items.visibility(entities.get(EntityTypes.ITEM)); items.visibility(entities.get(EntityTypes.ITEM));
@@ -129,7 +132,7 @@ public class Nametags extends Module {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public String getOwnerName(EntityReference<LivingEntity> owner) { public String getOwnerName(EntityReference<LivingEntity> owner) {
// si el dueño está en línea (de manera segura) // 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); LivingEntity ownerEntity = owner.resolve(queriableWorld, LivingEntity.class);
if (ownerEntity instanceof Player playerEntity) return playerEntity.getName().getString(); if (ownerEntity instanceof Player playerEntity) return playerEntity.getName().getString();
} }
@@ -0,0 +1,255 @@
package me.retucio.sputnik.module.modules.render;
import com.github.retucio.neutrino.EventListener;
import com.mojang.blaze3d.vertex.PoseStack;
import me.retucio.sputnik.event.input.KeyEvent;
import me.retucio.sputnik.event.render.RenderHeldItemEvent;
import me.retucio.sputnik.module.Category;
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.module.setting.settings.KeySetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting;
import net.minecraft.world.InteractionHand;
import org.joml.Quaternionf;
import com.mojang.blaze3d.platform.InputConstants;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class Stylish extends Module {
private final KeySetting key = sgGeneral.add(new KeySetting(
"tecla", "tecla a pulsar para hacer el truco",
InputConstants.KEY_Y
));
private final EnumSetting<TrickType> trick = sgGeneral.add(new EnumSetting<>(
"truco", "qué truco hacer al pulsar la tecla",
TrickType.class, TrickType.SPIN
));
private final BooleanSetting comboMode = sgGeneral.add(new BooleanSetting(
"combo", "encadena varios trucos distintos en una sola pulsación",
false
));
private final NumberSetting comboLength = sgGeneral.add(new NumberSetting(
"trucos por combo", "cuántos trucos encadenar si el combo está activado",
3, 2, 6, 1
)).visibility(comboMode::getValue);
private final NumberSetting speed = sgGeneral.add(new NumberSetting(
"velocidad", "velocidad de giro (grados/seg)",
360, 30, 2000, 1
));
private final NumberSetting spins = sgGeneral.add(new NumberSetting(
"vueltas", "cuantas vueltas completas da por truco",
1, 1, 5, 1
));
private final EnumSetting<RotateDirection> dir = sgGeneral.add(new EnumSetting<>(
"dirección", "dirección a rotar el ítem",
RotateDirection.class, RotateDirection.COUNTER_CLOCKWISE
));
private final EnumSetting<Hand> hand = sgGeneral.add(new EnumSetting<>(
"mano", "en qué mano(s) hacerlo",
Hand.class, Hand.MAIN_HAND
));
private final BooleanSetting easing = sgGeneral.add(new BooleanSetting(
"suavizado", "usa una curva de aceleración/desaceleración en vez de velocidad lineal",
true
));
private final NumberSetting cooldown = sgGeneral.add(new NumberSetting(
"cooldown", "tiempo mínimo en ms entre activaciones",
150, 0, 2000, 10
));
// estado de anim.
private boolean spinning = false;
private float progressDegrees = 0f;
private long lastTimeNanos = 0L;
private long lastTriggerMillis = 0L;
private final List<TrickType> queue = new ArrayList<>();
private int queueIndex = 0;
private final Random random = new Random();
public Stylish() {
super("estiloso", "haz truquitos con items en las manos", Category.RENDER);
}
@EventListener
private void onKey(KeyEvent event) {
if (event.getKey() != key.getValue()) return;
if (event.getAction() != InputConstants.PRESS) return;
if (spinning) return;
long now = System.currentTimeMillis();
if (now - lastTriggerMillis < cooldown.getIntValue()) return;
lastTriggerMillis = now;
buildQueue();
startNextTrick();
}
private void buildQueue() {
queue.clear();
queueIndex = 0;
if (!comboMode.getValue()) {
queue.add(resolveTrick(trick.getValue()));
return;
}
int amount = comboLength.getIntValue();
for (int i = 0; i < amount; i++) {
queue.add(resolveTrick(TrickType.RANDOM));
}
}
private TrickType resolveTrick(TrickType requested) {
if (requested != TrickType.RANDOM) return requested;
TrickType[] real = {
TrickType.SPIN, TrickType.FLIP, TrickType.ROLL,
TrickType.TWIRL, TrickType.WAVE, TrickType.POP, TrickType.THROW_CATCH
};
return real[random.nextInt(real.length)];
}
private void startNextTrick() {
if (queueIndex >= queue.size()) {
spinning = false;
return;
}
spinning = true;
progressDegrees = 0f;
lastTimeNanos = System.nanoTime();
}
@EventListener
private void onRenderHeldItem(RenderHeldItemEvent event) {
if (!spinning) return;
if ((event.getHand() == InteractionHand.MAIN_HAND && hand.is(Hand.OFF_HAND))
|| (event.getHand() == InteractionHand.OFF_HAND && hand.is(Hand.MAIN_HAND))
) {
return;
}
PoseStack matrices = event.getMatrices();
long now = System.nanoTime();
float delta = (now - lastTimeNanos) / 1_000_000_000f;
lastTimeNanos = now;
float target = 360.0f * spins.getIntValue();
progressDegrees += speed.getFloatValue() * delta;
boolean finished = progressDegrees >= target;
if (finished) progressDegrees = target;
float rawFraction = progressDegrees / target; // 0..1
float fraction = easing.getValue() ? easeInOutCubic(rawFraction) : rawFraction;
TrickType current = queue.get(queueIndex);
applyTrick(current, matrices, fraction);
if (finished) {
queueIndex++;
if (queueIndex < queue.size()) {
startNextTrick();
} else {
spinning = false;
}
}
}
private void applyTrick(TrickType type, PoseStack matrices, float fraction) {
float directionSign = dir.getValue() == RotateDirection.CLOCKWISE ? -1f : 1f;
float degrees = fraction * 360.0f * spins.getIntValue();
float angleRad = (float) Math.toRadians(degrees * directionSign);
switch (type) {
case SPIN -> matrices.rotate(new Quaternionf().rotationZ(angleRad));
case FLIP -> matrices.rotate(new Quaternionf().rotationX(angleRad));
case ROLL -> matrices.rotate(new Quaternionf().rotationY(angleRad));
case TWIRL -> {
// combina spin + flip para un giro más aparatoso
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.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.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.rotate(new Quaternionf().rotationX(angleRad * 2f));
}
case RANDOM -> {
// no debería llegar aquí, resolveTrick lo reemplaza antes
matrices.rotate(new Quaternionf().rotationZ(angleRad));
}
}
}
private float easeInOutCubic(float t) {
return t < 0.5f
? 4f * t * t * t
: 1f - (float) Math.pow(-2f * t + 2f, 3) / 2f;
}
private enum TrickType {
SPIN("giro"),
FLIP("voltereta"),
ROLL("balanceo"),
TWIRL("giro doble"),
WAVE("saludo"),
POP("pulso"),
THROW_CATCH("lanzar y coger"),
RANDOM("aleatorio");
private final String name;
TrickType(String name) { this.name = name; }
@Override public String toString() { return name; }
}
private enum RotateDirection {
CLOCKWISE("sentido horario"),
COUNTER_CLOCKWISE("sentido antihorario");
private final String name;
RotateDirection(String name) { this.name = name; }
@Override public String toString() { return name; }
}
private enum Hand {
MAIN_HAND("mano principal"),
OFF_HAND("mano secundaria");
private final String name;
Hand(String name) { this.name = name; }
@Override public String toString() { return name; }
}
}
@@ -4,6 +4,8 @@ import com.github.retucio.neutrino.EventListener;
import me.retucio.sputnik.event.render.Render3DEvent; import me.retucio.sputnik.event.render.Render3DEvent;
import me.retucio.sputnik.module.Category; import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.camera.Freecam;
import me.retucio.sputnik.module.setting.SettingGroup; import me.retucio.sputnik.module.setting.SettingGroup;
import me.retucio.sputnik.module.setting.settings.BooleanSetting; import me.retucio.sputnik.module.setting.settings.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.ColorSetting; import me.retucio.sputnik.module.setting.settings.ColorSetting;
@@ -46,7 +48,7 @@ public class Tracers extends Module {
private final BooleanSetting self = sgGeneral.add(new BooleanSetting( private final BooleanSetting self = sgGeneral.add(new BooleanSetting(
"uno mismo", "uno mismo",
"apuntarse a uno mismo en cámara libre o así", "apuntarse a uno mismo en cámara libre",
true true
)); ));
@@ -105,6 +107,7 @@ public class Tracers extends Module {
private Color getColor(Entity entity) { private Color getColor(Entity entity) {
if (!entities.isEnabled(entity.getType())) return null; if (!entities.isEnabled(entity.getType())) return null;
if (!self.getValue() && mc.player == entity) return null; if (!self.getValue() && mc.player == entity) return null;
if (self.getValue() && mc.player == entity && !ModuleManager.INSTANCE.getModuleByClass(Freecam.class).isEnabled()) return null;
if (entity instanceof Player) return playerColor.getValue(); if (entity instanceof Player) return playerColor.getValue();
return switch (entity.getType().getCategory()) { return switch (entity.getType().getCategory()) {
@@ -0,0 +1,484 @@
package me.retucio.sputnik.module.modules.world;
import com.github.retucio.neutrino.EventListener;
import me.retucio.sputnik.event.input.MouseClickEvent;
import me.retucio.sputnik.event.interact.AttackBlockEvent;
import me.retucio.sputnik.event.network.PacketEvent;
import me.retucio.sputnik.event.render.Render3DEvent;
import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.setting.SettingGroup;
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.ColorSetting;
import me.retucio.sputnik.module.setting.settings.EnumSetting;
import me.retucio.sputnik.module.setting.settings.ListSetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.ChatUtil;
import me.retucio.sputnik.util.InventoryUtil;
import me.retucio.sputnik.util.Lists;
import me.retucio.sputnik.util.MiscUtil;
import me.retucio.sputnik.util.RotationUtil;
import me.retucio.sputnik.util.render.RenderUtil;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.component.Tool;
import net.minecraft.world.level.ClipContext;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
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 com.mojang.blaze3d.platform.InputConstants;
import java.awt.*;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class AutoMine extends Module {
private final SettingGroup sgBlocks = addSg(new SettingGroup("bloques", true));
private final SettingGroup sgRender = addSg(new SettingGroup("renderizado", true));
private final EnumSetting<SelectionMode> mode = sgGeneral.add(new EnumSetting<>(
"modo de selección",
"cómo seleccionar los bloques a minar",
SelectionMode.class,
SelectionMode.INDIVIDUAL
));
private final NumberSetting maxBlocks = sgGeneral.add(new NumberSetting(
"límite de bloques",
"cantidad máxima de bloques a seleccionar de una vez (caja / flood)",
256,
1,
4096,
1
));
private final NumberSetting retryTime = sgGeneral.add(new NumberSetting(
"delay",
"delay entre reintentos de minado",
30,
0,
1000,
1
));
private final BooleanSetting cancelOutOfReach = sgGeneral.add(new BooleanSetting(
"cancelar fuera de alcance",
"cancelar aquellos paquetes que intenten romper bloques fuera del alcance del jugador",
true
));
private final BooleanSetting autoTool = sgGeneral.add(new BooleanSetting(
"auto herramienta",
"cambiar automáticamente a la herramienta más rápida antes de minar cada bloque",
true
));
private final BooleanSetting dontBreak = sgGeneral.add(new BooleanSetting(
"no romper pico",
"evita romper la herramienta seleccionada",
true
));
private final EnumSetting<RotateMode> rotate = sgGeneral.add(new EnumSetting<>(
"rotar",
"rotar al minar bloques mediante el módulo",
RotateMode.class, RotateMode.NONE
));
private final NumberSetting packetLimiter = sgGeneral.add(new NumberSetting(
"limitar paquetes",
"limita la cantidad de paquetes enviados en un segundo (0 para desactivar)",
15000, 0, 30000, 100
));
private final ListSetting<Block> blacklist = sgBlocks.add(new ListSetting<>(
"lista negra",
"bloques a excluir de la selección",
Lists.blockList,
Lists.allFalse(Lists.blockList),
Lists.blockNames
));
private final BooleanSetting render = sgRender.add(new BooleanSetting(
"renderizar",
"renderizar un contorno alrededor de los bloques que están siendo minados",
true
));
private final ColorSetting color = sgRender.add(new ColorSetting(
"color",
"color del contorno renderizado",
new Color(0, 255, 0, 100),
false
));
private final ColorSetting pendingColor = sgRender.add(new ColorSetting(
"color de selección pendiente",
"color del contorno de la primera esquina, en modo caja, mientras se espera la segunda",
new Color(255, 255, 0, 100),
false
));
private final NumberSetting lineWidth = sgRender.add(new NumberSetting(
"grosor",
"grosor de las líneas del contorno",
2,
0.1,
10,
0.1
));
private final List<MiningBlock> miningBlocks = new ArrayList<>();
private BlockPos pendingCorner = null;
private int packetCount = 0;
private int tickCount = 0;
public AutoMine() {
super(
"auto minado",
"selecciona un área o bloques individuales para minarlos automáticamente",
Category.WORLD
);
render.onUpdate(v -> {
color.visibility(v);
pendingColor.visibility(v);
lineWidth.visibility(v);
});
}
@Override
public void onDisable() {
miningBlocks.clear();
pendingCorner = null;
packetCount = 0;
tickCount = 0;
super.onDisable();
}
@Override
public void onTick() {
if (mc.player == null || mc.level == null || mc.gameMode == null) return;
tickCount++;
if (tickCount % 20 == 0) {
tickCount = 0;
packetCount = 0;
}
if (miningBlocks.isEmpty()) return;
// se limpian bloques ya rotos, o que fueron blacklisteados después de seleccionarse
Iterator<MiningBlock> iterator = miningBlocks.iterator();
while (iterator.hasNext()) {
MiningBlock block = iterator.next();
BlockState state = mc.level.getBlockState(block.pos);
if (state.isAir() || blacklist.isEnabled(state.getBlock())) {
iterator.remove();
}
}
for (MiningBlock block : miningBlocks) {
processBlock(block);
}
}
@EventListener
private void onClick(MouseClickEvent event) {
if (mc.gui.screen() != null) return;
if (mc.level == null || mc.hitResult == null) 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;
} else {
return;
}
event.cancel();
BlockPos pos = bhr.getBlockPos();
Direction dir = bhr.getDirection();
Block block = mc.level.getBlockState(pos).getBlock();
// clicar un bloque ya seleccionado lo quita de la selección, sea cual sea el modo
MiningBlock existing = getMiningBlock(pos);
if (existing != null) {
miningBlocks.remove(existing);
return;
}
if (blacklist.isEnabled(block)) {
ChatUtil.warn(Component.translatable("sputnik.module.autominado.blacklisted"));
return;
}
switch (mode.getValue()) {
case INDIVIDUAL -> tryAddBlock(pos, dir);
case BOX -> handleBoxSelection(pos, dir);
case FLOOD_FILL -> handleFloodFill(pos, dir);
}
}
@EventListener
private void onRenderWorld(Render3DEvent event) {
if (!render.getValue()) return;
for (MiningBlock block : miningBlocks) {
block.render(event);
}
if (pendingCorner != null) {
renderOutline(event, pendingCorner, pendingColor.getValue());
}
}
@EventListener
private void onPacketSend(PacketEvent.Send event) {
if (packetLimiter.getValue() <= 0) return;
if (packetCount > packetLimiter.getIntValue()) {
event.cancel();
return;
}
packetCount++;
}
private void handleBoxSelection(BlockPos pos, Direction dir) {
if (pendingCorner == null) {
pendingCorner = pos;
ChatUtil.info(Component.translatable("sputnik.module.autominado.cornerselected"));
return;
}
BlockPos corner1 = pendingCorner;
BlockPos corner2 = pos;
pendingCorner = null;
int minX = Math.min(corner1.getX(), corner2.getX());
int maxX = Math.max(corner1.getX(), corner2.getX());
int minY = Math.min(corner1.getY(), corner2.getY());
int maxY = Math.max(corner1.getY(), corner2.getY());
int minZ = Math.min(corner1.getZ(), corner2.getZ());
int maxZ = Math.max(corner1.getZ(), corner2.getZ());
int added = 0;
int limit = maxBlocks.getIntValue();
outer:
for (int x = minX; x <= maxX; x++) {
for (int y = minY; y <= maxY; y++) {
for (int z = minZ; z <= maxZ; z++) {
if (added >= limit) break outer;
if (tryAddBlock(new BlockPos(x, y, z), dir)) added++;
}
}
}
ChatUtil.info(Component.translatable("sputnik.module.autominado.boxselected", added));
}
private void handleFloodFill(BlockPos origin, Direction dir) {
if (mc.level == null) return;
Block target = mc.level.getBlockState(origin).getBlock();
Set<BlockPos> visited = new HashSet<>();
Deque<BlockPos> queue = new ArrayDeque<>();
queue.add(origin);
visited.add(origin);
int added = 0;
int limit = maxBlocks.getIntValue();
while (!queue.isEmpty() && added < limit) {
BlockPos current = queue.poll();
if (mc.level.getBlockState(current).getBlock() != target) continue;
if (tryAddBlock(current, dir)) added++;
for (Direction d : Direction.values()) {
BlockPos neighbor = current.relative(d);
if (visited.contains(neighbor)) continue;
visited.add(neighbor);
if (mc.level.getBlockState(neighbor).getBlock() == target) {
queue.add(neighbor);
}
}
}
ChatUtil.info(Component.translatable("sputnik.module.autominado.floodfilled", added));
}
// false si el bloque no se pudo (o no debía) agregar: aire, ya seleccionado o en la lista negra
private boolean tryAddBlock(BlockPos pos, Direction dir) {
if (mc.level == null) return false;
if (mc.level.getBlockState(pos).isAir()) return false;
if (getMiningBlock(pos) != null) return false;
if (blacklist.isEnabled(mc.level.getBlockState(pos).getBlock())) return false;
miningBlocks.add(new MiningBlock(pos, dir));
return true;
}
private boolean processBlock(MiningBlock block) {
if (mc.level.getBlockState(block.pos).isAir()) return false;
if (!block.mining) {
return block.mine();
} else if (block.shouldRetry()) {
block.startTime = System.currentTimeMillis();
block.mining = false;
return block.mine();
}
return false;
}
private MiningBlock getMiningBlock(BlockPos pos) {
for (MiningBlock block : miningBlocks) {
if (block.pos.equals(pos)) return block;
}
return null;
}
// básicamente AutoTool::selectFastestTool, pero apuntado a un bloque puntual en vez del raycast bajo la mira
private void switchToBestTool(BlockPos pos) {
if (mc.player == null || mc.level == null) return;
BlockState state = mc.level.getBlockState(pos);
List<ItemStack> tools = InventoryUtil.findAllStacks(stack -> stack.has(DataComponents.TOOL));
Map<Float, ItemStack> speeds = new HashMap<>();
for (ItemStack tool : tools) {
int slot = mc.player.getInventory().findSlotMatchingItem(tool);
if (!Inventory.isHotbarSlot(slot)) continue;
Tool toolComponent = tool.get(DataComponents.TOOL);
if (toolComponent != null) {
speeds.put(toolComponent.getMiningSpeed(state), tool);
}
}
if (speeds.isEmpty()) return;
Float fastestSpeed = MiscUtil.getHighest(speeds.keySet().stream().toList());
ItemStack fastestTool = speeds.get(fastestSpeed);
int slot = mc.player.getInventory().findSlotMatchingItem(fastestTool);
if (slot != -1) mc.player.getInventory().setSelectedSlot(slot);
}
private void renderOutline(Render3DEvent event, BlockPos pos, Color renderColor) {
VoxelShape shape = mc.level.getBlockState(pos).getShape(mc.level, pos);
if (shape.isEmpty()) return;
RenderUtil.drawVoxelShapeOutline(
event.getMatrices(),
shape,
pos,
renderColor,
lineWidth.getFloatValue(),
false
);
}
private RotationUtil.Mode getRotationMode() {
return switch (rotate.getValue()) {
case CLIENT, BOTH -> RotationUtil.Mode.CLIENT;
case SERVER -> RotationUtil.Mode.SILENT;
case NONE -> null;
};
}
private class MiningBlock {
BlockPos pos;
Direction dir;
boolean mining = false;
long startTime;
public MiningBlock(BlockPos pos, Direction dir) {
this.pos = pos;
this.dir = dir;
this.startTime = System.currentTimeMillis();
}
public boolean mine() {
if (cancelOutOfReach.getValue()
&& mc.player.position().distanceToSqr(Vec3.atLowerCornerOf(pos)) > Math.pow(mc.player.blockInteractionRange(), 2)) {
return false;
}
if (dontBreak.getValue()
&& mc.player.isHolding(ItemStack::isDamageableItem)
&& mc.player.getMainHandItem().getMaxDamage() - mc.player.getMainHandItem().getDamageValue() <= 1) {
ChatUtil.warn(Component.translatable("sputnik.module.autominado.pickbreaking"));
toggle();
return false;
}
if (autoTool.getValue()) {
switchToBestTool(pos);
}
Runnable mine = () -> {
mc.gameMode.startPrediction(mc.level, sequence ->
new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, pos, dir, sequence));
mc.gameMode.startPrediction(mc.level, sequence ->
new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, pos, dir, sequence));
};
RotationUtil.Mode rotation = getRotationMode();
if (rotation == null) mine.run();
else RotationUtil.lookAt(RotationUtil.NORMAL, Vec3.atLowerCornerOf(pos), 0, rotation, mine);
mining = true;
return true;
}
public void render(Render3DEvent event) {
renderOutline(event, pos, color.getValue());
}
public boolean shouldRetry() {
return mining && (System.currentTimeMillis() - startTime >= retryTime.getValue());
}
}
private enum SelectionMode {
INDIVIDUAL("individual"),
BOX("caja"),
FLOOD_FILL("inundación");
private final String name;
SelectionMode(String name) { this.name = name; }
@Override public String toString() { return name; }
}
private enum RotateMode {
CLIENT("cámara"),
SERVER("mediante paquetes"),
BOTH("ambos"),
NONE("no");
private final String name;
RotateMode(String name) { this.name = name; }
@Override public String toString() { return name; }
}
}
@@ -12,6 +12,10 @@ import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket; import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
import net.minecraft.world.level.block.entity.SignBlockEntity; 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 { 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) { if (event.getScreen() instanceof AbstractSignEditScreen screen && text != null && mc != null && mc.player != null) {
event.cancel(); event.cancel();
SignBlockEntity sign = ((AbstractSignEditScreenAccessor) screen).getBlockEntity(); SignBlockEntity sign = ((AbstractSignEditScreenAccessor) screen).getBlockEntity();
fillText(sign.getBlockPos(), sign.isFacingFrontText(mc.player), text); fillText(sign.getBlockPos(), sign.getSlotPlayerIsFacing(mc.player), text);
} }
} }
@EventListener @EventListener
private void onSendPacket(PacketEvent.Send event) { private void onSendPacket(PacketEvent.Send event) {
if (event.getPacket() instanceof ServerboundSignUpdatePacket packet) { if (event.getPacket() instanceof ServerboundSignUpdatePacket packet) {
if (text == null) text = packet.getLines().clone(); if (text == null) {
else System.arraycopy(text, 0, packet.getLines(), 0, 4); 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) { private void fillText(BlockPos blockPos, SignTextSlot slot, String[] text) {
mc.getConnection().send(new ServerboundSignUpdatePacket( mc.getConnection().send(new ServerboundSignUpdatePacket(blockPos, List.of(text), slot));
blockPos, front, text[0], text[1], text[2], text[3]
));
} }
} }
@@ -19,7 +19,7 @@ import net.minecraft.world.item.component.Tool;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -96,7 +96,7 @@ public class AutoTool extends Module {
if (mc.gui.screen() != null) return; if (mc.gui.screen() != null) return;
if (mode.is(AutoToolMode.ON_TICK) && mc.options.keyAttack.isDown()) { 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) { if (startedMining && delaySetting.getIntValue() > 0) {
@@ -132,9 +132,9 @@ public class AutoTool extends Module {
if (mc.player == null) return; if (mc.player == null) return;
if (key != KeyUtil.getKey(mc.options.keyAttack)) return; if (key != KeyUtil.getKey(mc.options.keyAttack)) return;
if (action == GLFW.GLFW_PRESS) { if (action == InputConstants.PRESS) {
onStartMining(); onStartMining();
} else if (action == GLFW.GLFW_RELEASE) { } else if (action == InputConstants.RELEASE) {
onFinishMining(); onFinishMining();
} }
} }
@@ -20,7 +20,7 @@ import net.minecraft.world.level.block.state.properties.Property;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@@ -31,7 +31,7 @@ public class BlockInfo extends Module {
private final KeySetting key = sgGeneral.add(new KeySetting( private final KeySetting key = sgGeneral.add(new KeySetting(
"tecla", "tecla",
"tecla a pulsar para obtener la info.", "tecla a pulsar para obtener la info.",
GLFW.GLFW_KEY_CAPS_LOCK InputConstants.KEY_CAPSLOCK
)); ));
private final EnumSetting<CopyMode> copy = sgGeneral.add(new EnumSetting<>( private final EnumSetting<CopyMode> copy = sgGeneral.add(new EnumSetting<>(
@@ -56,7 +56,7 @@ public class BlockInfo extends Module {
@EventListener @EventListener
private void onKey(KeyEvent event) { private void onKey(KeyEvent event) {
if (mc.player == null || mc.level == null) return; 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( HitResult result = mc.player.pick(
mc.player.blockInteractionRange(), mc.player.blockInteractionRange(),
@@ -6,6 +6,9 @@ import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.setting.settings.StringSetting; import me.retucio.sputnik.module.setting.settings.StringSetting;
import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket; import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
import me.retucio.sputnik.util.NetworkUtil;
import java.util.ArrayList;
public class ColoredSigns extends Module { public class ColoredSigns extends Module {
@@ -26,9 +29,11 @@ public class ColoredSigns extends Module {
@EventListener @EventListener
private void onSendPacket(PacketEvent.Send event) { private void onSendPacket(PacketEvent.Send event) {
if (event.getPacket() instanceof ServerboundSignUpdatePacket packet) { if (event.getPacket() instanceof ServerboundSignUpdatePacket packet) {
for (int i = 0; i < 4; i++) { event.cancel();
packet.getLines()[i] = packet.getLines()[i].replace(symbol.getValue(), "\247" + "\247a"); NetworkUtil.sendPacketNoEvent(new ServerboundSignUpdatePacket(
} packet.pos(), packet.lines().stream()
.map(line -> line.replace(symbol.getValue(), "\247" + "\247a"))
.toList(), packet.slot()));
} }
} }
} }
@@ -5,7 +5,7 @@ import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.util.EntityUtil; import me.retucio.sputnik.util.EntityUtil;
import me.retucio.sputnik.util.RotationUtil; import me.retucio.sputnik.util.RotationUtil;
import net.minecraft.world.entity.Entity; 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.ArrayList;
import java.util.List; import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
public class Racist extends Module { public class Racist extends Module {
private int lookTimer; private int lookTimer;
private final List<EnderMan> lookedEndermen = new ArrayList<>(); private final List<Enderman> lookedEndermen = new ArrayList<>();
public Racist() { public Racist() {
super("racismo", super("racismo",
@@ -33,7 +33,7 @@ public class Racist extends Module {
if (mc.level == null || mc.player == null) return; if (mc.level == null || mc.player == null) return;
for (Entity entity : mc.level.getEntities().getAll()) { for (Entity entity : mc.level.getEntities().getAll()) {
if (!(entity instanceof EnderMan enderman)) continue; if (!(entity instanceof Enderman enderman)) continue;
if (shouldLookAt(enderman)) { if (shouldLookAt(enderman)) {
lookAtEnderman(enderman); lookAtEnderman(enderman);
@@ -47,12 +47,12 @@ public class Racist extends Module {
lookTimer++; lookTimer++;
} }
private boolean shouldLookAt(EnderMan enderman) { private boolean shouldLookAt(Enderman enderman) {
return !(lookedEndermen.contains(enderman)) && lookTimer >= 10 return !(lookedEndermen.contains(enderman)) && lookTimer >= 10
&& EntityUtil.hasLineOfSight(mc.player, enderman); && 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); RotationUtil.lookAt(RotationUtil.LOW, enderman, EntityUtil.Target.HEAD, 0, RotationUtil.Mode.CLIENT);
} }
} }
@@ -1,5 +1,6 @@
package me.retucio.sputnik.module.setting.settings; package me.retucio.sputnik.module.setting.settings;
import com.mojang.blaze3d.platform.InputConstants;
import me.retucio.sputnik.config.ConfigManager; import me.retucio.sputnik.config.ConfigManager;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.ModuleManager; 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.ChatUtil;
import me.retucio.sputnik.util.KeyUtil; import me.retucio.sputnik.util.KeyUtil;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.lwjgl.glfw.GLFW;
public class KeySetting extends Setting<Integer> { public class KeySetting extends Setting<Integer> {
@@ -22,32 +23,19 @@ public class KeySetting extends Setting<Integer> {
public void setValue(Integer value) { public void setValue(Integer value) {
if (this.value.equals(value)) return; if (this.value.equals(value)) return;
if (value == GLFW.GLFW_KEY_ESCAPE) { if (value == InputConstants.KEY_ESCAPE) {
this.value = GLFW.GLFW_KEY_UNKNOWN; // asignar la tecla ESC a deshabilitar la tecla this.value = InputConstants.UNKNOWN.getValue(); // asignar la tecla ESC a deshabilitar la tecla
fireUpdateEvent(); 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); if (updateListener != null) updateListener.accept(this.value);
return; return;
} }
// con "teclas multimódulo" puesto se permite repetir tecla, que es justo lo que if (ModuleManager.INSTANCE != null && !ConfigManager.INSTANCE.isApplying()
// dice el ajuste. antes se le quitaba la tecla al otro módulo igualmente, así que && !ClientSettingsPanel.clientSettings.multipleKeybinds.getValue()
// 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()) {
for (Module module : ModuleManager.INSTANCE.getModules()) for (Module module : ModuleManager.INSTANCE.getModules())
if (module.getKey() == value && value != -1) { if (module.getKey() == value && value != InputConstants.UNKNOWN.getValue()) {
module.setKey(-1); module.setKey(InputConstants.UNKNOWN.getValue());
ChatUtil.info(Component.translatable("sputnik.setting.key.reset", module.getDisplayName())); ChatUtil.info(Component.translatable("sputnik.setting.key.reset", module.getDisplayName()));
} }
} }
@@ -4,22 +4,31 @@ import me.retucio.sputnik.module.setting.Setting;
import me.retucio.sputnik.util.I18nUtil; import me.retucio.sputnik.util.I18nUtil;
import java.util.*; import java.util.*;
import java.util.function.Supplier;
public class ListSetting<T> extends Setting<Map<T, Boolean>> { public class ListSetting<T> extends Setting<Map<T, Boolean>> {
private final List<T> options; private List<T> options;
private Map<T, String> displayNames = null; private Map<T, String> displayNames = null;
private final Supplier<List<T>> optionsSupplier;
private final Supplier<Map<T, Boolean>> initialValuesSupplier;
private final Supplier<Map<T, String>> displayNamesSupplier;
private boolean resolved;
public ListSetting(String name, String description, List<T> options, Map<T, Boolean> initialValues) { public ListSetting(String name, String description, List<T> options, Map<T, Boolean> initialValues) {
super(name, description, initialValues); super(name, description, new HashMap<>());
this.optionsSupplier = null;
this.initialValuesSupplier = null;
this.displayNamesSupplier = null;
this.resolved = true;
this.options = new ArrayList<>(options); this.options = new ArrayList<>(options);
this.defaultValue = new HashMap<>(); this.defaultValue = new HashMap<>();
for (T option : options) { for (T option : options) {
boolean enabled = initialValues != null && initialValues.getOrDefault(option, false); boolean enabled = initialValues != null && initialValues.getOrDefault(option, false);
defaultValue.put(option, enabled); defaultValue.put(option, enabled);
} }
this.value = new HashMap<>(defaultValue); this.value = new HashMap<>(defaultValue);
} }
@@ -28,11 +37,65 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
this.displayNames = displayNames; this.displayNames = displayNames;
} }
// constructor "lazy": para listas que no están listas (no pun intended) al momento de construirlas
public ListSetting(String name, String description,
Supplier<List<T>> optionsSupplier,
Supplier<Map<T, Boolean>> initialValuesSupplier,
Supplier<Map<T, String>> displayNamesSupplier
) {
super(name, description, new HashMap<>());
this.optionsSupplier = optionsSupplier;
this.initialValuesSupplier = initialValuesSupplier;
this.displayNamesSupplier = displayNamesSupplier;
this.resolved = false;
this.options = new ArrayList<>();
this.defaultValue = new HashMap<>();
this.value = new HashMap<>();
}
// resuelve la lista real la primera vez que se necesita
private void resolveIfNeeded() {
if (resolved || optionsSupplier == null) return;
resolved = true;
List<T> resolvedOptions = optionsSupplier.get();
if (resolvedOptions == null) resolvedOptions = new ArrayList<>();
Map<T, Boolean> resolvedInitial = initialValuesSupplier != null ? initialValuesSupplier.get() : null;
Map<T, Boolean> previousValue = this.value;
this.options = new ArrayList<>(resolvedOptions);
this.defaultValue = new HashMap<>();
for (T option : resolvedOptions) {
boolean enabled = resolvedInitial != null && resolvedInitial.getOrDefault(option, false);
defaultValue.put(option, enabled);
}
this.value = new HashMap<>(defaultValue);
// preservar cualquier valor ya aplicado (p. ej. por ConfigManager) antes del resolve
if (previousValue != null) {
for (Map.Entry<T, Boolean> entry : previousValue.entrySet()) {
if (this.value.containsKey(entry.getKey())) {
this.value.put(entry.getKey(), entry.getValue());
}
}
}
if (displayNamesSupplier != null) {
this.displayNames = displayNamesSupplier.get();
}
}
public boolean isEnabled(T option) { public boolean isEnabled(T option) {
resolveIfNeeded();
return value.getOrDefault(option, false); return value.getOrDefault(option, false);
} }
public void setEnabled(T option, boolean enabled) { public void setEnabled(T option, boolean enabled) {
resolveIfNeeded();
if (value.containsKey(option) && value.get(option) != enabled) { if (value.containsKey(option) && value.get(option) != enabled) {
value.put(option, enabled); value.put(option, enabled);
fireUpdateEvent(); fireUpdateEvent();
@@ -45,22 +108,26 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public Map<T, Boolean> getValues() { public Map<T, Boolean> getValues() {
resolveIfNeeded();
return new HashMap<>(value); return new HashMap<>(value);
} }
@Override @Override
public void setValue(Map<T, Boolean> values) { public void setValue(Map<T, Boolean> values) {
resolveIfNeeded();
if (!this.value.equals(values)) { if (!this.value.equals(values)) {
super.setValue(values); super.setValue(values);
} }
} }
public void setDefaultValue(Map<T, Boolean> values) { public void setDefaultValue(Map<T, Boolean> values) {
resolveIfNeeded();
defaultValue.clear(); defaultValue.clear();
defaultValue.putAll(values); defaultValue.putAll(values);
} }
public Map<String, Boolean> getConfigValues() { public Map<String, Boolean> getConfigValues() {
resolveIfNeeded();
Map<String, Boolean> configValues = new HashMap<>(); Map<String, Boolean> configValues = new HashMap<>();
for (T option : options) { for (T option : options) {
configValues.put(getConfigName(option), value.getOrDefault(option, false)); configValues.put(getConfigName(option), value.getOrDefault(option, false));
@@ -69,16 +136,17 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public void addOption(T option, boolean isDefault, String displayName) { public void addOption(T option, boolean isDefault, String displayName) {
resolveIfNeeded();
options.add(option); options.add(option);
defaultValue.put(option, isDefault); defaultValue.put(option, isDefault);
value.put(option, isDefault); value.put(option, isDefault);
if (this.displayNames != null) { if (this.displayNames != null) {
this.displayNames.put(option, displayName); this.displayNames.put(option, displayName);
} }
} }
public void setAll(boolean enabled) { public void setAll(boolean enabled) {
resolveIfNeeded();
for (T option : options) { for (T option : options) {
value.put(option, enabled); value.put(option, enabled);
} }
@@ -87,10 +155,12 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public List<T> getOptions() { public List<T> getOptions() {
resolveIfNeeded();
return Collections.unmodifiableList(options); return Collections.unmodifiableList(options);
} }
public List<T> getEnabledOptions() { public List<T> getEnabledOptions() {
resolveIfNeeded();
List<T> enabledOptions = new ArrayList<>(); List<T> enabledOptions = new ArrayList<>();
for (T option : options) { for (T option : options) {
if (isEnabled(option)) { if (isEnabled(option)) {
@@ -101,21 +171,18 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public Map<T, String> getDisplayNames() { public Map<T, String> getDisplayNames() {
resolveIfNeeded();
return displayNames != null ? new HashMap<>(displayNames) : null; return displayNames != null ? new HashMap<>(displayNames) : null;
} }
// OJO: nombre interno de la opción. es la clave de la config. (ver
// ConfigManager#applyListSetting) y para las listas del juego es la clave de
// traducción ("entity.minecraft.zombie"), que no depende del idioma. no traducir
public String getConfigName(T key) { public String getConfigName(T key) {
resolveIfNeeded();
if (displayNames != null && displayNames.containsKey(key)) { if (displayNames != null && displayNames.containsKey(key)) {
return displayNames.get(key); return displayNames.get(key);
} }
return key != null ? key.toString() : "?"; return key != null ? key.toString() : "?";
} }
// nombre visible: se traduce aquí. antes se mostraba el nombre interno tal cual, o sea
// los nombres de vanilla en inglés aunque el juego estuviera en otro idioma
public String getDisplayName(T key) { public String getDisplayName(T key) {
String name = getConfigName(key); String name = getConfigName(key);
return I18nUtil.orElse(name, name); return I18nUtil.orElse(name, name);
@@ -9,7 +9,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -120,11 +120,11 @@ public class HudEditor {
int offset = hud.arrowOffset.getIntValue(); int offset = hud.arrowOffset.getIntValue();
switch (key) { switch (key) {
case GLFW.GLFW_KEY_UP -> selected.setY(Math.max(1, selected.getY() - offset)); case InputConstants.KEY_UP -> selected.setY(Math.max(1, selected.getY() - offset));
case GLFW.GLFW_KEY_DOWN -> selected.setY(Math.min( case InputConstants.KEY_DOWN -> selected.setY(Math.min(
mc.getWindow().getGuiScaledHeight() - selected.getH() + 1, selected.getY() + offset)); mc.getWindow().getGuiScaledHeight() - selected.getH() + 1, selected.getY() + offset));
case GLFW.GLFW_KEY_LEFT -> selected.setX(Math.max(1, selected.getX() - offset)); case InputConstants.KEY_LEFT -> selected.setX(Math.max(1, selected.getX() - offset));
case GLFW.GLFW_KEY_RIGHT -> selected.setX(Math.min( case InputConstants.KEY_RIGHT -> selected.setX(Math.min(
mc.getWindow().getGuiScaledWidth() - selected.getW() + 1, selected.getX() + offset)); mc.getWindow().getGuiScaledWidth() - selected.getW() + 1, selected.getX() + offset));
} }
} }
@@ -11,7 +11,7 @@ import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.input.MouseButtonEvent; import net.minecraft.client.input.MouseButtonEvent;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NonNull;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
public class HudEditorScreen extends Screen { public class HudEditorScreen extends Screen {
@@ -61,10 +61,10 @@ public class HudEditorScreen extends Screen {
@EventListener @EventListener
public void onKey(KeyEvent event) { public void onKey(KeyEvent event) {
if (mc.gui.screen() != INSTANCE) return; if (mc.gui.screen() != INSTANCE) return;
if (event.getAction() == GLFW.GLFW_RELEASE) return; if (event.getAction() == InputConstants.RELEASE) return;
event.cancel(); event.cancel();
if (event.getKey() == GLFW.GLFW_KEY_ESCAPE) { if (event.getKey() == InputConstants.KEY_ESCAPE) {
HudEditor.INSTANCE.saveAll(); HudEditor.INSTANCE.saveAll();
HudEditor.INSTANCE.unselect(); HudEditor.INSTANCE.unselect();
mc.gui.setScreen(null); mc.gui.setScreen(null);
@@ -12,11 +12,10 @@ import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.setting.Setting; import me.retucio.sputnik.module.setting.Setting;
import me.retucio.sputnik.module.setting.settings.ColorSetting; 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.settings.ListButton;
import me.retucio.sputnik.ui.widgets.buttons.ModuleButton; import me.retucio.sputnik.ui.widgets.buttons.ModuleButton;
import me.retucio.sputnik.ui.widgets.buttons.SettingButton; 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.ClientSettingsPanel;
import me.retucio.sputnik.ui.widgets.panels.settings.ColorPickerPanel; import me.retucio.sputnik.ui.widgets.panels.settings.ColorPickerPanel;
import me.retucio.sputnik.ui.widgets.panels.ModulePanel; 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.SearchBarWidget;
import me.retucio.sputnik.ui.widgets.misc.TabBarWidget; import me.retucio.sputnik.ui.widgets.misc.TabBarWidget;
import me.retucio.sputnik.util.Colors; 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.KeyUtil;
import me.retucio.sputnik.util.MiscUtil; import me.retucio.sputnik.util.MiscUtil;
@@ -44,7 +42,7 @@ import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NonNull;
import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.platform.InputConstants;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -69,7 +67,6 @@ public class ClickGui extends Screen {
private final List<ModulePanel> modulePanels = new ArrayList<>(); private final List<ModulePanel> modulePanels = new ArrayList<>();
private final List<SettingsPanel> settingsPanels = new ArrayList<>(); private final List<SettingsPanel> settingsPanels = new ArrayList<>();
private final ClientSettingsPanel clientSettingsPanel = new ClientSettingsPanel(620, 280, 100, 20); 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 ScrollBarWidget scrollBar = new ScrollBarWidget();
private final SearchBarWidget searchBar = new SearchBarWidget(320, 10, 320, 20); 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 TabBarWidget tabBar = new TabBarWidget(this::onTabLeft);
private final ProfilesTab profilesTab = new ProfilesTab(); private final ProfilesTab profilesTab = new ProfilesTab();
private final MacrosTab macrosTab = new MacrosTab(); private final MacrosTab macrosTab = new MacrosTab();
private final FriendsTab friendsTab = new FriendsTab();
private static final int PLACEMENT_SEARCH_STEP = 8;
public ClickGui() { public ClickGui() {
super(Component.translatable("sputnik.ui.clickgui.title")); 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) { public void extractRenderState(@NonNull GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
switch (tabBar.getSelected()) { switch (tabBar.getSelected()) {
case MODULES -> renderModules(gui, mouseX, mouseY, delta); case MODULES -> renderModules(gui, mouseX, mouseY, delta);
case CLIENT_SETTINGS -> renderClientSettings(gui, mouseX, mouseY, delta);
case HUD -> renderHud(gui, mouseX, mouseY); case HUD -> renderHud(gui, mouseX, mouseY);
case PROFILES -> profilesTab.render(gui, mouseX, mouseY, delta); case PROFILES -> profilesTab.render(gui, mouseX, mouseY, delta);
case MACROS -> macrosTab.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); tabBar.render(gui, mouseX, mouseY, delta);
@@ -112,6 +114,11 @@ public class ClickGui extends Screen {
HudEditor.INSTANCE.render(gui, mouseX, mouseY); 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) { private void renderModules(@NonNull GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
scrollBar.setWindowHeight(mc.getWindow().getGuiScaledHeight()); scrollBar.setWindowHeight(mc.getWindow().getGuiScaledHeight());
scrollBar.setContentHeight(calculateContentHeight()); scrollBar.setContentHeight(calculateContentHeight());
@@ -124,7 +131,6 @@ public class ClickGui extends Screen {
searchBar.updatePosition(mouseX, mouseY); searchBar.updatePosition(mouseX, mouseY);
// actualizar la posición de renderizado vertical de los paneles cada tick // actualizar la posición de renderizado vertical de los paneles cada tick
friendsPanel.updateRenderY(scrollOffset);
clientSettingsPanel.updateRenderY(scrollOffset); clientSettingsPanel.updateRenderY(scrollOffset);
for (ModulePanel mp : modulePanels) { for (ModulePanel mp : modulePanels) {
mp.updateRenderY(scrollOffset); mp.updateRenderY(scrollOffset);
@@ -149,12 +155,6 @@ public class ClickGui extends Screen {
sp.drawTooltips(gui, mouseX, mouseY); 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(); filterSearchResults();
renderBottomGradient(gui, scrollOffset); renderBottomGradient(gui, scrollOffset);
@@ -191,40 +191,75 @@ public class ClickGui extends Screen {
bottom = Math.max(bottom, sp.getY() + sp.getH() + sp.getTotalHeight()); 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 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 @Override
public boolean mouseClicked(MouseButtonEvent click, boolean doubled) { public boolean mouseClicked(MouseButtonEvent click, boolean doubled) {
int x = (int) click.x(); int x = (int) click.x();
int y = (int) click.y(); 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()) { switch (tabBar.getSelected()) {
case MODULES -> { case MODULES -> {
miscWidgets.forEach(w -> w.mouseClicked(x, y, click.button())); miscWidgets.forEach(w -> w.mouseClicked(x, y, button));
friendsPanel.mouseClicked(x, y, click.button());
clientSettingsPanel.mouseClicked(x, y, click.button());
for (ModulePanel mp : modulePanels.reversed()) { for (ModulePanel mp : modulePanels.reversed()) {
mp.mouseClicked(x, y, click.button()); mp.mouseClicked(x, y, button);
} }
for (SettingsPanel sp : new ArrayList<>(settingsPanels)) { 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 CLIENT_SETTINGS -> {
case PROFILES -> profilesTab.mouseClicked(x, y, click.button()); if (!clientSettingsPanel.mouseClickedGroupTab(x, y, button)) {
case MACROS -> macrosTab.mouseClicked(x, y, click.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); return super.mouseClicked(click, doubled);
@@ -234,25 +269,29 @@ public class ClickGui extends Screen {
public boolean mouseReleased(MouseButtonEvent click) { public boolean mouseReleased(MouseButtonEvent click) {
int x = (int) click.x(); int x = (int) click.x();
int y = (int) click.y(); int y = (int) click.y();
int button = KeyUtil.toLegacyMouseButton(click.button());
if (tabBar.getSelected() == Tab.HUD) { 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); return super.mouseReleased(click);
} }
if (tabBar.getSelected() != Tab.MODULES) return super.mouseReleased(click); if (tabBar.getSelected() != Tab.MODULES) return super.mouseReleased(click);
miscWidgets.forEach(w -> w.mouseReleased( miscWidgets.forEach(w -> w.mouseReleased(
x, y, click.button())); x, y, button));
// registrar cuándo se suelta el clic, en cada panel respectivamente // 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()) { for (ModulePanel mp : modulePanels.reversed()) {
mp.mouseReleased(x, y, click.button()); mp.mouseReleased(x, y, button);
} }
for (SettingsPanel sp : new ArrayList<>(settingsPanels)) { for (SettingsPanel sp : new ArrayList<>(settingsPanels)) {
sp.mouseReleased(x, y, click.button()); sp.mouseReleased(x, y, button);
} }
return super.mouseReleased(click); return super.mouseReleased(click);
@@ -260,8 +299,14 @@ public class ClickGui extends Screen {
@Override @Override
public boolean mouseDragged(@NonNull MouseButtonEvent click, double deltaX, double deltaY) { public boolean mouseDragged(@NonNull MouseButtonEvent click, double deltaX, double deltaY) {
int button = KeyUtil.toLegacyMouseButton(click.button());
if (tabBar.getSelected() == Tab.HUD) { 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); return super.mouseDragged(click, deltaX, deltaY);
} }
@@ -285,11 +330,13 @@ public class ClickGui extends Screen {
switch (tabBar.getSelected()) { switch (tabBar.getSelected()) {
case MODULES -> searchBar.onKey(event.getKey(), event.getAction()); case MODULES -> searchBar.onKey(event.getKey(), event.getAction());
case CLIENT_SETTINGS -> clientSettingsPanel.onKey(event.getKey(), event.getAction());
case HUD -> { 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 PROFILES -> profilesTab.onKey(event.getKey(), event.getAction());
case MACROS -> macrosTab.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 @EventListener
public void onMouseMiddleButton(MouseClickEvent event) { public void onMouseMiddleButton(MouseClickEvent event) {
// mover todos los paneles a un punto visible al presionar shift + la rueda del ratón // 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 h = Sputnik.mc.getWindow().getGuiScaledHeight();
int minY = Math.min(modulePanels.stream().mapToInt(Panel::getY).min().getAsInt(), settingsPanels.stream().mapToInt(Panel::getY).min().getAsInt()); 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) { if (correction != 0) {
modulePanels.forEach(mp -> mp.setY(mp.getY() + correction)); modulePanels.forEach(mp -> mp.setY(mp.getY() + correction));
settingsPanels.forEach(sp -> sp.setY(sp.getY() + correction)); settingsPanels.forEach(sp -> sp.setY(sp.getY() + correction));
friendsPanel.setY(friendsPanel.getY() + correction);
clientSettingsPanel.setY(clientSettingsPanel.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()) { for (Button b : clientSettingsPanel.getButtons()) {
if (!(b instanceof SettingButton<?> sb)) continue; if (!(b instanceof SettingButton<?> sb)) continue;
Setting<?> setting = sb.getSetting(); 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) { public void openSettingsPanel(Module module, int x, int y) {
// asegurarse de que no se sale de la pantalla SettingsPanel panel = new SettingsPanel(module, 0, 0, 100, 20);
x = Math.clamp(x, 0, mc.getWindow().getGuiScaledWidth() - 80); 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); settingsPanels.add(panel);
Sputnik.EVENT_BUS.post(new SettingsPanelEvent.Open(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() { public void refreshListButtons() {
for (SettingsPanel panel : settingsPanels) for (SettingsPanel panel : settingsPanels)
for (Button button : panel.getButtons()) 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 // lo miran Sputnik#onInput y el editor del hud para no tratar las teclas que se están
// escribiendo como atajos de módulos // escribiendo como atajos de módulos
public boolean isCapturingInput() { public boolean isCapturingInput() {
return searchBar.isFocused() || profilesTab.isCapturingInput() || macrosTab.isCapturingInput(); return searchBar.isFocused() || profilesTab.isCapturingInput()
|| macrosTab.isCapturingInput() || friendsTab.isCapturingInput();
} }
public boolean isOnHudTab() { public boolean isOnHudTab() {
@@ -599,7 +605,6 @@ public class ClickGui extends Screen {
public List<ModulePanel> getModulePanels() { return modulePanels; } public List<ModulePanel> getModulePanels() { return modulePanels; }
public List<SettingsPanel> getSettingsPanels() { return settingsPanels; } public List<SettingsPanel> getSettingsPanels() { return settingsPanels; }
public ClientSettingsPanel getClientSettingsPanel() { return clientSettingsPanel; } public ClientSettingsPanel getClientSettingsPanel() { return clientSettingsPanel; }
public FriendsPanel getFriendsPanel() { return friendsPanel; }
public SearchBarWidget getSearchBar() { return searchBar; } public SearchBarWidget getSearchBar() { return searchBar; }
public TabBarWidget getTabBar() { return tabBar; } public TabBarWidget getTabBar() { return tabBar; }
public ScrollBarWidget getScrollBar() { return scrollBar; } public ScrollBarWidget getScrollBar() { return scrollBar; }
@@ -40,7 +40,7 @@ public class PreviewScreen extends Screen {
super(Component.translatable("sputnik.ui.preview.shulker")); super(Component.translatable("sputnik.ui.preview.shulker"));
this.color = ShulkerPeek.SHULKER_COLORS.get(shulker.getItem()); this.color = ShulkerPeek.SHULKER_COLORS.get(shulker.getItem());
this.title = shulker.getHoverName(); this.title = shulker.getHoverName();
this.inventory = shulker.get(DataComponents.CONTAINER).allItemsCopyStream().toList(); this.inventory = shulker.get(DataComponents.CONTAINER).nonEmptyItemCopyStream().toList();
this.parent = parent; this.parent = parent;
this.type = PreviewType.SHULKER; this.type = PreviewType.SHULKER;
} }
@@ -6,9 +6,11 @@ import me.retucio.sputnik.util.I18nUtil;
public enum Tab { public enum Tab {
MODULES("módulos"), MODULES("módulos"),
CLIENT_SETTINGS("ajustes"),
HUD("hud"), HUD("hud"),
PROFILES("perfiles"), PROFILES("perfiles"),
MACROS("macros"); MACROS("macros"),
FRIENDS("amigos");
private final String name; private final String name;
Loaded 100 of 130 files, more files were not shown because too many files have changed in this diff. Show more