Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
44494830be | ||
|
|
73682cb85d | ||
|
|
ac7de7a07a | ||
|
|
0bd31971a0 | ||
|
|
3010b164ab | ||
|
|
6cb4656365 |
No files matched your search
@@ -1,16 +1,16 @@
|
||||
# jenny's mod 2 100% real
|
||||
|
||||
mod para Minecraft Fabric 26.1.2 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
|
||||
mod para Minecraft Fabric 26.2 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
|
||||
|
||||
## instalación
|
||||
|
||||
### para gente normal:
|
||||
1. ir a [lanzamientos](https://github.com/retuci0/sputnik/releases)
|
||||
1. ir a [lanzamientos](https://codeberg.org/retucio/sputnik/releases)
|
||||
2. selecionar la versión más reciente
|
||||
3. descargar el .jar
|
||||
4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`)
|
||||
|
||||
asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `26.1.2`; Fabric `0.19.2`)
|
||||
asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `26.2`; Fabric `0.19.3`)
|
||||
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
|
||||
@@ -56,7 +56,7 @@ algunos módulos tienen teclas asignadas por defecto, asígnales `ESC` para desa
|
||||
<img src="screenshots/hudeditor.png" alt="editor de HUD">
|
||||
<img src="screenshots/colorpicker.png" alt="selector de colores">
|
||||
|
||||
## contibuciones
|
||||
## contribuciones
|
||||
|
||||
sí por favor
|
||||
|
||||
|
||||
+7
-17
@@ -1,31 +1,21 @@
|
||||
# v5.7
|
||||
# v6.3
|
||||
|
||||
## novedades
|
||||
|
||||
actualización a gradle 9.7.0
|
||||
|
||||
interfaz reorganizada en pestañas: módulos, hud, perfiles y macros
|
||||
|
||||
perfiles de configuración: guarda varias configs con nombre y cambia entre ellas sin reiniciar
|
||||
|
||||
macros: asigna una tecla a una lista de comandos o mensajes
|
||||
- actualizado a Gradle 9.7.1
|
||||
|
||||
### adiciones
|
||||
|
||||
#### módulos nuevos:
|
||||
|
||||
- cancelador de paquetes: evita que se envíen o reciban ciertos paquetes
|
||||
|
||||
#### comandos nuevos:
|
||||
|
||||
- `$?`: muestra los comandos disponibles y los describe
|
||||
- `$perfil`: gestiona los perfiles de configuración
|
||||
- `$macro`: gestiona las macros
|
||||
- autominado: mina automáticamente los bloques seleccionados, con distintos modos de selección
|
||||
- estiloso: haz truquitos con el ítem que tienes en la mano
|
||||
|
||||
### arreglos / mejoras
|
||||
|
||||
- las rotaciones de los módulos se reparten por prioridad en vez de pisarse entre ellas
|
||||
- el editor del hud ya es una pestaña más de la interfaz, además de su propia pantalla
|
||||
- mejoras varias a `puto gordo`
|
||||
- ahora `trazos` con `uno mismo` solo te apunta en cámara libre
|
||||
- nuevo ajuste de distancia máxima de renderizado para `nametags`
|
||||
|
||||
## problemas reconocidos
|
||||
|
||||
|
||||
+1
-1
@@ -10,6 +10,6 @@ discord_rpc_version=1.0.3
|
||||
neutrino_version=1.1.0
|
||||
jdk_version=25
|
||||
|
||||
mod_version=5.7
|
||||
mod_version=6.3
|
||||
maven_group=me.retucio
|
||||
archives_base_name=sputnik
|
||||
+2
-3
@@ -1,7 +1,6 @@
|
||||
#Sat Aug 29 22:10:52 CEST 2026
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
@@ -26,6 +26,7 @@ import me.retucio.sputnik.ui.hud.HudEditorScreen;
|
||||
import me.retucio.sputnik.ui.screen.UpdateScreen;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.FileButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.TextButton;
|
||||
import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
|
||||
import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
|
||||
@@ -181,10 +182,15 @@ public class Sputnik implements ClientModInitializer {
|
||||
|
||||
// verifica si algún botón de ajustes está escuchando
|
||||
private boolean isAnySettingButtonFocused() {
|
||||
if (ClickGui.INSTANCE == null) return false;
|
||||
for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels())
|
||||
for (Button sb : sf.getButtons())
|
||||
if ((sb instanceof BindButton b && b.isFocused()) || (sb instanceof TextButton t && t.isFocused()))
|
||||
if ((sb instanceof BindButton b && b.isFocused())
|
||||
|| (sb instanceof TextButton t && t.isFocused())
|
||||
|| (sb instanceof FileButton f && f.isFocused())
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -208,6 +214,7 @@ public class Sputnik implements ClientModInitializer {
|
||||
for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) {
|
||||
for (SettingButton<?> sb : sf.getButtons()) {
|
||||
if (sb instanceof BindButton bb) bb.onKey(key, action);
|
||||
if (sb instanceof FileButton fb) fb.onKey(key, action);
|
||||
if (sb instanceof TextButton tb) tb.onKey(key, action);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,11 @@ package me.retucio.sputnik.command.commands;
|
||||
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.util.interfaces.IChatComponent;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatComponent;
|
||||
import net.minecraft.client.gui.components.ChatComponent;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.List;
|
||||
|
||||
public class PurgeCommand extends Command {
|
||||
|
||||
@@ -84,6 +84,7 @@ public class ClientConfig {
|
||||
case ListSetting l: value = l.getConfigValues(); break;
|
||||
case ColorSetting c: value = c.getConfigValue(); break;
|
||||
case OptionSetting o: value = o.getConfigName(); break;
|
||||
case FileSetting f: value = f.getValue(); break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
|
||||
@@ -362,6 +362,7 @@ public class ConfigManager {
|
||||
case ListSetting listSetting -> applyListSetting(listSetting, value);
|
||||
case ColorSetting colorSetting -> applyColorSetting(colorSetting, value);
|
||||
case OptionSetting optionSetting -> applyOptionSetting(optionSetting, value);
|
||||
case FileSetting fileSetting -> applyFileSetting(fileSetting, value);
|
||||
default -> Sputnik.LOGGER.warn(I18nUtil.fmt("sputnik.config.warn.unknownsetting",
|
||||
"watafac queseso: %s", setting.getClass().getSimpleName()));
|
||||
}
|
||||
@@ -477,8 +478,8 @@ public class ConfigManager {
|
||||
}
|
||||
|
||||
private static void applyStringSetting(StringSetting setting, Object value) {
|
||||
if (value instanceof String) {
|
||||
setting.setValue((String) value);
|
||||
if (value instanceof String v) {
|
||||
setting.setValue(v);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -539,6 +540,12 @@ public class ConfigManager {
|
||||
}
|
||||
}
|
||||
|
||||
private static void applyFileSetting(FileSetting setting, Object value) {
|
||||
if (value instanceof String v) {
|
||||
setting.setValue(v);
|
||||
}
|
||||
}
|
||||
|
||||
private static <T> void applyOptionalProperty(Map<?, ?> map, String key, Class<T> type, Consumer<T> setter) {
|
||||
Object value = map.get(key);
|
||||
if (type.isInstance(value)) {
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package me.retucio.sputnik.event.interact;
|
||||
|
||||
import com.github.retucio.neutrino.Event;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class UpdateInventoryEvent extends Event {
|
||||
|
||||
private final List<ItemStack> prev;
|
||||
|
||||
public UpdateInventoryEvent(List<ItemStack> prev) {
|
||||
this.prev = prev;
|
||||
}
|
||||
|
||||
public List<ItemStack> getPrev() {
|
||||
return prev;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package me.retucio.sputnik.event.render;
|
||||
|
||||
import com.github.retucio.neutrino.Event;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
|
||||
|
||||
public class ApplyTransformationEvent extends Event {
|
||||
|
||||
private final ItemTransform transformation;
|
||||
private final boolean leftHanded;
|
||||
|
||||
public ApplyTransformationEvent(ItemTransform transformation, boolean leftHanded) {
|
||||
this.transformation = transformation;
|
||||
this.leftHanded = leftHanded;
|
||||
}
|
||||
|
||||
public ItemTransform getTransformation() {
|
||||
return transformation;
|
||||
}
|
||||
|
||||
public boolean isLeftHanded() {
|
||||
return leftHanded;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package me.retucio.sputnik.event.render;
|
||||
|
||||
import com.github.retucio.neutrino.Event;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import me.retucio.sputnik.mixinterfaces.IEntityRenderState;
|
||||
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||
import net.minecraft.client.renderer.entity.state.ItemEntityRenderState;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
|
||||
public class RenderItemEntityEvent extends Event {
|
||||
|
||||
public final ItemEntity itemEntity;
|
||||
public final ItemEntityRenderState renderState;
|
||||
public final PoseStack matrixStack;
|
||||
public final SubmitNodeCollector renderCommandQueue;
|
||||
public final int light;
|
||||
|
||||
public RenderItemEntityEvent(ItemEntityRenderState renderState, PoseStack matrixStack, SubmitNodeCollector renderCommandQueue, int light) {
|
||||
this.itemEntity = (ItemEntity) ((IEntityRenderState) renderState).sputnik$getEntity();
|
||||
this.renderState = renderState;
|
||||
this.matrixStack = matrixStack;
|
||||
this.renderCommandQueue = renderCommandQueue;
|
||||
this.light = light;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package me.retucio.sputnik.mixin.accessors;
|
||||
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
|
||||
@Mixin(ItemStackRenderState.class)
|
||||
public interface ItemStackRenderStateAccessor {
|
||||
|
||||
@Accessor("activeLayerCount")
|
||||
int getActiveLayerCount();
|
||||
|
||||
@Accessor("layers")
|
||||
ItemStackRenderState.LayerRenderState[] getLayers();
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package me.retucio.sputnik.mixin.accessors;
|
||||
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
|
||||
@Mixin(ItemStackRenderState.LayerRenderState.class)
|
||||
public interface LayerRenderStateAccessor {
|
||||
|
||||
@Accessor("itemTransform")
|
||||
ItemTransform sputnik$getTransform();
|
||||
}
|
||||
@@ -11,9 +11,7 @@ import me.retucio.sputnik.module.modules.misc.AntiInvis;
|
||||
import me.retucio.sputnik.module.modules.movement.BoatFly;
|
||||
import me.retucio.sputnik.module.modules.movement.Velocity;
|
||||
import me.retucio.sputnik.module.modules.render.Nametags;
|
||||
import me.retucio.sputnik.util.interfaces.IVec3;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
@@ -25,8 +23,6 @@ import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.entity.projectile.arrow.AbstractArrow;
|
||||
import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.joml.Vector3d;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
@@ -8,8 +8,10 @@ import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
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.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
|
||||
@@ -31,7 +33,7 @@ public abstract class EntityRendererMixin {
|
||||
|
||||
@ModifyExpressionValue(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;getTeamColor()I"))
|
||||
private int setGlowESPColor(int original, @Local(argsOnly = true) Entity entity) {
|
||||
if (esp.isEnabled() && esp.mode.is(EntityEsp.ESPMode.GLOW) && esp.entities.isEnabled(entity.getType())) return esp.glowColor.getRGB();
|
||||
if (esp.isEnabled() && esp.mode.is(EntityEsp.ESPMode.GLOW) && esp.entities.isEnabled(entity.getType())) return esp.glowColor.getRgb();
|
||||
return original;
|
||||
}
|
||||
}
|
||||
@@ -5,10 +5,10 @@ import me.retucio.sputnik.event.network.ReceiveMessageEvent;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.misc.ChatPlus;
|
||||
|
||||
import me.retucio.sputnik.util.interfaces.IChatComponent;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.util.interfaces.IChatListener;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatComponent;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatListener;
|
||||
|
||||
import net.minecraft.client.gui.components.ChatComponent;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.retucio.sputnik.mixin.mixins.hud;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.util.FormattedCharSequence;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.retucio.sputnik.mixin.mixins.hud;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessage;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
|
||||
@@ -84,7 +84,7 @@ public abstract class HudMixin {
|
||||
// dangerous abbreviation
|
||||
CrosshairPlus cp = ModuleManager.INSTANCE.getModuleByClass(CrosshairPlus.class);
|
||||
|
||||
int color = cp.isEnabled() ? cp.color.getRGB() : -1;
|
||||
int color = cp.isEnabled() ? cp.color.getRgb() : -1;
|
||||
int w = cp.isEnabled() ? cp.width.getIntValue() : width;
|
||||
int h = cp.isEnabled() ? cp.height.getIntValue() : height;
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package me.retucio.sputnik.mixin.mixins.item;
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.render.RenderItemEntityEvent;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||
import net.minecraft.client.renderer.entity.ItemEntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.state.ItemEntityRenderState;
|
||||
import net.minecraft.client.renderer.state.level.CameraRenderState;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
|
||||
@Mixin(ItemEntityRenderer.class)
|
||||
public class ItemEntityRendererMixin {
|
||||
|
||||
@Inject(method = "submit(Lnet/minecraft/client/renderer/entity/state/ItemEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;)V", at = @At("HEAD"), cancellable = true)
|
||||
private void onSubmit(ItemEntityRenderState state, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState camera, CallbackInfo ci) {
|
||||
RenderItemEntityEvent event = Sputnik.EVENT_BUS.post(
|
||||
new RenderItemEntityEvent(
|
||||
state,
|
||||
poseStack,
|
||||
submitNodeCollector,
|
||||
state.lightCoords
|
||||
)
|
||||
);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package me.retucio.sputnik.mixin.mixins.item;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.render.ApplyTransformationEvent;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(ItemTransform.class)
|
||||
public abstract class ItemTransformMixin {
|
||||
@Inject(method = "apply", at = @At("HEAD"), cancellable = true)
|
||||
private void onApply(boolean applyLeftHandFix, PoseStack.Pose pose, CallbackInfo ci) {
|
||||
ApplyTransformationEvent event = Sputnik.EVENT_BUS.post(new ApplyTransformationEvent((ItemTransform) (Object) this, applyLeftHandFix));
|
||||
if (event.isCancelled()) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,16 +3,14 @@ package me.retucio.sputnik.mixin.mixins.misc;
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.network.JoinWorldEvent;
|
||||
import me.retucio.sputnik.event.interact.OpenScreenEvent;
|
||||
import me.retucio.sputnik.event.ShutdownEvent;
|
||||
import me.retucio.sputnik.event.TickEvent;
|
||||
import me.retucio.sputnik.event.interact.UseItemEvent;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.camera.Freecam;
|
||||
import me.retucio.sputnik.module.modules.player.FastUse;
|
||||
import me.retucio.sputnik.util.interfaces.IVec3;
|
||||
import me.retucio.sputnik.mixinterfaces.IVec3;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.retucio.sputnik.mixin.mixins.misc;
|
||||
|
||||
import me.retucio.sputnik.util.interfaces.IVec3;
|
||||
import me.retucio.sputnik.mixinterfaces.IVec3;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.retucio.sputnik.mixin.mixins.network;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import me.retucio.sputnik.util.interfaces.IChatListener;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatListener;
|
||||
import net.minecraft.client.multiplayer.chat.ChatListener;
|
||||
import net.minecraft.network.chat.ChatType;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import me.retucio.sputnik.mixin.accessors.PackConfirmScreenAccessor;
|
||||
import me.retucio.sputnik.mixin.accessors.PendingRequestAccessor;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.network.RPackBypass;
|
||||
import me.retucio.sputnik.util.interfaces.IConfirmScreen;
|
||||
import me.retucio.sputnik.mixinterfaces.IConfirmScreen;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package me.retucio.sputnik.mixin.mixins.player;
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.interact.UpdateInventoryEvent;
|
||||
import net.minecraft.core.NonNullList;
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
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(Inventory.class)
|
||||
public abstract class InventoryMixin {
|
||||
|
||||
@Shadow @Final
|
||||
private NonNullList<ItemStack> items;
|
||||
|
||||
@Inject(method = "setChanged", at = @At("HEAD"))
|
||||
private void onChange(CallbackInfo ci) {
|
||||
Sputnik.EVENT_BUS.post(new UpdateInventoryEvent(items));
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -15,7 +15,7 @@ public abstract class EntityHitboxDebugRendererMixin {
|
||||
@ModifyVariable(method = "showHitboxes", at = @At("STORE"), name = "mainColor")
|
||||
private int modifyHitboxColor(int original) {
|
||||
Hitboxes hitboxes = ModuleManager.INSTANCE.getModuleByClass(Hitboxes.class);
|
||||
if (hitboxes.isEnabled()) return hitboxes.color.getRGB();
|
||||
if (hitboxes.isEnabled()) return hitboxes.color.getRgb();
|
||||
return original;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package me.retucio.sputnik.mixin.mixins.render;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
|
||||
import me.retucio.sputnik.mixinterfaces.IEntityRenderState;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
|
||||
@Mixin(EntityRenderDispatcher.class)
|
||||
public abstract class EntityRenderDispatcherMixin {
|
||||
@ModifyExpressionValue(
|
||||
method = "extractEntity(Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState;",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/EntityRenderer;createRenderState(Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState;")
|
||||
)
|
||||
private <E extends Entity> EntityRenderState getAndUpdateRenderState$setEntity(EntityRenderState state, E entity, float partialTicks) {
|
||||
((IEntityRenderState) state).sputnik$setEntity(entity);
|
||||
return state;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package me.retucio.sputnik.mixin.mixins.render;
|
||||
|
||||
import me.retucio.sputnik.mixinterfaces.IEntityRenderState;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
|
||||
@Mixin(EntityRenderState.class)
|
||||
public abstract class EntityRenderStateMixin implements IEntityRenderState {
|
||||
@Unique
|
||||
private Entity entity;
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public Entity sputnik$getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sputnik$setEntity(Entity entity) {
|
||||
this.entity = entity;
|
||||
}
|
||||
}
|
||||
+13
-5
@@ -8,7 +8,6 @@ import me.retucio.sputnik.module.modules.camera.Freecam;
|
||||
import me.retucio.sputnik.module.modules.render.Nametags;
|
||||
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.EntityTypes;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
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.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@@ -49,19 +49,27 @@ public abstract class LivingEntityRendererMixin<T extends LivingEntity> {
|
||||
}
|
||||
|
||||
@ModifyReturnValue(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN"))
|
||||
private boolean shouldRenderPlayerNametag(boolean original, @Local(argsOnly = true) T livingEntity) {
|
||||
if (nametags.isEnabled() && livingEntity instanceof Player)
|
||||
private boolean shouldRenderPlayerNametag(boolean original, @Local(argsOnly = true, name = "entity") T entity) {
|
||||
if (nametags.isEnabled() && entity instanceof Player)
|
||||
return nametags.entities.isEnabled(EntityTypes.PLAYER) && original;
|
||||
return original;
|
||||
}
|
||||
|
||||
@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) {
|
||||
if (livingEntity instanceof Player player) {
|
||||
private void renderSelfNametag(T entity, double distanceToCameraSq, CallbackInfoReturnable<Boolean> cir) {
|
||||
if (entity instanceof Player player) {
|
||||
if (player == mc.player && nametags.showSelf.getValue()) {
|
||||
cir.setReturnValue(true);
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ package me.retucio.sputnik.mixin.mixins.screen;
|
||||
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.network.RPackBypass;
|
||||
import me.retucio.sputnik.util.interfaces.IConfirmScreen;
|
||||
import me.retucio.sputnik.mixinterfaces.IConfirmScreen;
|
||||
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.layouts.LinearLayout;
|
||||
|
||||
@@ -33,7 +33,7 @@ public class ScreenMixin {
|
||||
if (watermark == null || watermark.isEmpty()) return;
|
||||
gui.text(mc.font, watermark,
|
||||
mc.getWindow().getGuiScaledWidth() - mc.font.width(watermark) - 2, 2,
|
||||
ClientSettingsPanel.clientSettings.color.getRGB(), false
|
||||
ClientSettingsPanel.clientSettings.color.getRgb(), false
|
||||
);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.network.chat.Component;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
public interface IConfirmScreen {
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
|
||||
public interface IEntityRenderState {
|
||||
|
||||
@Nullable
|
||||
Entity sputnik$getEntity();
|
||||
|
||||
void sputnik$setEntity(Entity entity);
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
public interface IGuiMessageLine extends IGuiMessage {
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.core.Vec3i;
|
||||
import org.joml.Vector3d;
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
/* code by meteorclient dev team */
|
||||
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.Style;
|
||||
@@ -6,16 +6,19 @@ import me.retucio.sputnik.config.ConfigManager;
|
||||
import me.retucio.sputnik.event.sputnik.ToggleModuleEvent;
|
||||
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.KeySetting;
|
||||
import me.retucio.sputnik.module.setting.Setting;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
import me.retucio.sputnik.util.I18nUtil;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.awt.*;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -35,8 +38,6 @@ public class Module {
|
||||
|
||||
// ajustes que están en todos los módulos
|
||||
|
||||
// estos cuatro están en los 93 módulos, así que comparten clave en vez de derivar una por módulo
|
||||
|
||||
protected KeySetting bind = new KeySetting(
|
||||
"tecla",
|
||||
"tecla asignada al módulo, ESC para desactivar",
|
||||
@@ -44,7 +45,7 @@ public class Module {
|
||||
).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
|
||||
protected EnumSetting<KeyMode> keyMode = new EnumSetting<KeyMode>(
|
||||
protected EnumSetting<KeyMode> keyMode = new EnumSetting<>(
|
||||
"modo de tecla",
|
||||
"cómo interpretar la tecla configurada",
|
||||
KeyMode.class, KeyMode.TOGGLE
|
||||
@@ -56,12 +57,26 @@ public class Module {
|
||||
true
|
||||
).translationKey("sputnik.setting.common.notify");
|
||||
|
||||
protected EnumSetting<NotifyMode> notifyMode = new EnumSetting<NotifyMode>(
|
||||
protected EnumSetting<NotifyMode> notifyMode = new EnumSetting<>(
|
||||
"modo de notificación",
|
||||
"cómo notificar cuando se activa / desactiva",
|
||||
NotifyMode.class, NotifyMode.WIDGET
|
||||
).translationKey("sputnik.setting.common.notifymode");
|
||||
|
||||
protected BooleanSetting displayed = new BooleanSetting(
|
||||
"visible",
|
||||
"mostrar en el arraylist del HUD",
|
||||
true
|
||||
).translationKey("sputnik.setting.common.displayed");;
|
||||
|
||||
protected ColorSetting arraylistColor = new ColorSetting(
|
||||
"color del arraylist",
|
||||
"color a usar en el arraylist para el nombre del módulo",
|
||||
new Color(Colors.red, Colors.green, Colors.blue, Colors.alpha),
|
||||
true
|
||||
).translationKey("sputnik.setting.common.arraylistcolor")
|
||||
.visibility(displayed::getValue);
|
||||
|
||||
protected final List<SettingGroup> sgs = new ArrayList<>();
|
||||
protected final SettingGroup sgModule = addSg(new SettingGroup("módulo", false, "sputnik.group.common.module"));
|
||||
protected final SettingGroup sgGeneral = addSg(new SettingGroup("general", true, "sputnik.group.common.general"));
|
||||
@@ -72,14 +87,11 @@ public class Module {
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.category = category;
|
||||
sgModule.addAll(bind, keyMode, notify, notifyMode);
|
||||
sgModule.addAll(bind, keyMode, notify, notifyMode, displayed, arraylistColor);
|
||||
}
|
||||
|
||||
public Module(String name, String description, Category category, int key) {
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.category = category;
|
||||
sgModule.addAll(bind, keyMode, notify, notifyMode);
|
||||
this(name, description, category);
|
||||
this.bind.setDefaultValue(key);
|
||||
|
||||
// puto marcos
|
||||
@@ -155,7 +167,6 @@ public class Module {
|
||||
}
|
||||
}
|
||||
|
||||
// onDisable no miraba notify.getValue(), así que avisaba aunque estuviera desactivado
|
||||
private void notifyToggle(boolean on) {
|
||||
if (!notify.getValue()) return;
|
||||
if (ConfigManager.INSTANCE != null && ConfigManager.INSTANCE.isApplying()) return;
|
||||
@@ -174,8 +185,6 @@ public class Module {
|
||||
|
||||
// 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() {
|
||||
return name;
|
||||
}
|
||||
@@ -250,6 +259,10 @@ public class Module {
|
||||
return bind;
|
||||
}
|
||||
|
||||
public boolean isVisible() { return displayed.getValue(); }
|
||||
|
||||
public Color getArraylistColor() { return arraylistColor.getValue(); }
|
||||
|
||||
public boolean isSearchMatch() {
|
||||
return searchMatch;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ import me.retucio.sputnik.module.modules.inventory.*;
|
||||
import me.retucio.sputnik.module.modules.misc.*;
|
||||
import me.retucio.sputnik.module.modules.movement.*;
|
||||
import me.retucio.sputnik.module.modules.network.*;
|
||||
import me.retucio.sputnik.module.modules.network.PacketLogger;
|
||||
import me.retucio.sputnik.module.modules.player.*;
|
||||
import me.retucio.sputnik.module.modules.render.*;
|
||||
import me.retucio.sputnik.module.modules.render.CritsPlus;
|
||||
@@ -90,6 +91,7 @@ public class ModuleManager {
|
||||
add(new ChestplateSwitch());
|
||||
add(new CrystalAura());
|
||||
add(new HoldAttack());
|
||||
add(new KillAura());
|
||||
add(new MaceKill());
|
||||
add(new ProjectileTrajectories());
|
||||
add(new SpearKill());
|
||||
@@ -128,6 +130,7 @@ public class ModuleManager {
|
||||
add(new Headhitters());
|
||||
add(new HitboxDesync());
|
||||
add(new InfiniteElytra());
|
||||
add(new ItemMagnet());
|
||||
add(new Jesus());
|
||||
add(new Parkour());
|
||||
add(new ReverseStep());
|
||||
@@ -144,6 +147,7 @@ public class ModuleManager {
|
||||
add(new LogoutSpots());
|
||||
add(new PacketCanceller());
|
||||
add(new PacketDelay());
|
||||
add(new PacketLogger());
|
||||
add(new PacketMine());
|
||||
add(new Reconnect());
|
||||
add(new RPackBypass());
|
||||
@@ -152,6 +156,7 @@ public class ModuleManager {
|
||||
private void addPlayer() {
|
||||
add(new AirPlace());
|
||||
add(new AntiHunger());
|
||||
add(new AutoEat());
|
||||
add(new AutoFish());
|
||||
add(new Capes());
|
||||
add(new FastUse());
|
||||
@@ -172,14 +177,17 @@ public class ModuleManager {
|
||||
add(new Fonts());
|
||||
add(new GlintPlus());
|
||||
add(new Hitboxes());
|
||||
add(new ItemPhysics());
|
||||
add(new Lsd());
|
||||
add(new Nametags());
|
||||
add(new NoRender());
|
||||
add(new Particles());
|
||||
add(new Stylish());
|
||||
add(new Tracers());
|
||||
}
|
||||
|
||||
private void addWorld() {
|
||||
add(new AutoMine());
|
||||
add(new AutoSign());
|
||||
add(new AutoTool());
|
||||
add(new BlockInfo());
|
||||
|
||||
@@ -358,8 +358,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 (event.getPacket() instanceof ClientboundPlayerCombatKillPacket packet) {
|
||||
if (mc.player.getId() == packet.playerId())
|
||||
if (mc.player.getId() == packet.playerId()) {
|
||||
toggle();
|
||||
}
|
||||
} else if (event.getPacket() instanceof ClientboundSetHealthPacket packet) {
|
||||
if (mc.player.getHealth() - packet.getHealth() > 0 && toggleOnDamage.getValue()) {
|
||||
ChatUtil.info(Component.translatable("sputnik.module.freecam.damagedisable"));
|
||||
|
||||
@@ -7,6 +7,7 @@ import me.retucio.sputnik.module.setting.settings.*;
|
||||
import me.retucio.sputnik.ui.hud.HudElement;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.ui.hud.HudEditorScreen;
|
||||
import me.retucio.sputnik.ui.hud.elements.CustomImageElement;
|
||||
import me.retucio.sputnik.ui.hud.elements.DynoElement;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
@@ -126,6 +127,19 @@ public class Hud extends Module {
|
||||
Dynosaurs.class, Dynosaurs.SPINOSAURUS
|
||||
));
|
||||
|
||||
public FileSetting customImagePath = sgElements.add(new FileSetting(
|
||||
"ruta de imagen",
|
||||
"ruta de la imagen a renderizar en el elemento de imagen custom",
|
||||
""
|
||||
));
|
||||
|
||||
public EnumSetting<SpeedUnits> speedUnit = sgElements.add(new EnumSetting<>(
|
||||
"velocidad",
|
||||
"unidad a usar para la velocidad",
|
||||
SpeedUnits.class,
|
||||
SpeedUnits.BPS
|
||||
));
|
||||
|
||||
public Hud() {
|
||||
super("HUD",
|
||||
"superposición de la pantalla con info. adicional",
|
||||
@@ -137,6 +151,11 @@ public class Hud extends Module {
|
||||
DynoElement element = (DynoElement) HudRenderer.INSTANCE.getElement(DynoElement.class);
|
||||
if (element != null) element.reloadTexture();
|
||||
});
|
||||
|
||||
customImagePath.onUpdate(v -> {
|
||||
CustomImageElement element = (CustomImageElement) HudRenderer.INSTANCE.getElement(CustomImageElement.class);
|
||||
if (element != null) element.reloadTexture();
|
||||
});
|
||||
}
|
||||
|
||||
public enum TimeFormat {
|
||||
@@ -171,4 +190,21 @@ public class Hud extends Module {
|
||||
@Override public String toString() { return name; }
|
||||
public String toRealString() { return super.toString(); }
|
||||
}
|
||||
|
||||
public enum SpeedUnits {
|
||||
BPT("bloques/tick", "b/t"),
|
||||
BPS("bloques/segundo", "b/s"),
|
||||
KBPH("kilobloques/hora", "kb/h");
|
||||
|
||||
private final String name;
|
||||
private final String symbol;
|
||||
|
||||
SpeedUnits(String name, String symbol) {
|
||||
this.name = name;
|
||||
this.symbol = symbol;
|
||||
}
|
||||
|
||||
@Override public String toString() { return name; }
|
||||
public String getSymbol() { return symbol; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
package me.retucio.sputnik.module.modules.combat;
|
||||
|
||||
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.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.ListSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.Lists;
|
||||
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
|
||||
|
||||
public class KillAura extends Module {
|
||||
|
||||
private final SettingGroup sgEntities = addSg(new SettingGroup("entidades", true));
|
||||
|
||||
private final NumberSetting reach = sgGeneral.add(new NumberSetting(
|
||||
"alcance", "qué tan lejos extender el brazo",
|
||||
3.0f, 0.1f, 64.0f, 0.1f
|
||||
));
|
||||
|
||||
private final EnumSetting<AttackMode> attackMode = sgGeneral.add(new EnumSetting<>(
|
||||
"modo de ataque", "elige de qué manera atacar",
|
||||
AttackMode.class, AttackMode.TIMED
|
||||
));
|
||||
|
||||
private final NumberSetting cooldownPercentage = sgGeneral.add(new NumberSetting(
|
||||
"porcentaje de cooldown", "cuánto esperar a que se llene la barrita de ataque",
|
||||
100, 0, 100, 1
|
||||
));
|
||||
|
||||
private final BooleanSetting swingHand = sgGeneral.add(new BooleanSetting(
|
||||
"mover la mano", "mover la mano al atacar",
|
||||
true
|
||||
));
|
||||
|
||||
private final EnumSetting<ListMode> listMode = sgEntities.add(new EnumSetting<>(
|
||||
"modo de lista", "cómo interpretar la lista",
|
||||
ListMode.class, ListMode.WHITELIST
|
||||
));
|
||||
|
||||
private final ListSetting<EntityType<? extends Entity>> whitelist = sgEntities.add(new ListSetting<>(
|
||||
"entidades", "qué entidades atacar",
|
||||
Lists.entityList, Lists.allFalse(Lists.entityList), Lists.entityNames
|
||||
)).visibility(() -> listMode.is(ListMode.WHITELIST));
|
||||
|
||||
private final ListSetting<EntityType<? extends Entity>> blacklist = sgEntities.add(new ListSetting<>(
|
||||
"entidades ", "qué entidades NO atacar",
|
||||
Lists.entityList, Lists.allFalse(Lists.entityList), Lists.entityNames
|
||||
)).visibility(() -> listMode.is(ListMode.BLACKLIST));
|
||||
|
||||
public KillAura() {
|
||||
super("killaura", "si la violencia no funciona, es porque no has aplicado la suficiente", Category.COMBAT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null || mc.level == null) return;
|
||||
|
||||
Entity target = findClosestTarget();
|
||||
if (target != null) {
|
||||
attack(target);
|
||||
}
|
||||
}
|
||||
|
||||
private Entity findClosestTarget() {
|
||||
Entity closest = null;
|
||||
double closestDistSq = reach.getValue() * reach.getValue();
|
||||
|
||||
for (Entity entity : mc.level.getEntities().getAll()) {
|
||||
if (!shouldAttack(entity)) continue;
|
||||
|
||||
double distSq = entity.distanceToSqr(mc.player);
|
||||
if (distSq > closestDistSq) continue;
|
||||
|
||||
closest = entity;
|
||||
closestDistSq = distSq;
|
||||
}
|
||||
return closest;
|
||||
}
|
||||
|
||||
private void attack(Entity entity) {
|
||||
if (mc.player.getAttackStrengthScale(0) < cooldownPercentage.getNormalizedValue()
|
||||
&& attackMode.is(AttackMode.TIMED)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mc.level.isTickingEntity(entity)) return;
|
||||
|
||||
if (swingHand.getValue()) {
|
||||
mc.player.swing(InteractionHand.MAIN_HAND);
|
||||
}
|
||||
|
||||
mc.gameMode.attack(mc.player, entity);
|
||||
}
|
||||
|
||||
private boolean shouldAttack(Entity entity) {
|
||||
if (entity.is(mc.player)) return false;
|
||||
if (!entity.isAlive()) return false;
|
||||
if (entity.distanceToSqr(mc.player) > reach.getValue() * reach.getValue()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return switch (listMode.getValue()) {
|
||||
case WHITELIST -> whitelist.isEnabled(entity.getType());
|
||||
case BLACKLIST -> !blacklist.isEnabled(entity.getType());
|
||||
};
|
||||
}
|
||||
|
||||
private enum AttackMode {
|
||||
TIMED("timeado"),
|
||||
SPAM("spam");
|
||||
|
||||
private final String name;
|
||||
AttackMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
|
||||
private enum ListMode {
|
||||
WHITELIST("lista blanca (incluir)"),
|
||||
BLACKLIST("lista negra (excluir)");
|
||||
|
||||
private final String name;
|
||||
ListMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,9 +15,9 @@ import me.retucio.sputnik.module.setting.SettingGroup;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.util.interfaces.TextVisitor;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.mixinterfaces.TextVisitor;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.gui.components.PlayerFaceExtractor;
|
||||
|
||||
@@ -34,8 +34,10 @@ public class ScreenshotPlus extends Module {
|
||||
|
||||
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",
|
||||
ScreenshotActions.class, ScreenshotActions.NONE));
|
||||
public final EnumSetting<ScreenshotActions> defaultAction = sgGeneral.add(new EnumSetting<>(
|
||||
"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 copyButton = sgButtons.add(new BooleanSetting("botón de copiar", "mostrar botón para copiar la captura al portapapeles", true));
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
package me.retucio.sputnik.module.modules.movement;
|
||||
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import me.retucio.sputnik.event.interact.UpdateInventoryEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class ItemMagnet extends Module {
|
||||
|
||||
private final NumberSetting range = sgGeneral.add(new NumberSetting(
|
||||
"rango", "rango de recogida de items",
|
||||
6, 1, 32, 0.5f
|
||||
));
|
||||
|
||||
@Nullable
|
||||
private ItemEntity current = null;
|
||||
|
||||
private AABB box = null;
|
||||
|
||||
private final List<ItemEntity> cannotPickUp = new ArrayList<>();
|
||||
|
||||
private int cooldown = 0;
|
||||
|
||||
public ItemMagnet() {
|
||||
super("imán de items", "recoge items distantes rápidamente mediante paquetes de movimiento", Category.MOVEMENT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
current = null;
|
||||
cooldown = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
current = null;
|
||||
cooldown = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null || mc.level == null || mc.getConnection() == null) return;
|
||||
|
||||
if (current != null && !current.isAlive()) {
|
||||
current = null;
|
||||
cooldown = 0;
|
||||
}
|
||||
|
||||
if (current != null) {
|
||||
box = mc.player.getVehicle() == null
|
||||
? mc.player.getBoundingBox()
|
||||
: mc.player.getVehicle().getBoundingBox().minmax(mc.player.getBoundingBox()).inflate(1.0, 0, 1.0);
|
||||
|
||||
if (!box.intersects(current.getBoundingBox())) {
|
||||
if (cooldown > 0) {
|
||||
cooldown--;
|
||||
return;
|
||||
}
|
||||
|
||||
Vec3 realPos = mc.player.position();
|
||||
|
||||
// tparse al item
|
||||
mc.getConnection().send(new ServerboundMovePlayerPacket.Pos(
|
||||
current.getX(), current.getY(), current.getZ(),
|
||||
mc.player.onGround(),
|
||||
mc.player.horizontalCollision
|
||||
));
|
||||
|
||||
// para evitar desync
|
||||
mc.getConnection().send(new ServerboundMovePlayerPacket.Pos(
|
||||
realPos.x, realPos.y, realPos.z,
|
||||
mc.player.onGround(),
|
||||
mc.player.horizontalCollision
|
||||
));
|
||||
|
||||
// pequeño margen antes de reintentar con el mismo ítem
|
||||
cooldown = 2;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
for (Entity entity : mc.level.getEntities().getAll()) {
|
||||
if (entity.is(mc.player)) continue;
|
||||
if (entity.distanceToSqr(mc.player) > range.getFloatValue() * range.getFloatValue()) continue;
|
||||
|
||||
if (entity instanceof ItemEntity item) {
|
||||
if (cannotPickUp.contains(item)) continue;
|
||||
|
||||
if (InventoryUtil.findSlot(stack -> stack.is(item.getItem().getItem()) && stack.getCount() < stack.getMaxStackSize()) == -1
|
||||
&& mc.player.getInventory().getFreeSlot() == -1
|
||||
) {
|
||||
cannotPickUp.add(item);
|
||||
continue;
|
||||
}
|
||||
|
||||
current = item;
|
||||
cooldown = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onInventoryChange(UpdateInventoryEvent event) {
|
||||
cannotPickUp.clear();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -82,6 +82,15 @@ public class Scaffold extends Module {
|
||||
0.1
|
||||
)).visibility(extend::getValue);
|
||||
|
||||
private final NumberSetting bridgeWidth = sgBridge.add(new NumberSetting(
|
||||
"ancho del puente",
|
||||
"número de bloques de ancho del puente",
|
||||
1,
|
||||
1,
|
||||
5,
|
||||
1
|
||||
));
|
||||
|
||||
|
||||
/* torre */
|
||||
|
||||
@@ -160,7 +169,7 @@ public class Scaffold extends Module {
|
||||
|
||||
private final ColorSetting fillingColor = sgRender.add(new ColorSetting(
|
||||
"color del relleno",
|
||||
"color a uisar al renderizar el relleno",
|
||||
"color a usar al renderizar el relleno",
|
||||
Colors.withAlpha(Colors.mainColor, 60),
|
||||
false
|
||||
)).visibility(fillings::getValue);
|
||||
@@ -228,8 +237,12 @@ public class Scaffold extends Module {
|
||||
|
||||
// seleccionar nivel Y
|
||||
double y;
|
||||
if (mjBridge.getValue() && mjY != null && isMoving()) {
|
||||
y = mjY;
|
||||
if (mjBridge.getValue()) {
|
||||
if (mjY == null || !isMoving()) {
|
||||
// no moving (or not yet initialized): keep mjY synced to the real ground level
|
||||
mjY = (int) Math.floor(pos.y - 0.5);
|
||||
}
|
||||
y = isMoving() ? mjY : (pos.y - 0.5);
|
||||
} else {
|
||||
y = pos.y - 0.5;
|
||||
}
|
||||
@@ -243,7 +256,24 @@ public class Scaffold extends Module {
|
||||
|
||||
// colocar bloque
|
||||
bp.set(pos.x, y, pos.z);
|
||||
place(bp);
|
||||
BlockPos center = bp.immutable();
|
||||
|
||||
int width = bridgeWidth.getIntValue();
|
||||
if (width > 1) {
|
||||
Vec3 right = Vec3.directionFromRotation(0, mc.player.getYRot() + 90).normalize();
|
||||
int leftOff = (width - 1) / 2;
|
||||
int rightOff = width / 2;
|
||||
for (int i = -leftOff; i <= rightOff; i++) {
|
||||
BlockPos offsetPos = new BlockPos(
|
||||
(int) Math.round(center.getX() + right.x * i),
|
||||
center.getY(),
|
||||
(int) Math.round(center.getZ() + right.z * i)
|
||||
);
|
||||
place(offsetPos);
|
||||
}
|
||||
} else {
|
||||
place(center);
|
||||
}
|
||||
|
||||
// colocar bloque encima de la cabeza
|
||||
if (headhitter.getValue() && mc.options.keyJump.isDown() && !mc.options.keyShift.isDown()) {
|
||||
@@ -294,14 +324,6 @@ public class Scaffold extends Module {
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPlaceBlock(PlaceBlockEvent event) {
|
||||
// guardar último valor Y para el mj bridge
|
||||
if (mjBridge.getValue()) {
|
||||
mjY = event.getResult().getBlockPos().getY();
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onSneak(SneakEvent event) {
|
||||
// no agacharse
|
||||
@@ -377,7 +399,7 @@ public class Scaffold extends Module {
|
||||
}
|
||||
|
||||
private boolean isMoving() {
|
||||
return mc.player.zza != 0
|
||||
return mc.player.zza != 0
|
||||
|| mc.player.xxa != 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@ import org.jspecify.annotations.NonNull;
|
||||
|
||||
public class PacketCanceller extends Module {
|
||||
|
||||
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> c2s = sgGeneral.add(new ListSetting(
|
||||
"cliente > servidor", "paquetes a cancelar, dirección servidor",
|
||||
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> c2s = sgGeneral.add(new ListSetting<>(
|
||||
"C2S", "paquetes a cancelar, dirección servidor",
|
||||
Lists.c2sPacketList, Lists.allFalse(Lists.c2sPacketList), Lists.c2sPacketNames
|
||||
));
|
||||
|
||||
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> s2c = sgGeneral.add(new ListSetting(
|
||||
"servidor > cliente", "paquetes a cancelar, dirección cliente",
|
||||
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> s2c = sgGeneral.add(new ListSetting<>(
|
||||
"S2C", "paquetes a cancelar, dirección cliente",
|
||||
Lists.s2cPacketList, Lists.allFalse(Lists.s2cPacketList), Lists.s2cPacketNames
|
||||
));
|
||||
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
package me.retucio.sputnik.module.modules.network;
|
||||
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import me.retucio.sputnik.event.network.PacketEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.FileSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.ListSetting;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.Lists;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
import net.minecraft.network.protocol.PacketType;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardOpenOption;
|
||||
import java.time.Instant;
|
||||
import java.time.ZoneId;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
|
||||
public class PacketLogger extends Module {
|
||||
|
||||
private static final DateTimeFormatter TIME = DateTimeFormatter
|
||||
.ofPattern("HH:mm:ss.SSS")
|
||||
.withZone(ZoneId.systemDefault());
|
||||
|
||||
private static final int QUEUE_CAPACITY = 8192;
|
||||
private static final int BATCH_SIZE = 256;
|
||||
|
||||
private final ListSetting<PacketType<? extends Packet<?>>> packets = sgGeneral.add(new ListSetting<>(
|
||||
"paquetes", "paquetes a loguear",
|
||||
Lists.packetList, Lists.allFalse(Lists.packetList), Lists.packetNames
|
||||
));
|
||||
|
||||
private final EnumSetting<LogMode> mode = sgGeneral.add(new EnumSetting<>(
|
||||
"modo de logueo", "de qué manera loguear los paquetes",
|
||||
LogMode.class, LogMode.FILE
|
||||
));
|
||||
|
||||
private final FileSetting file = sgGeneral.add(new FileSetting(
|
||||
"archivo", "archivo donde loguear los paquetes",
|
||||
"sputnik/packets.log"
|
||||
)).visibility(() -> mode.is(LogMode.FILE));
|
||||
|
||||
private final BlockingQueue<String> queue = new ArrayBlockingQueue<>(QUEUE_CAPACITY);
|
||||
private final AtomicInteger dropped = new AtomicInteger();
|
||||
|
||||
private volatile boolean running;
|
||||
private volatile Thread writer;
|
||||
|
||||
public PacketLogger() {
|
||||
super("logger de paquetes", "loguea paquetes", Category.NETWORK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
startWriter();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
stopWriter();
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPacketSend(PacketEvent.Send event) {
|
||||
handle("OUT", event.getPacket());
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPacketReceive(PacketEvent.Receive event) {
|
||||
handle("IN", event.getPacket());
|
||||
}
|
||||
|
||||
private void handle(String direction, Packet<?> packet) {
|
||||
if (packet == null || !packets.isEnabled(packet.type())) return;
|
||||
|
||||
String name = nameOf(packet);
|
||||
String body = describe(packet);
|
||||
|
||||
switch (mode.getValue()) {
|
||||
case CHAT -> onGameThread(() -> ChatUtil.info("[" + direction + "] " + body));
|
||||
case NOTIFICATION -> onGameThread(() -> HudRenderer.INSTANCE.pushNotification(name, body));
|
||||
case FILE -> enqueue("[" + TIME.format(Instant.now()) + "] [" + direction + "] " + name + " " + body);
|
||||
}
|
||||
}
|
||||
|
||||
private static void onGameThread(Runnable action) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if (mc.isSameThread()) action.run();
|
||||
else mc.execute(action);
|
||||
}
|
||||
|
||||
private static String nameOf(Packet<?> packet) {
|
||||
PacketType<?> type = packet.type();
|
||||
return type.id().toString();
|
||||
}
|
||||
|
||||
private static String describe(Packet<?> packet) {
|
||||
try {
|
||||
return String.valueOf(packet);
|
||||
} catch (Throwable t) {
|
||||
return packet.getClass().getSimpleName() + " <toString failed: " + t + ">";
|
||||
}
|
||||
}
|
||||
|
||||
private void enqueue(String line) {
|
||||
if (!running) return;
|
||||
if (!queue.offer(line)) dropped.incrementAndGet();
|
||||
}
|
||||
|
||||
private void startWriter() {
|
||||
if (running) return;
|
||||
|
||||
Path path = file.getPath().toAbsolutePath();
|
||||
|
||||
queue.clear();
|
||||
dropped.set(0);
|
||||
running = true;
|
||||
|
||||
Thread thread = new Thread(() -> writerLoop(path), "sputnik-packet-logger");
|
||||
thread.setDaemon(true);
|
||||
thread.setPriority(Thread.MIN_PRIORITY);
|
||||
writer = thread;
|
||||
thread.start();
|
||||
}
|
||||
|
||||
private void stopWriter() {
|
||||
if (!running) return;
|
||||
running = false;
|
||||
|
||||
Thread thread = writer;
|
||||
writer = null;
|
||||
if (thread == null) return;
|
||||
|
||||
try {
|
||||
thread.join(2000);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
|
||||
int lost = dropped.getAndSet(0);
|
||||
if (lost > 0) {
|
||||
onGameThread(() -> ChatUtil.warn("se descartaron " + lost + " paquetes (cola llena)"));
|
||||
}
|
||||
}
|
||||
|
||||
private void writerLoop(Path path) {
|
||||
try {
|
||||
Path parent = path.getParent();
|
||||
if (parent != null) Files.createDirectories(parent);
|
||||
|
||||
try (BufferedWriter out = Files.newBufferedWriter(
|
||||
path, StandardCharsets.UTF_8,
|
||||
StandardOpenOption.CREATE, StandardOpenOption.APPEND)) {
|
||||
|
||||
out.write("--- sesión iniciada " + Instant.now() + " ---");
|
||||
out.newLine();
|
||||
out.flush();
|
||||
|
||||
List<String> batch = new ArrayList<>(BATCH_SIZE);
|
||||
|
||||
while (running || !queue.isEmpty()) {
|
||||
String first = queue.poll(250, TimeUnit.MILLISECONDS);
|
||||
if (first == null) continue;
|
||||
|
||||
batch.add(first);
|
||||
queue.drainTo(batch, BATCH_SIZE - 1);
|
||||
|
||||
for (String line : batch) {
|
||||
out.write(line);
|
||||
out.newLine();
|
||||
}
|
||||
batch.clear();
|
||||
out.flush();
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
} catch (IOException e) {
|
||||
running = false;
|
||||
queue.clear();
|
||||
onGameThread(() -> {
|
||||
ChatUtil.error("no se pudo escribir el log: " + e.getMessage());
|
||||
toggle();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private enum LogMode {
|
||||
CHAT("chat"),
|
||||
NOTIFICATION("notis"),
|
||||
FILE("archivo");
|
||||
|
||||
private final String name;
|
||||
LogMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
}
|
||||
@@ -54,8 +54,6 @@ public class PacketMine extends Module {
|
||||
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(
|
||||
"delay ",
|
||||
"delay entre selecciones de bloques",
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
package me.retucio.sputnik.module.modules.player;
|
||||
|
||||
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.ListSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
|
||||
import me.retucio.sputnik.util.Lists;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
import net.minecraft.world.item.Item;
|
||||
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.List;
|
||||
|
||||
|
||||
public class AutoEat extends Module {
|
||||
|
||||
private final NumberSetting hunger = sgGeneral.add(new NumberSetting(
|
||||
"hambre", "cuánta hambre es necesaria para comer (puntos de comida)",
|
||||
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;
|
||||
|
||||
public AutoEat() {
|
||||
super("puto gordo", "come aut/omáticamente al tener hambre", Category.PLAYER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
if (eating) stopEating();
|
||||
super.onDisable();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null) return;
|
||||
|
||||
if (eating) {
|
||||
if (mc.player.getUseItemRemainingTicks() > 0) {
|
||||
return;
|
||||
} else {
|
||||
if (mc.player.getFoodData().getFoodLevel() >= whenToStop.getIntValue()) {
|
||||
stopEating();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (mc.player.getFoodData().getFoodLevel() <= hunger.getIntValue()) {
|
||||
List<ItemStack> sorted = InventoryUtil.findAllStacks(
|
||||
stack -> stack.getItem().components().get(DataComponents.FOOD) != null
|
||||
);
|
||||
sorted.sort(Comparator.comparingInt(
|
||||
(ItemStack s) -> s.getItem().components().get(DataComponents.FOOD).nutrition()
|
||||
).reversed());
|
||||
|
||||
if (sorted.isEmpty()) return;
|
||||
|
||||
sorted.removeIf(stack -> blacklist.isEnabled(stack.getItem()));
|
||||
|
||||
boolean inHotbar = false;
|
||||
for (ItemStack stack : sorted) {
|
||||
int slot = InventoryUtil.findSlot(s -> stack == s);
|
||||
if (Inventory.isHotbarSlot(slot)) {
|
||||
mc.player.getInventory().setSelectedSlot(slot);
|
||||
inHotbar = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!inHotbar) {
|
||||
int free = mc.player.getInventory().getFreeSlot();
|
||||
|
||||
InventoryUtil.move(InventoryUtil.findSlot(stack -> stack == sorted.getFirst()), free != -1
|
||||
? free
|
||||
: mc.player.getInventory().getSelectedSlot());
|
||||
|
||||
if (free != -1) {
|
||||
mc.player.getInventory().setSelectedSlot(free);
|
||||
}
|
||||
}
|
||||
|
||||
startEating();
|
||||
}
|
||||
}
|
||||
|
||||
private void startEating() {
|
||||
eating = true;
|
||||
mc.options.keyUse.setDown(true);
|
||||
}
|
||||
|
||||
private void stopEating() {
|
||||
eating = 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()));
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,7 @@ public class BlockOutline extends Module {
|
||||
|
||||
@EventListener
|
||||
private void onRenderBlockOutline(RenderBlockOutlineEvent event) {
|
||||
event.setColor(color.getRGB());
|
||||
event.setColor(color.getRgb());
|
||||
event.setLineWidth(lineWidth.getFloatValue());
|
||||
}
|
||||
}
|
||||
@@ -20,16 +20,16 @@ import java.awt.*;
|
||||
|
||||
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 EnumSetting<BreakMode> breakMode = sgGeneral.add(new EnumSetting<>("modo de minado", "elige si el cubo se encoge o se dilata",
|
||||
BreakMode.class, BreakMode.INWARDS));
|
||||
|
||||
private final BooleanSetting outlines = sgOulines.add(new BooleanSetting("contorno", "renderizar contorno", true));
|
||||
private final ColorSetting outlineColor = sgOulines.add(new ColorSetting("color del contorno", "color del contorno",
|
||||
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));
|
||||
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 ColorSetting fillingColor = sgFilling.add(new ColorSetting("color del relleno", "color del relleno",
|
||||
|
||||
@@ -46,30 +46,30 @@ public class GlintPlus extends Module {
|
||||
}
|
||||
|
||||
public RenderType getGlint() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !items.getValue()) return RenderTypes.glint();
|
||||
return GlintRenderType.glintColor.get(color);
|
||||
}
|
||||
|
||||
public RenderType getGlintTranslucent() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !items.getValue()) return RenderTypes.glintTranslucent();
|
||||
return GlintRenderType.glintTranslucentColor.get(color);
|
||||
}
|
||||
|
||||
public RenderType getEntityGlint() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !items.getValue()) return RenderTypes.entityGlint();
|
||||
return GlintRenderType.entityGlintColor.get(color);
|
||||
}
|
||||
|
||||
public RenderType getArmorEntityGlint() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !armor.getValue()) return RenderTypes.armorEntityGlint();
|
||||
return GlintRenderType.armorEntityGlintColor.get(color);
|
||||
}
|
||||
|
||||
public int getColor() {
|
||||
public int getGlintColor() {
|
||||
String colorName = glintColor.getValue().getRealName().toLowerCase();
|
||||
|
||||
switch (colorName) {
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
package me.retucio.sputnik.module.modules.render;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.math.Axis;
|
||||
import me.retucio.sputnik.event.render.ApplyTransformationEvent;
|
||||
import me.retucio.sputnik.event.render.RenderItemEntityEvent;
|
||||
import me.retucio.sputnik.mixin.accessors.ItemStackRenderStateAccessor;
|
||||
import me.retucio.sputnik.mixin.accessors.LayerRenderStateAccessor;
|
||||
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 com.github.retucio.neutrino.EventListener;
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import org.joml.Vector3f;
|
||||
import org.joml.Vector3fc;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemPhysics extends Module {
|
||||
|
||||
private static final float PIXEL_SIZE = 1f / 16f;
|
||||
|
||||
private final BooleanSetting randomRotation = sgGeneral.add(new BooleanSetting(
|
||||
"rotación aleatoria",
|
||||
"añade una rotación aleatoria a cada objeto",
|
||||
true
|
||||
));
|
||||
|
||||
private final RandomSource random = RandomSource.createThreadLocalInstance();
|
||||
private boolean skipTransformation;
|
||||
|
||||
public ItemPhysics() {
|
||||
super("física de objetos", "aplica física a los objetos en el suelo", Category.RENDER);
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onRenderItemEntity(RenderItemEntityEvent event) {
|
||||
event.cancel();
|
||||
|
||||
if (event.renderState.item.isEmpty() || event.itemEntity == null) return;
|
||||
|
||||
PoseStack matrices = event.matrixStack;
|
||||
random.setSeed(event.itemEntity.getId() * 0x53505554L);
|
||||
|
||||
var accessor = (ItemStackRenderStateAccessor) event.renderState.item;
|
||||
for (int i = 0; i < accessor.getActiveLayerCount(); i++) {
|
||||
ItemStackRenderState.LayerRenderState layer = accessor.getLayers()[i];
|
||||
ModelInfo info = getInfo(layer.prepareQuadList());
|
||||
|
||||
matrices.pushPose();
|
||||
applyTransformation(matrices, ((LayerRenderStateAccessor) layer).sputnik$getTransform());
|
||||
matrices.translate(0, info.offsetY, 0);
|
||||
offsetInWater(matrices, event.itemEntity);
|
||||
|
||||
if (info.flat) {
|
||||
matrices.mulPose(Axis.XP.rotationDegrees(90));
|
||||
matrices.translate(0, 0, info.offsetZ);
|
||||
}
|
||||
|
||||
if (randomRotation.getValue()) {
|
||||
var axis = Axis.YP;
|
||||
var x = 0.5f; var y = 0.0f; var z = 0.5f;
|
||||
|
||||
if (info.flat) {
|
||||
axis = Axis.ZP;
|
||||
y = 0.5f; z = 0.0f;
|
||||
}
|
||||
|
||||
float degrees = (random.nextFloat() * 2 - 1) * 90;
|
||||
matrices.translate(x, y, z);
|
||||
matrices.mulPose(axis.rotationDegrees(degrees));
|
||||
matrices.translate(-x, -y, -z);
|
||||
}
|
||||
|
||||
renderLayer(event, info);
|
||||
matrices.popPose();
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onApplyTransformation(ApplyTransformationEvent event) {
|
||||
if (skipTransformation) {
|
||||
event.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
private void renderLayer(RenderItemEntityEvent event, ModelInfo info) {
|
||||
PoseStack matrices = event.matrixStack;
|
||||
skipTransformation = true;
|
||||
|
||||
for (int j = 0; j < event.renderState.count; j++) {
|
||||
matrices.pushPose();
|
||||
|
||||
if (j > 0) {
|
||||
float x = (random.nextFloat() * 2 - 1) * 0.25f;
|
||||
float z = (random.nextFloat() * 2 - 1) * 0.25f;
|
||||
translate(matrices, info, x, 0, z);
|
||||
}
|
||||
|
||||
event.renderState.item.submit(matrices, event.renderCommandQueue, event.light, OverlayTexture.NO_OVERLAY, event.renderState.outlineColor);
|
||||
matrices.popPose();
|
||||
|
||||
float y = Math.max(random.nextFloat() * PIXEL_SIZE, PIXEL_SIZE / 2f);
|
||||
translate(matrices, info, 0, y, 0);
|
||||
}
|
||||
|
||||
skipTransformation = false;
|
||||
}
|
||||
|
||||
private void translate(PoseStack matrices, ModelInfo info, float x, float y, float z) {
|
||||
if (info.flat) {
|
||||
float temp = y; y = z; z = -temp;
|
||||
}
|
||||
matrices.translate(x, y, z);
|
||||
}
|
||||
|
||||
private void applyTransformation(PoseStack matrices, ItemTransform transform) {
|
||||
transform = new ItemTransform(
|
||||
transform.rotation(),
|
||||
new Vector3f(transform.translation().x(), 0, transform.translation().z()),
|
||||
transform.scale()
|
||||
);
|
||||
transform.apply(false, matrices.last());
|
||||
}
|
||||
|
||||
private void offsetInWater(PoseStack matrices, ItemEntity entity) {
|
||||
if (entity.isInWater()) {
|
||||
matrices.translate(0, 0.333f, 0);
|
||||
}
|
||||
}
|
||||
|
||||
private ModelInfo getInfo(List<net.minecraft.client.resources.model.geometry.BakedQuad> quads) {
|
||||
float minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE;
|
||||
float minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE;
|
||||
float minZ = Float.MAX_VALUE, maxZ = Float.MIN_VALUE;
|
||||
|
||||
for (var quad : quads) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
Vector3fc vec = quad.position(i);
|
||||
minY = Math.min(minY, vec.y()); maxY = Math.max(maxY, vec.y());
|
||||
minZ = Math.min(minZ, vec.z()); maxZ = Math.max(maxZ, vec.z());
|
||||
minX = Math.min(minX, vec.x()); maxX = Math.max(maxX, vec.x());
|
||||
}
|
||||
}
|
||||
|
||||
if (minX == Float.MAX_VALUE) minX = 0;
|
||||
if (minY == Float.MAX_VALUE) minY = 0;
|
||||
if (minZ == Float.MAX_VALUE) minZ = 0;
|
||||
if (maxX == Float.MIN_VALUE) maxX = 1;
|
||||
if (maxY == Float.MIN_VALUE) maxY = 1;
|
||||
if (maxZ == Float.MIN_VALUE) maxZ = 1;
|
||||
|
||||
float x = maxX - minX, y = maxY - minY, z = maxZ - minZ;
|
||||
boolean flat = (x > PIXEL_SIZE && y > PIXEL_SIZE && z <= PIXEL_SIZE);
|
||||
|
||||
return new ModelInfo(flat, 0.5f - minY, -maxZ);
|
||||
}
|
||||
|
||||
private record ModelInfo(boolean flat, float offsetY, float offsetZ) {}
|
||||
}
|
||||
@@ -13,6 +13,7 @@ import me.retucio.sputnik.module.setting.SettingGroup;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
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.Lists;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.util.Mth;
|
||||
@@ -64,6 +65,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 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 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 showProjectileDamage = sgInfo.add(new BooleanSetting("daño del proyectil", "muestra cuánto daño hace un proyectil en su nametag", true));
|
||||
|
||||
@@ -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 org.lwjgl.glfw.GLFW;
|
||||
|
||||
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",
|
||||
GLFW.GLFW_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() != GLFW.GLFW_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.mulPose(new Quaternionf().rotationZ(angleRad));
|
||||
|
||||
case FLIP -> matrices.mulPose(new Quaternionf().rotationX(angleRad));
|
||||
|
||||
case ROLL -> matrices.mulPose(new Quaternionf().rotationY(angleRad));
|
||||
|
||||
case TWIRL -> {
|
||||
// combina spin + flip para un giro más aparatoso
|
||||
matrices.mulPose(new Quaternionf().rotationZ(angleRad));
|
||||
matrices.mulPose(new Quaternionf().rotationX(angleRad * 0.5f));
|
||||
}
|
||||
|
||||
case WAVE -> {
|
||||
// bamboleo tipo saludo, sin vuelta completa
|
||||
float waveAngle = (float) Math.sin(fraction * Math.PI * spins.getIntValue()) * 25f;
|
||||
matrices.mulPose(new Quaternionf().rotationZ((float) Math.toRadians(waveAngle * directionSign)));
|
||||
}
|
||||
|
||||
case POP -> {
|
||||
// pequeño pulso de escala, como si el ítem "respirara"
|
||||
float scalePulse = 1f + (float) Math.sin(fraction * Math.PI) * 0.25f;
|
||||
matrices.scale(scalePulse, scalePulse, scalePulse);
|
||||
matrices.mulPose(new Quaternionf().rotationZ(angleRad * 0.3f));
|
||||
}
|
||||
|
||||
case THROW_CATCH -> {
|
||||
// el ítem "sube", gira en el aire y "cae" de vuelta
|
||||
float height = (float) Math.sin(fraction * Math.PI) * 0.35f;
|
||||
matrices.translate(0f, height, 0f);
|
||||
matrices.mulPose(new Quaternionf().rotationX(angleRad * 2f));
|
||||
}
|
||||
|
||||
case RANDOM -> {
|
||||
// no debería llegar aquí, resolveTrick lo reemplaza antes
|
||||
matrices.mulPose(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.module.Category;
|
||||
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.settings.BooleanSetting;
|
||||
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(
|
||||
"uno mismo",
|
||||
"apuntarse a uno mismo en cámara libre o así",
|
||||
"apuntarse a uno mismo en cámara libre",
|
||||
true
|
||||
));
|
||||
|
||||
@@ -105,6 +107,7 @@ public class Tracers extends Module {
|
||||
private Color getColor(Entity entity) {
|
||||
if (!entities.isEnabled(entity.getType())) 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();
|
||||
|
||||
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 org.lwjgl.glfw.GLFW;
|
||||
|
||||
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() != GLFW.GLFW_PRESS) return;
|
||||
if (event.getButton() != GLFW.GLFW_MOUSE_BUTTON_1) 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; }
|
||||
}
|
||||
}
|
||||
@@ -6,12 +6,14 @@ import me.retucio.sputnik.event.input.MouseClickEvent;
|
||||
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.NumberSetting;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import me.retucio.sputnik.util.MiscUtil;
|
||||
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
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.block.state.BlockState;
|
||||
@@ -26,6 +28,11 @@ import java.util.Map;
|
||||
|
||||
public class AutoTool extends Module {
|
||||
|
||||
private final EnumSetting<AutoToolMode> mode = sgGeneral.add(new EnumSetting<>(
|
||||
"modo", "de qué manera ejecutar el módulo",
|
||||
AutoToolMode.class, AutoToolMode.ON_CLICK
|
||||
));
|
||||
|
||||
private final NumberSetting delaySetting = sgGeneral.add(new NumberSetting(
|
||||
"delay",
|
||||
"delay al cambiar de herramienta",
|
||||
@@ -86,6 +93,11 @@ public class AutoTool extends Module {
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null) return;
|
||||
if (mc.gui.screen() != null) return;
|
||||
|
||||
if (mode.is(AutoToolMode.ON_TICK) && mc.options.keyAttack.isDown()) {
|
||||
handle(KeyUtil.getKey(mc.options.keyAttack), GLFW.GLFW_PRESS);
|
||||
}
|
||||
|
||||
if (startedMining && delaySetting.getIntValue() > 0) {
|
||||
delay++;
|
||||
@@ -165,10 +177,12 @@ public class AutoTool extends Module {
|
||||
BlockState state = mc.level.getBlockState(bhr.getBlockPos());
|
||||
|
||||
List<ItemStack> tools = InventoryUtil.findAllStacks(stack -> stack.has(DataComponents.TOOL));
|
||||
if (tools.isEmpty()) return;
|
||||
|
||||
Map<Float, ItemStack> speeds = new HashMap<>();
|
||||
for (ItemStack tool : tools) {
|
||||
int slot = mc.player.getInventory().findSlotMatchingItem(tool);
|
||||
if (!Inventory.isHotbarSlot(slot)) continue; // skip anything outside the hotbar
|
||||
|
||||
Tool toolComponent = tool.get(DataComponents.TOOL);
|
||||
if (toolComponent != null) {
|
||||
speeds.put(toolComponent.getMiningSpeed(state), tool);
|
||||
@@ -193,4 +207,13 @@ public class AutoTool extends Module {
|
||||
finishedMining = false;
|
||||
switchBackDelay = 0;
|
||||
}
|
||||
|
||||
private enum AutoToolMode {
|
||||
ON_TICK("cada tick"),
|
||||
ON_CLICK("cada click");
|
||||
|
||||
private final String name;
|
||||
AutoToolMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
}
|
||||
@@ -143,7 +143,8 @@ public abstract class Setting<T> {
|
||||
|
||||
public void fireUpdateEvent() {
|
||||
Sputnik.EVENT_BUS.post(
|
||||
new UpdateSettingEvent(this, getModule().shouldSaveSettings()));
|
||||
new UpdateSettingEvent(this, getModule().shouldSaveSettings())
|
||||
);
|
||||
}
|
||||
|
||||
public void onUpdate(Consumer<T> listener) {
|
||||
|
||||
@@ -223,7 +223,7 @@ public class ColorSetting extends Setting<Color> {
|
||||
return defaultRainbowSpeed;
|
||||
}
|
||||
|
||||
public int getRGB() {
|
||||
public int getRgb() {
|
||||
return getValue().getRGB();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package me.retucio.sputnik.module.setting.settings;
|
||||
|
||||
import me.retucio.sputnik.module.setting.Setting;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.I18nUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
|
||||
public class FileSetting extends Setting<String> {
|
||||
|
||||
private File file;
|
||||
|
||||
public FileSetting(String name, String description, String defaultValue) {
|
||||
super(name, description, defaultValue);
|
||||
file = new File(defaultValue);
|
||||
}
|
||||
|
||||
public boolean isDirectory() {
|
||||
return file.isDirectory();
|
||||
}
|
||||
|
||||
public boolean exists() {
|
||||
return file.exists();
|
||||
}
|
||||
|
||||
public boolean canWrite() {
|
||||
return file.canWrite();
|
||||
}
|
||||
|
||||
public File getFile() {
|
||||
return file;
|
||||
}
|
||||
|
||||
public String getFilename() {
|
||||
return file.getName();
|
||||
}
|
||||
|
||||
public Path getPath() {
|
||||
return Path.of(file.getPath());
|
||||
}
|
||||
|
||||
public String getAbsPathStr() {
|
||||
return file.getAbsolutePath();
|
||||
}
|
||||
|
||||
public String getRelPathStr() {
|
||||
return file.getPath();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setValue(String value) {
|
||||
super.setValue(value);
|
||||
file = new File(value);
|
||||
if (!exists()) {
|
||||
ChatUtil.error(I18nUtil.fmt(
|
||||
"sputnik.filesetting.doesnotexist",
|
||||
"el archivo \"%s\" no existe!".formatted(value),
|
||||
value
|
||||
));
|
||||
}
|
||||
|
||||
if (!canWrite()) {
|
||||
if (!exists()) {
|
||||
ChatUtil.warn(I18nUtil.fmt(
|
||||
"sputnik.filesetting.cannotwrite",
|
||||
"no se puede escribir a \"%s\"!".formatted(value),
|
||||
value
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,22 +4,31 @@ import me.retucio.sputnik.module.setting.Setting;
|
||||
import me.retucio.sputnik.util.I18nUtil;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
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 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) {
|
||||
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.defaultValue = new HashMap<>();
|
||||
|
||||
for (T option : options) {
|
||||
boolean enabled = initialValues != null && initialValues.getOrDefault(option, false);
|
||||
defaultValue.put(option, enabled);
|
||||
}
|
||||
|
||||
this.value = new HashMap<>(defaultValue);
|
||||
}
|
||||
|
||||
@@ -28,11 +37,65 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
|
||||
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) {
|
||||
resolveIfNeeded();
|
||||
return value.getOrDefault(option, false);
|
||||
}
|
||||
|
||||
public void setEnabled(T option, boolean enabled) {
|
||||
resolveIfNeeded();
|
||||
if (value.containsKey(option) && value.get(option) != enabled) {
|
||||
value.put(option, enabled);
|
||||
fireUpdateEvent();
|
||||
@@ -45,22 +108,26 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
|
||||
}
|
||||
|
||||
public Map<T, Boolean> getValues() {
|
||||
resolveIfNeeded();
|
||||
return new HashMap<>(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setValue(Map<T, Boolean> values) {
|
||||
resolveIfNeeded();
|
||||
if (!this.value.equals(values)) {
|
||||
super.setValue(values);
|
||||
}
|
||||
}
|
||||
|
||||
public void setDefaultValue(Map<T, Boolean> values) {
|
||||
resolveIfNeeded();
|
||||
defaultValue.clear();
|
||||
defaultValue.putAll(values);
|
||||
}
|
||||
|
||||
public Map<String, Boolean> getConfigValues() {
|
||||
resolveIfNeeded();
|
||||
Map<String, Boolean> configValues = new HashMap<>();
|
||||
for (T option : options) {
|
||||
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) {
|
||||
resolveIfNeeded();
|
||||
options.add(option);
|
||||
defaultValue.put(option, isDefault);
|
||||
value.put(option, isDefault);
|
||||
|
||||
if (this.displayNames != null) {
|
||||
this.displayNames.put(option, displayName);
|
||||
}
|
||||
}
|
||||
|
||||
public void setAll(boolean enabled) {
|
||||
resolveIfNeeded();
|
||||
for (T option : options) {
|
||||
value.put(option, enabled);
|
||||
}
|
||||
@@ -87,10 +155,12 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
|
||||
}
|
||||
|
||||
public List<T> getOptions() {
|
||||
resolveIfNeeded();
|
||||
return Collections.unmodifiableList(options);
|
||||
}
|
||||
|
||||
public List<T> getEnabledOptions() {
|
||||
resolveIfNeeded();
|
||||
List<T> enabledOptions = new ArrayList<>();
|
||||
for (T option : options) {
|
||||
if (isEnabled(option)) {
|
||||
@@ -101,21 +171,18 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
|
||||
}
|
||||
|
||||
public Map<T, String> getDisplayNames() {
|
||||
resolveIfNeeded();
|
||||
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) {
|
||||
resolveIfNeeded();
|
||||
if (displayNames != null && displayNames.containsKey(key)) {
|
||||
return displayNames.get(key);
|
||||
}
|
||||
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) {
|
||||
String name = getConfigName(key);
|
||||
return I18nUtil.orElse(name, name);
|
||||
|
||||
@@ -88,9 +88,7 @@ public class OptionSetting<T> extends Setting<T> {
|
||||
return displayNames;
|
||||
}
|
||||
|
||||
// OJO: nombre interno de la opción, o sea la clave de la config. (ver ClientConfig
|
||||
// #onUpdateSetting). igual que en ListSetting, para las listas del juego es la clave
|
||||
// de traducción. no traducir
|
||||
// no traducir.
|
||||
public String getConfigName(T key) {
|
||||
if (displayNames != null && displayNames.containsKey(key)) return displayNames.get(key);
|
||||
return key != null ? key.toString() : "?";
|
||||
|
||||
@@ -36,38 +36,46 @@ public class HudRenderer {
|
||||
Map<String, int[]> positions = ConfigManager.INSTANCE.getConfig().hudPositions;
|
||||
Map<String, Boolean> visibilities = ConfigManager.INSTANCE.getConfig().hudVisibilities;
|
||||
|
||||
addElement(new CoordsElement(), positions, visibilities);
|
||||
addElement(new FpsElement(), positions, visibilities);
|
||||
addElement(new TpsElement(), positions, visibilities);
|
||||
addElement(new CustomTextElement(), positions, visibilities);
|
||||
addElement(new PingElement(), positions, visibilities);
|
||||
addElement(new RotationElement(), positions, visibilities);
|
||||
addElement(new TimeElement(), positions, visibilities);
|
||||
addElement(new UptimeElement(), positions, visibilities);
|
||||
addElement(new CoordsElement(), positions, visibilities, true);
|
||||
addElement(new FpsElement(), positions, visibilities, true);
|
||||
addElement(new TpsElement(), positions, visibilities, false);
|
||||
addElement(new CustomTextElement(), positions, visibilities, false);
|
||||
addElement(new PingElement(), positions, visibilities, true);
|
||||
addElement(new RotationElement(), positions, visibilities, false);
|
||||
addElement(new TimeElement(), positions, visibilities, true);
|
||||
addElement(new UptimeElement(), positions, visibilities, false);
|
||||
addElement(new SpeedElement(), positions, visibilities, false);
|
||||
addElement(new ArrayListElement(), positions, visibilities, true);
|
||||
|
||||
addElement(new DynoElement(), positions, visibilities);
|
||||
addElement(new EchestElement(), positions, visibilities);
|
||||
addElement(new TotemsElement(), positions, visibilities);
|
||||
addElement(new ArmorElement(), positions, visibilities);
|
||||
addElement(new DynoElement(), positions, visibilities, false);
|
||||
addElement(new EchestElement(), positions, visibilities, false);
|
||||
addElement(new TotemsElement(), positions, visibilities, true);
|
||||
addElement(new ArmorElement(), positions, visibilities, true);
|
||||
addElement(new CustomImageElement(), positions, visibilities, false);
|
||||
|
||||
HudEditor.INSTANCE.setElements(elements);
|
||||
}
|
||||
|
||||
private void addElement(HudElement element, Map<String, int[]> positions, Map<String, Boolean> visibilities) {
|
||||
private void addElement(HudElement element, Map<String, int[]> positions, Map<String, Boolean> visibilities, boolean defVisible) {
|
||||
int[] savedPos;
|
||||
|
||||
if (positions.get(element.getId()) == null)
|
||||
if (positions.get(element.getId()) == null) {
|
||||
savedPos = new int[] {element.defaultX, element.defaultY};
|
||||
else
|
||||
} else {
|
||||
savedPos = positions.get(element.getId());
|
||||
}
|
||||
|
||||
Boolean savedVisibility = visibilities.get(element.getId());
|
||||
|
||||
if (savedPos != null)
|
||||
if (savedPos != null) {
|
||||
element.setPosition(savedPos[0], savedPos[1]);
|
||||
}
|
||||
|
||||
if (savedVisibility != null)
|
||||
if (savedVisibility != null) {
|
||||
element.setVisible(savedVisibility);
|
||||
} else {
|
||||
element.setVisible(defVisible);
|
||||
}
|
||||
|
||||
elements.add(element);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package me.retucio.sputnik.ui.hud;
|
||||
import com.mojang.blaze3d.platform.NativeImage;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.renderer.RenderPipelines;
|
||||
@@ -35,7 +36,9 @@ public abstract class ImageHudElement extends HudElement {
|
||||
public void reloadTexture() {
|
||||
textureLoaded = false;
|
||||
String imagePath = getImagePath();
|
||||
if (imagePath == null || imagePath.isEmpty()) return;
|
||||
if (imagePath == null || imagePath.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// cargar
|
||||
@@ -65,12 +68,18 @@ public abstract class ImageHudElement extends HudElement {
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Sputnik.LOGGER.error(Component.translatable("sputnik.hud.error.texture", getId(), e.getMessage()).getString());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInGame(GuiGraphicsExtractor gui, float delta, Hud hud) {
|
||||
if (!textureLoaded || !isVisible()) return;
|
||||
if (getImagePath() == null || getImagePath().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
if (!textureLoaded || !isVisible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
gui.blit(
|
||||
RenderPipelines.GUI_TEXTURED,
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
package me.retucio.sputnik.ui.hud.elements;
|
||||
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.ui.hud.HudElement;
|
||||
import me.retucio.sputnik.ui.hud.HudEditor;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ArrayListElement extends HudElement {
|
||||
|
||||
public ArrayListElement() {
|
||||
super("arraylist", 2, 2);
|
||||
}
|
||||
|
||||
private List<Module> getSortedModules() {
|
||||
List<Module> sorted = ModuleManager.INSTANCE.getModules().stream()
|
||||
.filter(Module::isEnabled)
|
||||
.sorted(Comparator.comparingInt((Module m) -> mc.font.width(m.getName())))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return isLowerHalf()
|
||||
? sorted
|
||||
: sorted.reversed();
|
||||
}
|
||||
|
||||
private boolean isRightHalf() {
|
||||
return x > mc.getWindow().getGuiScaledWidth() / 2;
|
||||
}
|
||||
|
||||
private boolean isLowerHalf() {
|
||||
return y > mc.getWindow().getGuiScaledHeight() / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInGame(GuiGraphicsExtractor gui, float delta, Hud hud) {
|
||||
List<Module> modules = getSortedModules();
|
||||
boolean shadow = hud != null && hud.shadow.getValue();
|
||||
int lineHeight = mc.font.lineHeight + 1;
|
||||
|
||||
if (modules.isEmpty()) {
|
||||
w = 0;
|
||||
h = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
boolean rightAlign = isRightHalf();
|
||||
int maxWidth = mc.font.width(modules.getFirst().getDisplayName()); // widest = first
|
||||
int currY = y;
|
||||
|
||||
for (Module module : modules) {
|
||||
if (!module.isVisible()) continue;
|
||||
|
||||
String name = module.getDisplayName();
|
||||
int textWidth = mc.font.width(name);
|
||||
int drawX = rightAlign
|
||||
? x + (maxWidth - textWidth)
|
||||
: x;
|
||||
|
||||
int color = module.getArraylistColor().getRGB();
|
||||
HudRenderer.INSTANCE.drawSnappedText(gui, name, drawX, currY, color, shadow);
|
||||
|
||||
currY += lineHeight;
|
||||
}
|
||||
|
||||
w = maxWidth;
|
||||
h = currY - y - 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInEditor(GuiGraphicsExtractor gui, Hud hud) {
|
||||
drawEditorBackground(gui);
|
||||
renderInGame(gui, 0, hud);
|
||||
}
|
||||
|
||||
protected void drawEditorBackground(GuiGraphicsExtractor gui) {
|
||||
int bgColor = visible ? Colors.visibleHudElementColor.getRGB() : Colors.disabledHudElementColor.getRGB();
|
||||
int outlineColor = HudEditor.INSTANCE != null && HudEditor.INSTANCE.isSelected(this)
|
||||
? Colors.selectedHudElementOutlineColor.getRGB()
|
||||
: Colors.unselectedHudElementOutlineColor.getRGB();
|
||||
|
||||
gui.fill(x - 1, y - 1, x + w + 1, y + h + 1, bgColor);
|
||||
gui.fill(x - 1, y - 1, x + w + 1, y, outlineColor);
|
||||
gui.fill(x - 1, y + h, x + w + 1, y + h + 1, outlineColor);
|
||||
gui.fill(x - 1, y, x, y + h, outlineColor);
|
||||
gui.fill(x + w, y, x + w + 1, y + h, outlineColor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Component> getTooltip() {
|
||||
return List.of(
|
||||
Component.translatable("sputnik.hud.element.arraylist.name"),
|
||||
Component.translatable("sputnik.hud.element.arraylist.desc")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
package me.retucio.sputnik.ui.hud.elements;
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.ui.hud.ImageHudElement;
|
||||
|
||||
import com.mojang.blaze3d.platform.NativeImage;
|
||||
import net.minecraft.client.renderer.texture.DynamicTexture;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.InputStream;
|
||||
import java.util.List;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
|
||||
public class CustomImageElement extends ImageHudElement {
|
||||
|
||||
public CustomImageElement() {
|
||||
super("customimage", 200, 200);
|
||||
reloadTexture();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getImagePath() {
|
||||
Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
|
||||
if (hud != null && hud.customImagePath != null && !hud.customImagePath.getValue().isEmpty()) {
|
||||
return hud.customImagePath.getValue();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reloadTexture() {
|
||||
textureLoaded = false;
|
||||
String imagePath = getImagePath();
|
||||
if (imagePath == null || imagePath.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
File file = new File(imagePath);
|
||||
if (!file.exists() || !file.isFile()) {
|
||||
Sputnik.LOGGER.error(Component.translatable(
|
||||
"sputnik.hud.error.texture", getId(), "file not found: " + imagePath).getString()
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
try (InputStream stream = new FileInputStream(file)) {
|
||||
NativeImage image = NativeImage.read(stream);
|
||||
|
||||
if (texture != null) texture.close();
|
||||
mc.getTextureManager().getTexture(textureId);
|
||||
mc.getTextureManager().release(textureId);
|
||||
|
||||
Supplier<String> nameSupplier = () -> textureId.toString();
|
||||
texture = new DynamicTexture(nameSupplier, image);
|
||||
|
||||
this.imageWidth = image.getWidth();
|
||||
this.imageHeight = image.getHeight();
|
||||
this.w = imageWidth;
|
||||
this.h = imageHeight;
|
||||
|
||||
mc.getTextureManager().register(textureId, texture);
|
||||
textureLoaded = true;
|
||||
|
||||
Sputnik.LOGGER.info(Component.translatable("sputnik.hud.info.textureloaded", getId()).getString());
|
||||
} catch (Exception e) {
|
||||
Sputnik.LOGGER.error(Component.translatable(
|
||||
"sputnik.hud.error.texture", getId(), e.getMessage()).getString()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Component> getTooltip() {
|
||||
return List.of(
|
||||
Component.translatable("sputnik.hud.element.customimage.name"),
|
||||
Component.translatable("sputnik.hud.element.customimage.desc")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -23,8 +23,9 @@ public class CustomTextElement extends TextHudElement {
|
||||
@Override
|
||||
public String getPreviewText() {
|
||||
Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
|
||||
if (hud != null && hud.customText != null && !hud.customText.getValue().isEmpty())
|
||||
if (hud != null && hud.customText != null && !hud.customText.getValue().isEmpty()) {
|
||||
return hud.customText.getValue();
|
||||
}
|
||||
|
||||
return "texto custom";
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package me.retucio.sputnik.ui.hud.elements;
|
||||
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.ui.hud.TextHudElement;
|
||||
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.util.Mth;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class SpeedElement extends TextHudElement {
|
||||
|
||||
public SpeedElement() {
|
||||
super("velocidad", 0, (mc.getWindow().getGuiScaledHeight() - mc.font.lineHeight) / 2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getText(float delta, Hud hud) {
|
||||
if (mc.player == null) return getPreviewText();
|
||||
|
||||
String unit = hud.speedUnit.getValue().getSymbol();
|
||||
|
||||
// solo velocidad horizontal
|
||||
float speed = Mth.sqrt(
|
||||
(float) (mc.player.getDeltaMovement().x() * mc.player.getDeltaMovement().x())
|
||||
+ (float) (mc.player.getDeltaMovement().z() * mc.player.getDeltaMovement().z())
|
||||
);
|
||||
if (hud.speedUnit.is(Hud.SpeedUnits.BPS)) {
|
||||
speed = speed * 20;
|
||||
} else if (hud.speedUnit.is(Hud.SpeedUnits.KBPH)) {
|
||||
speed = speed * 20 * 3600 / 1000;
|
||||
}
|
||||
|
||||
return String.format("%.2f %s", speed, unit);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreviewText() {
|
||||
return "0 b/s";
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Component> getTooltip() {
|
||||
return List.of(
|
||||
Component.translatable("sputnik.hud.elementos.velocidad.name"),
|
||||
Component.translatable("sputnik.hud.elementos.velocidad.desc")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,152 @@
|
||||
package me.retucio.sputnik.ui.widgets.buttons.settings;
|
||||
|
||||
import me.retucio.sputnik.module.setting.settings.FileSetting;
|
||||
import me.retucio.sputnik.ui.screen.ClickGui;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
|
||||
import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import me.retucio.sputnik.util.MiscUtil;
|
||||
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.resources.language.I18n;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
import org.lwjgl.util.tinyfd.TinyFileDialogs;
|
||||
|
||||
import java.awt.*;
|
||||
import java.nio.file.Path;
|
||||
|
||||
|
||||
public class FileButton extends SettingButton<FileSetting> {
|
||||
|
||||
private boolean typing;
|
||||
private final FileSetting setting;
|
||||
private final StringBuilder buffer = new StringBuilder();
|
||||
|
||||
public FileButton(FileSetting setting, SettingsPanel parent, int offset) {
|
||||
super(setting, parent, offset);
|
||||
this.setting = setting;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
|
||||
// fondo
|
||||
int bgColor = isHovered(mouseX, mouseY)
|
||||
? Colors.buttonColor.brighter().getRGB()
|
||||
: Colors.buttonColor.getRGB();
|
||||
gui.fill(x, y, x + w - 20, y + h, bgColor);
|
||||
|
||||
// botón de navegar
|
||||
int browseButtonColor = isBrowseButtonHovered(mouseX, mouseY)
|
||||
? Colors.buttonColor.brighter().getRGB()
|
||||
: Colors.buttonColor.getRGB();
|
||||
gui.fill(x + w - 20, y, x + w, y + h, browseButtonColor);
|
||||
gui.text(mc.font, "...", x + w - 20 + (20 - mc.font.width("...")) / 2, y + 3, -1, true);
|
||||
|
||||
// texto
|
||||
String label = setting.getName() + ": " + (typing ? buffer + "_" : setting.getValue());
|
||||
gui.text(mc.font, label, x + 5, y + 3, -1, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseClicked(int mouseX, int mouseY, int button) {
|
||||
if (isHovered(mouseX, mouseY) && ClickGui.INSTANCE.trySelect(this)) {
|
||||
if (button == 0) {
|
||||
typing = true;
|
||||
buffer.setLength(0);
|
||||
buffer.append(setting.getValue()); // precargar valor anterior
|
||||
} else if (button == 1 && KeyUtil.isShiftDown()) {
|
||||
typing = false;
|
||||
setting.reset();
|
||||
}
|
||||
} else {
|
||||
typing = false;
|
||||
if (isBrowseButtonHovered(mouseX, mouseY)) {
|
||||
Path path = pickFile();
|
||||
if (path != null) {
|
||||
setting.setValue(path.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onKey(int key, int action) {
|
||||
if (!typing || action == GLFW.GLFW_RELEASE) return;
|
||||
|
||||
// pegar con ctrl + v
|
||||
if (key == GLFW.GLFW_KEY_V && KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_CONTROL)) {
|
||||
paste();
|
||||
return;
|
||||
}
|
||||
|
||||
switch (key) { // casos para teclas especiales como enter, escape o borrar
|
||||
case GLFW.GLFW_KEY_ENTER -> {
|
||||
setting.setValue(buffer.toString());
|
||||
typing = false;
|
||||
} case GLFW.GLFW_KEY_BACKSPACE -> {
|
||||
onBackspace();
|
||||
} case GLFW.GLFW_KEY_ESCAPE -> {
|
||||
typing = false;
|
||||
} case GLFW.GLFW_KEY_SPACE -> {
|
||||
charTyped(' ');
|
||||
} default -> {
|
||||
String c = KeyUtil.getKeyName(key);
|
||||
if (c.length() == 1) {
|
||||
if (KeyUtil.isShiftDown())
|
||||
charTyped(KeyUtil.shiftKey(c).charAt(0));
|
||||
else
|
||||
charTyped(c.toLowerCase().charAt(0));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void charTyped(char c) {
|
||||
if (!typing) return;
|
||||
buffer.append(c);
|
||||
|
||||
if (mc.font.width(setting.getName() + ": " + buffer + "_") > w - 8) {
|
||||
onBackspace();
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isFocused() {
|
||||
return typing;
|
||||
}
|
||||
|
||||
public void onBackspace() {
|
||||
MiscUtil.backspace(buffer);
|
||||
}
|
||||
|
||||
public void paste() {
|
||||
buffer.append(MiscUtil.getPasteContent(100));
|
||||
}
|
||||
|
||||
private boolean isBrowseButtonHovered(int mx, int my) {
|
||||
return mx >= x + w - 20 && mx <= x + w
|
||||
&& my >= y && my <= y + h;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isHovered(int mx, int my) {
|
||||
return mx > x && mx < x + w - 20
|
||||
&& my > y && my <= y + h;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public Path pickFile() {
|
||||
String result = TinyFileDialogs.tinyfd_openFileDialog(
|
||||
I18n.get("sputnik.filesetting.choose"),
|
||||
setting.isDirectory()
|
||||
? setting.getValue()
|
||||
: setting.getPath().getParent().toString(),
|
||||
null,
|
||||
I18n.get("sputnik.filesetting.supportedfiles"),
|
||||
false);
|
||||
return result == null ? null : Path.of(result);
|
||||
}
|
||||
}
|
||||
@@ -221,6 +221,7 @@ public class SettingsPanel extends CloseablePanel<SettingButton<? extends Settin
|
||||
case SliderButton sliderButton -> text += ": " + sliderButton.df.format((sliderButton.getSetting()).getValue());
|
||||
case CycleButton<?> cycleButton -> text += ": " + cycleButton.getSetting().getValue();
|
||||
case BindButton bindButton -> text += ": " + bindButton.getSetting().getKeyName();
|
||||
case FileButton fileButton -> text += ": " + fileButton.getSetting().getValue() + " ...";
|
||||
case TextButton textButton -> text += ": " + textButton.getSetting().getValue();
|
||||
case ColorButton colorButton -> text += colorButton.getSetting().getTooltipText();
|
||||
default -> {}
|
||||
@@ -307,6 +308,7 @@ public class SettingsPanel extends CloseablePanel<SettingButton<? extends Settin
|
||||
case BooleanSetting b -> new ToggleButton(b, this, offset);
|
||||
case NumberSetting n -> new SliderButton(n, this, offset);
|
||||
case EnumSetting<?> e -> new CycleButton<>(e, this, offset);
|
||||
case FileSetting f -> new FileButton(f, this, offset);
|
||||
case KeySetting k -> new BindButton(k, this, offset);
|
||||
case StringSetting s -> new TextButton(s, this, offset);
|
||||
case ListSetting<?> l -> new ListButton<>(l, this, offset);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package me.retucio.sputnik.util;
|
||||
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.core.particles.ParticleType;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.network.ProtocolInfo;
|
||||
@@ -16,12 +18,15 @@ import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.inventory.MenuType;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import org.jspecify.annotations.NonNull;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.*;
|
||||
import java.util.List;
|
||||
import java.util.function.BooleanSupplier;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static me.retucio.sputnik.util.Colors.*;
|
||||
@@ -46,6 +51,11 @@ public class Lists {
|
||||
public static final List<MenuType<?>> screenList = BuiltInRegistries.MENU.stream().toList();
|
||||
public static Map<MenuType<?>, String> screenNames;
|
||||
|
||||
public static List<Item> foodList = new ArrayList<>();
|
||||
public static Map<Item, String> foodNames = new HashMap<>();
|
||||
|
||||
public static List<PacketType<? extends Packet<?>>> packetList = new ArrayList<>();
|
||||
public static Map<PacketType<? extends @NonNull Packet<?>>, String> packetNames = new HashMap<>();
|
||||
public static List<PacketType<? extends @NonNull Packet<?>>> c2sPacketList = new ArrayList<>();
|
||||
public static Map<PacketType<? extends @NonNull Packet<?>>, String> c2sPacketNames = new HashMap<>();
|
||||
public static List<PacketType<? extends @NonNull Packet<?>>> s2cPacketList = new ArrayList<>();
|
||||
@@ -116,6 +126,11 @@ public class Lists {
|
||||
c2sPacketList.add(type);
|
||||
c2sPacketNames.put(type, type.id().toShortString());
|
||||
}));
|
||||
|
||||
packetList.addAll(c2sPacketList);
|
||||
packetList.addAll(s2cPacketList);
|
||||
packetNames.putAll(c2sPacketNames);
|
||||
packetNames.putAll(s2cPacketNames);
|
||||
}
|
||||
|
||||
public static <T> Map<T, Boolean> allTrue(List<T> options) {
|
||||
@@ -126,11 +141,17 @@ public class Lists {
|
||||
|
||||
@SafeVarargs
|
||||
public static <T> Map<T, Boolean> allTrueExcept(List<T> options, T... exceptions) {
|
||||
Map<T, Boolean> map = allFalse(options);
|
||||
Map<T, Boolean> map = allTrue(options);
|
||||
for (T exception : exceptions) map.replace(exception, false);
|
||||
return map;
|
||||
}
|
||||
|
||||
public static <T> Map<T, Boolean> allTrueExcept(List<T> options, Predicate<T> not) {
|
||||
Map<T, Boolean> map = allTrue(options);
|
||||
map.keySet().forEach(t -> { if (not.test(t)) map.put(t, false); });
|
||||
return map;
|
||||
}
|
||||
|
||||
public static <T> Map<T, Boolean> allFalse(List<T> options) {
|
||||
Map<T, Boolean> map = new HashMap<>();
|
||||
for (T option : options) map.put(option, false);
|
||||
@@ -144,14 +165,21 @@ public class Lists {
|
||||
return map;
|
||||
}
|
||||
|
||||
public static <T> Map<T, Boolean> allFalseExcept(List<T> options, Predicate<T> not) {
|
||||
Map<T, Boolean> map = allFalse(options);
|
||||
map.keySet().forEach(t -> { if (not.test(t)) map.put(t, true); });
|
||||
return map;
|
||||
}
|
||||
|
||||
public static <T> Map<T, String> getMapOfLists(List<T> options, List<String> names) {
|
||||
Map<T, String> result = new HashMap<>();
|
||||
|
||||
// no exceder los límites de ninguna de las dos listas
|
||||
int size = Math.min(options.size(), names.size());
|
||||
|
||||
for (int i = 0; i < size; i++)
|
||||
for (int i = 0; i < size; i++) {
|
||||
result.put(options.get(i), names.get(i));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -49,6 +49,7 @@ public class MiscUtil {
|
||||
}
|
||||
|
||||
public static <T extends Number> T getHighest(List<T> list) {
|
||||
if (list.isEmpty()) return null;
|
||||
if (list.getFirst() == null) return null;
|
||||
T maxValue = list.getFirst();
|
||||
for (T t : list) {
|
||||
|
||||
@@ -41,9 +41,9 @@
|
||||
"sputnik.commands.macro.removed": "macro %s removed",
|
||||
"sputnik.commands.panorama.desc": "creates a panorama resource pack based on your current position",
|
||||
"sputnik.commands.panorama.errorassemble": "failed to assemble custom resource pack! does a pack of that name already exist?",
|
||||
"sputnik.commands.panorama.finalizing": "finalizing resource pack...",
|
||||
"sputnik.commands.panorama.packdesc": "generated by Sputnik",
|
||||
"sputnik.commands.panorama.ready": "resource pack ready!",
|
||||
"sputnik.commands.panorama.finalizing": "finalizing resource pack...",
|
||||
"sputnik.commands.peek.desc": "peeks at another player's inventory",
|
||||
"sputnik.commands.plugins.calmdown": "calm dooowwnnn",
|
||||
"sputnik.commands.plugins.desc": "looks for the plugins the server has",
|
||||
@@ -123,10 +123,17 @@
|
||||
"sputnik.enum.module.modules.client.hud.dynosaurs.trex": "t-rex",
|
||||
"sputnik.enum.module.modules.client.hud.dynosaurs.triceratops": "triceratops",
|
||||
"sputnik.enum.module.modules.client.hud.dynosaurs.velocirraptor": "velociraptor",
|
||||
"sputnik.enum.module.modules.client.hud.speedunits.bpt": "blocks/tick",
|
||||
"sputnik.enum.module.modules.client.hud.speedunits.bps": "blocks/second",
|
||||
"sputnik.enum.module.modules.client.hud.speedunits.kbph": "kiloblocks/hour",
|
||||
"sputnik.enum.module.modules.client.hud.timeformat.twelve_hour": "12h",
|
||||
"sputnik.enum.module.modules.client.hud.timeformat.twenty_four_hour": "24h",
|
||||
"sputnik.enum.module.modules.combat.holdattack.attackmode.spam": "spam",
|
||||
"sputnik.enum.module.modules.combat.holdattack.attackmode.time": "time",
|
||||
"sputnik.enum.module.modules.combat.killaura.attackmode.spam": "spam",
|
||||
"sputnik.enum.module.modules.combat.killaura.attackmode.timed": "time",
|
||||
"sputnik.enum.module.modules.combat.killaura.listmode.blacklist": "blacklist",
|
||||
"sputnik.enum.module.modules.combat.killaura.listmode.whitelist": "whitelist",
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorystyle.dashed": "dashed",
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorystyle.dotted": "points",
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorystyle.solid": "solid",
|
||||
@@ -135,7 +142,7 @@
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorytargets.entities": "entities",
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorytargets.none": "none",
|
||||
"sputnik.enum.module.modules.misc.anvilfont.fontmode.circled": "round",
|
||||
"sputnik.enum.module.modules.misc.anvilfont.fontmode.cursed": "well weird",
|
||||
"sputnik.enum.module.modules.misc.anvilfont.fontmode.cursed": "cursed",
|
||||
"sputnik.enum.module.modules.misc.anvilfont.fontmode.greek": "greek",
|
||||
"sputnik.enum.module.modules.misc.anvilfont.fontmode.normal": "normal",
|
||||
"sputnik.enum.module.modules.misc.anvilfont.fontmode.uppercase": "uppercase",
|
||||
@@ -152,6 +159,9 @@
|
||||
"sputnik.enum.module.modules.network.packetdelay.packets.all": "all",
|
||||
"sputnik.enum.module.modules.network.packetdelay.packets.keep_alive": "KeepAlive packets",
|
||||
"sputnik.enum.module.modules.network.packetdelay.packets.others": "all but KeepAlive",
|
||||
"sputnik.enum.module.modules.network.packetlogger.logmode.chat": "chat",
|
||||
"sputnik.enum.module.modules.network.packetlogger.logmode.file": "save to file",
|
||||
"sputnik.enum.module.modules.network.packetlogger.logmode.notification": "notification",
|
||||
"sputnik.enum.module.modules.network.packetmine.clickaction.add_priority": "add priority",
|
||||
"sputnik.enum.module.modules.network.packetmine.clickaction.none": "nothing",
|
||||
"sputnik.enum.module.modules.network.packetmine.clickaction.unselect": "unselect",
|
||||
@@ -202,6 +212,8 @@
|
||||
"sputnik.enum.module.modules.render.norender.colors.red": "red",
|
||||
"sputnik.enum.module.modules.render.norender.colors.white": "white",
|
||||
"sputnik.enum.module.modules.render.norender.colors.yellow": "yellow",
|
||||
"sputnik.enum.module.modules.world.autotool.autotoolmode.on_click": "on click",
|
||||
"sputnik.enum.module.modules.world.autotool.autotoolmode.on_tick": "on tick",
|
||||
"sputnik.enum.module.modules.world.blockinfo.copymode.command": "copy /setblock command",
|
||||
"sputnik.enum.module.modules.world.blockinfo.copymode.dont": "don't copy",
|
||||
"sputnik.enum.module.modules.world.blockinfo.copymode.json": "copy json contents",
|
||||
@@ -214,6 +226,10 @@
|
||||
"sputnik.enum.module.modules.world.timechanger.moonphases.waning_gibbous": "waning gibbous",
|
||||
"sputnik.enum.module.modules.world.timechanger.moonphases.waxing_crescent": "waxing crescent",
|
||||
"sputnik.enum.module.modules.world.timechanger.moonphases.waxing_gibbous": "waxing gibbous",
|
||||
"sputnik.filesetting.cannotwrite": "cannot write to \"%s\"!",
|
||||
"sputnik.filesetting.choose": "choose a file",
|
||||
"sputnik.filesetting.doesnotexist": "file \"%s\" does not exist!",
|
||||
"sputnik.filesetting.supportedfiles": "supported files",
|
||||
"sputnik.group.andamios.bloques": "blocks",
|
||||
"sputnik.group.andamios.puente": "bridge",
|
||||
"sputnik.group.andamios.renderizado": "render",
|
||||
@@ -242,6 +258,7 @@
|
||||
"sputnik.group.interfaz.widgets": "widgets",
|
||||
"sputnik.group.jesus.bloques": "blocks",
|
||||
"sputnik.group.jkrowling.libro": "book",
|
||||
"sputnik.group.killaura.entidades": "entities",
|
||||
"sputnik.group.manos.animaciones": "animations",
|
||||
"sputnik.group.manos.brazo": "arm",
|
||||
"sputnik.group.manos.manoprincipal": "main hand",
|
||||
@@ -286,6 +303,8 @@
|
||||
"sputnik.hud.editor.title": "HUD editor",
|
||||
"sputnik.hud.element.armor.desc": "armor status",
|
||||
"sputnik.hud.element.coords.desc": "shows your XYZ position in the world",
|
||||
"sputnik.hud.element.customimage.desc": "an image of your choosing",
|
||||
"sputnik.hud.element.customimage.name": "custom image",
|
||||
"sputnik.hud.element.customtext.desc": "text of your choosing",
|
||||
"sputnik.hud.element.customtext.name": "custom text",
|
||||
"sputnik.hud.element.dyno.desc": "long live autism goddamn",
|
||||
@@ -298,6 +317,8 @@
|
||||
"sputnik.hud.element.ping.name": "ping",
|
||||
"sputnik.hud.element.rotation.desc": "shows your current rotation",
|
||||
"sputnik.hud.element.rotation.name": "rotations",
|
||||
"sputnik.hud.elementos.velocidad.desc": "the player's speed",
|
||||
"sputnik.hud.elementos.velocidad.name": "speed",
|
||||
"sputnik.hud.element.time.desc": "hours and minutes in the selected timezone",
|
||||
"sputnik.hud.element.time.name": "time",
|
||||
"sputnik.hud.element.totems.desc": "totems available",
|
||||
@@ -356,7 +377,91 @@
|
||||
"sputnik.module.autofish.rodbreaking": "the rod is about to break",
|
||||
"sputnik.module.autoherramienta.desc": "automatically switches to the right tool",
|
||||
"sputnik.module.autoherramienta.name": "auto tool",
|
||||
"sputnik.module.autominado.name": "auto mine",
|
||||
"sputnik.module.autominado.desc": "select blocks to mine them automatically",
|
||||
"sputnik.module.autominado.blacklisted": "that block is blacklisted!",
|
||||
"sputnik.module.autominado.cornerselected": "corner selected",
|
||||
"sputnik.module.autominado.boxselected": "box selected",
|
||||
"sputnik.module.autominado.floodfilled": "flood filled",
|
||||
"sputnik.module.autominado.pickbreaking": "pickaxe's about to break!",
|
||||
"sputnik.setting.autominado.general.mododeseleccion.name": "selection mode",
|
||||
"sputnik.setting.autominado.general.mododeseleccion.desc": "in which way to select blocks",
|
||||
"sputnik.enum.module.modules.world.automine.selectionmode.individual": "individual",
|
||||
"sputnik.enum.module.modules.world.automine.selectionmode.box": "box",
|
||||
"sputnik.enum.module.modules.world.automine.selectionmode.flood_fill": "flood fill",
|
||||
"sputnik.setting.autominado.general.limitedebloques.name": "block limit",
|
||||
"sputnik.setting.autominado.general.limitedebloques.desc": "max number of blocks to select",
|
||||
"sputnik.setting.autominado.general.delay.name": "delay",
|
||||
"sputnik.setting.autominado.general.delay.desc": "delay between attempts to mine",
|
||||
"sputnik.setting.autominado.general.cancelarfueradealcance.name": "cancel out of reach",
|
||||
"sputnik.setting.autominado.general.cancelarfueradealcance.desc": "do not try to mine blocks that are out of reach",
|
||||
"sputnik.setting.autominado.general.autoherramienta.name": "autotool",
|
||||
"sputnik.setting.autominado.general.autoherramienta.desc": "select the best tool automatically",
|
||||
"sputnik.setting.autominado.general.noromperpico.name": "don't break",
|
||||
"sputnik.setting.autominado.general.noromperpico.desc": "avoid breaking the current tool",
|
||||
"sputnik.setting.autominado.general.rotar.name": "rotate",
|
||||
"sputnik.setting.autominado.general.rotar.desc": "whether to rotate to face the block being mined, and in which way to do so",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.client": "client-sided",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.server": "server-sided",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.both": "client- and server-sided",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.none": "none",
|
||||
"sputnik.setting.autominado.general.limitarpaquetes.name": "limit packets",
|
||||
"sputnik.setting.autominado.general.limitarpaquetes.desc": "max number of packets to send per second (0 to disable)",
|
||||
"sputnik.setting.autominado.bloques.listanegra.name": "blacklist",
|
||||
"sputnik.setting.autominado.bloques.listanegra.desc": "blocks NOT to mine",
|
||||
"sputnik.setting.autominado.renderizado.renderizar.name": "render",
|
||||
"sputnik.setting.autominado.renderizado.renderizar.desc": "whether to render outlines of blocks being mined, or in the queue",
|
||||
"sputnik.setting.autominado.renderizado.color.name": "color",
|
||||
"sputnik.setting.autominado.renderizado.color.desc": "color of blocks being mined",
|
||||
"sputnik.setting.autominado.renderizado.colordeseleccionpendiente.name": "color of pending selection",
|
||||
"sputnik.setting.autominado.renderizado.colordeseleccionpendiente.desc": "color of the first corner in box mode",
|
||||
"sputnik.setting.autominado.renderizado.grosor.name": "thickness",
|
||||
"sputnik.setting.autominado.renderizado.grosor.desc": "line thickness",
|
||||
"sputnik.group.autominado.bloques": "blocks",
|
||||
"sputnik.group.autominado.renderizado": "render",
|
||||
"sputnik.module.estiloso.name": "stylish",
|
||||
"sputnik.module.estiloso.desc": "be stylish",
|
||||
"sputnik.setting.estiloso.general.truco.name": "trick",
|
||||
"sputnik.setting.estiloso.general.truco.desc": "which trick to do",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.spin": "spin",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.flip": "flip",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.roll": "roll",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.twirl": "twirl",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.wave": "wave",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.pop": "pop",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.throw_catch": "throw & catch",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.random": "random",
|
||||
"sputnik.setting.estiloso.general.combo.name": "combo",
|
||||
"sputnik.setting.estiloso.general.combo.desc": "concatenate tricks to do a combo",
|
||||
"sputnik.setting.estiloso.general.trucosporcombo.name": "combo tricks",
|
||||
"sputnik.setting.estiloso.general.trucosporcombo.desc": "how many tricks to do in a combo",
|
||||
"sputnik.setting.estiloso.general.mano.name": "hand",
|
||||
"sputnik.setting.estiloso.general.mano.desc": "in which hand(s) to do it",
|
||||
"sputnik.setting.estiloso.general.tecla.name": "key",
|
||||
"sputnik.setting.estiloso.general.tecla.desc": "key to use to do the thing",
|
||||
"sputnik.setting.estiloso.general.velocidad.name": "speed",
|
||||
"sputnik.setting.estiloso.general.velocidad.desc": "how quickly to do it",
|
||||
"sputnik.setting.estiloso.general.vueltas.name": "times",
|
||||
"sputnik.setting.estiloso.general.vueltas.desc": "how many times to do it",
|
||||
"sputnik.setting.estiloso.general.direccion.name": "direction",
|
||||
"sputnik.setting.estiloso.general.direccion.desc": "in which direction to do it",
|
||||
"sputnik.enum.module.modules.render.stylish.hand.main_hand": "main hand",
|
||||
"sputnik.enum.module.modules.render.stylish.hand.off_hand": "off hand",
|
||||
"sputnik.setting.estiloso.general.suavizado.name": "easing",
|
||||
"sputnik.setting.estiloso.general.suavizado.desc": "use non-linear velocity instead of linear",
|
||||
"sputnik.setting.estiloso.general.cooldown.name": "cooldown",
|
||||
"sputnik.setting.estiloso.general.cooldown.desc": "cooldown between tricks",
|
||||
"sputnik.enum.module.modules.render.stylish.rotatedirection.clockwise": "clockwise",
|
||||
"sputnik.enum.module.modules.render.stylish.rotatedirection.counter_clockwise": "counter-clockwise",
|
||||
"sputnik.setting.hud.elementos.velocidad.name": "velocity",
|
||||
"sputnik.setting.hud.elementos.velocidad.desc": "unit to use when showing current speed",
|
||||
"sputnik.module.autopechera.desc": "switches to a chestplate before hitting with the mace",
|
||||
"sputnik.setting.nametags.general.distancia.name": "render distance",
|
||||
"sputnik.setting.nametags.general.distancia.desc": "max distance to render nametags",
|
||||
"sputnik.setting.putogordo.general.cuandoparar.name": "when to stop",
|
||||
"sputnik.setting.putogordo.general.cuandoparar.desc": "how many food points you need to have to stop eating",
|
||||
"sputnik.setting.putogordo.general.listanegra.name": "blacklist",
|
||||
"sputnik.setting.putogordo.general.listanegra.desc": "food items NOT to eat",
|
||||
"sputnik.module.autopechera.name": "auto chestplate",
|
||||
"sputnik.module.autopesca.desc": "fishes for you",
|
||||
"sputnik.module.autopesca.name": "auto fish",
|
||||
@@ -378,6 +483,8 @@
|
||||
"sputnik.module.bypassearpacks.name": "bypass packs",
|
||||
"sputnik.module.camaralibre.desc": "lets the camera move independently from the player. useful for scouting around",
|
||||
"sputnik.module.camaralibre.name": "freecam",
|
||||
"sputnik.module.canceladordepaquetes.desc": "cancels packets.",
|
||||
"sputnik.module.canceladordepaquetes.name": "packet cancel",
|
||||
"sputnik.module.capas.desc": "choose which cape to wear (only visible to you)",
|
||||
"sputnik.module.capas.name": "capes",
|
||||
"sputnik.module.capturasdepantalla.desc": "choose what to do after taking a screenshot",
|
||||
@@ -395,9 +502,9 @@
|
||||
"sputnik.module.cocaina.desc": "changes the speed of everything in the game",
|
||||
"sputnik.module.cocaina.name": "cocaine",
|
||||
"sputnik.module.colocarenaire.desc": "lets you place blocks in the air",
|
||||
"sputnik.module.colocarenaire.name": "place in air",
|
||||
"sputnik.module.colocarenaire.name": "airplace",
|
||||
"sputnik.module.conejo.desc": "do the elytra bounce by holding space",
|
||||
"sputnik.module.conejo.name": "rabbit",
|
||||
"sputnik.module.conejo.name": "ebounce",
|
||||
"sputnik.module.confetti.desc": "changes the color of the totem pop particles",
|
||||
"sputnik.module.confetti.name": "confetti",
|
||||
"sputnik.module.contorno.desc": "customizes the block outline",
|
||||
@@ -406,13 +513,13 @@
|
||||
"sputnik.module.criticos.name": "crits",
|
||||
"sputnik.module.delaydepaquetes.desc": "applies a delay to packets",
|
||||
"sputnik.module.delaydepaquetes.name": "packet delay",
|
||||
"sputnik.module.delfin.desc": "*dolphin noise*",
|
||||
"sputnik.module.delfin.desc": "*dolphin noises*",
|
||||
"sputnik.module.delfin.name": "dolphin",
|
||||
"sputnik.module.destellodeenchants.desc": "changes the color of the enchantment glint",
|
||||
"sputnik.module.destellodeenchants.name": "enchant glint",
|
||||
"sputnik.module.desyncdehitbox.desc": "chinese exploit",
|
||||
"sputnik.module.desyncdehitbox.name": "hitbox desync",
|
||||
"sputnik.module.discordrpc.desc": "customizes your activity on dishcord",
|
||||
"sputnik.module.discordrpc.desc": "customizes your activity on dickord",
|
||||
"sputnik.module.discordrpc.disconnected": "disconnected: %s - %s",
|
||||
"sputnik.module.discordrpc.error": "error: %s - %s",
|
||||
"sputnik.module.discordrpc.initerror": "error initializing rpc: %s",
|
||||
@@ -426,7 +533,7 @@
|
||||
"sputnik.module.dupedebundle.desc": "dupes items using a bundle and a book",
|
||||
"sputnik.module.dupedebundle.name": "bundle dupe",
|
||||
"sputnik.module.elytras.desc": "fly with elytra",
|
||||
"sputnik.module.elytras.name": "elytra",
|
||||
"sputnik.module.elytras.name": "elytrafly",
|
||||
"sputnik.module.escalerasveloces.desc": "climb ladders faster",
|
||||
"sputnik.module.escalerasveloces.name": "fast ladders",
|
||||
"sputnik.module.escalones.desc": "makes the step-up height whatever you want",
|
||||
@@ -436,6 +543,8 @@
|
||||
"sputnik.module.estampaescrotos.desc": "stamp other people's ballsacks",
|
||||
"sputnik.module.estampaescrotos.name": "ballsack stamper",
|
||||
"sputnik.module.freecam.damagedisable": "freecam was disabled because you took damage",
|
||||
"sputnik.module.fisicadeobjetos.name": "item physics",
|
||||
"sputnik.module.fisicadeobjetos.desc": "applies physics to dropped items",
|
||||
"sputnik.module.friends.already": "%s is already your friend",
|
||||
"sputnik.module.friends.notplayer": "%s could not be added as a friend",
|
||||
"sputnik.module.fuentes.desc": "changes the font used when rendering text",
|
||||
@@ -448,6 +557,8 @@
|
||||
"sputnik.module.hotkeysinvcreativo.name": "creative inv. hotkeys",
|
||||
"sputnik.module.hud.desc": "screen overlay with extra info",
|
||||
"sputnik.module.hud.name": "HUD",
|
||||
"sputnik.module.imandeitems.desc": "picks up distant items quickly via movement packets",
|
||||
"sputnik.module.imandeitems.name": "item magnet",
|
||||
"sputnik.module.infodebloque.desc": "shows the nbt contents of the block you're looking at",
|
||||
"sputnik.module.infodebloque.name": "block info",
|
||||
"sputnik.module.interfaz.desc": "gui settings, and other miscellaneous ones",
|
||||
@@ -463,6 +574,10 @@
|
||||
"sputnik.module.jugadorfalso.desc": "spawns a fake player entity for testing purposes",
|
||||
"sputnik.module.jugadorfalso.name": "fake player",
|
||||
"sputnik.module.keypearl.nopearls": "you have no pearls",
|
||||
"sputnik.module.killaura.desc": "if violence doesn't work, you haven't applied enough of it.",
|
||||
"sputnik.module.killaura.name": "killaura",
|
||||
"sputnik.module.loggerdepaquetes.desc": "logs packets",
|
||||
"sputnik.module.loggerdepaquetes.name": "packet logger",
|
||||
"sputnik.module.lsd.desc": "what the actual FUCK",
|
||||
"sputnik.module.lsd.name": "lsd",
|
||||
"sputnik.module.macekill.oops": "oops: %s",
|
||||
@@ -492,8 +607,6 @@
|
||||
"sputnik.module.notificaciones.name": "notifications",
|
||||
"sputnik.module.packetdelay.singleplayer": "packet delay doesn't work in singleplayer",
|
||||
"sputnik.module.packetmine.pickbreaking": "the pickaxe is about to break",
|
||||
"sputnik.module.canceladordepaquetes.name": "packet cancel",
|
||||
"sputnik.module.canceladordepaquetes.desc": "cancels packets.",
|
||||
"sputnik.module.parkour.desc": "automatically jumps on the last possible tick, at the block's edge",
|
||||
"sputnik.module.parkour.name": "parkour",
|
||||
"sputnik.module.particulas.desc": "emits artificial particles",
|
||||
@@ -512,7 +625,9 @@
|
||||
"sputnik.module.progresodeminado.name": "mining progress",
|
||||
"sputnik.module.puntosdedesconexion.desc": "shows you the spots where other players log out",
|
||||
"sputnik.module.puntosdedesconexion.name": "logout spots",
|
||||
"sputnik.module.racismo.desc": "gimme a smoke bro",
|
||||
"sputnik.module.putogordo.desc": "automatically eats when hungry",
|
||||
"sputnik.module.putogordo.name": "fatass",
|
||||
"sputnik.module.racismo.desc": "detroit moment",
|
||||
"sputnik.module.racismo.name": "racism",
|
||||
"sputnik.module.reconectar.desc": "adds a button to reconnect to a server after being disconnected",
|
||||
"sputnik.module.reconectar.name": "reconnect",
|
||||
@@ -563,17 +678,17 @@
|
||||
"sputnik.module.tenedormagico.desc": "bro thinks he's Poseidon",
|
||||
"sputnik.module.tenedormagico.name": "magic fork",
|
||||
"sputnik.module.tobillosfuertes.desc": "avoids fall damage",
|
||||
"sputnik.module.tobillosfuertes.name": "strong ankles",
|
||||
"sputnik.module.tobillosfuertes.name": "no fall",
|
||||
"sputnik.module.toggled.off": "%s was disabled",
|
||||
"sputnik.module.toggled.on": "%s was enabled",
|
||||
"sputnik.module.trayectoria.desc": "shows the trajectory of projectiles",
|
||||
"sputnik.module.trayectoria.name": "trajectory",
|
||||
"sputnik.module.trazos.desc": "draw lines from the camera to the selected entities",
|
||||
"sputnik.module.trazos.name": "trails",
|
||||
"sputnik.module.trazos.name": "tracers",
|
||||
"sputnik.module.trianguladordestrongholds.desc": "uses fancy math to work out where the closest stronghold is",
|
||||
"sputnik.module.trianguladordestrongholds.name": "stronghold triangulator",
|
||||
"sputnik.module.yunquesconpluma.desc": "lets you use different typefaces when renaming items in an anvil",
|
||||
"sputnik.module.yunquesconpluma.name": "anvils with a quill",
|
||||
"sputnik.module.yunquesconpluma.name": "faggot anvils",
|
||||
"sputnik.module.zoom.desc": "magnifying glass",
|
||||
"sputnik.module.zoom.name": "zoom",
|
||||
"sputnik.profile.error.dir": "could not create the profiles directory",
|
||||
@@ -583,6 +698,8 @@
|
||||
"sputnik.setting.amigos.general.prevenirataques.name": "prevent attacks",
|
||||
"sputnik.setting.amigos.general.rueditaparaanadiramigo.desc": "press the middle mouse button to (un)mark a player as a friend",
|
||||
"sputnik.setting.amigos.general.rueditaparaanadiramigo.name": "middle click to add friend",
|
||||
"sputnik.setting.andamios.puente.anchodelpuente.name": "width",
|
||||
"sputnik.setting.andamios.puente.anchodelpuente.desc": "bridge width",
|
||||
"sputnik.setting.andamios.bloques.autoselect.desc": "automatically select the closest slot with blocks",
|
||||
"sputnik.setting.andamios.bloques.autoselect.name": "autoselect",
|
||||
"sputnik.setting.andamios.bloques.bloques.desc": "blocks to apply the filter to",
|
||||
@@ -689,6 +806,8 @@
|
||||
"sputnik.setting.autoherramienta.general.delay.name": "delay",
|
||||
"sputnik.setting.autoherramienta.general.delaydelcambiodevuelta.desc": "delay in ticks before switching back to the original tool",
|
||||
"sputnik.setting.autoherramienta.general.delaydelcambiodevuelta.name": "switch back delay",
|
||||
"sputnik.setting.autoherramienta.general.modo.desc": "when to check for changing tools",
|
||||
"sputnik.setting.autoherramienta.general.modo.name": "mode",
|
||||
"sputnik.setting.autopechera.general.cambiardevuelta.desc": "switch back to elytra, if they were equipped",
|
||||
"sputnik.setting.autopechera.general.cambiardevuelta.name": "switch back",
|
||||
"sputnik.setting.autopesca.general.evitarromper.desc": "avoid breaking the rod if it's about to go",
|
||||
@@ -743,6 +862,10 @@
|
||||
"sputnik.setting.camaralibre.velocidad.tecladelscroll.name": "scroll key",
|
||||
"sputnik.setting.camaralibre.velocidad.velocidad.desc": "camera movement speed",
|
||||
"sputnik.setting.camaralibre.velocidad.velocidad.name": "speed",
|
||||
"sputnik.setting.canceladordepaquetes.general.c2s.desc": "serverbound packets to cancel",
|
||||
"sputnik.setting.canceladordepaquetes.general.c2s.name": "C2S",
|
||||
"sputnik.setting.canceladordepaquetes.general.s2c.desc": "clientbound packets to cancel",
|
||||
"sputnik.setting.canceladordepaquetes.general.s2c.name": "S2C",
|
||||
"sputnik.setting.capas.general.capa.desc": "which cape to wear",
|
||||
"sputnik.setting.capas.general.capa.name": "cape",
|
||||
"sputnik.setting.capturasdepantalla.botones.botondeabrir.desc": "show a button to open the screenshot file",
|
||||
@@ -783,7 +906,7 @@
|
||||
"sputnik.setting.cielocustom.cuerposceleste.sol.name": "sun",
|
||||
"sputnik.setting.cielocustom.general.hora.desc": "in-game time",
|
||||
"sputnik.setting.cielocustom.general.hora.name": "time",
|
||||
"sputnik.setting.cocaina.general.multi.desc": "like in Balatro",
|
||||
"sputnik.setting.cocaina.general.multi.desc": "is that a MOTHERFUCKING Balatro reference?!?",
|
||||
"sputnik.setting.cocaina.general.multi.name": "multi",
|
||||
"sputnik.setting.colocarenaire.general.colocarconnormalidad.desc": "place normally if already looking at a block in range",
|
||||
"sputnik.setting.colocarenaire.general.colocarconnormalidad.name": "place normally",
|
||||
@@ -804,8 +927,12 @@
|
||||
"sputnik.setting.colocarenaire.scrolleo.tecladelscroll.desc": "key to hold for scrolling to work",
|
||||
"sputnik.setting.colocarenaire.scrolleo.tecladelscroll.name": "scroll key",
|
||||
"sputnik.setting.color.rainbow": "rainbow",
|
||||
"sputnik.setting.common.arraylistcolor.name": "arraylist color",
|
||||
"sputnik.setting.common.arraylistcolor.desc": "color to use when displaying module name in the arraylist hud element",
|
||||
"sputnik.setting.common.bind.desc": "key bound to the module, ESC to unbind",
|
||||
"sputnik.setting.common.bind.name": "key",
|
||||
"sputnik.setting.common.displayed.name": "displayed",
|
||||
"sputnik.setting.common.displayed.desc": "whether to display this module in the arraylist hud element",
|
||||
"sputnik.setting.common.keymode.desc": "how to interpret the bound key",
|
||||
"sputnik.setting.common.keymode.name": "key mode",
|
||||
"sputnik.setting.common.notify.desc": "notify when toggling on / off",
|
||||
@@ -900,6 +1027,8 @@
|
||||
"sputnik.setting.estampaescrotos.general.maximapotencia.name": "max power",
|
||||
"sputnik.setting.estampaescrotos.general.prevenirmuerte.desc": "prevent death from fall damage if the attack was blocked, by cancelling the movement packets",
|
||||
"sputnik.setting.estampaescrotos.general.prevenirmuerte.name": "prevent death",
|
||||
"sputnik.setting.fisicadeobjetos.general.rotacionaleatoria.name": "rotación aleatoria",
|
||||
"sputnik.setting.fisicadeobjetos.general.rotacionaleatoria.desc": "añade una rotación aleatoria a cada objeto",
|
||||
"sputnik.setting.friend.nickname.desc": "what name to save the friend under",
|
||||
"sputnik.setting.friend.nickname.name": "name",
|
||||
"sputnik.setting.fuentes.general.fuente.desc": "font to use",
|
||||
@@ -928,6 +1057,8 @@
|
||||
"sputnik.setting.hud.elementos.formatodelahora.name": "time format",
|
||||
"sputnik.setting.hud.elementos.mododecoordenadas.desc": "which coordinates to show",
|
||||
"sputnik.setting.hud.elementos.mododecoordenadas.name": "coords mode",
|
||||
"sputnik.setting.hud.elementos.rutadeimagen.desc": "path to custom image",
|
||||
"sputnik.setting.hud.elementos.rutadeimagen.name": "path",
|
||||
"sputnik.setting.hud.elementos.textocustom.desc": "watermark (leave empty to remove)",
|
||||
"sputnik.setting.hud.elementos.textocustom.name": "custom text",
|
||||
"sputnik.setting.hud.elementos.zonahoraria.desc": "timezone as UTC+n",
|
||||
@@ -940,6 +1071,8 @@
|
||||
"sputnik.setting.hud.visualizacion.mostrarenf3.name": "show in F3",
|
||||
"sputnik.setting.hud.visualizacion.sombra.desc": "text with shadow",
|
||||
"sputnik.setting.hud.visualizacion.sombra.name": "shadow",
|
||||
"sputnik.setting.imandeitems.general.rango.desc": "how far to reach out for items",
|
||||
"sputnik.setting.imandeitems.general.rango.name": "range",
|
||||
"sputnik.setting.infodebloque.general.copiar.desc": "copy to clipboard",
|
||||
"sputnik.setting.infodebloque.general.copiar.name": "copy",
|
||||
"sputnik.setting.infodebloque.general.liquidos.desc": "also include liquids in the raycast",
|
||||
@@ -1007,6 +1140,26 @@
|
||||
"sputnik.setting.jugadorfalso.general.nombre.desc": "what name to give the player",
|
||||
"sputnik.setting.jugadorfalso.general.nombre.name": "name",
|
||||
"sputnik.setting.key.reset": "keybind for module %s reset",
|
||||
"sputnik.setting.killaura.entidades.entidades.desc": "entities to attack",
|
||||
"sputnik.setting.killaura.entidades.entidades.name": "entities",
|
||||
"sputnik.setting.killaura.entidades.entidades1.desc": "entities NOT to attack",
|
||||
"sputnik.setting.killaura.entidades.entidades1.name": "entities",
|
||||
"sputnik.setting.killaura.entidades.mododelista.desc": "how to interpret the list",
|
||||
"sputnik.setting.killaura.entidades.mododelista.name": "list mode",
|
||||
"sputnik.setting.killaura.general.alcance.desc": "how far to reach",
|
||||
"sputnik.setting.killaura.general.alcance.name": "reach",
|
||||
"sputnik.setting.killaura.general.mododeataque.desc": "how to attack",
|
||||
"sputnik.setting.killaura.general.mododeataque.name": "attack mode",
|
||||
"sputnik.setting.killaura.general.moverlamano.desc": "whether to swing the hand when attacking",
|
||||
"sputnik.setting.killaura.general.moverlamano.name": "swing",
|
||||
"sputnik.setting.killaura.general.porcentajedecooldown.desc": "how long to wait for the cooldown bar to fill",
|
||||
"sputnik.setting.killaura.general.porcentajedecooldown.name": "cooldown percentage",
|
||||
"sputnik.setting.loggerdepaquetes.general.archivo.desc": "file to use as log file",
|
||||
"sputnik.setting.loggerdepaquetes.general.archivo.name": "file",
|
||||
"sputnik.setting.loggerdepaquetes.general.mododelogueo.desc": "how to log packets",
|
||||
"sputnik.setting.loggerdepaquetes.general.mododelogueo.name": "logging mode",
|
||||
"sputnik.setting.loggerdepaquetes.general.paquetes.desc": "packets to log",
|
||||
"sputnik.setting.loggerdepaquetes.general.paquetes.name": "packets",
|
||||
"sputnik.setting.lsd.general.intensidad.desc": "how much the image is distorted and tinted",
|
||||
"sputnik.setting.lsd.general.intensidad.name": "strength",
|
||||
"sputnik.setting.lsd.general.rotaciones.desc": "how much the offset swirls; higher = more whirls",
|
||||
@@ -1281,6 +1434,8 @@
|
||||
"sputnik.setting.puntosdedesconexion.relleno.colordelrelleno.name": "fill color",
|
||||
"sputnik.setting.puntosdedesconexion.relleno.relleno.desc": "render the box fill (faces)",
|
||||
"sputnik.setting.puntosdedesconexion.relleno.relleno.name": "fill",
|
||||
"sputnik.setting.putogordo.general.hambre.desc": "how hungry you have to be to eat (food points)",
|
||||
"sputnik.setting.putogordo.general.hambre.name": "hunger",
|
||||
"sputnik.setting.recorrido.general.color.desc": "color to use",
|
||||
"sputnik.setting.recorrido.general.color.name": "color",
|
||||
"sputnik.setting.recorrido.general.esperanzadevida.desc": "how long the trails last",
|
||||
@@ -1501,7 +1656,7 @@
|
||||
"sputnik.ui.tab.profiles": "profiles",
|
||||
"sputnik.update.clickhere": "CLICK HERE",
|
||||
"sputnik.update.download": "download the latest version (%s) from here:",
|
||||
"sputnik.update.idgaf": "i don't care",
|
||||
"sputnik.update.idgaf": "i don't give a FUCK",
|
||||
"sputnik.update.outdated": "outdated version: %s",
|
||||
"sputnik.update.title": "update",
|
||||
"sputnik.version.error.fetch": "could not check the latest version",
|
||||
|
||||
@@ -41,9 +41,9 @@
|
||||
"sputnik.commands.macro.removed": "macro %s borrada",
|
||||
"sputnik.commands.panorama.desc": "crea un pack de textures con la panorámica basada en tu posición actual",
|
||||
"sputnik.commands.panorama.errorassemble": "no se pudo crear el pack; existe uno ya con ese nombre?",
|
||||
"sputnik.commands.panorama.finalizing": "finalizando pack...",
|
||||
"sputnik.commands.panorama.packdesc": "generado por Sputnik",
|
||||
"sputnik.commands.panorama.ready": "pack listo!",
|
||||
"sputnik.commands.panorama.finalizing": "finalizando pack...",
|
||||
"sputnik.commands.peek.desc": "cotillea el inventario de otro jugador",
|
||||
"sputnik.commands.plugins.calmdown": "calmaaa",
|
||||
"sputnik.commands.plugins.desc": "busca los plugins que tenga el server",
|
||||
@@ -123,10 +123,17 @@
|
||||
"sputnik.enum.module.modules.client.hud.dynosaurs.trex": "t-rex",
|
||||
"sputnik.enum.module.modules.client.hud.dynosaurs.triceratops": "tricerátops",
|
||||
"sputnik.enum.module.modules.client.hud.dynosaurs.velocirraptor": "velocirráptor",
|
||||
"sputnik.enum.module.modules.client.hud.speedunits.bpt": "bloques/tick",
|
||||
"sputnik.enum.module.modules.client.hud.speedunits.bps": "bloques/segundo",
|
||||
"sputnik.enum.module.modules.client.hud.speedunits.kbph": "kilobloques/hora",
|
||||
"sputnik.enum.module.modules.client.hud.timeformat.twelve_hour": "12h",
|
||||
"sputnik.enum.module.modules.client.hud.timeformat.twenty_four_hour": "24h",
|
||||
"sputnik.enum.module.modules.combat.holdattack.attackmode.spam": "spamear",
|
||||
"sputnik.enum.module.modules.combat.holdattack.attackmode.time": "timear",
|
||||
"sputnik.enum.module.modules.combat.killaura.attackmode.spam": "spamear",
|
||||
"sputnik.enum.module.modules.combat.killaura.attackmode.timed": "timear",
|
||||
"sputnik.enum.module.modules.combat.killaura.listmode.blacklist": "lista negra (excluir)",
|
||||
"sputnik.enum.module.modules.combat.killaura.listmode.whitelist": "lista blanca (incluir)",
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorystyle.dashed": "discontinua",
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorystyle.dotted": "puntos",
|
||||
"sputnik.enum.module.modules.combat.projectiletrajectories.trajectorystyle.solid": "continua",
|
||||
@@ -152,6 +159,9 @@
|
||||
"sputnik.enum.module.modules.network.packetdelay.packets.all": "todos",
|
||||
"sputnik.enum.module.modules.network.packetdelay.packets.keep_alive": "paquetes KeepAlive",
|
||||
"sputnik.enum.module.modules.network.packetdelay.packets.others": "todos menos KeepAlive",
|
||||
"sputnik.enum.module.modules.network.packetlogger.logmode.chat": "chat",
|
||||
"sputnik.enum.module.modules.network.packetlogger.logmode.file": "archivo",
|
||||
"sputnik.enum.module.modules.network.packetlogger.logmode.notification": "notis",
|
||||
"sputnik.enum.module.modules.network.packetmine.clickaction.add_priority": "agregar prioridad",
|
||||
"sputnik.enum.module.modules.network.packetmine.clickaction.none": "nada",
|
||||
"sputnik.enum.module.modules.network.packetmine.clickaction.unselect": "deseleccionar",
|
||||
@@ -202,6 +212,8 @@
|
||||
"sputnik.enum.module.modules.render.norender.colors.red": "rojo",
|
||||
"sputnik.enum.module.modules.render.norender.colors.white": "blanco",
|
||||
"sputnik.enum.module.modules.render.norender.colors.yellow": "amarillo",
|
||||
"sputnik.enum.module.modules.world.autotool.autotoolmode.on_click": "cada click",
|
||||
"sputnik.enum.module.modules.world.autotool.autotoolmode.on_tick": "cada tick",
|
||||
"sputnik.enum.module.modules.world.blockinfo.copymode.command": "copiar comando /setblock",
|
||||
"sputnik.enum.module.modules.world.blockinfo.copymode.dont": "no copiar",
|
||||
"sputnik.enum.module.modules.world.blockinfo.copymode.json": "copiar contenido json",
|
||||
@@ -214,6 +226,10 @@
|
||||
"sputnik.enum.module.modules.world.timechanger.moonphases.waning_gibbous": "menguante gibosa",
|
||||
"sputnik.enum.module.modules.world.timechanger.moonphases.waxing_crescent": "creciente",
|
||||
"sputnik.enum.module.modules.world.timechanger.moonphases.waxing_gibbous": "creciente gibosa",
|
||||
"sputnik.filesetting.cannotwrite": "no se puede escribir a \"%s\"!",
|
||||
"sputnik.filesetting.choose": "elige un archivo",
|
||||
"sputnik.filesetting.doesnotexist": "el archivo \"%s\" no existe!",
|
||||
"sputnik.filesetting.supportedfiles": "archivos soportados",
|
||||
"sputnik.group.andamios.bloques": "bloques",
|
||||
"sputnik.group.andamios.puente": "puente",
|
||||
"sputnik.group.andamios.renderizado": "renderizado",
|
||||
@@ -242,6 +258,7 @@
|
||||
"sputnik.group.interfaz.widgets": "widgets",
|
||||
"sputnik.group.jesus.bloques": "bloques",
|
||||
"sputnik.group.jkrowling.libro": "libro",
|
||||
"sputnik.group.killaura.entidades": "entidades",
|
||||
"sputnik.group.manos.animaciones": "animaciones",
|
||||
"sputnik.group.manos.brazo": "brazo",
|
||||
"sputnik.group.manos.manoprincipal": "mano principal",
|
||||
@@ -286,6 +303,8 @@
|
||||
"sputnik.hud.editor.title": "editor del HUD",
|
||||
"sputnik.hud.element.armor.desc": "estado de la armadura",
|
||||
"sputnik.hud.element.coords.desc": "te muestra tu posición XYZ en el mundo",
|
||||
"sputnik.hud.element.customimage.desc": "imagen que tú eliges",
|
||||
"sputnik.hud.element.customimage.name": "imagen custom",
|
||||
"sputnik.hud.element.customtext.desc": "texto que tú eliges",
|
||||
"sputnik.hud.element.customtext.name": "texto custom",
|
||||
"sputnik.hud.element.dyno.desc": "que viva el autismo joder",
|
||||
@@ -298,6 +317,8 @@
|
||||
"sputnik.hud.element.ping.name": "ping",
|
||||
"sputnik.hud.element.rotation.desc": "te muestra tu rotación actual",
|
||||
"sputnik.hud.element.rotation.name": "rotaciones",
|
||||
"sputnik.hud.elementos.velocidad.desc": "velocidad del jugador",
|
||||
"sputnik.hud.elementos.velocidad.name": "velocidad",
|
||||
"sputnik.hud.element.time.desc": "hora y minutos de la zona horaria seleccionada",
|
||||
"sputnik.hud.element.time.name": "hora",
|
||||
"sputnik.hud.element.totems.desc": "totems disponibles",
|
||||
@@ -356,7 +377,91 @@
|
||||
"sputnik.module.autofish.rodbreaking": "caña a punto de romperse",
|
||||
"sputnik.module.autoherramienta.desc": "cambia a la herramienta adecuada automáticamente",
|
||||
"sputnik.module.autoherramienta.name": "auto herramienta",
|
||||
"sputnik.module.autominado.name": "auto minado",
|
||||
"sputnik.module.autominado.desc": "selecciona un área o bloques individuales para minarlos automáticamente",
|
||||
"sputnik.module.autominado.blacklisted": "ese bloque está en la lista negra!",
|
||||
"sputnik.module.autominado.cornerselected": "esquina seleccionada",
|
||||
"sputnik.module.autominado.boxselected": "área seleccionada",
|
||||
"sputnik.module.autominado.floodfilled": "inundación seleccionada",
|
||||
"sputnik.module.autominado.pickbreaking": "el pico está por romperse!",
|
||||
"sputnik.setting.autominado.general.mododeseleccion.name": "modo de selección",
|
||||
"sputnik.setting.autominado.general.mododeseleccion.desc": "cómo seleccionar los bloques a minar",
|
||||
"sputnik.enum.module.modules.world.automine.selectionmode.individual": "individual",
|
||||
"sputnik.enum.module.modules.world.automine.selectionmode.box": "caja",
|
||||
"sputnik.enum.module.modules.world.automine.selectionmode.flood_fill": "inundación",
|
||||
"sputnik.setting.autominado.general.limitedebloques.name": "límite de bloques",
|
||||
"sputnik.setting.autominado.general.limitedebloques.desc": "cantidad máxima de bloques a seleccionar de una vez (caja / flood)",
|
||||
"sputnik.setting.autominado.general.delay.name": "delay",
|
||||
"sputnik.setting.autominado.general.delay.desc": "delay entre reintentos de minado",
|
||||
"sputnik.setting.autominado.general.cancelarfueradealcance.name": "cancelar fuera de alcance",
|
||||
"sputnik.setting.autominado.general.cancelarfueradealcance.desc": "cancelar aquellos paquetes que intenten romper bloques fuera del alcance del jugador",
|
||||
"sputnik.setting.autominado.general.autoherramienta.name": "auto herramienta",
|
||||
"sputnik.setting.autominado.general.autoherramienta.desc": "cambiar automáticamente a la herramienta más rápida antes de minar cada bloque",
|
||||
"sputnik.setting.autominado.general.noromperpico.name": "no romper pico",
|
||||
"sputnik.setting.autominado.general.noromperpico.desc": "evita romper la herramienta seleccionada",
|
||||
"sputnik.setting.autominado.general.rotar.name": "rotar",
|
||||
"sputnik.setting.autominado.general.rotar.desc": "rotar al minar bloques mediante el módulo",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.client": "cámara",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.server": "mediante paquetes",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.both": "ambos",
|
||||
"sputnik.enum.module.modules.world.automine.rotatemode.none": "no",
|
||||
"sputnik.setting.autominado.general.limitarpaquetes.name": "limitar paquetes",
|
||||
"sputnik.setting.autominado.general.limitarpaquetes.desc": "limita la cantidad de paquetes enviados en un segundo (0 para desactivar)",
|
||||
"sputnik.setting.autominado.bloques.listanegra.name": "lista negra",
|
||||
"sputnik.setting.autominado.bloques.listanegra.desc": "bloques a excluir de la selección",
|
||||
"sputnik.setting.autominado.renderizado.renderizar.name": "renderizar",
|
||||
"sputnik.setting.autominado.renderizado.renderizar.desc": "renderizar un contorno alrededor de los bloques que están siendo minados",
|
||||
"sputnik.setting.autominado.renderizado.color.name": "color",
|
||||
"sputnik.setting.autominado.renderizado.color.desc": "color del contorno renderizado",
|
||||
"sputnik.setting.autominado.renderizado.colordeseleccionpendiente.name": "color de selección pendiente",
|
||||
"sputnik.setting.autominado.renderizado.colordeseleccionpendiente.desc": "color del contorno de la primera esquina, en modo caja, mientras se espera la segunda",
|
||||
"sputnik.setting.autominado.renderizado.grosor.name": "grosor",
|
||||
"sputnik.setting.autominado.renderizado.grosor.desc": "grosor de las líneas del contorno",
|
||||
"sputnik.group.autominado.bloques": "bloques",
|
||||
"sputnik.group.autominado.renderizado": "renderizado",
|
||||
"sputnik.module.estiloso.name": "estiloso",
|
||||
"sputnik.module.estiloso.desc": "haz truquitos con items en las manos",
|
||||
"sputnik.setting.estiloso.general.truco.name": "truco",
|
||||
"sputnik.setting.estiloso.general.truco.desc": "qué truco hacer al pulsar la tecla",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.spin": "giro",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.flip": "voltereta",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.roll": "balanceo",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.twirl": "giro doble",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.wave": "saludo",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.pop": "pulso",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.throw_catch": "lanzar y coger",
|
||||
"sputnik.enum.module.modules.render.stylish.tricktype.random": "aleatorio",
|
||||
"sputnik.setting.estiloso.general.combo.name": "combo",
|
||||
"sputnik.setting.estiloso.general.combo.desc": "encadena varios trucos distintos en una sola pulsación",
|
||||
"sputnik.setting.estiloso.general.trucosporcombo.name": "combo tricks",
|
||||
"sputnik.setting.estiloso.general.trucosporcombo.desc": "cuántos trucos encadenar si el combo está activado",
|
||||
"sputnik.setting.estiloso.general.mano.name": "mano",
|
||||
"sputnik.setting.estiloso.general.mano.desc": "en qué mano(s) hacerlo",
|
||||
"sputnik.setting.estiloso.general.tecla.name": "tecla",
|
||||
"sputnik.setting.estiloso.general.tecla.desc": "tecla a pulsar para hacer el truco",
|
||||
"sputnik.setting.estiloso.general.velocidad.name": "velocidad",
|
||||
"sputnik.setting.estiloso.general.velocidad.desc": "velocidad de giro (grados/seg)",
|
||||
"sputnik.setting.estiloso.general.vueltas.name": "vueltas",
|
||||
"sputnik.setting.estiloso.general.vueltas.desc": "cuantas vueltas completas da",
|
||||
"sputnik.setting.estiloso.general.direccion.name": "dirección",
|
||||
"sputnik.setting.estiloso.general.direccion.desc": "dirección a rotar el ítem",
|
||||
"sputnik.enum.module.modules.render.stylish.hand.main_hand": "mano principal",
|
||||
"sputnik.enum.module.modules.render.stylish.hand.off_hand": "mano secundaria",
|
||||
"sputnik.setting.estiloso.general.suavizado.name": "suavizado",
|
||||
"sputnik.setting.estiloso.general.suavizado.desc": "usa una curva de aceleración/desaceleración en vez de velocidad lineal",
|
||||
"sputnik.setting.estiloso.general.cooldown.name": "cooldown",
|
||||
"sputnik.setting.estiloso.general.cooldown.desc": "tiempo mínimo en ms entre activaciones",
|
||||
"sputnik.enum.module.modules.render.stylish.rotatedirection.clockwise": "sentido horario",
|
||||
"sputnik.enum.module.modules.render.stylish.rotatedirection.counter_clockwise": "sentido antihorario",
|
||||
"sputnik.setting.hud.elementos.velocidad.name": "velocidad",
|
||||
"sputnik.setting.hud.elementos.velocidad.desc": "unidad a usar para la velocidad",
|
||||
"sputnik.module.autopechera.desc": "cambia a pechera antes de pegar con el mazo",
|
||||
"sputnik.setting.nametags.general.distancia.name": "distancia",
|
||||
"sputnik.setting.nametags.general.distancia.desc": "distancia máxima para renderizar nametags",
|
||||
"sputnik.setting.putogordo.general.cuandoparar.name": "cuándo parar",
|
||||
"sputnik.setting.putogordo.general.cuandoparar.desc": "cuántos puntos de comida hace falta tener para parar de comer",
|
||||
"sputnik.setting.putogordo.general.listanegra.name": "lista negra",
|
||||
"sputnik.setting.putogordo.general.listanegra.desc": "alimentos a NO comer",
|
||||
"sputnik.module.autopechera.name": "autopechera",
|
||||
"sputnik.module.autopesca.desc": "pesca por ti",
|
||||
"sputnik.module.autopesca.name": "auto pesca",
|
||||
@@ -378,6 +483,8 @@
|
||||
"sputnik.module.bypassearpacks.name": "bypassear packs",
|
||||
"sputnik.module.camaralibre.desc": "permite a la cámara moverse independientemente del jugador. útil para explorar alrededores",
|
||||
"sputnik.module.camaralibre.name": "cámara libre",
|
||||
"sputnik.module.canceladordepaquetes.desc": "cancela paquetes.",
|
||||
"sputnik.module.canceladordepaquetes.name": "cancelador de paquetes",
|
||||
"sputnik.module.capas.desc": "elige qué capa llevar (solo visible para ti)",
|
||||
"sputnik.module.capas.name": "capas",
|
||||
"sputnik.module.capturasdepantalla.desc": "elige qué hacer tras tomar una captura de pantalla",
|
||||
@@ -436,6 +543,8 @@
|
||||
"sputnik.module.estampaescrotos.desc": "estampa escrotos ajenos",
|
||||
"sputnik.module.estampaescrotos.name": "estampaescrotos",
|
||||
"sputnik.module.freecam.damagedisable": "cámara libre se ha desactivado porque has recibido daño",
|
||||
"sputnik.module.fisicadeobjetos.name": "física de objetos",
|
||||
"sputnik.module.fisicadeobjetos.desc": "aplica física a los objetos en el suelo",
|
||||
"sputnik.module.friends.already": "%s ya es tu amigo",
|
||||
"sputnik.module.friends.notplayer": "no se pudo añadir a %s como amigo",
|
||||
"sputnik.module.fuentes.desc": "modifica el tipo de letra utilizado al renderizar texto",
|
||||
@@ -448,6 +557,8 @@
|
||||
"sputnik.module.hotkeysinvcreativo.name": "hotkeys inv. creativo",
|
||||
"sputnik.module.hud.desc": "superposición de la pantalla con info. adicional",
|
||||
"sputnik.module.hud.name": "HUD",
|
||||
"sputnik.module.imandeitems.desc": "recoge items distantes rápidamente mediante paquetes de movimiento",
|
||||
"sputnik.module.imandeitems.name": "imán de items",
|
||||
"sputnik.module.infodebloque.desc": "muestra el contenido nbt del bloque al que se está apuntando",
|
||||
"sputnik.module.infodebloque.name": "info. de bloque",
|
||||
"sputnik.module.interfaz.desc": "ajustes de la interfaz, y otros misceláneos",
|
||||
@@ -463,6 +574,10 @@
|
||||
"sputnik.module.jugadorfalso.desc": "invoca una entidad de jugador falsa por motivos de testeo",
|
||||
"sputnik.module.jugadorfalso.name": "jugador falso",
|
||||
"sputnik.module.keypearl.nopearls": "no tienes perlas",
|
||||
"sputnik.module.killaura.desc": "si la violencia no funciona, es porque no has aplicado la suficiente",
|
||||
"sputnik.module.killaura.name": "killaura",
|
||||
"sputnik.module.loggerdepaquetes.desc": "loguea paquetes",
|
||||
"sputnik.module.loggerdepaquetes.name": "logger de paquetes",
|
||||
"sputnik.module.lsd.desc": "distorsiona y tiñe la pantalla",
|
||||
"sputnik.module.lsd.name": "lsd",
|
||||
"sputnik.module.macekill.oops": "upsi: %s",
|
||||
@@ -510,6 +625,8 @@
|
||||
"sputnik.module.progresodeminado.name": "progreso de minado",
|
||||
"sputnik.module.puntosdedesconexion.desc": "te muestra los puntos donde otros jugadores se desconectan",
|
||||
"sputnik.module.puntosdedesconexion.name": "puntos de desconexión",
|
||||
"sputnik.module.putogordo.desc": "come automáticamente al tener hambre",
|
||||
"sputnik.module.putogordo.name": "puto gordo",
|
||||
"sputnik.module.racismo.desc": "amego segarro",
|
||||
"sputnik.module.racismo.name": "racismo",
|
||||
"sputnik.module.reconectar.desc": "añade un botón para reconectarse a un servidor tras ser desconectado",
|
||||
@@ -581,6 +698,8 @@
|
||||
"sputnik.setting.amigos.general.prevenirataques.name": "prevenir ataques",
|
||||
"sputnik.setting.amigos.general.rueditaparaanadiramigo.desc": "pulsara la ruedita del ratón para (des)marcar a un jugador como amigo",
|
||||
"sputnik.setting.amigos.general.rueditaparaanadiramigo.name": "ruedita para añadir amigo",
|
||||
"sputnik.setting.andamios.puente.anchodelpuente.name": "ancho del puente",
|
||||
"sputnik.setting.andamios.puente.anchodelpuente.desc": "número de bloques de ancho del puente",
|
||||
"sputnik.setting.andamios.bloques.autoselect.desc": "seleccionar slot más cercano con bloques automáticamente",
|
||||
"sputnik.setting.andamios.bloques.autoselect.name": "autoselect",
|
||||
"sputnik.setting.andamios.bloques.bloques.desc": "bloques a aplicar al filtro",
|
||||
@@ -687,6 +806,8 @@
|
||||
"sputnik.setting.autoherramienta.general.delay.name": "delay",
|
||||
"sputnik.setting.autoherramienta.general.delaydelcambiodevuelta.desc": "delay en ticks para cambiar de vuelta a la herramienta inicial",
|
||||
"sputnik.setting.autoherramienta.general.delaydelcambiodevuelta.name": "delay del cambio de vuelta",
|
||||
"sputnik.setting.autoherramienta.general.modo.desc": "de qué manera ejecutar el módulo",
|
||||
"sputnik.setting.autoherramienta.general.modo.name": "modo",
|
||||
"sputnik.setting.autopechera.general.cambiardevuelta.desc": "cambiar de vuelta a elytras, si estaban puestas",
|
||||
"sputnik.setting.autopechera.general.cambiardevuelta.name": "cambiar de vuelta",
|
||||
"sputnik.setting.autopesca.general.evitarromper.desc": "evitar romper la caña si está en las últimas",
|
||||
@@ -741,6 +862,10 @@
|
||||
"sputnik.setting.camaralibre.velocidad.tecladelscroll.name": "tecla del scroll",
|
||||
"sputnik.setting.camaralibre.velocidad.velocidad.desc": "velocidad de movimiento de la cámara",
|
||||
"sputnik.setting.camaralibre.velocidad.velocidad.name": "velocidad",
|
||||
"sputnik.setting.canceladordepaquetes.general.c2s.desc": "paquetes a cancelar, dirección servidor",
|
||||
"sputnik.setting.canceladordepaquetes.general.c2s.name": "C2S",
|
||||
"sputnik.setting.canceladordepaquetes.general.s2c.desc": "paquetes a cancelar, dirección cliente",
|
||||
"sputnik.setting.canceladordepaquetes.general.s2c.name": "S2C",
|
||||
"sputnik.setting.capas.general.capa.desc": "qué capa llevar puesta",
|
||||
"sputnik.setting.capas.general.capa.name": "capa",
|
||||
"sputnik.setting.capturasdepantalla.botones.botondeabrir.desc": "mostrar botón para abrir el archivo de la captura",
|
||||
@@ -802,8 +927,12 @@
|
||||
"sputnik.setting.colocarenaire.scrolleo.tecladelscroll.desc": "tecla a mantener para que el scroll funcione",
|
||||
"sputnik.setting.colocarenaire.scrolleo.tecladelscroll.name": "tecla del scroll",
|
||||
"sputnik.setting.color.rainbow": "arcoíris",
|
||||
"sputnik.setting.common.arraylistcolor.name": "color del arraylist",
|
||||
"sputnik.setting.common.arraylistcolor.desc": "color a usar en el arraylist para el nombre del módulo",
|
||||
"sputnik.setting.common.bind.desc": "tecla asignada al módulo, ESC para desactivar",
|
||||
"sputnik.setting.common.bind.name": "tecla",
|
||||
"sputnik.setting.common.displayed.name": "visible",
|
||||
"sputnik.setting.common.displayed.desc": "mostrar en el arraylist del HUD",
|
||||
"sputnik.setting.common.keymode.desc": "cómo interpretar la tecla configurada",
|
||||
"sputnik.setting.common.keymode.name": "modo de tecla",
|
||||
"sputnik.setting.common.notify.desc": "notificar al activar / desactivar",
|
||||
@@ -898,6 +1027,8 @@
|
||||
"sputnik.setting.estampaescrotos.general.maximapotencia.name": "máxima potencia",
|
||||
"sputnik.setting.estampaescrotos.general.prevenirmuerte.desc": "prevenir la muerte por daño de caída si el ataque fue bloqueado, cancelando los paquetes de movimiento",
|
||||
"sputnik.setting.estampaescrotos.general.prevenirmuerte.name": "prevenir muerte",
|
||||
"sputnik.setting.fisicadeobjetos.general.rotacionaleatoria.name": "rotación aleatoria",
|
||||
"sputnik.setting.fisicadeobjetos.general.rotacionaleatoria.desc": "añade una rotación aleatoria a cada objeto",
|
||||
"sputnik.setting.friend.nickname.desc": "con qué nombre guardar al amigo",
|
||||
"sputnik.setting.friend.nickname.name": "nombre",
|
||||
"sputnik.setting.fuentes.general.fuente.desc": "fuente a emplear",
|
||||
@@ -926,6 +1057,8 @@
|
||||
"sputnik.setting.hud.elementos.formatodelahora.name": "formato de la hora",
|
||||
"sputnik.setting.hud.elementos.mododecoordenadas.desc": "qué coordenadas mostrar",
|
||||
"sputnik.setting.hud.elementos.mododecoordenadas.name": "modo de coordenadas",
|
||||
"sputnik.setting.hud.elementos.rutadeimagen.desc": "ruta de la imagen a renderizar en el elemento de imagen custom",
|
||||
"sputnik.setting.hud.elementos.rutadeimagen.name": "ruta de imagen",
|
||||
"sputnik.setting.hud.elementos.textocustom.desc": "marca de agua (dejar vacío para quitar)",
|
||||
"sputnik.setting.hud.elementos.textocustom.name": "texto custom",
|
||||
"sputnik.setting.hud.elementos.zonahoraria.desc": "zona horaria en UTC+n",
|
||||
@@ -938,6 +1071,8 @@
|
||||
"sputnik.setting.hud.visualizacion.mostrarenf3.name": "mostrar en F3",
|
||||
"sputnik.setting.hud.visualizacion.sombra.desc": "texto con sombra",
|
||||
"sputnik.setting.hud.visualizacion.sombra.name": "sombra",
|
||||
"sputnik.setting.imandeitems.general.rango.desc": "rango de recogida de items",
|
||||
"sputnik.setting.imandeitems.general.rango.name": "rango",
|
||||
"sputnik.setting.infodebloque.general.copiar.desc": "copiar al portapapeles",
|
||||
"sputnik.setting.infodebloque.general.copiar.name": "copiar",
|
||||
"sputnik.setting.infodebloque.general.liquidos.desc": "también incluir líquidos en el raycast",
|
||||
@@ -1005,6 +1140,26 @@
|
||||
"sputnik.setting.jugadorfalso.general.nombre.desc": "qué nombre asignarle al jugador",
|
||||
"sputnik.setting.jugadorfalso.general.nombre.name": "nombre",
|
||||
"sputnik.setting.key.reset": "tecla del módulo %s restablecida",
|
||||
"sputnik.setting.killaura.entidades.entidades.desc": "qué entidades atacar",
|
||||
"sputnik.setting.killaura.entidades.entidades.name": "entidades",
|
||||
"sputnik.setting.killaura.entidades.entidades1.desc": "qué entidades NO atacar",
|
||||
"sputnik.setting.killaura.entidades.entidades1.name": "entidades",
|
||||
"sputnik.setting.killaura.entidades.mododelista.desc": "cómo interpretar la lista",
|
||||
"sputnik.setting.killaura.entidades.mododelista.name": "modo de lista",
|
||||
"sputnik.setting.killaura.general.alcance.desc": "qué tan lejos extender el brazo",
|
||||
"sputnik.setting.killaura.general.alcance.name": "alcance",
|
||||
"sputnik.setting.killaura.general.mododeataque.desc": "elige de qué manera atacar",
|
||||
"sputnik.setting.killaura.general.mododeataque.name": "modo de ataque",
|
||||
"sputnik.setting.killaura.general.moverlamano.desc": "mover la mano al atacar",
|
||||
"sputnik.setting.killaura.general.moverlamano.name": "mover la mano",
|
||||
"sputnik.setting.killaura.general.porcentajedecooldown.desc": "cuánto esperar a que se llene la barrita de ataque",
|
||||
"sputnik.setting.killaura.general.porcentajedecooldown.name": "porcentaje de cooldown",
|
||||
"sputnik.setting.loggerdepaquetes.general.archivo.desc": "archivo al que loguear los paquetes",
|
||||
"sputnik.setting.loggerdepaquetes.general.archivo.name": "archivo",
|
||||
"sputnik.setting.loggerdepaquetes.general.mododelogueo.desc": "de qué manera loguear los paquetes",
|
||||
"sputnik.setting.loggerdepaquetes.general.mododelogueo.name": "modo de logueo",
|
||||
"sputnik.setting.loggerdepaquetes.general.paquetes.desc": "paquetes a loguear",
|
||||
"sputnik.setting.loggerdepaquetes.general.paquetes.name": "paquetes",
|
||||
"sputnik.setting.lsd.general.intensidad.desc": "cuánto se distorsiona y se tiñe la imagen",
|
||||
"sputnik.setting.lsd.general.intensidad.name": "intensidad",
|
||||
"sputnik.setting.lsd.general.rotaciones.desc": "cuántas vueltas da el desplazamiento; más = más remolinos",
|
||||
@@ -1279,6 +1434,8 @@
|
||||
"sputnik.setting.puntosdedesconexion.relleno.colordelrelleno.name": "color del relleno",
|
||||
"sputnik.setting.puntosdedesconexion.relleno.relleno.desc": "renderizar relleno de la caja (caras)",
|
||||
"sputnik.setting.puntosdedesconexion.relleno.relleno.name": "relleno",
|
||||
"sputnik.setting.putogordo.general.hambre.desc": "cuánta hambre es necesaria para comer (puntos de comida)",
|
||||
"sputnik.setting.putogordo.general.hambre.name": "hambre",
|
||||
"sputnik.setting.recorrido.general.color.desc": "color a usar",
|
||||
"sputnik.setting.recorrido.general.color.name": "color",
|
||||
"sputnik.setting.recorrido.general.esperanzadevida.desc": "cuánto duran los trazos",
|
||||
@@ -1509,4 +1666,4 @@
|
||||
"sputnik.version.info.uptodate": "el mod está al día: v%s",
|
||||
"sputnik.version.warn.check": "no se pudo comprobar si el mod está actualizado: %s",
|
||||
"sputnik.version.warn.metadata": "no se pudo construir gradle.properties desde la metadata"
|
||||
}
|
||||
}
|
||||
@@ -7,10 +7,6 @@ uniform sampler2D InSampler;
|
||||
in vec2 texCoord;
|
||||
out vec4 fragColor;
|
||||
|
||||
// 26.2 pasó los samplers con nombre a bind groups; los uniforms van en un bloque std140
|
||||
// que rellena LsdPostProcessor cada frame. el tiempo se lleva aquí en vez de leerlo de
|
||||
// Globals.GameTime porque ese es una fracción del día (se reinicia cada 24000 ticks) y
|
||||
// animaría la distorsión lentísimo con un salto cada 20 minutos
|
||||
layout(std140) uniform LsdConfig {
|
||||
float strength;
|
||||
float seed;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
"mixins.item.ItemMixin",
|
||||
"mixins.item.ItemStackMixin",
|
||||
"mixins.item.TridentItemMixin",
|
||||
"mixins.misc.ReferenceMixin",
|
||||
"mixins.misc.StringUtilMixin",
|
||||
"mixins.misc.Vec3Mixin",
|
||||
"mixins.network.ClientIntentionPacketMixin",
|
||||
@@ -25,6 +26,7 @@
|
||||
"mixins.network.ServerConnectorMixin",
|
||||
"mixins.network.YggdrasilUserApiServiceMixin",
|
||||
"mixins.player.InputMixin",
|
||||
"mixins.player.InventoryMixin",
|
||||
"mixins.player.PlayerInventoryMixin",
|
||||
"mixins.player.PlayerMixin",
|
||||
"mixins.world.BlockCollisionsMixin"
|
||||
@@ -40,7 +42,9 @@
|
||||
"accessors.AbstractSignEditScreenAccessor",
|
||||
"accessors.AnvilScreenAccessor",
|
||||
"accessors.ClientPacketListenerAccessor",
|
||||
"accessors.ItemStackRenderStateAccessor",
|
||||
"accessors.KeyBindingAccessor",
|
||||
"accessors.LayerRenderStateAccessor",
|
||||
"accessors.OverlayTextureAccessor",
|
||||
"mixins.entity.EntityRendererMixin",
|
||||
"mixins.hud.BossBarHudMixin",
|
||||
@@ -55,6 +59,8 @@
|
||||
"mixins.io.KeyboardHandlerMixin",
|
||||
"mixins.io.MouseHandlerMixin",
|
||||
"mixins.io.ScreenshotMixin",
|
||||
"mixins.item.ItemEntityRendererMixin",
|
||||
"mixins.item.ItemTransformMixin",
|
||||
"mixins.misc.FontManagerMixin",
|
||||
"mixins.misc.MinecraftMixin",
|
||||
"mixins.misc.OptionsMixin",
|
||||
@@ -72,6 +78,8 @@
|
||||
"mixins.render.CapeLayerMixin",
|
||||
"mixins.render.ChunkBorderRendererMixin",
|
||||
"mixins.render.EntityHitboxDebugRendererMixin",
|
||||
"mixins.render.EntityRenderDispatcherMixin",
|
||||
"mixins.render.EntityRenderStateMixin",
|
||||
"mixins.render.EquipmentLayerRendererMixin",
|
||||
"mixins.render.FogRendererMixin",
|
||||
"mixins.render.FontMixin",
|
||||
|
||||
Reference in new issue
Block a user