Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 retuci0
|
86594f1ca3 | ||
|
retuci0
|
f074f05c51 | ||
|
retuci0
|
436b79fd2b | ||
|
retuci0
|
9afaa4e0c8 | ||
|
retuci0
|
f794457538 | ||
|
retuci0
|
ec3e633cec | ||
|
retuci0
|
8f17bd8e67 |
No files matched your search
@@ -1,23 +1,23 @@
|
||||
# jenny's mod 2 100% real
|
||||
|
||||
mod para Minecraft Fabric 1.21.10 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
|
||||
mod para Minecraft Fabric 1.21.11 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/camera-tweaks/releases)
|
||||
1. ir a [lanzamientos](https://github.com/retuci0/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 `1.21.10`; Fabric `0.138.3`)
|
||||
asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `1.21.11`; Fabric `0.17.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
|
||||
1. clona el respositorio (`git clone https://github.com/retuci0/camera-tweaks`)
|
||||
2. entra al directorio del repositorio (`cd camera-tweaks`)
|
||||
1. clona el respositorio (`git clone https://github.com/retuci0/sputnik`)
|
||||
2. entra al directorio del repositorio (`cd sputnik`)
|
||||
3. `gradlew build` para Windows o `chmod +x gradlew` + `./gradlew build` para Linux (Mac es Linux)
|
||||
4. el resultado estará en `/build/libs/camtweaks-X.X.jar` (el que no lleva "sources" en el nombre)
|
||||
4. el resultado estará en `/build/libs/sputnik-X.X.jar` (el que no lleva "sources" en el nombre)
|
||||
|
||||
## uso
|
||||
|
||||
|
||||
+15
-25
@@ -1,6 +1,6 @@
|
||||
plugins {
|
||||
id 'fabric-loom' version "${loom_version}"
|
||||
id 'maven-publish'
|
||||
id 'fabric-loom' version "${loom_version}"
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
version = project.mod_version
|
||||
@@ -11,25 +11,25 @@ base {
|
||||
}
|
||||
|
||||
repositories {
|
||||
// Add repositories to retrieve artifacts from in here.
|
||||
// You should only use this when depending on other mods because
|
||||
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
|
||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
|
||||
// for more information about repositories.
|
||||
maven {
|
||||
name = "FDD Maven"
|
||||
url = "https://maven.firstdark.dev/releases"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// To change the versions see the gradle.properties file
|
||||
// mc
|
||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||
|
||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
|
||||
|
||||
|
||||
// otros
|
||||
include(modImplementation "dev.firstdark.discordrpc:discord-rpc:1.0.3")
|
||||
}
|
||||
|
||||
loom {
|
||||
accessWidenerPath = file("src/main/resources/camtweaks.accesswidener")
|
||||
accessWidenerPath = file("src/main/resources/sputnik.accesswidener")
|
||||
}
|
||||
|
||||
processResources {
|
||||
@@ -45,11 +45,6 @@ tasks.withType(JavaCompile).configureEach {
|
||||
}
|
||||
|
||||
java {
|
||||
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
||||
// if it is present.
|
||||
// If you remove this line, sources will not be generated.
|
||||
withSourcesJar()
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
}
|
||||
@@ -58,11 +53,12 @@ jar {
|
||||
inputs.property "archivesName", project.base.archivesName
|
||||
|
||||
from("LICENSE") {
|
||||
rename { "${it}_${inputs.properties.archivesName}"}
|
||||
rename {
|
||||
"${it}_${inputs.properties.archivesName}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// configure the maven publication
|
||||
publishing {
|
||||
publications {
|
||||
create("mavenJava", MavenPublication) {
|
||||
@@ -71,11 +67,5 @@ publishing {
|
||||
}
|
||||
}
|
||||
|
||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
||||
repositories {
|
||||
// Add repositories to publish to here.
|
||||
// Notice: This block does NOT have the same function as the block in the top level.
|
||||
// The repositories here will be used for publishing your artifact, not for
|
||||
// retrieving dependencies.
|
||||
}
|
||||
repositories {}
|
||||
}
|
||||
+14
-10
@@ -1,25 +1,29 @@
|
||||
# v2.2
|
||||
# v2.9
|
||||
|
||||
## novedades
|
||||
|
||||
- elementos del hud con imágenes
|
||||
varios módulos que no quería añadir porque son cheats en toda regla, pero ya total, como la mayoría que he añadido hasta la fecha es baneable
|
||||
|
||||
### adiciones
|
||||
|
||||
- elementos del hud de dinosaurios (autismaxxing), echest (items del echest) y totems (totems restantes en el inventario)
|
||||
- categoría de movimiento
|
||||
|
||||
#### módulos nuevos:
|
||||
|
||||
- conejo: haz el elytra-bounce más fácilmente
|
||||
- packetmine: mina usando paquetes, para minar más rápido o para evitar la animación de minado
|
||||
- aliviar cpu: evita renderizar objetos en pantalla si la ventana no está seleccionada
|
||||
- delfín: *ruidos de delfín*
|
||||
- patinaje: esparce semen allá por donde pisas (haciéndolo más resbaladizo)
|
||||
- jesús: hermano se cree Jesús (camina sobre el agua)
|
||||
- info. de bloque: (muestra el contenido nbt de un bloque)
|
||||
- estampaescrotos: mazo en esteroides
|
||||
- tenedor mágico: hermano se cree Poseidón (tweaks a la propulsión acuática del tridente)
|
||||
- elytras: vuela con las elytras (en vez de solo planear)
|
||||
- barco volador: convierte tu bote de acacia en un caza militar
|
||||
|
||||
### arreglos / mejoras
|
||||
|
||||
- ya no te puedes mover con una interfaz abierta en modo cámara libre
|
||||
- minar sin interrupción ya va
|
||||
- destello de enchants ya funciona
|
||||
- ahora no siempre se verá a traves de paredes al renderizar (ej.: superposición de luz)
|
||||
- el renderizado de líneas ya se adapta bien a la posición de la cámara
|
||||
- la superposición de daño ya funciona
|
||||
- ahora puedes cambiar el título de la ventana en los ajustes del mod
|
||||
|
||||
## problemas reconocidos
|
||||
|
||||
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
org.gradle.jvmargs=-Xmx1G
|
||||
org.gradle.jvmargs=-Xmx2G
|
||||
org.gradle.parallel=true
|
||||
|
||||
minecraft_version=1.21.11
|
||||
@@ -8,6 +8,6 @@ loom_version=1.13-SNAPSHOT
|
||||
|
||||
fabric_api_version=0.140.2+1.21.11
|
||||
|
||||
mod_version=2.2
|
||||
mod_version=2.9
|
||||
maven_group=me.retucio
|
||||
archives_base_name=camtweaks
|
||||
archives_base_name=sputnik
|
||||
@@ -1,9 +0,0 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ChunkOcclusionDataBuilderMixin#onChunkOcclusion
|
||||
*/
|
||||
public class ChunkOcclusionEvent extends Event {}
|
||||
@@ -1,12 +0,0 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onStop
|
||||
*/
|
||||
public class ShutdownEvent extends Event {
|
||||
|
||||
public ShutdownEvent() {}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onTickPre
|
||||
* @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onTickPost
|
||||
*/
|
||||
public class TickEvent {
|
||||
|
||||
public static class Pre extends Event {}
|
||||
public static class Post extends Event {}
|
||||
}
|
||||
@@ -1,117 +0,0 @@
|
||||
package me.retucio.camtweaks.module;
|
||||
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.module.modules.camera.*;
|
||||
import me.retucio.camtweaks.module.modules.client.HUD;
|
||||
import me.retucio.camtweaks.module.modules.misc.*;
|
||||
import me.retucio.camtweaks.module.modules.network.*;
|
||||
import me.retucio.camtweaks.module.modules.player.*;
|
||||
import me.retucio.camtweaks.module.modules.render.*;
|
||||
import me.retucio.camtweaks.module.modules.render.CritsPlus;
|
||||
import me.retucio.camtweaks.module.modules.world.*;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
// donde se registran los módulos, y los "listeners" de eventos en cada módulo que lo necesite
|
||||
public class ModuleManager {
|
||||
|
||||
public static ModuleManager INSTANCE;
|
||||
|
||||
private final List<Module> modules = new ArrayList<>();
|
||||
|
||||
public ModuleManager() {
|
||||
addModules();
|
||||
}
|
||||
|
||||
// por orden alfabético y todo, flipas
|
||||
private void addModules() {
|
||||
modules.add(new AntiInvis());
|
||||
modules.add(new AnvilFont());
|
||||
modules.add(new AttributeSwapper());
|
||||
modules.add(new AutoSign());
|
||||
modules.add(new BlockESP());
|
||||
modules.add(new BlockOutline());
|
||||
modules.add(new BossbarStack());
|
||||
modules.add(new BreakingProgress());
|
||||
modules.add(new BungeecordSpoofer());
|
||||
modules.add(new ChatPlus());
|
||||
modules.add(new ColoredSigns());
|
||||
modules.add(new CritsPlus());
|
||||
modules.add(new DamageOverlay());
|
||||
modules.add(new ElytraBounce());
|
||||
modules.add(new FakePlayer());
|
||||
modules.add(new FastUse());
|
||||
modules.add(new Freecam());
|
||||
modules.add(new Freelook());
|
||||
modules.add(new Fullbright());
|
||||
modules.add(new GlintPlus());
|
||||
modules.add(new HandView());
|
||||
modules.add(new Headhitters());
|
||||
modules.add(new HUD());
|
||||
modules.add(new InventoryPlus());
|
||||
modules.add(new LightOverlay());
|
||||
modules.add(new LogoutSpots());
|
||||
modules.add(new Nametags());
|
||||
modules.add(new NoMiningInterruptions());
|
||||
modules.add(new NoRender());
|
||||
modules.add(new Offhand());
|
||||
modules.add(new PacketDelay());
|
||||
modules.add(new PerspectivePlus());
|
||||
modules.add(new PortalGUI());
|
||||
modules.add(new Racist());
|
||||
modules.add(new Reconnect());
|
||||
modules.add(new Rotations());
|
||||
modules.add(new RPackBypass());
|
||||
modules.add(new SafeWalk());
|
||||
modules.add(new ScreenshotPlus());
|
||||
modules.add(new ShulkerPeek());
|
||||
modules.add(new TimeChanger());
|
||||
modules.add(new UIMove());
|
||||
modules.add(new WarnLowDurability());
|
||||
modules.add(new Zoom());
|
||||
|
||||
modules.sort(Comparator.comparing(module -> module.getName().toLowerCase()));
|
||||
|
||||
// registrar los "listeners" necesarios
|
||||
for (Module module : getEnabledModules()) {
|
||||
for (Method method : module.getClass().getDeclaredMethods()) {
|
||||
if (method.isAnnotationPresent(SubscribeEvent.class)) {
|
||||
CameraTweaks.EVENT_BUS.register(module);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// para obtener módulos más fácilmente (por nombre, clase, o la lista completa)
|
||||
public List<Module> getModules() {
|
||||
return modules;
|
||||
}
|
||||
|
||||
public List<Module> getEnabledModules() {
|
||||
List<Module> enabledModules = new ArrayList<>();
|
||||
for (Module module : modules)
|
||||
if (module.isEnabled()) enabledModules.add(module);
|
||||
|
||||
return enabledModules;
|
||||
}
|
||||
|
||||
public Module getModuleByName(String name) {
|
||||
for (Module module : modules)
|
||||
if (module.getName().equalsIgnoreCase(name)) return module;
|
||||
return null;
|
||||
}
|
||||
|
||||
public <T extends Module> T getModuleByClass(Class<T> clazz) {
|
||||
for (Module module : modules)
|
||||
if (clazz.isInstance(module))
|
||||
return clazz.cast(module);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.camera;
|
||||
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.ChangeRotationEvent;
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
|
||||
|
||||
public class Rotations extends Module {
|
||||
|
||||
public NumberSetting yaw = addSetting(new NumberSetting("guiñada", "eje vertical - giro horizontal (yaw)", 0, -180, 180, 1));
|
||||
public NumberSetting pitch = addSetting(new NumberSetting("cabeceo", "eje horizontal - giro vertical (pitch)", 0, -90, 90, 1));
|
||||
|
||||
public BooleanSetting smooth = addSetting(new BooleanSetting("evitar movimiento", "cancela todo movimiento de la cámara", false));
|
||||
public BooleanSetting serverSide = addSetting(new BooleanSetting("serverside", "espamea paquetes de rotación al servidor", false));
|
||||
|
||||
public Rotations() {
|
||||
super("rotaciones",
|
||||
"te permite forzar una rotación específica",
|
||||
Category.CAMERA);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null) return;
|
||||
|
||||
mc.player.setYaw(yaw.getFloatValue());
|
||||
mc.player.setPitch(pitch.getFloatValue());
|
||||
|
||||
if (serverSide.isEnabled())
|
||||
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(
|
||||
yaw.getFloatValue(), pitch.getFloatValue(), mc.player.isOnGround(), mc.player.horizontalCollision));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onChangeRotation(ChangeRotationEvent event) {
|
||||
if (smooth.isEnabled()
|
||||
&& (event.getYaw() != yaw.getFloatValue() || event.getPitch() != pitch.getFloatValue())){
|
||||
event.cancel();
|
||||
}}
|
||||
|
||||
}
|
||||
@@ -1,105 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.camera;
|
||||
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.GetFOVEvent;
|
||||
import me.retucio.camtweaks.event.events.MouseScrollEvent;
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.KeySetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
import me.retucio.camtweaks.util.KeyUtil;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
// continúa en GameRendererMixin
|
||||
public class Zoom extends Module {
|
||||
|
||||
public BooleanSetting showHands = addSetting(new BooleanSetting("mostrar manos", "esconde o muestra las manos al hacer zoom", true));
|
||||
public BooleanSetting showHUD = addSetting(new BooleanSetting("mostrar HUD", "esconde o muestra los indicadores en pantalla", true));
|
||||
|
||||
public NumberSetting scrollSens = addSetting(new NumberSetting("sensibilidad del scroll", "sensibilidad de la rueda del ratón (0 para desactivar)",
|
||||
0.4, 0, 8, 0.1));
|
||||
|
||||
public KeySetting scrollKey = addSetting(new KeySetting("tecla del scroll", "qué tecla mantener para usar la rueda del ratón", GLFW.GLFW_KEY_LEFT_CONTROL));
|
||||
|
||||
public NumberSetting defaultZoom = addSetting(new NumberSetting("zoom", "cantidad de zoom",
|
||||
6, 1, 10, 0.1));
|
||||
|
||||
public NumberSetting mouseSensMultiplier = addSetting(new NumberSetting("sensibilidad", "multiplicador de la sensibilidad del ratón",
|
||||
0.4, 0, 1, 0.05));
|
||||
|
||||
public BooleanSetting smoothCam = addSetting(new BooleanSetting("cámara cinemática", "usa la cámara cinemática mientras hagas zoom", false));
|
||||
|
||||
private boolean prevSmoothCam;
|
||||
private double prevMouseSens;
|
||||
private double prevFov;
|
||||
private boolean prevHUD;
|
||||
private double value;
|
||||
|
||||
public Zoom() {
|
||||
super("zoom",
|
||||
"lupa",
|
||||
Category.CAMERA,
|
||||
GLFW.GLFW_KEY_F);
|
||||
|
||||
keyMode.setDefaultValue(KeyModes.HOLD);
|
||||
keyMode.setValue(KeyModes.HOLD);
|
||||
|
||||
notify.setDefaultValue(false);
|
||||
notify.setEnabled(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
if (mc.options == null) return;
|
||||
|
||||
prevSmoothCam = mc.options.smoothCameraEnabled;
|
||||
prevMouseSens = mc.options.getMouseSensitivity().getValue();
|
||||
prevFov = mc.options.getFov().getValue();
|
||||
prevHUD = mc.options.hudHidden;
|
||||
mc.options.hudHidden = !showHUD.isEnabled();
|
||||
|
||||
value = defaultZoom.getValue();
|
||||
|
||||
super.onEnable();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
if (mc.options == null) return;
|
||||
|
||||
mc.options.smoothCameraEnabled = prevSmoothCam;
|
||||
mc.options.getMouseSensitivity().setValue(prevMouseSens);
|
||||
mc.options.hudHidden = prevHUD;
|
||||
|
||||
mc.worldRenderer.scheduleTerrainUpdate();
|
||||
|
||||
super.onDisable();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
mc.options.smoothCameraEnabled = smoothCam.isEnabled();
|
||||
if (!smoothCam.isEnabled())
|
||||
mc.options.getMouseSensitivity().setValue(prevMouseSens * mouseSensMultiplier.getValue());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
private void onMouseScroll(MouseScrollEvent event) {
|
||||
boolean key = scrollKey.getKey() == GLFW.GLFW_KEY_UNKNOWN || KeyUtil.isKeyDown(scrollKey.getKey());
|
||||
if (isEnabled() && scrollSens.getValue() > 0 && key) {
|
||||
value += event.getVertical() * 0.25 * (scrollSens.getValue() * value);
|
||||
if (value < 1) value = 1;
|
||||
|
||||
event.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
private void onGetFov(GetFOVEvent event) {
|
||||
event.setFov((float) (event.getFov() / value));
|
||||
|
||||
if (prevFov != event.getFov()) mc.worldRenderer.scheduleTerrainUpdate();
|
||||
prevFov = event.getFov();
|
||||
}
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.client;
|
||||
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.command.CommandManager;
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.TickEvent;
|
||||
import me.retucio.camtweaks.event.events.camtweaks.LoadClickGUIEvent;
|
||||
import me.retucio.camtweaks.event.events.camtweaks.LoadCommandManagerEvent;
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.camtweaks.module.modules.misc.ChatPlus;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.ColorSetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
import me.retucio.camtweaks.module.settings.StringSetting;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.camtweaks.util.Colors;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
// módulo no visible solo para los ajustes de la interfaz (y del cliente en general)
|
||||
public class GUI extends Module {
|
||||
|
||||
public ColorSetting color = addSetting(new ColorSetting("color", "color principal de la interfaz y el mod",
|
||||
new Color(70, 20, 210, 230), false));
|
||||
|
||||
// números negativos para deslizamiento inverso, 0 para desactivar
|
||||
public NumberSetting scrollSens = addSetting(new NumberSetting("sensibilidad del scroll", "qué tan sensible es la interfaz a la rueda del ratón",
|
||||
5, -15, 15, 0.5));
|
||||
public BooleanSetting scrollBar = addSetting(new BooleanSetting("barra de desplazamiento", "renderizar una barra de desplazamiento a la derecha de la interfaz", true));
|
||||
|
||||
public BooleanSetting searchBar = addSetting(new BooleanSetting("barra de búsqueda", "renderizar una barra de búsqueda que filtra resultados en todos los marcos abiertos", true));
|
||||
public BooleanSetting matchCase = addSetting(new BooleanSetting("distinguir mayúsculas", "la búsqueda es sensible a mayúsculas y minúsculas", false));
|
||||
// ^^^ no sé de qué sirve porque está todo en minúsculas pero bueno
|
||||
|
||||
public BooleanSetting blur = addSetting(new BooleanSetting("desenfoque", "desenfocar el fondo mientras la interfaz está abierta", true));
|
||||
public StringSetting watermark = addSetting(new StringSetting("marca de agua", "marca de agua para interfaces (dejar vacío para desactivar)", CameraTweaks.getVersionName(), 40));
|
||||
|
||||
public StringSetting commandPrefix = addSetting(new StringSetting("prefijo", "prefijo de los comandos", "$", 10));
|
||||
public StringSetting chatName = addSetting(new StringSetting("nombre", "qué nombre usar en notificaciones por el chat", "smegma", 20));
|
||||
|
||||
public BooleanSetting multipleKeybinds = addSetting(new BooleanSetting("teclas multimódulo", "permitir asignar la misma tecla a más de un módulo", false));
|
||||
|
||||
public GUI() {
|
||||
super("interfaz",
|
||||
"ajustes de la interfaz, y otros misceláneos",
|
||||
Category.CLIENT,
|
||||
GLFW.GLFW_KEY_RIGHT_SHIFT);
|
||||
|
||||
CameraTweaks.EVENT_BUS.register(this);
|
||||
keyMode.setVisible(false);
|
||||
notify.setVisible(false);
|
||||
searchBar.onUpdate(v -> matchCase.setVisible(v));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onLoadCommandManager(LoadCommandManagerEvent event) {
|
||||
commandPrefix.onUpdate(CommandManager.INSTANCE::setPrefix);
|
||||
commandPrefix.setDefaultValue(CommandManager.INSTANCE.getPrefix());
|
||||
|
||||
chatName.onUpdate(name -> {
|
||||
ChatUtil.updatePrefix(name);
|
||||
ModuleManager.INSTANCE.getModuleByClass(ChatPlus.class).updateClientName();
|
||||
});
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onLoadClickGUI(LoadClickGUIEvent event) {
|
||||
color.onUpdate(v -> {
|
||||
Colors.red = color.getR();
|
||||
Colors.green = color.getG();
|
||||
Colors.blue = color.getB();
|
||||
Colors.alpha = color.getA();
|
||||
Colors.updateAllColors(new Color(Colors.red, Colors.green, Colors.blue, Colors.alpha));
|
||||
});
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onTick(TickEvent.Post event) {
|
||||
if (color.isRainbow()) {
|
||||
Colors.red = color.getR();
|
||||
Colors.green = color.getG();
|
||||
Colors.blue = color.getB();
|
||||
Colors.updateAllColors(new Color(Colors.red, Colors.green, Colors.blue, Colors.alpha));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.client;
|
||||
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.*;
|
||||
import me.retucio.camtweaks.ui.hud.HudElement;
|
||||
import me.retucio.camtweaks.ui.hud.HudRenderer;
|
||||
import me.retucio.camtweaks.ui.hud.HudEditorScreen;
|
||||
import me.retucio.camtweaks.ui.hud.elements.DynoElement;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/** lógica del HUD manejada en:
|
||||
* @see HudRenderer
|
||||
* @see HudElement
|
||||
* @see HudEditorScreen
|
||||
*/
|
||||
|
||||
public class HUD extends Module {
|
||||
|
||||
// editor
|
||||
public KeySetting editorKey = addSetting(new KeySetting("tecla del editor", "tecla asignada al editor de elementos del hud", GLFW.GLFW_KEY_PAGE_UP));
|
||||
|
||||
// ajustes
|
||||
public ColorSetting color = addSetting(new ColorSetting("color", "color del texto de los elementos del HUD",
|
||||
new Color(255, 255, 255, 255), false));
|
||||
public BooleanSetting showOnF3 = addSetting(new BooleanSetting("mostrar en F3", "renderizar HUD en el menú de debug", false));
|
||||
public BooleanSetting showOnChat = addSetting(new BooleanSetting("mostrar en chat", "renderizar HUD en la pantalla del chat", false));
|
||||
|
||||
public BooleanSetting shadow = addSetting(new BooleanSetting("sombra", "texto con sombra", true));
|
||||
public NumberSetting timezone = addSetting(new NumberSetting("zona horaria", "zona horaria en UTC+n", 1, -6, 6, 1));
|
||||
public EnumSetting<TimeFormat> timeFormat = addSetting(new EnumSetting<>("formato de la hora", "12h o 24h", TimeFormat.class, TimeFormat.TWENTY_FOUR_HOUR));
|
||||
public StringSetting customText = addSetting(new StringSetting("texto custom", "marca de agua (dejar vacío para quitar)", "adolf jitler inshtagram feishbuc twiter", 40));
|
||||
public EnumSetting<CoordsMode> coordsMode = addSetting(new EnumSetting<>("modo de coordenadas", "qué coordenadas mostrar", CoordsMode.class, CoordsMode.OVERWORLD));
|
||||
public EnumSetting<Dynosaurs> dyno = addSetting(new EnumSetting<>("dinosaurio", "qué dinosaurio mostrar",
|
||||
Dynosaurs.class, Dynosaurs.SPINOSAURUS));
|
||||
|
||||
public HUD() {
|
||||
super("HUD",
|
||||
"superposición de la pantalla con info. adicional",
|
||||
Category.CLIENT,
|
||||
GLFW.GLFW_KEY_F12
|
||||
);
|
||||
|
||||
dyno.onUpdate(v -> {
|
||||
DynoElement element = (DynoElement) HudRenderer.getElement(DynoElement.class);
|
||||
if (element != null) element.reloadTexture();
|
||||
});
|
||||
}
|
||||
|
||||
public enum TimeFormat {
|
||||
TWENTY_FOUR_HOUR("24h"),
|
||||
TWELVE_HOUR("12h");
|
||||
|
||||
final String name;
|
||||
TimeFormat(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
|
||||
public enum CoordsMode {
|
||||
OVERWORLD("superficie"),
|
||||
NETHER("nether"),
|
||||
BOTH("ambas");
|
||||
|
||||
private final String name;
|
||||
CoordsMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
|
||||
public enum Dynosaurs {
|
||||
ANKYLOSAURUS("anquilosaurio"),
|
||||
PTERODACTYL("ptetodáctilo"),
|
||||
SPINOSAURUS("espinosaurio"),
|
||||
TREX("t-rex"),
|
||||
TRICERATOPS("tricerátops"),
|
||||
VELOCIRRAPTOR("velocirráptor");
|
||||
|
||||
private final String name;
|
||||
Dynosaurs(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
public String toRealString() { return super.toString(); }
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.player;
|
||||
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class FastUse extends Module {
|
||||
|
||||
public BooleanSetting items = addSetting(new BooleanSetting("items", "usar items precozmente", true));
|
||||
public NumberSetting itemCooldown = addSetting(new NumberSetting("cooldown de items", "cooldown para usar items en ticks", 0, 0, 4, 1));
|
||||
|
||||
public BooleanSetting blocks = addSetting(new BooleanSetting("bloques", "colocar bloques precozmente", true));
|
||||
public NumberSetting blockCooldown = addSetting(new NumberSetting("cooldown de bloques", "cooldown para colocar bloques en ticks", 0, 0, 4, 1));
|
||||
|
||||
public FastUse() {
|
||||
super("precoz",
|
||||
"hace cosas como usar items o colocar bloques más rápido",
|
||||
Category.PLAYER);
|
||||
|
||||
items.onUpdate(v -> itemCooldown.setVisible(v));
|
||||
blocks.onUpdate(v -> blockCooldown.setVisible(v));
|
||||
}
|
||||
|
||||
public int getCooldown(ItemStack stack) {
|
||||
if (stack.getItem() instanceof BlockItem && blocks.isEnabled()) return blockCooldown.getIntValue();
|
||||
if (items.isEnabled() && !(stack.getItem() instanceof BlockItem)) return itemCooldown.getIntValue();
|
||||
else return 4; // cooldown por defecto, 4 ticks
|
||||
}
|
||||
}
|
||||
@@ -1,134 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.player;
|
||||
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.RenderHeldItemEvent;
|
||||
import me.retucio.camtweaks.event.events.RenderArmEvent;
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.RotationAxis;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
/** continúa en:
|
||||
* @see me.retucio.camtweaks.mixin.HeldItemRendererMixin
|
||||
*/
|
||||
|
||||
public class HandView extends Module {
|
||||
|
||||
// ajustes de animaciones
|
||||
public BooleanSetting oldAnimations = addSetting(new BooleanSetting("animaciones viejas", "como las de la 1.8, al pegar", false));
|
||||
public BooleanSetting skipSwapping = addSetting(new BooleanSetting("no swap", "se salta la animación de cambiar items de mano", false));
|
||||
public BooleanSetting noFood = addSetting(new BooleanSetting("no comer", "no renderiza la animación de comer", false));
|
||||
|
||||
// ajustes de mano principal
|
||||
public NumberSetting scaleMainX = addSetting(new NumberSetting("escala de la mano principal (X)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
public NumberSetting scaleMainY = addSetting(new NumberSetting("escala de la mano principal (Y)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
public NumberSetting scaleMainZ = addSetting(new NumberSetting("escala de la mano principal (Z)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
|
||||
public NumberSetting posMainX = addSetting(new NumberSetting("posición de la mano principal (X)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
public NumberSetting posMainY = addSetting(new NumberSetting("posición de la mano principal (Y)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
public NumberSetting posMainZ = addSetting(new NumberSetting("posición de la mano principal (Z)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
|
||||
public NumberSetting rotMainX = addSetting(new NumberSetting("rotación de la mano principal (X)", ".",
|
||||
0, -180, 180, 1));
|
||||
public NumberSetting rotMainY = addSetting(new NumberSetting("rotación de la mano principal (Y)", ".",
|
||||
0, -180, 180, 1));
|
||||
public NumberSetting rotMainZ = addSetting(new NumberSetting("rotación de la mano principal (Z)", ".",
|
||||
0, -180, 180, 1));
|
||||
|
||||
// ajustes de mano secundaria
|
||||
public NumberSetting scaleOffX = addSetting(new NumberSetting("escala de la mano secundaria (X)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
public NumberSetting scaleOffY = addSetting(new NumberSetting("escala de la mano secundaria (Y)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
public NumberSetting scaleOffZ = addSetting(new NumberSetting("escala de la mano secundaria (Z)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
|
||||
public NumberSetting posOffX = addSetting(new NumberSetting("posición de la mano secundaria (X)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
public NumberSetting posOffY = addSetting(new NumberSetting("posición de la mano secundaria (Y)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
public NumberSetting posOffZ = addSetting(new NumberSetting("posición de la mano secundaria (Z)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
|
||||
public NumberSetting rotOffX = addSetting(new NumberSetting("rotación de la mano secundaria (X)", ".",
|
||||
0, -180, 180, 1));
|
||||
public NumberSetting rotOffY = addSetting(new NumberSetting("rotación de la mano secundaria (Y)", ".",
|
||||
0, -180, 180, 1));
|
||||
public NumberSetting rotOffZ = addSetting(new NumberSetting("rotación de la mano secundaria (Z)", ".",
|
||||
0, -180, 180, 1));
|
||||
|
||||
// brazo
|
||||
public NumberSetting scaleArmX = addSetting(new NumberSetting("escala del brazo (X)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
public NumberSetting scaleArmY = addSetting(new NumberSetting("escala del brazo (Y)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
public NumberSetting scaleArmZ = addSetting(new NumberSetting("escala del brazo (Z)", ".",
|
||||
1, 0.01, 5, 0.1));
|
||||
|
||||
public NumberSetting posArmX = addSetting(new NumberSetting("posición del brazo (X)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
public NumberSetting posArmY = addSetting(new NumberSetting("posición del brazo (Y)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
public NumberSetting posArmZ = addSetting(new NumberSetting("posición del brazo (Z)", ".",
|
||||
0, -3, 3, 0.1));
|
||||
|
||||
public NumberSetting rotArmX = addSetting(new NumberSetting("rotación del brazo (X)", ".",
|
||||
0, -180, 180, 1));
|
||||
public NumberSetting rotArmY = addSetting(new NumberSetting("rotación del brazo (Y)", ".",
|
||||
0, -180, 180, 1));
|
||||
public NumberSetting rotArmZ = addSetting(new NumberSetting("rotación del brazo (Z)", ".",
|
||||
0, -180, 180, 1));
|
||||
|
||||
public HandView() {
|
||||
super("manos",
|
||||
"modifica la manera en la que se renderizan las manos",
|
||||
Category.PLAYER);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onHeldItemRender(RenderHeldItemEvent event) {
|
||||
if (event.getHand() == Hand.MAIN_HAND) {
|
||||
scale(event.getMatrices(), new Vector3d(scaleMainX.getValue(), scaleMainY.getValue(), scaleMainZ.getValue()));
|
||||
translate(event.getMatrices(), new Vector3d(posMainX.getValue(), posMainY.getValue(), posMainZ.getValue()));
|
||||
rotate(event.getMatrices(), new Vector3d(rotMainX.getValue(), rotMainY.getValue(), rotMainZ.getValue()));
|
||||
}
|
||||
else {
|
||||
scale(event.getMatrices(), new Vector3d(scaleOffX.getValue(), scaleOffY.getValue(), scaleOffZ.getValue()));
|
||||
translate(event.getMatrices(), new Vector3d(posOffX.getValue(), posOffY.getValue(), posOffZ.getValue()));
|
||||
rotate(event.getMatrices(), new Vector3d(rotOffX.getValue(), rotOffY.getValue(), rotOffZ.getValue()));
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onRenderArm(RenderArmEvent event) {
|
||||
scale(event.getMatrices(), new Vector3d(scaleArmX.getValue(), scaleArmY.getValue(), scaleArmZ.getValue()));
|
||||
translate(event.getMatrices(), new Vector3d(posArmX.getValue(), posArmY.getValue(), posArmZ.getValue()));
|
||||
rotate(event.getMatrices(), new Vector3d(rotArmX.getValue(), rotArmY.getValue(), rotArmZ.getValue()));
|
||||
}
|
||||
|
||||
private void rotate(MatrixStack matrix, Vector3d rotation) {
|
||||
matrix.multiply(RotationAxis.POSITIVE_X.rotationDegrees((float) rotation.x));
|
||||
matrix.multiply(RotationAxis.POSITIVE_Y.rotationDegrees((float) rotation.y));
|
||||
matrix.multiply(RotationAxis.POSITIVE_Z.rotationDegrees((float) rotation.z));
|
||||
}
|
||||
|
||||
private void scale(MatrixStack matrix, Vector3d scale) {
|
||||
matrix.scale((float) scale.x, (float) scale.y, (float) scale.z);
|
||||
}
|
||||
|
||||
private void translate(MatrixStack matrix, Vector3d translation) {
|
||||
matrix.translate((float) translation.x, (float) translation.y, (float) translation.z);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.render;
|
||||
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.RenderWorldEvent;
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.ColorSetting;
|
||||
import me.retucio.camtweaks.module.settings.ListSetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.camtweaks.util.Colors;
|
||||
import me.retucio.camtweaks.util.Lists;
|
||||
import me.retucio.camtweaks.util.render.RenderUtil;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.render.OverlayTexture;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vec3i;
|
||||
import net.minecraft.util.shape.VoxelShape;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class BlockESP extends Module {
|
||||
|
||||
public ListSetting<Block> blocks = addSetting(new ListSetting<>("bloques", "bloques a resaltar",
|
||||
Lists.blockList, Lists.allFalse(Lists.blockList), Lists.blockNames));
|
||||
|
||||
public NumberSetting radius = addSetting(new NumberSetting("radio", "radio de búsqueda de bloques", 24, 2, 128, 1));
|
||||
|
||||
public BooleanSetting outlines = addSetting(new BooleanSetting("contorno", "renderizar contorno de bloques", true));
|
||||
public ColorSetting outlineColor = addSetting(new ColorSetting("color del contorno", "color del contorno", Colors.CELESTE, false));
|
||||
public NumberSetting lineWidth = addSetting(new NumberSetting("grosor del contorno", "grosor de las líneas del contorno", 1, 1, 5, 0.2));
|
||||
|
||||
public BooleanSetting fillings = addSetting(new BooleanSetting("relleno", "renderizar relleno de bloques", true));
|
||||
public ColorSetting fillingColor = addSetting(new ColorSetting("color del relleno", "color del relleno", new Color(57, 177, 215, 67), false));
|
||||
|
||||
|
||||
public BlockESP() {
|
||||
super("resaltado de bloques",
|
||||
"te muestra la posición de cierto tipo de bloque renderizando una caja con su forma",
|
||||
Category.RENDER);
|
||||
|
||||
outlines.onUpdate(v -> {
|
||||
outlineColor.setVisible(v);
|
||||
lineWidth.setVisible(v);
|
||||
});
|
||||
|
||||
fillings.onUpdate(v -> fillingColor.setVisible(v));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onRenderWorld(RenderWorldEvent event) {
|
||||
if (mc.player == null || mc.world == null) return;
|
||||
|
||||
for (Block block : blocks.getOptions()) {
|
||||
if (blocks.isEnabled(block)) {
|
||||
List<BlockPos> blocksToHighlight = getNearbyBlocks(block);
|
||||
for (BlockPos pos : blocksToHighlight) {
|
||||
if (outlines.isEnabled()) {
|
||||
RenderUtil.drawVoxelShapeOutline(
|
||||
event.getMatrices(),
|
||||
getVoxelShape(pos),
|
||||
pos,
|
||||
outlineColor.getColor(),
|
||||
lineWidth.getFloatValue(),
|
||||
false);
|
||||
}
|
||||
if (fillings.isEnabled()) {
|
||||
RenderUtil.drawVoxelShapeFilled(
|
||||
event.getMatrices(),
|
||||
getVoxelShape(pos),
|
||||
pos,
|
||||
fillingColor.getColor(),
|
||||
false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<BlockPos> getNearbyBlocks(Block block) {
|
||||
List<BlockPos> blockPosList = new ArrayList<>();
|
||||
|
||||
for (int i = -radius.getIntValue(); i < radius.getIntValue(); i++) {
|
||||
for (int j = -radius.getIntValue(); j < radius.getIntValue(); j++) {
|
||||
for (int k = -radius.getIntValue(); k < radius.getIntValue(); k++) {
|
||||
BlockPos pos = mc.player.getBlockPos().add(new Vec3i(i, j, k));
|
||||
if (mc.world.getBlockState(pos).getBlock() == block) {
|
||||
blockPosList.add(pos);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return blockPosList;
|
||||
}
|
||||
|
||||
private VoxelShape getVoxelShape(BlockPos pos) {
|
||||
return mc.world.getBlockState(pos).getOutlineShape(mc.world, pos);
|
||||
}
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.render;
|
||||
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.ColorSetting;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/** continúa en:
|
||||
* @see me.retucio.camtweaks.mixin.WorldRendererMixin
|
||||
*/
|
||||
|
||||
public class BlockOutline extends Module {
|
||||
|
||||
public ColorSetting color = addSetting(new ColorSetting("color", "color del contorno de los bloques",
|
||||
new Color(0, 0, 0, 102), true));
|
||||
|
||||
public BlockOutline() {
|
||||
super("contorno",
|
||||
"customiza el contorno de los bloques",
|
||||
Category.RENDER);
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.render;
|
||||
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.ColorSetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/** continúa en:
|
||||
* @see me.retucio.camtweaks.mixin.DamageParticleMixin
|
||||
* @see me.retucio.camtweaks.mixin.DamageParticleFactoryMixin
|
||||
*/
|
||||
|
||||
public class CritsPlus extends Module {
|
||||
|
||||
public ColorSetting color = addSetting(new ColorSetting("color", "color de las partículas", new Color(0, 0, 255, 255), false));
|
||||
|
||||
public NumberSetting scale = addSetting(new NumberSetting("escala", "tamaño", 1, 0, 2, 0.05));
|
||||
public NumberSetting multiplier; // no sé dónde se calcula cuántas partículas aparecen :/
|
||||
public NumberSetting velocityMultipler = addSetting(new NumberSetting("dispersión", "multiplicador de la velocidad de dispersión", 1, 0, 10, 0.1));
|
||||
public NumberSetting gravity = addSetting(new NumberSetting("gravedad", "multiplicador de fuerza de gravedad", 1, 0, 10, 0.1));
|
||||
public NumberSetting maxAge = addSetting(new NumberSetting("vida máxima", "cuánto persiste la partícula", 10, 0, 50, 1));
|
||||
public BooleanSetting collide = addSetting(new BooleanSetting("colisionar", "colisionar con bloques", false));
|
||||
|
||||
public CritsPlus() {
|
||||
super("críticos",
|
||||
"cambia la apariencia de los críticos al gusto",
|
||||
Category.RENDER);
|
||||
}
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.render;
|
||||
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.EnumSetting;
|
||||
import me.retucio.camtweaks.module.settings.ListSetting;
|
||||
import me.retucio.camtweaks.util.Lists;
|
||||
import net.minecraft.particle.ParticleType;
|
||||
import net.minecraft.util.Formatting;
|
||||
|
||||
/** continúa en:
|
||||
* @see me.retucio.camtweaks.mixin.ClientPlayNetworkHandlerMixin
|
||||
* @see me.retucio.camtweaks.mixin.FogRendererMixin
|
||||
* @see me.retucio.camtweaks.mixin.GameRendererMixin
|
||||
* @see me.retucio.camtweaks.mixin.InGameHudMixin
|
||||
* @see me.retucio.camtweaks.mixin.InGameOverlayRendererMixin
|
||||
* @see me.retucio.camtweaks.mixin.ParticleManagerMixin
|
||||
* @see me.retucio.camtweaks.mixin.StatusEffectFogModifierMixin
|
||||
* @see me.retucio.camtweaks.mixin.StuckArrowsFeatureRendererMixin
|
||||
* @see me.retucio.camtweaks.mixin.TextRendererDrawerMixin
|
||||
* @see me.retucio.camtweaks.mixin.WeatherRenderingMixin
|
||||
*/
|
||||
|
||||
public class NoRender extends Module {
|
||||
|
||||
public BooleanSetting spyglassOverlay = addSetting(new BooleanSetting("catalejo", "renderizar overlay del catalejo", false));
|
||||
public BooleanSetting fluidOverlay = addSetting(new BooleanSetting("fluídos", "renderizar fluídos sobre la cámara como el agua, lava o nieve en polvo (aunque no sea un fluído)", false));
|
||||
public BooleanSetting pumpkinOverlay = addSetting(new BooleanSetting("calabaza", "renderiza el overlay de la calabaza tallada", false));
|
||||
public BooleanSetting fireOverlay = addSetting(new BooleanSetting("fuego", "renderizar llamas sobre la cámara", false));
|
||||
public BooleanSetting portalOverlay = addSetting(new BooleanSetting("portal", "renderizar el overlay del portal del nether", false));
|
||||
|
||||
public BooleanSetting rain = addSetting(new BooleanSetting("lluvia", "l l u v i a", true));
|
||||
public BooleanSetting snow = addSetting(new BooleanSetting("nieve", "n i e v e", true));
|
||||
public BooleanSetting endFlashes = addSetting(new BooleanSetting("flashes del end", "renderizar los recientemente añadidos flashes en el end", true));
|
||||
|
||||
public ListSetting<ParticleType<?>> particles = addSetting(new ListSetting<>("partículas", "lista de partículas que se renderizan",
|
||||
Lists.particleList, Lists.allTrue(Lists.particleList), Lists.particleNames));
|
||||
|
||||
public BooleanSetting nauseaEffect = addSetting(new BooleanSetting("náusea", "renderizar borrachera", false));
|
||||
public BooleanSetting blindnessEffect = addSetting(new BooleanSetting("ceguera", "renderizar miopía", false));
|
||||
public BooleanSetting darknessEffect = addSetting(new BooleanSetting("oscuridad", "renderizar miedo a la oscuridad", false));
|
||||
|
||||
public BooleanSetting scoreboard = addSetting(new BooleanSetting("marcador", "mostrar marcador a la derecha", false));
|
||||
public BooleanSetting titles = addSetting(new BooleanSetting("títulos", "mostrar títulos (del comando /title)", false));
|
||||
public BooleanSetting totemPop = addSetting(new BooleanSetting("tótem", "renderizar el pop del tótem", true));
|
||||
|
||||
public BooleanSetting stuckArrows = addSetting(new BooleanSetting("flechas clavadas", "renderizar flechas clavadas en jugadores", false));
|
||||
|
||||
public BooleanSetting bold = addSetting(new BooleanSetting("negrita", "letra pero §lgorda", true));
|
||||
// public BooleanSetting italics = addSetting(new BooleanSetting("cursiva", "letra pero §otorcida", true));
|
||||
public BooleanSetting underlined = addSetting(new BooleanSetting("subrayado", "letra pero §nen el suelo", true));
|
||||
public BooleanSetting strikethrough = addSetting(new BooleanSetting("tachado", "letra pero §mdiscriminada", true));
|
||||
public EnumSetting<Colors> color = addSetting(new EnumSetting<>("colores", "§co§4r§6g§eu§al§2l§9o §1g§5a§dy", Colors.class, Colors.DEFAULT));
|
||||
public BooleanSetting scrambledText = addSetting(new BooleanSetting("garabato", "engarabatar texto (o como se diga) (§kasí§r)", false));
|
||||
|
||||
public NoRender() {
|
||||
super("no render",
|
||||
"customiza qué se renderiza y qué no",
|
||||
Category.RENDER);
|
||||
}
|
||||
|
||||
public enum Colors {
|
||||
BLACK("negro"),
|
||||
DARK_BLUE("azul oscuro"),
|
||||
DARK_GREEN("verde"),
|
||||
DARK_AQUA("cian"),
|
||||
DARK_RED("granate"),
|
||||
DARK_PURPLE("morado"),
|
||||
GOLD("naranja"),
|
||||
GRAY("gris claro"),
|
||||
DARK_GRAY("gris oscuro"),
|
||||
BLUE("azul"),
|
||||
GREEN("lima"),
|
||||
AQUA("turquesa"),
|
||||
RED("rojo"),
|
||||
LIGHT_PURPLE("lila"),
|
||||
YELLOW("amarillo"),
|
||||
WHITE("blanco"),
|
||||
DEFAULT("por defecto");
|
||||
|
||||
private final String name;
|
||||
Colors(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
public Formatting toFormatting() { return (Formatting.byColorIndex(this.ordinal())); }
|
||||
}
|
||||
}
|
||||
@@ -1,143 +0,0 @@
|
||||
package me.retucio.camtweaks.module.modules.world;
|
||||
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.RenderWorldEvent;
|
||||
import me.retucio.camtweaks.module.Category;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
||||
import me.retucio.camtweaks.module.settings.ColorSetting;
|
||||
import me.retucio.camtweaks.module.settings.NumberSetting;
|
||||
import me.retucio.camtweaks.util.render.RenderUtil;
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.world.LightType;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class LightOverlay extends Module {
|
||||
|
||||
public NumberSetting radius = addSetting(new NumberSetting("radio", "radio a tener en cuenta al renderizar superposición",
|
||||
16, 5, 128, 1));
|
||||
public NumberSetting yRadius = addSetting(new NumberSetting("rango vertical", "distancia vertical a tener en cuenta",
|
||||
4, 1, 16, 1));
|
||||
|
||||
public NumberSetting interval = addSetting(new NumberSetting("intervalo", "cada cuántos ticks comprobar el nivel de luz",
|
||||
10, 1, 80, 1));
|
||||
|
||||
public ColorSetting lightColor = addSetting(new ColorSetting("color de la luz", "color de los bloques con luz",
|
||||
new Color(0, 255, 0, 67), false));
|
||||
public ColorSetting darknessColor = addSetting(new ColorSetting("color de oscuridad", "color de bloques con 0 luz",
|
||||
new Color(255, 0, 0, 67), false));
|
||||
|
||||
public BooleanSetting onWater = addSetting(new BooleanSetting("en agua", "mostrar también bloques cubiertos en agua", true));
|
||||
|
||||
List<BlockPos> blocks = new ArrayList<>();
|
||||
|
||||
public LightOverlay() {
|
||||
super("superposición de luz",
|
||||
"te muestra el nivel de luz en bloques, para prevenir mob spawns",
|
||||
Category.WORLD);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onRenderWorld(RenderWorldEvent event) {
|
||||
if (mc.player == null || mc.world == null) return;
|
||||
if (mc.player.age % interval.getIntValue() == 0) {
|
||||
blocks = findExposedBlocks(
|
||||
radius.getIntValue(),
|
||||
yRadius.getIntValue()
|
||||
);
|
||||
}
|
||||
|
||||
for (BlockPos block : blocks) {
|
||||
if (mc.world.getBlockState(block).isAir() || !canSpawnOn(block)) continue;
|
||||
if (!mc.world.getBlockState(block).isOpaque()) continue;
|
||||
int light = mc.world.getLightLevel(LightType.BLOCK, block.up());
|
||||
|
||||
Color color = light == 0 ? darknessColor.getColor()
|
||||
: new Color(
|
||||
(lightColor.getR() / 15) * light,
|
||||
(lightColor.getG() / 15) * light,
|
||||
(lightColor.getB() / 15) * light,
|
||||
lightColor.getA());
|
||||
|
||||
RenderUtil.drawBlockFaceFilled(event.getMatrices(), block, Direction.UP, color, 0.001f, true);
|
||||
}
|
||||
}
|
||||
|
||||
private List<BlockPos> findExposedBlocks(int radius, int yRadius) {
|
||||
List<BlockPos> results = new ArrayList<>();
|
||||
|
||||
BlockPos pos = mc.player.getBlockPos();
|
||||
|
||||
int minX = pos.getX() - radius;
|
||||
int maxX = pos.getX() + radius;
|
||||
int minY = Math.max(mc.world.getDimension().minY(), pos.getY() - yRadius);
|
||||
int maxY = Math.min(mc.world.getDimension().height() - 1, pos.getY() + yRadius);
|
||||
int minZ = pos.getZ() - radius;
|
||||
int maxZ = pos.getZ() + radius;
|
||||
|
||||
maxY = Math.min(maxY, mc.world.getDimension().height() - 2);
|
||||
|
||||
for (int x = minX; x <= maxX; x++) {
|
||||
for (int z = minZ; z <= maxZ; z++) {
|
||||
for (int y = minY; y <= maxY; y++) {
|
||||
BlockPos current = new BlockPos(x, y, z);
|
||||
|
||||
if (!mc.world.isAir(current) && canSpawnOn(current))
|
||||
results.add(current);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
private boolean canSpawnOn(BlockPos pos) {
|
||||
BlockState aboveState = mc.world.getBlockState(pos.up());
|
||||
Block aboveBlock = aboveState.getBlock();
|
||||
|
||||
if (aboveState.isAir()) return true;
|
||||
if (aboveBlock == Blocks.WATER && onWater.isEnabled()) return true;
|
||||
|
||||
if (aboveBlock instanceof PlantBlock) return true;
|
||||
|
||||
if (!aboveState.isOpaque() && !aboveState.isFullCube(mc.world, pos.up())) {
|
||||
|
||||
if (aboveBlock instanceof SlabBlock
|
||||
|| aboveBlock instanceof StairsBlock
|
||||
|| aboveBlock instanceof ButtonBlock
|
||||
|| aboveBlock instanceof CarpetBlock
|
||||
|| aboveBlock instanceof PressurePlateBlock
|
||||
|| aboveBlock instanceof PaneBlock
|
||||
|| aboveBlock instanceof TrapdoorBlock
|
||||
|| aboveBlock instanceof FenceBlock
|
||||
|| aboveBlock instanceof WallBlock
|
||||
|| aboveBlock instanceof AnvilBlock
|
||||
|| aboveBlock instanceof BedBlock) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (aboveBlock == Blocks.CHEST ||
|
||||
aboveBlock == Blocks.ENDER_CHEST ||
|
||||
aboveBlock == Blocks.BARREL ||
|
||||
aboveBlock == Blocks.TRAPPED_CHEST) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return aboveBlock != Blocks.ENCHANTING_TABLE
|
||||
&& aboveBlock != Blocks.GRINDSTONE
|
||||
&& aboveBlock != Blocks.STONECUTTER
|
||||
&& aboveBlock != Blocks.LOOM
|
||||
&& aboveBlock != Blocks.COMPOSTER
|
||||
&& aboveBlock != Blocks.CAKE;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package me.retucio.camtweaks.module.settings;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
// ajuste booleano, es decir, o se encuentra encencido o apagado (similar a un interruptor)
|
||||
public class BooleanSetting extends Setting {
|
||||
|
||||
private boolean defaultValue;
|
||||
private boolean enabled;
|
||||
|
||||
private Consumer<Boolean> updateListener;
|
||||
|
||||
public BooleanSetting(String name, String description, boolean defaultValue) {
|
||||
super(name, description);
|
||||
this.enabled = defaultValue;
|
||||
this.defaultValue = defaultValue;
|
||||
}
|
||||
|
||||
public void toggle() {
|
||||
setEnabled(!enabled);
|
||||
if (updateListener != null) updateListener.accept(enabled);
|
||||
}
|
||||
|
||||
public boolean isEnabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public void setEnabled(boolean enabled) {
|
||||
if (this.enabled != enabled) {
|
||||
this.enabled = enabled;
|
||||
fireUpdateEvent();
|
||||
if (updateListener != null) updateListener.accept(enabled);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
public void setDefaultValue(boolean value) {
|
||||
defaultValue = value;
|
||||
}
|
||||
|
||||
public void reset() {
|
||||
setEnabled(defaultValue);
|
||||
}
|
||||
|
||||
public void onUpdate(Consumer<Boolean> listener) {
|
||||
this.updateListener = listener;
|
||||
if (updateListener != null) updateListener.accept(enabled); // actualizar por primera vez
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package me.retucio.camtweaks.module.settings;
|
||||
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.camtweaks.util.KeyUtil;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class KeySetting extends Setting {
|
||||
|
||||
private int key;
|
||||
private int defaultKey;
|
||||
|
||||
private Consumer<Integer> updateListener;
|
||||
|
||||
public KeySetting(String name, String description, int defaultKey) {
|
||||
super(name, description);
|
||||
this.key = defaultKey;
|
||||
this.defaultKey = defaultKey;
|
||||
}
|
||||
|
||||
public int getKey() {
|
||||
return key;
|
||||
}
|
||||
|
||||
public void setKey(int key) {
|
||||
if (this.key == key) return;
|
||||
|
||||
if (key == GLFW.GLFW_KEY_ESCAPE) {
|
||||
this.key = GLFW.GLFW_KEY_UNKNOWN; // asignar la tecla ESC a deshabilitar la tecla
|
||||
fireUpdateEvent();
|
||||
if (updateListener != null) updateListener.accept(key);
|
||||
return;
|
||||
}
|
||||
|
||||
if (ModuleManager.INSTANCE != null) {
|
||||
for (Module module : ModuleManager.INSTANCE.getModules())
|
||||
if (module.getKey() == key && !ClientSettingsFrame.guiSettings.multipleKeybinds.isEnabled() && key != -1) {
|
||||
module.setKey(-1);
|
||||
ChatUtil.info("tecla del módulo " + module.getName() + " restablecida");
|
||||
}
|
||||
}
|
||||
this.key = key;
|
||||
|
||||
fireUpdateEvent();
|
||||
if (updateListener != null) updateListener.accept(key);
|
||||
}
|
||||
|
||||
public int getDefaultKey() {
|
||||
return defaultKey;
|
||||
}
|
||||
|
||||
public void setDefaultKey(int key) {
|
||||
this.defaultKey = key;
|
||||
}
|
||||
|
||||
public String getKeyName() {
|
||||
return KeyUtil.getKeyName(key);
|
||||
}
|
||||
|
||||
public void reset() {
|
||||
setKey(defaultKey);
|
||||
}
|
||||
|
||||
public void onUpdate(Consumer<Integer> listener) {
|
||||
this.updateListener = listener;
|
||||
if (updateListener != null) updateListener.accept(key);
|
||||
}
|
||||
}
|
||||
@@ -1,114 +0,0 @@
|
||||
package me.retucio.camtweaks.module.settings;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class ListSetting<T> extends Setting {
|
||||
|
||||
private List<T> options;
|
||||
private Map<T, Boolean> values;
|
||||
private Map<T, Boolean> defaultValues;
|
||||
private Map<T, String> displayNames = null;
|
||||
|
||||
private Consumer<Map<T, Boolean>> updateListener;
|
||||
|
||||
public ListSetting(String name, String description, List<T> options, Map<T, Boolean> initialValues) {
|
||||
super(name, description);
|
||||
this.options = new ArrayList<>(options);
|
||||
this.defaultValues = new HashMap<>();
|
||||
|
||||
for (T option : options) {
|
||||
boolean enabled = initialValues != null && initialValues.getOrDefault(option, false);
|
||||
defaultValues.put(option, enabled);
|
||||
}
|
||||
this.values = new HashMap<>(defaultValues);
|
||||
}
|
||||
|
||||
public ListSetting(String name, String description, List<T> options, Map<T, Boolean> initialValues, Map<T, String> displayNames) {
|
||||
this(name, description, options, initialValues);
|
||||
this.displayNames = displayNames;
|
||||
}
|
||||
|
||||
public boolean isEnabled(T option) {
|
||||
return values.getOrDefault(option, false);
|
||||
}
|
||||
|
||||
public void setEnabled(T option, boolean enabled) {
|
||||
if (values.containsKey(option) && values.get(option) != enabled) {
|
||||
values.put(option, enabled);
|
||||
fireUpdateEvent();
|
||||
if (updateListener != null) updateListener.accept(new HashMap<>(values));
|
||||
}
|
||||
}
|
||||
|
||||
public void toggle(T option) {
|
||||
setEnabled(option, !isEnabled(option));
|
||||
}
|
||||
|
||||
public Map<T, Boolean> getValues() {
|
||||
return new HashMap<>(values);
|
||||
}
|
||||
|
||||
public void setValues(Map<T, Boolean> values) {
|
||||
this.values = new HashMap<>(values);
|
||||
}
|
||||
|
||||
public Map<T, Boolean> getDefaultValues() {
|
||||
return new HashMap<>(defaultValues);
|
||||
}
|
||||
|
||||
public void setDefaultValues(Map<T, Boolean> values) {
|
||||
defaultValues = values;
|
||||
}
|
||||
|
||||
public Map<String, Boolean> getConfigValues() {
|
||||
Map<String, Boolean> configValues = new HashMap<>();
|
||||
for (int i = 0; i < values.size(); i++)
|
||||
configValues.put(getDisplayName(options.get(i)), values.get(options.get(i)));
|
||||
return configValues;
|
||||
}
|
||||
|
||||
public void addOption(T option, boolean value, String displayName) {
|
||||
if (!(this.options instanceof ArrayList))
|
||||
this.options = new ArrayList<>(this.options);
|
||||
|
||||
this.options.add(option);
|
||||
this.values.put(option, value);
|
||||
this.defaultValues.put(option, value);
|
||||
|
||||
if (this.displayNames != null)
|
||||
this.displayNames.put(option, displayName);
|
||||
}
|
||||
|
||||
public void reset() {
|
||||
values.clear();
|
||||
values.putAll(defaultValues);
|
||||
fireUpdateEvent();
|
||||
if (updateListener != null) updateListener.accept(new HashMap<>(values));
|
||||
}
|
||||
|
||||
public void setAll(boolean enabled) {
|
||||
for (T option : options) values.put(option, enabled);
|
||||
}
|
||||
|
||||
public void onUpdate(Consumer<Map<T, Boolean>> listener) {
|
||||
this.updateListener = listener;
|
||||
if (updateListener != null) updateListener.accept(new HashMap<>(values));
|
||||
}
|
||||
|
||||
public List<T> getOptions() {
|
||||
return options;
|
||||
}
|
||||
|
||||
public Map<T, String> getDisplayNames() {
|
||||
return displayNames;
|
||||
}
|
||||
|
||||
public String getDisplayName(T key) {
|
||||
if (displayNames != null) return displayNames.get(key);
|
||||
return key.toString();
|
||||
}
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package me.retucio.camtweaks.module.settings;
|
||||
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.event.events.camtweaks.UpdateSettingEvent;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
|
||||
// base para los tipos de ajustes
|
||||
public abstract class Setting {
|
||||
|
||||
private final String name;
|
||||
private final String description;
|
||||
|
||||
private boolean visible = true;
|
||||
private boolean searchMatch = true;
|
||||
|
||||
private Module module;
|
||||
|
||||
protected Setting(String name, String description) {
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public boolean isVisible() {
|
||||
return visible;
|
||||
}
|
||||
|
||||
public void setVisible(boolean visible) {
|
||||
this.visible = visible;
|
||||
}
|
||||
|
||||
public boolean isSearchMatch() {
|
||||
return searchMatch;
|
||||
}
|
||||
|
||||
public void setSearchMatch(boolean searchMatch) {
|
||||
this.searchMatch = searchMatch;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public Module getModule() {
|
||||
return module;
|
||||
}
|
||||
|
||||
public void setModule(Module module) {
|
||||
this.module = module;
|
||||
}
|
||||
|
||||
public void fireUpdateEvent() {
|
||||
CameraTweaks.EVENT_BUS.post(new UpdateSettingEvent(this, module.shouldSaveSettings()));
|
||||
}
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
package me.retucio.camtweaks.module.settings;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class StringSetting extends Setting {
|
||||
|
||||
private String value;
|
||||
private String defaultValue;
|
||||
private final int maxLength;
|
||||
|
||||
private Consumer<String> updateListener;
|
||||
|
||||
public StringSetting(String name, String description, String defaultValue, int maxLength) {
|
||||
super(name, description);
|
||||
this.value = defaultValue;
|
||||
this.defaultValue = defaultValue;
|
||||
this.maxLength = maxLength;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
if (this.value.equals(value)) return;
|
||||
this.value = value.length() > maxLength ? value.substring(0, maxLength) : value;
|
||||
fireUpdateEvent();
|
||||
if (updateListener != null) updateListener.accept(this.value);
|
||||
}
|
||||
|
||||
public String getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
public void setDefaultValue(String defaultValue) {
|
||||
this.defaultValue = defaultValue;
|
||||
}
|
||||
|
||||
public void reset() {
|
||||
setValue(defaultValue);
|
||||
}
|
||||
|
||||
public int getMaxLength() {
|
||||
return maxLength;
|
||||
}
|
||||
|
||||
public void onUpdate(Consumer<String> listener) {
|
||||
this.updateListener = listener;
|
||||
if (updateListener != null) updateListener.accept(value);
|
||||
}
|
||||
}
|
||||
@@ -1,253 +0,0 @@
|
||||
package me.retucio.camtweaks.ui.widgets.frames;
|
||||
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.event.events.camtweaks.SettingsFrameEvent;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.*;
|
||||
import me.retucio.camtweaks.ui.widgets.buttons.settings.*;
|
||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
||||
import me.retucio.camtweaks.ui.widgets.buttons.*;
|
||||
import me.retucio.camtweaks.ui.widgets.Frame;
|
||||
import me.retucio.camtweaks.util.Colors;
|
||||
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
// marco para los botones de los ajustes de cada módulo
|
||||
public class SettingsFrame extends Frame<SettingButton<? extends Setting>> {
|
||||
|
||||
public Module module;
|
||||
|
||||
public SettingsFrame(Module module, int x, int y, int w, int h) {
|
||||
super("ajustes de " + module.getName(), x, y, w, h);
|
||||
this.module = module;
|
||||
|
||||
// asegurarse de que no se sale de la pantalla
|
||||
if (mc.getWindow() != null) {
|
||||
this.x = Math.clamp(this.x, 0, mc.getWindow().getScaledWidth() - w);
|
||||
this.y = Math.clamp(this.y, 0, mc.getWindow().getScaledHeight() - totalHeight - h);
|
||||
}
|
||||
|
||||
addButtons();
|
||||
|
||||
visibleButtons = buttons.stream()
|
||||
.filter(sb -> sb.getSetting().isVisible())
|
||||
.toList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(DrawContext ctx, int mouseX, int mouseY, float delta) {
|
||||
updateWidth();
|
||||
|
||||
// cabezal
|
||||
int centerX = x + w / 2;
|
||||
int centerY = renderY + h / 2;
|
||||
int titleX = x + 8;
|
||||
int titleY = centerY - mc.textRenderer.fontHeight / 2;
|
||||
|
||||
int headerColor = module.isEnabled()
|
||||
? Colors.enabledToggleButtonColor.getRGB()
|
||||
: Colors.disabledToggleButtonColor.getRGB();
|
||||
|
||||
int closeButtonColor = isCloseButtonHovered(mouseX, mouseY)
|
||||
? Color.RED.getRGB()
|
||||
: -1;
|
||||
|
||||
if (!module.shouldSaveSettings()) headerColor = (int) module.getSettings().stream().filter(s -> ((BooleanSetting) s).isEnabled()).count() > 0
|
||||
? Colors.enabledToggleButtonColor.getRGB()
|
||||
: Colors.disabledToggleButtonColor.getRGB();
|
||||
|
||||
ctx.fill(x, renderY, x + w, renderY + h, headerColor);
|
||||
ctx.drawText(mc.textRenderer, title, titleX, titleY, -1, true);
|
||||
ctx.drawText(mc.textRenderer, "×", x + w - mc.textRenderer.getWidth("×") - 8, titleY, closeButtonColor, true);
|
||||
|
||||
visibleButtons = buttons.stream()
|
||||
.filter(sb -> sb.getSetting().isVisible() && sb.getSetting().isSearchMatch())
|
||||
.toList();
|
||||
|
||||
// descripción
|
||||
List<String> descLines = wrapDescription(module.getDescription(), w - 8);
|
||||
int lineSpacing = 2;
|
||||
|
||||
int descHeight = descLines.size() * mc.textRenderer.fontHeight + (descLines.size() - 1) * lineSpacing;
|
||||
int descBoxTop = renderY + h + 5;
|
||||
int descBoxBottom = descBoxTop + descHeight + 8;
|
||||
|
||||
totalHeight = descHeight + 8 + h * visibleButtons.size() + 4;
|
||||
|
||||
ctx.fill(x, descBoxTop - 4, x + w, descBoxTop + totalHeight, Colors.frameBGColor.getRGB());
|
||||
ctx.fill(x + 4, descBoxTop, x + w - 4, descBoxBottom, Colors.buttonColor.getRGB());
|
||||
|
||||
int firstLineY = descBoxTop + ((descBoxBottom - descBoxTop) - descHeight) / 2;
|
||||
for (int i = 0; i < descLines.size(); i++) {
|
||||
String line = descLines.get(i);
|
||||
int lineX = centerX - mc.textRenderer.getWidth(line) / 2;
|
||||
int lineY = firstLineY + i * (mc.textRenderer.fontHeight + lineSpacing);
|
||||
ctx.drawText(mc.textRenderer, line, lineX, lineY, -1, true);
|
||||
}
|
||||
|
||||
int startButtonY = firstLineY - descBoxTop + descBoxBottom;
|
||||
for (SettingButton<?> sb : visibleButtons) {
|
||||
sb.setX(x + 4);
|
||||
sb.setY(startButtonY);
|
||||
sb.setW(w - 8);
|
||||
sb.setH(h - h / 4);
|
||||
sb.render(ctx, mouseX, mouseY, delta);
|
||||
startButtonY += h;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawTooltips(DrawContext ctx, int mouseX, int mouseY) {
|
||||
for (SettingButton<?> sb : visibleButtons)
|
||||
sb.drawTooltip(ctx, mouseX, mouseY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseClicked(int mouseX, int mouseY, int button) {
|
||||
if (isHovered(mouseX, mouseY) && ClickGUI.INSTANCE.trySelect(this)) {
|
||||
if (isCloseButtonHovered(mouseX, mouseY)) {
|
||||
ClickGUI.INSTANCE.closeSettingsFrame(this.module);
|
||||
return;
|
||||
} if (button == 0) {
|
||||
dragging = true;
|
||||
dragX = mouseX - x;
|
||||
dragY = mouseY - y;
|
||||
} else if (button == 1) {
|
||||
ClickGUI.INSTANCE.closeSettingsFrame(module);
|
||||
}
|
||||
}
|
||||
|
||||
for (SettingButton<?> sb : visibleButtons)
|
||||
sb.mouseClicked(mouseX, mouseY, button);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseReleased(int mouseX, int mouseY, int button) {
|
||||
super.mouseReleased(mouseX, mouseY, button);
|
||||
if (button == 0) {
|
||||
dragging = false;
|
||||
CameraTweaks.EVENT_BUS.post(new SettingsFrameEvent.Move(this));
|
||||
}
|
||||
|
||||
for (SettingButton<?> sb : visibleButtons)
|
||||
sb.mouseReleased(mouseX, mouseY, button);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseDragged(int mouseX, int mouseY) {
|
||||
for (SettingButton<?> sb : visibleButtons)
|
||||
sb.mouseDragged(mouseX, mouseY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onKey(int key, int action) {}
|
||||
|
||||
@Override
|
||||
public void updateWidth() {
|
||||
// asegurarse de que todos los botones caben en el marco, haciendo que la anchura se ajuste al texto más largo
|
||||
if (mc.textRenderer == null) return;
|
||||
|
||||
int maxWidth = mc.textRenderer.getWidth(title);
|
||||
for (SettingButton<?> button : buttons) {
|
||||
String text = button.getSetting().getName();
|
||||
|
||||
switch (button) {
|
||||
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 TextButton textButton -> text += ": " + textButton.getSetting().getValue();
|
||||
default -> {}
|
||||
}
|
||||
|
||||
int textWidth = mc.textRenderer.getWidth(text);
|
||||
maxWidth = Math.max(maxWidth, textWidth);
|
||||
}
|
||||
this.w = maxWidth + 30;
|
||||
}
|
||||
|
||||
public void updatePosition(double mouseX, double mouseY) {
|
||||
if (dragging) {
|
||||
x = (int) (mouseX - dragX);
|
||||
y = (int) (mouseY - dragY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private List<String> wrapDescription(String text, int maxWidth) {
|
||||
List<String> lines = new ArrayList<>();
|
||||
if (mc.textRenderer == null) return lines;
|
||||
|
||||
String[] words = text.split(" ");
|
||||
StringBuilder line = new StringBuilder();
|
||||
|
||||
for (String word : words) {
|
||||
String testLine = line.isEmpty() ? word : line + " " + word;
|
||||
if (mc.textRenderer.getWidth(testLine) > maxWidth - 8) { // padding of 4 each side
|
||||
if (!line.isEmpty()) lines.add(line.toString());
|
||||
line = new StringBuilder(word);
|
||||
} else {
|
||||
line = new StringBuilder(testLine);
|
||||
}
|
||||
}
|
||||
if (!line.isEmpty()) lines.add(line.toString());
|
||||
return lines;
|
||||
}
|
||||
|
||||
private void addButtons() {
|
||||
int offset = h;
|
||||
|
||||
for (Setting setting : module.getSettings()) {
|
||||
switch (setting) {
|
||||
case BooleanSetting b -> {
|
||||
addButton(new ToggleButton(b, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
case NumberSetting n -> {
|
||||
addButton(new SliderButton(n, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
case EnumSetting<?> e -> {
|
||||
addButton(new CycleButton<>(e, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
case KeySetting k -> {
|
||||
addButton(new BindButton(k, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
case StringSetting s -> {
|
||||
addButton(new TextButton(s, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
case ListSetting<?> l -> {
|
||||
addButton(new ListButton<>(l, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
case ColorSetting c -> {
|
||||
addButton(new ColorButton(c, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
case OptionSetting<?> o -> {
|
||||
addButton(new ChooseButton<>(o, this, offset));
|
||||
offset += 18;
|
||||
}
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void addButton(SettingButton<?> button) {
|
||||
buttons.add(button);
|
||||
updateWidth(); // actualizar anchura del frame tras cada iteración
|
||||
}
|
||||
|
||||
protected boolean isCloseButtonHovered(double mouseX, double mouseY) {
|
||||
return mouseX > x + w - mc.textRenderer.getWidth("×") - 12 && mouseX < x + w - 4
|
||||
&& mouseY > renderY + 4 && mouseY < renderY + h - 4;
|
||||
}
|
||||
}
|
||||
@@ -1,103 +0,0 @@
|
||||
package me.retucio.camtweaks.util;
|
||||
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.mixin.accessor.KeyBindingAccessor;
|
||||
import net.minecraft.client.input.KeyInput;
|
||||
import net.minecraft.client.option.KeyBinding;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
||||
|
||||
// cosas útiles relacionadas a las teclas
|
||||
public class KeyUtil {
|
||||
|
||||
public static boolean isKeyDown(int key) {
|
||||
return GLFW.glfwGetKey(
|
||||
mc.getWindow().getHandle(),
|
||||
key) != GLFW.GLFW_RELEASE;
|
||||
}
|
||||
|
||||
public static boolean isKeyDown(KeyBinding key) {
|
||||
return GLFW.glfwGetKey(
|
||||
mc.getWindow().getHandle(),
|
||||
((KeyBindingAccessor) key).getBoundKey().getCode()
|
||||
) != GLFW.GLFW_RELEASE;
|
||||
}
|
||||
|
||||
public static boolean isShiftDown() {
|
||||
return isKeyDown(GLFW.GLFW_KEY_LEFT_SHIFT)
|
||||
|| isKeyDown(GLFW.GLFW_KEY_RIGHT_SHIFT);
|
||||
}
|
||||
|
||||
public static void pressKey(int key, int action) {
|
||||
pressKey(key, action, 0, 0);
|
||||
}
|
||||
|
||||
public static void pressKey(int key, int action, int scancode, int modifiers) {
|
||||
mc.keyboard.onKey(
|
||||
mc.getWindow().getHandle(),
|
||||
action,
|
||||
new KeyInput(key, scancode, modifiers));
|
||||
}
|
||||
|
||||
public static String getKeyName(int key) {
|
||||
if (key == GLFW.GLFW_KEY_UNKNOWN) return "ninguna";
|
||||
|
||||
String name = GLFW.glfwGetKeyName(key, 0);
|
||||
if (name != null) return name.toUpperCase();
|
||||
|
||||
// para teclas especiales
|
||||
return switch (key) {
|
||||
case GLFW.GLFW_KEY_SPACE -> "espacio";
|
||||
case GLFW.GLFW_KEY_LEFT_SHIFT -> "shift izquierdo";
|
||||
case GLFW.GLFW_KEY_RIGHT_SHIFT -> "shift derecho";
|
||||
case GLFW.GLFW_KEY_LEFT_CONTROL -> "ctrl izquierdo";
|
||||
case GLFW.GLFW_KEY_RIGHT_CONTROL -> "ctrl derecho";
|
||||
case GLFW.GLFW_KEY_LEFT_ALT -> "alt izquierdo";
|
||||
case GLFW.GLFW_KEY_RIGHT_ALT -> "alt gr";
|
||||
case GLFW.GLFW_KEY_TAB -> "tab";
|
||||
case GLFW.GLFW_KEY_ENTER -> "enter";
|
||||
case GLFW.GLFW_KEY_BACKSPACE -> "borrar";
|
||||
case GLFW.GLFW_KEY_DELETE -> "suprimir";
|
||||
case GLFW.GLFW_KEY_UP -> "arriba";
|
||||
case GLFW.GLFW_KEY_DOWN -> "abajo";
|
||||
case GLFW.GLFW_KEY_LEFT -> "izquierda";
|
||||
case GLFW.GLFW_KEY_RIGHT -> "derecha";
|
||||
case GLFW.GLFW_KEY_PAGE_UP -> "pág. arriba";
|
||||
case GLFW.GLFW_KEY_PAGE_DOWN -> "pág. abajo";
|
||||
default -> {
|
||||
if (key >= GLFW.GLFW_KEY_F1 && key <= GLFW.GLFW_KEY_F25)
|
||||
yield "F" + (key - GLFW.GLFW_KEY_F1 + 1); // F1–F25
|
||||
yield "tecla " + key; // fallback
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
// quizás debería de añadir layouts...
|
||||
public static String shiftKey(String c) {
|
||||
return switch (c) {
|
||||
case "`" -> "~";
|
||||
case "1" -> "!";
|
||||
case "2" -> "@";
|
||||
case "3" -> "#";
|
||||
case "4" -> "$";
|
||||
case "5" -> "%";
|
||||
case "6" -> "^";
|
||||
case "7" -> "&";
|
||||
case "8" -> "*";
|
||||
case "9" -> "(";
|
||||
case "0" -> ")";
|
||||
case "-" -> "_";
|
||||
case "=" -> "+";
|
||||
case "[" -> "{";
|
||||
case "]" -> "}";
|
||||
case "\\" -> "|";
|
||||
case ";" -> ":";
|
||||
case "'" -> "\"";
|
||||
case "," -> "<";
|
||||
case "." -> ">";
|
||||
case "/" -> "?";
|
||||
default -> c.toUpperCase();
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package me.retucio.camtweaks.util.interfaces;
|
||||
|
||||
import net.minecraft.client.gui.hud.ChatHudLine;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IChatHud {
|
||||
|
||||
void smegma$add(Text message, int id);
|
||||
|
||||
List<ChatHudLine.Visible> smegma$getVisibleMessages();
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package me.retucio.camtweaks.util.interfaces;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
public interface IChatHudLine {
|
||||
|
||||
String smegma$getText();
|
||||
|
||||
int smegma$getId();
|
||||
void smegma$setId(int id);
|
||||
|
||||
GameProfile smegma$getSender();
|
||||
void smegma$setSender(GameProfile profile);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package me.retucio.camtweaks.util.interfaces;
|
||||
|
||||
public interface IChatHudLineVisible extends IChatHudLine {
|
||||
|
||||
boolean smegma$isStartOfEntry();
|
||||
void smegma$setStartOfEntry(boolean start);
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
package me.retucio.camtweaks.util.interfaces;
|
||||
|
||||
public interface IConfirmScreen {
|
||||
|
||||
void smegma$setBypassAction(Runnable action);
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package me.retucio.camtweaks.util.interfaces;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
public interface IMessageHandler {
|
||||
|
||||
GameProfile smegma$getSender();
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package me.retucio.camtweaks.util.interfaces;
|
||||
|
||||
import net.minecraft.util.math.Vec3i;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
public interface IVec3d {
|
||||
|
||||
void smegma$set(double x, double y, double z);
|
||||
default void smegma$set(Vec3i vec) { smegma$set(vec.getX(), vec.getY(), vec.getZ()); }
|
||||
default void semgma$set(Vector3d vec) { smegma$set(vec.x, vec.y, vec.z); }
|
||||
|
||||
void smegma$setXZ(double x, double z);
|
||||
void smegma$setY(double y);
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package me.retucio.camtweaks.util.render;
|
||||
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.client.render.RenderSetup;
|
||||
|
||||
import static me.retucio.camtweaks.util.render.Pipelines.*;
|
||||
|
||||
public class Layers {
|
||||
|
||||
private static final RenderLayer LINES;
|
||||
private static final RenderLayer LINES_CULL;
|
||||
|
||||
private static final RenderLayer QUADS;
|
||||
private static final RenderLayer QUADS_CULL;
|
||||
|
||||
|
||||
public static RenderLayer lines() {
|
||||
return LINES;
|
||||
}
|
||||
|
||||
public static RenderLayer linesCull() {
|
||||
return LINES_CULL;
|
||||
}
|
||||
|
||||
public static RenderLayer quads() {
|
||||
return QUADS;
|
||||
}
|
||||
|
||||
public static RenderLayer quadsCull() {
|
||||
return QUADS_CULL;
|
||||
}
|
||||
|
||||
static {
|
||||
LINES = RenderLayer.of(CameraTweaks.MOD_ID + "_lines", RenderSetup.builder(LINES_PIPELINE).build());
|
||||
LINES_CULL = RenderLayer.of(CameraTweaks.MOD_ID + "_lines_cull", RenderSetup.builder(LINES_CULL_PIPELINE).build());
|
||||
|
||||
QUADS = RenderLayer.of(CameraTweaks.MOD_ID + "_quads", RenderSetup.builder(QUADS_PIPELINE).build());
|
||||
QUADS_CULL = RenderLayer.of(CameraTweaks.MOD_ID + "quads_cull", RenderSetup.builder(QUADS_CULL_PIPELINE).build());
|
||||
}
|
||||
|
||||
}
|
||||
+51
-48
@@ -1,45 +1,47 @@
|
||||
package me.retucio.camtweaks;
|
||||
package me.retucio.sputnik;
|
||||
|
||||
|
||||
import me.retucio.camtweaks.command.CommandManager;
|
||||
import me.retucio.camtweaks.command.commands.BindCommand;
|
||||
import me.retucio.sputnik.cape.CapeManager;
|
||||
import me.retucio.sputnik.command.CommandManager;
|
||||
import me.retucio.sputnik.command.commands.BindCommand;
|
||||
|
||||
import me.retucio.camtweaks.config.ConfigManager;
|
||||
import me.retucio.sputnik.config.ConfigManager;
|
||||
|
||||
import me.retucio.camtweaks.event.EventBus;
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.ShutdownEvent;
|
||||
import me.retucio.sputnik.event.EventBus;
|
||||
import me.retucio.sputnik.event.SubscribeEvent;
|
||||
import me.retucio.sputnik.event.events.ShutdownEvent;
|
||||
import me.retucio.sputnik.event.events.sputnik.LoadCapeManagerEvent;
|
||||
import me.retucio.sputnik.event.events.sputnik.LoadClickGUIEvent;
|
||||
import me.retucio.sputnik.event.events.sputnik.LoadCommandManagerEvent;
|
||||
import me.retucio.sputnik.event.events.sputnik.LoadModuleManagerEvent;
|
||||
|
||||
import me.retucio.camtweaks.event.events.camtweaks.LoadClickGUIEvent;
|
||||
import me.retucio.camtweaks.event.events.camtweaks.LoadCommandManagerEvent;
|
||||
import me.retucio.camtweaks.event.events.camtweaks.LoadModuleManagerEvent;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.HUD;
|
||||
|
||||
import me.retucio.camtweaks.module.modules.client.HUD;
|
||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
||||
import me.retucio.camtweaks.ui.hud.HudEditorScreen;
|
||||
import me.retucio.camtweaks.ui.hud.HudRenderer;
|
||||
import me.retucio.camtweaks.ui.widgets.buttons.settings.BindButton;
|
||||
import me.retucio.camtweaks.ui.widgets.buttons.SettingButton;
|
||||
import me.retucio.camtweaks.ui.widgets.buttons.settings.TextButton;
|
||||
import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||
import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.ui.screen.ClickGUI;
|
||||
import me.retucio.sputnik.ui.hud.HudEditorScreen;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.TextButton;
|
||||
import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||
import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
|
||||
import me.retucio.sputnik.ui.widgets.Button;
|
||||
|
||||
import me.retucio.camtweaks.ui.widgets.Button;
|
||||
import me.retucio.camtweaks.util.*;
|
||||
import me.retucio.sputnik.util.*;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import me.retucio.sputnik.util.render.DrawUtil;
|
||||
import me.retucio.sputnik.util.render.RenderUtil;
|
||||
|
||||
|
||||
import me.retucio.camtweaks.util.render.DrawUtil;
|
||||
import me.retucio.camtweaks.util.render.RenderUtil;
|
||||
import me.retucio.sputnik.util.render.Textures;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.screen.ChatScreen;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen;
|
||||
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
|
||||
import net.minecraft.client.gui.screen.ingame.AnvilScreen;
|
||||
@@ -50,43 +52,38 @@ import org.lwjgl.glfw.GLFW;
|
||||
|
||||
|
||||
|
||||
public class CameraTweaks implements ClientModInitializer {
|
||||
public class Sputnik implements ClientModInitializer {
|
||||
|
||||
// cosas necesarias
|
||||
public static final CameraTweaks INSTANCE = new CameraTweaks();
|
||||
public static final Sputnik INSTANCE = new Sputnik();
|
||||
public static final EventBus EVENT_BUS = new EventBus();
|
||||
public static final Logger LOGGER = LogManager.getLogger(CameraTweaks.class);
|
||||
public static final Logger LOGGER = LogManager.getLogger(Sputnik.class);
|
||||
public static MinecraftClient mc;
|
||||
|
||||
// id y versión
|
||||
public static final String MOD_ID = "camtweaks";
|
||||
public static final String MOD_VERSION;
|
||||
|
||||
static {
|
||||
MOD_VERSION = FabricLoader.getInstance().getModContainer(MOD_ID)
|
||||
public static final String MOD_ID = "sputnik";
|
||||
public static final String MOD_VERSION = FabricLoader.getInstance()
|
||||
.getModContainer(MOD_ID)
|
||||
.orElseThrow()
|
||||
.getMetadata()
|
||||
.getVersion()
|
||||
.getFriendlyString();
|
||||
}
|
||||
|
||||
|
||||
private Screen prevScreen;
|
||||
public static boolean settingsApplied = false;
|
||||
|
||||
static {
|
||||
// puta vida
|
||||
System.setProperty("java.awt.headless", "false");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
// por algún motivo aunque lo añada a los args de la JVM sigue siendo true a menos que haga esto??? puta vida
|
||||
System.setProperty("java.awt.headless", "false");
|
||||
|
||||
mc = MinecraftClient.getInstance();
|
||||
ConfigManager.load();
|
||||
|
||||
EVENT_BUS.register(this);
|
||||
|
||||
EVENT_BUS.register(HudRenderer.class);
|
||||
|
||||
EVENT_BUS.register(ChatUtil.class);
|
||||
EVENT_BUS.register(DrawUtil.class);
|
||||
EVENT_BUS.register(EntityUtil.class);
|
||||
@@ -97,6 +94,11 @@ public class CameraTweaks implements ClientModInitializer {
|
||||
|
||||
Lists.init();
|
||||
|
||||
Textures.registerAll();
|
||||
|
||||
CapeManager.INSTANCE = new CapeManager();
|
||||
EVENT_BUS.post(new LoadCapeManagerEvent());
|
||||
|
||||
ModuleManager.INSTANCE = new ModuleManager();
|
||||
EVENT_BUS.post(new LoadModuleManagerEvent());
|
||||
|
||||
@@ -107,8 +109,9 @@ public class CameraTweaks implements ClientModInitializer {
|
||||
HudEditorScreen.INSTANCE = new HudEditorScreen();
|
||||
EVENT_BUS.post(new LoadClickGUIEvent());
|
||||
|
||||
mc.execute(HudRenderer::init);
|
||||
|
||||
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
|
||||
ConfigManager.save();
|
||||
EVENT_BUS.post(new ShutdownEvent());
|
||||
}));
|
||||
}
|
||||
@@ -123,13 +126,13 @@ public class CameraTweaks implements ClientModInitializer {
|
||||
}
|
||||
|
||||
ModuleManager.INSTANCE.getEnabledModules().forEach(Module::onTick);
|
||||
mc.getWindow().setTitle(ClientSettingsFrame.guiSettings.windowTitle.getValue());
|
||||
}
|
||||
|
||||
|
||||
// se ejecuta cada vez que se presiona una tecla
|
||||
public void onKeyPress(int key, int action) {
|
||||
public void onKey(int key, int action) {
|
||||
if (key == GLFW.GLFW_KEY_F3) return; // prevenir activación de módulos al usar combinaciones de F3
|
||||
ModuleManager.INSTANCE.getEnabledModules().forEach(module -> module.onKey(key, action));
|
||||
|
||||
boolean anyFocused = isAnySettingButtonFocused() || ClickGUI.INSTANCE.getSearchBar().isFocused();
|
||||
ClickGUI.INSTANCE.setAnyFocused(anyFocused);
|
||||
@@ -173,7 +176,7 @@ public class CameraTweaks implements ClientModInitializer {
|
||||
// se ocupa de hacer los botones de ajustes que lo necesiten escuchar teclas
|
||||
private void handleSettingButtonsKey(int key, int action) {
|
||||
for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames()) {
|
||||
for (SettingButton sb : sf.getButtons()) {
|
||||
for (SettingButton<?> sb : sf.getButtons()) {
|
||||
if (sb instanceof BindButton bb) bb.onKey(key, action);
|
||||
if (sb instanceof TextButton tb) tb.onKey(key, action);
|
||||
}
|
||||
@@ -199,7 +202,7 @@ public class CameraTweaks implements ClientModInitializer {
|
||||
// manejar la lógica de apertura del editor de elementos del hud, con la misma lógica que handleClickGUIKey()
|
||||
private void handleHudEditorKey(int key, boolean anyFocused) {
|
||||
HUD hud = ModuleManager.INSTANCE.getModuleByClass(HUD.class);
|
||||
if (key != hud.editorKey.getKey() || anyFocused || isOnTypingScreen()) return;
|
||||
if (key != hud.editorKey.getValue() || anyFocused || isOnTypingScreen()) return;
|
||||
|
||||
if (mc.currentScreen != HudEditorScreen.INSTANCE) {
|
||||
if (!hud.isEnabled()) {
|
||||
@@ -0,0 +1,61 @@
|
||||
package me.retucio.sputnik.cape;
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.texture.NativeImage;
|
||||
import net.minecraft.client.texture.NativeImageBackedTexture;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
public class Cape {
|
||||
|
||||
private final MinecraftClient mc = MinecraftClient.getInstance();
|
||||
|
||||
private final String name;
|
||||
private final Identifier id;
|
||||
private NativeImage img;
|
||||
private NativeImageBackedTexture texture;
|
||||
|
||||
public Cape(String name) {
|
||||
this.name = name;
|
||||
this.id = Identifier.of(Sputnik.MOD_ID, "textures/capes/" + name + ".png");
|
||||
}
|
||||
|
||||
public void load() {
|
||||
this.img = loadTexture(this.id);
|
||||
}
|
||||
|
||||
public NativeImage loadTexture(Identifier id) {
|
||||
try (InputStream inputStream = mc.getResourceManager().getResource(id).get().getInputStream()) {
|
||||
return NativeImage.read(inputStream);
|
||||
} catch (IOException e) {
|
||||
Sputnik.LOGGER.error("ups: {}", e.getMessage());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void register() {
|
||||
texture = new NativeImageBackedTexture(null, img);
|
||||
mc.getTextureManager().registerTexture(id, texture);
|
||||
img = null;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public Identifier getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public NativeImageBackedTexture getTexture() {
|
||||
return texture;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return name.replace('-', ' ');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package me.retucio.sputnik.cape;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static me.retucio.sputnik.Sputnik.mc;
|
||||
|
||||
public class CapeManager {
|
||||
|
||||
public static CapeManager INSTANCE;
|
||||
|
||||
private final List<Cape> capes = new ArrayList<>();
|
||||
|
||||
public CapeManager() {
|
||||
addCapes();
|
||||
}
|
||||
|
||||
public void addCapes() {
|
||||
addCape("sputnik");
|
||||
addCape("half-life");
|
||||
addCape("hollow-knight");
|
||||
|
||||
addCape("cherry-blossom");
|
||||
addCape("migrator");
|
||||
addCape("minecraft");
|
||||
addCape("pancakes");
|
||||
addCape("vanilla");
|
||||
|
||||
addCape("tiktok");
|
||||
addCape("twitch");
|
||||
|
||||
addCape("mojang");
|
||||
addCape("mojang-old");
|
||||
addCape("mojang-old-old");
|
||||
|
||||
addCape("minecon-2011");
|
||||
addCape("minecon-2012");
|
||||
addCape("minecon-2013");
|
||||
addCape("minecon-2015");
|
||||
addCape("minecon-2016");
|
||||
addCape("experience-2025");
|
||||
|
||||
addCape("15th-anniversary");
|
||||
addCape("bedrock");
|
||||
addCape("birthday");
|
||||
addCape("copper");
|
||||
addCape("eye-blossom");
|
||||
addCape("mcc-15");
|
||||
addCape("prismarine");
|
||||
addCape("turtle");
|
||||
addCape("valentine");
|
||||
|
||||
addCape("chinese-translator");
|
||||
addCape("cobalt");
|
||||
addCape("mojira-mod");
|
||||
addCape("millionth-customer");
|
||||
addCape("realms-mapmaker");
|
||||
addCape("scrolls-champion");
|
||||
addCape("translator");
|
||||
|
||||
addCape("cheapsh0t");
|
||||
addCape("dannybstyle");
|
||||
addCape("julianclark");
|
||||
addCape("mrmessiah");
|
||||
|
||||
for (Cape cape : capes) {
|
||||
mc.execute(cape::load);
|
||||
mc.execute(cape::register);
|
||||
}
|
||||
}
|
||||
|
||||
private void addCape(String name) {
|
||||
capes.add(new Cape(name));
|
||||
}
|
||||
|
||||
public Cape getCape(String name) {
|
||||
for (Cape cape : capes)
|
||||
if (cape.getName().equalsIgnoreCase(name))
|
||||
return cape;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public List<Cape> getCapes() {
|
||||
return capes;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.command;
|
||||
package me.retucio.sputnik.command;
|
||||
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.ArgumentType;
|
||||
@@ -65,7 +65,7 @@ public abstract class Command {
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return me.retucio.camtweaks.command.CommandManager.INSTANCE.getPrefix() + name;
|
||||
return me.retucio.sputnik.command.CommandManager.INSTANCE.getPrefix() + name;
|
||||
}
|
||||
|
||||
public String toString(String... args) {
|
||||
+6
-6
@@ -1,11 +1,10 @@
|
||||
package me.retucio.camtweaks.command;
|
||||
package me.retucio.sputnik.command;
|
||||
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.command.commands.*;
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.command.commands.*;
|
||||
import me.retucio.sputnik.event.SubscribeEvent;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.command.CommandSource;
|
||||
|
||||
@@ -33,6 +32,7 @@ public class CommandManager {
|
||||
|
||||
public static void registerCommands() {
|
||||
addCommand(new BindCommand());
|
||||
addCommand(new ConfigCommand());
|
||||
addCommand(new CopyScreenshotCommand());
|
||||
addCommand(new EnderChestCommand());
|
||||
addCommand(new GarbageCleanerCommand());
|
||||
@@ -49,7 +49,7 @@ public class CommandManager {
|
||||
for (Command command : commands) {
|
||||
for (Method method : command.getClass().getDeclaredMethods()) {
|
||||
if (method.isAnnotationPresent(SubscribeEvent.class)) {
|
||||
CameraTweaks.EVENT_BUS.register(command);
|
||||
Sputnik.EVENT_BUS.register(command);
|
||||
break;
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.command.args;
|
||||
package me.retucio.sputnik.command.args;
|
||||
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.mojang.brigadier.arguments.ArgumentType;
|
||||
@@ -8,19 +8,19 @@ import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
|
||||
import com.mojang.brigadier.suggestion.Suggestions;
|
||||
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
||||
|
||||
import me.retucio.camtweaks.util.EntityUtil;
|
||||
import me.retucio.sputnik.util.EntityUtil;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
// para autocompletar entidades
|
||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
||||
import static me.retucio.sputnik.Sputnik.mc;
|
||||
|
||||
|
||||
// para autocompletar entidades
|
||||
public class EntityArgumentType implements ArgumentType<Entity> {
|
||||
|
||||
public static final EntityArgumentType INSTANCE = new EntityArgumentType();
|
||||
+7
-4
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.command.args;
|
||||
package me.retucio.sputnik.command.args;
|
||||
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.mojang.brigadier.arguments.ArgumentType;
|
||||
@@ -7,8 +7,9 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
|
||||
import com.mojang.brigadier.suggestion.Suggestions;
|
||||
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.util.MiscUtil;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
@@ -19,6 +20,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
public class ModuleArgumentType implements ArgumentType<Module> {
|
||||
|
||||
public static final ModuleArgumentType INSTANCE = new ModuleArgumentType();
|
||||
|
||||
private static final DynamicCommandExceptionType UNKNOWN_MODULE = new DynamicCommandExceptionType(
|
||||
name -> Text.literal("módulo \"" + name + "\" no encontrado"));
|
||||
|
||||
@@ -35,7 +37,8 @@ public class ModuleArgumentType implements ArgumentType<Module> {
|
||||
|
||||
@Override
|
||||
public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
|
||||
return CommandSource.suggestMatching(ModuleManager.INSTANCE.getModules().stream().map(module -> module.getName().replace(" ", "_")), builder);
|
||||
return CommandSource.suggestMatching(ModuleManager.INSTANCE.getModules()
|
||||
.stream().map(module -> MiscUtil.removeAccentMarks(module.getName().replace(" ", "_"))), builder);
|
||||
}
|
||||
|
||||
@Override
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.command.args;
|
||||
package me.retucio.sputnik.command.args;
|
||||
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.mojang.brigadier.arguments.ArgumentType;
|
||||
@@ -15,7 +15,7 @@ import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
||||
import static me.retucio.sputnik.Sputnik.mc;
|
||||
|
||||
// para autocompletar nombres de jugadores
|
||||
public class PlayerArgumentType implements ArgumentType<PlayerEntity> {
|
||||
+8
-8
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.command.args.ModuleArgumentType;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.settings.KeySetting;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.camtweaks.util.KeyUtil;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.command.args.ModuleArgumentType;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.KeySetting;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
@@ -42,7 +42,7 @@ public class BindCommand extends Command {
|
||||
public static boolean onKeyPress(int key) {
|
||||
if (listeningModule == null) return false;
|
||||
KeySetting bind = listeningModule.getBind();
|
||||
if (bind != null) bind.setKey(key);
|
||||
if (bind != null) bind.setValue(key);
|
||||
|
||||
ChatUtil.info(
|
||||
Text.of("la tecla " + Formatting.AQUA + KeyUtil.getKeyName(key) + Formatting.RESET +
|
||||
@@ -0,0 +1,66 @@
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.command.args.ModuleArgumentType;
|
||||
import me.retucio.sputnik.ui.screen.ClickGUI;
|
||||
import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
|
||||
public class ConfigCommand extends Command {
|
||||
|
||||
public ConfigCommand() {
|
||||
super("config", "abre el marco de ajustes de un módulo", "ajustes", "settings");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void build(LiteralArgumentBuilder<CommandSource> builder) {
|
||||
builder
|
||||
.then(argument("módulo", ModuleArgumentType.INSTANCE)
|
||||
.executes(ctx -> {
|
||||
mc.execute(() -> openSf(ctx));
|
||||
return SUCCESS;
|
||||
})
|
||||
.then(argument("x", IntegerArgumentType.integer())
|
||||
.then(argument("y", IntegerArgumentType.integer())
|
||||
.executes(ctx -> {
|
||||
mc.execute(() -> openSfWithPos(ctx,
|
||||
ctx.getArgument("x", Integer.class),
|
||||
ctx.getArgument("y", Integer.class)));
|
||||
return SUCCESS;
|
||||
})
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
private void openSf(CommandContext<CommandSource> ctx) {
|
||||
Module module = ctx.getArgument("módulo", Module.class);
|
||||
mc.setScreen(ClickGUI.INSTANCE);
|
||||
|
||||
if (ClickGUI.INSTANCE.isSettingsFrameOpen(module)) return;
|
||||
|
||||
SettingsFrame sf = ClickGUI.INSTANCE.getSfOfModule(module);
|
||||
int x = mc.getWindow().getScaledWidth() / 2 - sf.getW() / 2;
|
||||
int y = 67;
|
||||
|
||||
ClickGUI.INSTANCE.openSettingsFrame(module, x, y);
|
||||
}
|
||||
|
||||
private void openSfWithPos(CommandContext<CommandSource> ctx, int x, int y) {
|
||||
Module module = ctx.getArgument("módulo", Module.class);
|
||||
mc.setScreen(ClickGUI.INSTANCE);
|
||||
|
||||
if (ClickGUI.INSTANCE.isSettingsFrameOpen(module)) {
|
||||
SettingsFrame sf = ClickGUI.INSTANCE.getSfOfModule(module);
|
||||
sf.setX(x);
|
||||
sf.setY(y);
|
||||
}
|
||||
|
||||
ClickGUI.INSTANCE.openSettingsFrame(module, x, y);
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.misc.ScreenshotPlus;
|
||||
import net.minecraft.command.CommandSource;
|
||||
|
||||
// se usa principalmente para el módulo ScreenshotPlus, pero también se puede usar sin él supongo
|
||||
+7
-8
@@ -1,13 +1,12 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.TickEvent;
|
||||
import me.retucio.camtweaks.ui.screen.PreviewScreen;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.camtweaks.util.InventoryUtil;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.event.SubscribeEvent;
|
||||
import me.retucio.sputnik.event.events.TickEvent;
|
||||
import me.retucio.sputnik.ui.screen.PreviewScreen;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
import net.minecraft.command.CommandSource;
|
||||
|
||||
// accede a los contenidos de tu enderchest
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.command.args.PlayerArgumentType;
|
||||
import me.retucio.camtweaks.util.MiscUtil;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.command.args.PlayerArgumentType;
|
||||
import me.retucio.sputnik.util.MiscUtil;
|
||||
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
||||
import net.minecraft.command.CommandSource;
|
||||
|
||||
+4
-4
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.util.interfaces.IChatHud;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.util.interfaces.IChatHud;
|
||||
import net.minecraft.client.gui.hud.ChatHud;
|
||||
import net.minecraft.client.gui.hud.ChatHudLine;
|
||||
import net.minecraft.command.CommandSource;
|
||||
@@ -31,7 +31,7 @@ public class PurgeCommand extends Command {
|
||||
ChatHud chatHud = mc.inGameHud.getChatHud();
|
||||
|
||||
synchronized (chatHud) {
|
||||
List<ChatHudLine.Visible> visibleMessages = ((IChatHud) chatHud).smegma$getVisibleMessages();
|
||||
List<ChatHudLine.Visible> visibleMessages = ((IChatHud) chatHud).sputnik$getVisibleMessages();
|
||||
int toRemove = Math.min(amount, visibleMessages.size());
|
||||
for (int i = 0; i < toRemove; i++)
|
||||
visibleMessages.removeFirst();
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus;
|
||||
import me.retucio.camtweaks.util.ChatUtil;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.misc.ScreenshotPlus;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.command.CommandSource;
|
||||
|
||||
import java.io.IOException;
|
||||
+3
-4
@@ -1,9 +1,9 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.mixin.accessor.ClientPlayNetworkHandlerAccessor;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.mixin.accessor.ClientPlayNetworkHandlerAccessor;
|
||||
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.network.encryption.NetworkEncryptionUtils;
|
||||
@@ -11,7 +11,6 @@ import net.minecraft.network.message.LastSeenMessagesCollector;
|
||||
import net.minecraft.network.message.MessageBody;
|
||||
import net.minecraft.network.message.MessageSignatureData;
|
||||
import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
import java.time.Instant;
|
||||
|
||||
+6
-7
@@ -1,12 +1,11 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.command.args.EntityArgumentType;
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.KeyEvent;
|
||||
import me.retucio.camtweaks.util.EntityUtil;
|
||||
import me.retucio.camtweaks.util.MiscUtil;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.command.args.EntityArgumentType;
|
||||
import me.retucio.sputnik.event.SubscribeEvent;
|
||||
import me.retucio.sputnik.event.events.KeyEvent;
|
||||
import me.retucio.sputnik.util.EntityUtil;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.entity.Entity;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.command.commands;
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.camtweaks.command.Command;
|
||||
import me.retucio.camtweaks.command.args.ModuleArgumentType;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.command.args.ModuleArgumentType;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import net.minecraft.command.CommandSource;
|
||||
|
||||
// porque usar el ratón es más lento que escribir, a menos que tengas toque con el teclado como yo
|
||||
@@ -0,0 +1,357 @@
|
||||
package me.retucio.sputnik.config;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class BinarySerializer {
|
||||
|
||||
private static final int MAGIC_NUMBER = 0x53505554; // "SPUT"
|
||||
private static final int VERSION = 1;
|
||||
|
||||
private static final byte TYPE_NULL = 0;
|
||||
private static final byte TYPE_BOOLEAN = 1;
|
||||
private static final byte TYPE_INT = 2;
|
||||
private static final byte TYPE_DOUBLE = 3;
|
||||
private static final byte TYPE_STRING = 4;
|
||||
private static final byte TYPE_MAP = 5;
|
||||
private static final byte TYPE_INT_ARRAY = 6;
|
||||
private static final byte TYPE_FRAME_DATA = 7;
|
||||
|
||||
public static void writeConfig(ClientConfig config, File file)
|
||||
throws IOException {
|
||||
try (DataOutputStream out = new DataOutputStream(
|
||||
new BufferedOutputStream(new FileOutputStream(file)))) {
|
||||
|
||||
// cabezal
|
||||
out.writeInt(MAGIC_NUMBER);
|
||||
out.writeInt(VERSION);
|
||||
|
||||
// mapas
|
||||
writeStringBooleanMap(out, config.moduleStates);
|
||||
writeSettingsMap(out, config.settings);
|
||||
writeStringIntArrayMap(out, config.settingsFrames);
|
||||
writeExtendableFrames(out, config.extendableFrames);
|
||||
writeStringIntArrayMap(out, config.hudPositions);
|
||||
writeStringBooleanMap(out, config.hudVisibilities);
|
||||
writeStringStringMap(out, config.hudImagePaths);
|
||||
|
||||
// posición de la barra de búsqueda
|
||||
if (config.searchBarPosition != null) {
|
||||
out.writeBoolean(true);
|
||||
out.writeInt(config.searchBarPosition[0]);
|
||||
out.writeInt(config.searchBarPosition[1]);
|
||||
} else {
|
||||
out.writeBoolean(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static ClientConfig readConfig(File file)
|
||||
throws IOException {
|
||||
if (!file.exists() || file.length() == 0) {
|
||||
throw new IOException("archivo de config. vacío o inexistente");
|
||||
}
|
||||
|
||||
try (DataInputStream in = new DataInputStream(
|
||||
new BufferedInputStream(new FileInputStream(file)))) {
|
||||
|
||||
if (file.length() < 8) {
|
||||
throw new IOException("archivo demasiado pequeño para ser válido");
|
||||
}
|
||||
|
||||
// verificar cabezal
|
||||
int magic = in.readInt();
|
||||
if (magic != MAGIC_NUMBER) {
|
||||
throw new IOException("formato de archivo inválido: " + magic);
|
||||
}
|
||||
|
||||
int version = in.readInt();
|
||||
if (version != VERSION) {
|
||||
throw new IOException("versión inválida: " + version);
|
||||
}
|
||||
|
||||
ClientConfig config = new ClientConfig();
|
||||
|
||||
// leer mapas
|
||||
config.moduleStates = readStringBooleanMap(in);
|
||||
config.settings = readSettingsMap(in);
|
||||
config.settingsFrames = readStringIntArrayMap(in);
|
||||
config.extendableFrames = readExtendableFrames(in);
|
||||
config.hudPositions = readStringIntArrayMap(in);
|
||||
config.hudVisibilities = readStringBooleanMap(in);
|
||||
config.hudImagePaths = readStringStringMap(in);
|
||||
|
||||
// leer pos. de la barra de búsqueda
|
||||
if (in.readBoolean()) {
|
||||
config.searchBarPosition = new int[]{in.readInt(), in.readInt()};
|
||||
}
|
||||
|
||||
return config;
|
||||
}
|
||||
}
|
||||
|
||||
private static void writeStringBooleanMap(DataOutputStream out, Map<String, Boolean> map)
|
||||
throws IOException {
|
||||
if (map == null) {
|
||||
out.writeInt(0);
|
||||
return;
|
||||
}
|
||||
out.writeInt(map.size());
|
||||
for (Map.Entry<String, Boolean> entry : map.entrySet()) {
|
||||
writeString(out, entry.getKey());
|
||||
out.writeBoolean(entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
private static Map<String, Boolean> readStringBooleanMap(DataInputStream in)
|
||||
throws IOException {
|
||||
int size = in.readInt();
|
||||
Map<String, Boolean> map = new HashMap<>(size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
String key = readString(in);
|
||||
boolean value = in.readBoolean();
|
||||
map.put(key, value);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
private static void writeSettingsMap(DataOutputStream out, Map<String, Object> map)
|
||||
throws IOException {
|
||||
if (map == null) {
|
||||
out.writeInt(0);
|
||||
return;
|
||||
}
|
||||
out.writeInt(map.size());
|
||||
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||
writeString(out, entry.getKey());
|
||||
writeSettingValue(out, entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
private static Map<String, Object> readSettingsMap(DataInputStream in)
|
||||
throws IOException {
|
||||
int size = in.readInt();
|
||||
Map<String, Object> map = new HashMap<>(size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
String key = readString(in);
|
||||
Object value = readSettingValue(in);
|
||||
map.put(key, value);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
private static void writeSettingValue(DataOutputStream out, Object value)
|
||||
throws IOException {
|
||||
switch (value) {
|
||||
case Boolean b -> {
|
||||
out.writeByte(TYPE_BOOLEAN);
|
||||
out.writeBoolean(b);
|
||||
}
|
||||
case Integer i -> {
|
||||
out.writeByte(TYPE_INT);
|
||||
out.writeInt(i);
|
||||
}
|
||||
case Double v -> {
|
||||
out.writeByte(TYPE_DOUBLE);
|
||||
out.writeDouble(v);
|
||||
}
|
||||
case String s -> {
|
||||
out.writeByte(TYPE_STRING);
|
||||
writeString(out, s);
|
||||
}
|
||||
case Map<?, ?> map -> {
|
||||
out.writeByte(TYPE_MAP);
|
||||
writeGenericMap(out, map);
|
||||
} // fallback
|
||||
case null, default -> out.writeByte(TYPE_NULL);
|
||||
}
|
||||
}
|
||||
|
||||
private static Object readSettingValue(DataInputStream in) throws IOException {
|
||||
byte type = in.readByte();
|
||||
return switch (type) {
|
||||
case TYPE_BOOLEAN -> in.readBoolean();
|
||||
case TYPE_INT -> in.readInt();
|
||||
case TYPE_DOUBLE -> in.readDouble();
|
||||
case TYPE_STRING -> readString(in);
|
||||
case TYPE_MAP -> readGenericMap(in);
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
private static void writeGenericMap(DataOutputStream out, Map<?, ?> map)
|
||||
throws IOException {
|
||||
if (map == null) {
|
||||
out.writeInt(0);
|
||||
return;
|
||||
}
|
||||
out.writeInt(map.size());
|
||||
for (Map.Entry<?, ?> entry : map.entrySet()) {
|
||||
writeObject(out, entry.getKey());
|
||||
writeObject(out, entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
private static Map<Object, Object> readGenericMap(DataInputStream in)
|
||||
throws IOException {
|
||||
int size = in.readInt();
|
||||
Map<Object, Object> map = new HashMap<>(size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
Object key = readObject(in);
|
||||
Object value = readObject(in);
|
||||
map.put(key, value);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
private static void writeObject(DataOutputStream out, Object obj)
|
||||
throws IOException {
|
||||
switch (obj) {
|
||||
case String s -> {
|
||||
out.writeByte(TYPE_STRING);
|
||||
writeString(out, s);
|
||||
}
|
||||
case Boolean b -> {
|
||||
out.writeByte(TYPE_BOOLEAN);
|
||||
out.writeBoolean(b);
|
||||
}
|
||||
case Number number -> {
|
||||
if (obj instanceof Integer) {
|
||||
out.writeByte(TYPE_INT);
|
||||
out.writeInt((Integer) obj);
|
||||
} else if (obj instanceof Double) {
|
||||
out.writeByte(TYPE_DOUBLE);
|
||||
out.writeDouble((Double) obj);
|
||||
}
|
||||
}
|
||||
default -> {
|
||||
out.writeByte(TYPE_STRING);
|
||||
writeString(out, obj.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Object readObject(DataInputStream in) throws IOException {
|
||||
byte type = in.readByte();
|
||||
return switch (type) {
|
||||
case TYPE_STRING -> readString(in);
|
||||
case TYPE_BOOLEAN -> in.readBoolean();
|
||||
case TYPE_INT -> in.readInt();
|
||||
case TYPE_DOUBLE -> in.readDouble();
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
private static void writeStringIntArrayMap(DataOutputStream out, Map<String, int[]> map)
|
||||
throws IOException {
|
||||
if (map == null) {
|
||||
out.writeInt(0);
|
||||
return;
|
||||
}
|
||||
out.writeInt(map.size());
|
||||
for (Map.Entry<String, int[]> entry : map.entrySet()) {
|
||||
writeString(out, entry.getKey());
|
||||
int[] array = entry.getValue();
|
||||
if (array == null) {
|
||||
out.writeInt(0);
|
||||
} else {
|
||||
out.writeInt(array.length);
|
||||
for (int value : array) {
|
||||
out.writeInt(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Map<String, int[]> readStringIntArrayMap(DataInputStream in)
|
||||
throws IOException {
|
||||
int size = in.readInt();
|
||||
Map<String, int[]> map = new HashMap<>(size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
String key = readString(in);
|
||||
int arraySize = in.readInt();
|
||||
int[] array = new int[arraySize];
|
||||
for (int j = 0; j < arraySize; j++) {
|
||||
array[j] = in.readInt();
|
||||
}
|
||||
map.put(key, array);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
private static void writeExtendableFrames(DataOutputStream out, Map<String, ClientConfig.FrameData> map)
|
||||
throws IOException {
|
||||
if (map == null) {
|
||||
out.writeInt(0);
|
||||
return;
|
||||
}
|
||||
out.writeInt(map.size());
|
||||
for (Map.Entry<String, ClientConfig.FrameData> entry : map.entrySet()) {
|
||||
writeString(out, entry.getKey());
|
||||
ClientConfig.FrameData data = entry.getValue();
|
||||
out.writeInt(data.x());
|
||||
out.writeInt(data.y());
|
||||
out.writeBoolean(data.extended());
|
||||
}
|
||||
}
|
||||
|
||||
private static Map<String, ClientConfig.FrameData> readExtendableFrames(DataInputStream in)
|
||||
throws IOException {
|
||||
int size = in.readInt();
|
||||
Map<String, ClientConfig.FrameData> map = new HashMap<>(size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
String key = readString(in);
|
||||
int x = in.readInt();
|
||||
int y = in.readInt();
|
||||
boolean extended = in.readBoolean();
|
||||
map.put(key, new ClientConfig.FrameData(x, y, extended));
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
private static void writeStringStringMap(DataOutputStream out, Map<String, String> map)
|
||||
throws IOException {
|
||||
if (map == null) {
|
||||
out.writeInt(0);
|
||||
return;
|
||||
}
|
||||
out.writeInt(map.size());
|
||||
for (Map.Entry<String, String> entry : map.entrySet()) {
|
||||
writeString(out, entry.getKey());
|
||||
writeString(out, entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
private static Map<String, String> readStringStringMap(DataInputStream in)
|
||||
throws IOException {
|
||||
int size = in.readInt();
|
||||
Map<String, String> map = new HashMap<>(size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
String key = readString(in);
|
||||
String value = readString(in);
|
||||
map.put(key, value);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
// Optimized string writing (UTF-8 with length prefix)
|
||||
private static void writeString(DataOutputStream out, String str) throws IOException {
|
||||
if (str == null) {
|
||||
out.writeInt(-1);
|
||||
return;
|
||||
}
|
||||
byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
|
||||
out.writeInt(bytes.length);
|
||||
out.write(bytes);
|
||||
}
|
||||
|
||||
private static String readString(DataInputStream in) throws IOException {
|
||||
int length = in.readInt();
|
||||
if (length == -1) return null;
|
||||
byte[] bytes = new byte[length];
|
||||
in.readFully(bytes);
|
||||
return new String(bytes, "UTF-8");
|
||||
}
|
||||
}
|
||||
+17
-14
@@ -1,15 +1,17 @@
|
||||
package me.retucio.camtweaks.config;
|
||||
package me.retucio.sputnik.config;
|
||||
|
||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
||||
import me.retucio.camtweaks.event.events.camtweaks.*;
|
||||
import me.retucio.camtweaks.module.settings.*;
|
||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
||||
import me.retucio.sputnik.event.SubscribeEvent;
|
||||
import me.retucio.sputnik.event.events.sputnik.*;
|
||||
import me.retucio.sputnik.module.setting.settings.*;
|
||||
import me.retucio.sputnik.ui.screen.ClickGUI;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS;
|
||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
||||
import static me.retucio.sputnik.Sputnik.EVENT_BUS;
|
||||
import static me.retucio.sputnik.Sputnik.mc;
|
||||
|
||||
// clase donde se guardan las configuraciones temporalmente hasta escribirlas en camera_tweaks.json
|
||||
public class ClientConfig {
|
||||
@@ -55,14 +57,14 @@ public class ClientConfig {
|
||||
// guardar ajustes con su respectivo tipo de valor, en formato "nombreMódulo:nombreAjuste"
|
||||
Object value = null;
|
||||
switch (event.getSetting()) {
|
||||
case BooleanSetting b: value = b.isEnabled(); break;
|
||||
case BooleanSetting b: value = b.getValue(); break;
|
||||
case EnumSetting e: value = e.getIndex(); break;
|
||||
case KeySetting k: value = k.getKey(); break;
|
||||
case KeySetting k: value = k.getValue(); break;
|
||||
case NumberSetting n: value = n.getValue(); break;
|
||||
case StringSetting s: value = s.getValue(); break;
|
||||
case ListSetting l: value = l.getConfigValues(); break;
|
||||
case ColorSetting c: value = c.getConfigValue(); break;
|
||||
case OptionSetting o: value = o.getIndex(); break;
|
||||
case OptionSetting o: value = o.getDisplayName(); break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
@@ -71,19 +73,18 @@ public class ClientConfig {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onOpenSettingsFrame(SettingsFrameEvent.Open event) {
|
||||
if (settingsFrames.containsKey(event.getFrame().module.getName())) return;
|
||||
ConfigManager.setFramePosition(event.getFrame());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onCloseSettingsFrame(SettingsFrameEvent.Close event) {
|
||||
settingsFrames.remove(event.getFrame().module.getName());
|
||||
settingsFrames.remove(event.getFrame().getModule().getName());
|
||||
ConfigManager.save();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onMoveSettingsFrame(SettingsFrameEvent.Move event) {
|
||||
settingsFrames.replace(event.getFrame().module.getName(), new int[]{event.getFrame().getX(), event.getFrame().getY()});
|
||||
settingsFrames.replace(event.getFrame().getModule().getName(), new int[]{event.getFrame().getX(), event.getFrame().getY()});
|
||||
ConfigManager.save();
|
||||
}
|
||||
|
||||
@@ -119,5 +120,7 @@ public class ClientConfig {
|
||||
ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
|
||||
}
|
||||
|
||||
public record FrameData(int x, int y, boolean extended) {}
|
||||
public record FrameData(int x, int y, boolean extended) implements Serializable {
|
||||
@Serial private static final long serialVersionUID = 1L;
|
||||
}
|
||||
}
|
||||
+97
-77
@@ -1,29 +1,30 @@
|
||||
package me.retucio.camtweaks.config;
|
||||
package me.retucio.sputnik.config;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import me.retucio.camtweaks.CameraTweaks;
|
||||
import me.retucio.camtweaks.module.Module;
|
||||
import me.retucio.camtweaks.module.ModuleManager;
|
||||
import me.retucio.camtweaks.module.settings.*;
|
||||
import me.retucio.camtweaks.ui.widgets.frames.ModuleFrame;
|
||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
||||
import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||
import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.setting.*;
|
||||
import me.retucio.sputnik.module.setting.settings.*;
|
||||
import me.retucio.sputnik.ui.widgets.Frame;
|
||||
import me.retucio.sputnik.ui.widgets.frames.ModuleFrame;
|
||||
import me.retucio.sputnik.ui.screen.ClickGUI;
|
||||
import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||
import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileReader;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
// se ocupa de guardar, cargar y aplicar ajustes
|
||||
// pues no me ha dado dolores de cabeza el coso este con los NPE de los cojones...
|
||||
public class ConfigManager {
|
||||
|
||||
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
|
||||
private static final File CONFIG_FILE = new File("camera_tweaks.json");
|
||||
private static final File CONFIG_FILE = new File("sputnik.dat");
|
||||
private static final File LEGACY_JSON_FILE = new File("sputnik.json");
|
||||
|
||||
private static boolean loaded = false;
|
||||
private static ClientConfig config = null;
|
||||
@@ -33,33 +34,47 @@ public class ConfigManager {
|
||||
|
||||
// guardar configuraciones
|
||||
public static void save() {
|
||||
if (!loaded) return;
|
||||
ensureConfig();
|
||||
|
||||
try (FileWriter writer = new FileWriter(CONFIG_FILE)) {
|
||||
GSON.toJson(config, writer);
|
||||
CameraTweaks.LOGGER.info("ajustes guardados");
|
||||
try {
|
||||
BinarySerializer.writeConfig(config, CONFIG_FILE);
|
||||
Sputnik.LOGGER.info("ajustes guardados");
|
||||
} catch (IOException e) {
|
||||
CameraTweaks.LOGGER.error("error al guardar ajustes", e);
|
||||
Sputnik.LOGGER.error("error al guardar ajustes", e);
|
||||
}
|
||||
}
|
||||
|
||||
// cargar configuraciones
|
||||
public static void load() {
|
||||
CameraTweaks.LOGGER.info("cargando ajustes...");
|
||||
Sputnik.LOGGER.info("cargando ajustes...");
|
||||
|
||||
if (!CONFIG_FILE.exists()) {
|
||||
ensureConfig();
|
||||
save();
|
||||
return;
|
||||
if (CONFIG_FILE.exists()) {
|
||||
try {
|
||||
config = BinarySerializer.readConfig(CONFIG_FILE);
|
||||
Sputnik.LOGGER.info("ajustes cargados");
|
||||
return;
|
||||
} catch (IOException e) {
|
||||
Sputnik.LOGGER.error("error cargando ajustes, intentando json", e);
|
||||
}
|
||||
}
|
||||
|
||||
try (FileReader reader = new FileReader(CONFIG_FILE)) {
|
||||
config = GSON.fromJson(reader, ClientConfig.class);
|
||||
CameraTweaks.LOGGER.info("ajustes cargados");
|
||||
} catch (IOException e) {
|
||||
CameraTweaks.LOGGER.error("no se pudieron cargar los ajustes, usando ajustes por defecto", e);
|
||||
ensureConfig();
|
||||
// Fallback to legacy JSON
|
||||
if (LEGACY_JSON_FILE.exists()) {
|
||||
try (FileReader reader = new FileReader(LEGACY_JSON_FILE)) {
|
||||
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||
config = gson.fromJson(reader, ClientConfig.class);
|
||||
Sputnik.LOGGER.info("ajustes json cargados (migración)");
|
||||
|
||||
save();
|
||||
return;
|
||||
} catch (IOException e) {
|
||||
Sputnik.LOGGER.error("error cargando json, usando defaults", e);
|
||||
}
|
||||
}
|
||||
|
||||
// crear nuevo config
|
||||
ensureConfig();
|
||||
save();
|
||||
}
|
||||
|
||||
// aplicar configuraciones cargadas
|
||||
@@ -74,7 +89,7 @@ public class ConfigManager {
|
||||
applyExtendableFrames();
|
||||
|
||||
loaded = true;
|
||||
CameraTweaks.LOGGER.info("ajustes aplicados");
|
||||
Sputnik.LOGGER.info("ajustes aplicados");
|
||||
}
|
||||
|
||||
// obtener configuración actual
|
||||
@@ -92,7 +107,7 @@ public class ConfigManager {
|
||||
save();
|
||||
}
|
||||
|
||||
public static void setSetting(Setting setting, Object value) {
|
||||
public static void setSetting(Setting<?> setting, Object value) {
|
||||
ensureConfig();
|
||||
config.settings.put(getSettingKey(setting), value);
|
||||
save();
|
||||
@@ -100,7 +115,10 @@ public class ConfigManager {
|
||||
|
||||
public static void setFramePosition(SettingsFrame frame) {
|
||||
ensureConfig();
|
||||
config.settingsFrames.put(frame.module.getName(), new int[] {frame.getX(), frame.getY()});
|
||||
if (!config.settingsFrames.containsKey(frame.getModule().getName()))
|
||||
config.settingsFrames.put(frame.getModule().getName(), new int[] {frame.getX(), frame.getY()});
|
||||
else
|
||||
config.settingsFrames.replace(frame.getModule().getName(), new int[] {frame.getX(), frame.getY()});
|
||||
save();
|
||||
}
|
||||
|
||||
@@ -122,17 +140,6 @@ public class ConfigManager {
|
||||
save();
|
||||
}
|
||||
|
||||
public static void setHudImagePath(String id, String imagePath) {
|
||||
ensureConfig();
|
||||
config.hudImagePaths.put(id, imagePath);
|
||||
save();
|
||||
}
|
||||
|
||||
public static String getHudImagePath(String id) {
|
||||
ensureConfig();
|
||||
return config.hudImagePaths.getOrDefault(id, "");
|
||||
}
|
||||
|
||||
public static void setSearchBarPosition(int x, int y) {
|
||||
ensureConfig();
|
||||
config.searchBarPosition = new int[] {x, y};
|
||||
@@ -143,7 +150,7 @@ public class ConfigManager {
|
||||
// ------------------ APLICAR AJUSTES ------------------
|
||||
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
public static void applySetting(Module parent, Setting setting) {
|
||||
public static void applySetting(Module parent, Setting<?> setting) {
|
||||
String key = getSettingKey(setting);
|
||||
|
||||
if (!config.settings.containsKey(key)) return;
|
||||
@@ -159,7 +166,7 @@ public class ConfigManager {
|
||||
case ListSetting listSetting -> applyListSetting(listSetting, value);
|
||||
case ColorSetting colorSetting -> applyColorSetting(colorSetting, value);
|
||||
case OptionSetting optionSetting -> applyOptionSetting(optionSetting, value);
|
||||
default -> CameraTweaks.LOGGER.warn("watafac queseso: {}", setting.getClass().getSimpleName());
|
||||
default -> Sputnik.LOGGER.warn("watafac queseso: {}", setting.getClass().getSimpleName());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,22 +176,29 @@ public class ConfigManager {
|
||||
module.setEnabled(config.moduleStates.get(module.getName()));
|
||||
}
|
||||
});
|
||||
CameraTweaks.LOGGER.info("estados de módulos aplicados");
|
||||
Sputnik.LOGGER.info("estados de módulos aplicados");
|
||||
}
|
||||
|
||||
private static void applyModuleSettings() {
|
||||
ModuleManager.INSTANCE.getModules().forEach(module -> {
|
||||
module.getSettings().forEach(setting -> applySetting(module, setting));
|
||||
});
|
||||
CameraTweaks.LOGGER.info("ajustes de módulos aplicados");
|
||||
Sputnik.LOGGER.info("ajustes de módulos aplicados");
|
||||
}
|
||||
|
||||
private static void applySettingsFrames() {
|
||||
config.settingsFrames.forEach((moduleName, position) -> {
|
||||
Module module = ModuleManager.INSTANCE.getModuleByName(moduleName);
|
||||
|
||||
if (module == null) {
|
||||
Sputnik.LOGGER.warn("\"null\" como módulo (\"{}\")", moduleName);
|
||||
return;
|
||||
}
|
||||
|
||||
ClickGUI.INSTANCE.openSettingsFrame(module, position[0], position[1]);
|
||||
});
|
||||
CameraTweaks.LOGGER.info("estados de marcos de ajustes aplicados");
|
||||
|
||||
Sputnik.LOGGER.info("estados de marcos de ajustes aplicados");
|
||||
}
|
||||
|
||||
private static void applySearchBarPosition() {
|
||||
@@ -192,7 +206,7 @@ public class ConfigManager {
|
||||
ClickGUI.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]);
|
||||
ClickGUI.INSTANCE.getSearchBar().setY(config.searchBarPosition[1]);
|
||||
}
|
||||
CameraTweaks.LOGGER.info("posición de la barra de búsqueda aplicada");
|
||||
Sputnik.LOGGER.info("posición de la barra de búsqueda aplicada");
|
||||
}
|
||||
|
||||
private static void applyGuiSettings() {
|
||||
@@ -200,40 +214,42 @@ public class ConfigManager {
|
||||
ClientSettingsFrame.guiSettings.getSettings().forEach(setting -> {
|
||||
applySetting(ClientSettingsFrame.guiSettings, setting);
|
||||
});
|
||||
CameraTweaks.LOGGER.info("ajustes del cliente aplicados");
|
||||
Sputnik.LOGGER.info("ajustes del cliente aplicados");
|
||||
}
|
||||
|
||||
private static void applyExtendableFrames() {
|
||||
applyExtendableFrame(ClickGUI.INSTANCE.getModulesFrame());
|
||||
applyExtendableFrame(ClickGUI.INSTANCE.getGuiSettingsFrame());
|
||||
|
||||
CameraTweaks.LOGGER.info("posiciones de marcos extendibles aplicadasa");
|
||||
Sputnik.LOGGER.info("posiciones de marcos extendibles aplicadas");
|
||||
ClickGUI.INSTANCE.refreshListButtons();
|
||||
}
|
||||
|
||||
private static void applyExtendableFrame(ModuleFrame frame) {
|
||||
ClientConfig.FrameData frameData = config.extendableFrames.get("M");
|
||||
private static void applyExtendableFrame(Frame<?> frame) {
|
||||
ClientConfig.FrameData frameData = null;
|
||||
if (frame instanceof ModuleFrame)
|
||||
frameData = config.extendableFrames.get("M");
|
||||
|
||||
if (frame instanceof ClientSettingsFrame)
|
||||
frameData = config.extendableFrames.get("S");
|
||||
|
||||
if (frameData != null) {
|
||||
frame.setX(frameData.x());
|
||||
frame.setY(frameData.y());
|
||||
frame.extended = frameData.extended();
|
||||
|
||||
if (frame instanceof ModuleFrame mFrame)
|
||||
mFrame.extended = frameData.extended();
|
||||
if (frame instanceof ClientSettingsFrame sFrame)
|
||||
sFrame.extended = frameData.extended();
|
||||
}
|
||||
}
|
||||
|
||||
private static void applyExtendableFrame(ClientSettingsFrame frame) {
|
||||
ClientConfig.FrameData frameData = config.extendableFrames.get("S");
|
||||
if (frameData != null) {
|
||||
frame.setX(frameData.x());
|
||||
frame.setY(frameData.y());
|
||||
frame.extended = frameData.extended();
|
||||
}
|
||||
}
|
||||
|
||||
// ajustes de módulos
|
||||
|
||||
private static void applyBooleanSetting(BooleanSetting setting, Object value) {
|
||||
if (value instanceof Boolean) {
|
||||
setting.setEnabled((Boolean) value);
|
||||
setting.setValue((Boolean) value);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,9 +275,9 @@ public class ConfigManager {
|
||||
|
||||
private static void applyKeySetting(KeySetting setting, Object value) {
|
||||
if (value instanceof Double) {
|
||||
setting.setKey(((Double) value).intValue());
|
||||
setting.setValue(((Double) value).intValue());
|
||||
} else if (value instanceof Integer) {
|
||||
setting.setKey((Integer) value);
|
||||
setting.setValue((Integer) value);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -275,7 +291,7 @@ public class ConfigManager {
|
||||
convertedValues.put(option, booleanValue instanceof Boolean && (Boolean) booleanValue);
|
||||
}
|
||||
|
||||
setting.setValues(convertedValues);
|
||||
setting.setValue(convertedValues);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -287,8 +303,14 @@ public class ConfigManager {
|
||||
Number b = (Number) map.get("b");
|
||||
Number a = (Number) map.get("a");
|
||||
|
||||
if (r != null && g != null && b != null && a != null)
|
||||
setting.setRGB(r.intValue(), g.intValue(), b.intValue(), a.intValue());
|
||||
if (r != null && g != null && b != null && a != null) {
|
||||
setting.setRGB(
|
||||
r.intValue(),
|
||||
g.intValue(),
|
||||
b.intValue(),
|
||||
a.intValue()
|
||||
);
|
||||
}
|
||||
|
||||
applyOptionalProperty(map, "rb", Boolean.class, setting::setRainbow);
|
||||
applyOptionalProperty(map, "rs", Number.class, val -> setting.setRainbowSpeed(val.intValue()));
|
||||
@@ -297,13 +319,12 @@ public class ConfigManager {
|
||||
}
|
||||
|
||||
private static <T> void applyOptionSetting(OptionSetting<T> setting, Object value) {
|
||||
if (value instanceof Double) {
|
||||
int index = ((Double) value).intValue();
|
||||
setting.setValue(setting.getOption(index));
|
||||
if (value instanceof String name) {
|
||||
setting.setValueByName(name);
|
||||
}
|
||||
}
|
||||
|
||||
private static <T> void applyOptionalProperty(Map<?, ?> map, String key, Class<T> type, java.util.function.Consumer<T> setter) {
|
||||
private static <T> void applyOptionalProperty(Map<?, ?> map, String key, Class<T> type, Consumer<T> setter) {
|
||||
Object value = map.get(key);
|
||||
if (type.isInstance(value)) {
|
||||
setter.accept(type.cast(value));
|
||||
@@ -314,19 +335,18 @@ public class ConfigManager {
|
||||
// ------------------ MÉTODOS DE AYUDA ------------------
|
||||
|
||||
private static boolean shouldApply() {
|
||||
return CameraTweaks.mc != null && ModuleManager.INSTANCE != null && config != null;
|
||||
return Sputnik.mc != null && ModuleManager.INSTANCE != null && config != null;
|
||||
}
|
||||
|
||||
|
||||
private static void ensureConfig() {
|
||||
if (config == null) config = new ClientConfig();
|
||||
}
|
||||
|
||||
private static String getSettingKey(Setting setting) {
|
||||
return setting.getModule().getName() + ":" + setting.getName();
|
||||
private static String getSettingKey(Setting<?> setting) {
|
||||
return setting.getSg().getModule().getName() + ":" + setting.getName();
|
||||
}
|
||||
|
||||
public static boolean hasLoaded() {
|
||||
return loaded;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package me.retucio.sputnik.event;
|
||||
|
||||
import net.minecraft.entity.vehicle.AbstractBoatEntity;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
|
||||
public class BoatMoveEvent extends Event {
|
||||
|
||||
private final AbstractBoatEntity boat;
|
||||
private Vec3d pos;
|
||||
|
||||
public BoatMoveEvent(AbstractBoatEntity boat, Vec3d pos) {
|
||||
this.boat = boat;
|
||||
this.pos = pos;
|
||||
}
|
||||
|
||||
public AbstractBoatEntity getBoat() {
|
||||
return boat;
|
||||
}
|
||||
|
||||
public Vec3d getPos() {
|
||||
return pos;
|
||||
}
|
||||
|
||||
public void setPos(Vec3d pos) {
|
||||
this.pos = pos;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.event;
|
||||
package me.retucio.sputnik.event;
|
||||
|
||||
// evento base, cancelable (usado en mixins)
|
||||
public class Event {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.event;
|
||||
package me.retucio.sputnik.event;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Modifier;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.event;
|
||||
package me.retucio.sputnik.event;
|
||||
|
||||
public enum Stage {
|
||||
PRE, // antes de que haya sucedido
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.camtweaks.event;
|
||||
package me.retucio.sputnik.event;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientWorldMixin#onAddEntity
|
||||
* @see me.retucio.sputnik.mixin.ClientWorldMixin#onAddEntity
|
||||
*/
|
||||
public class AddEntityEvent extends Event {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
|
||||
public class AttackBlockEvent extends Event {
|
||||
|
||||
private final BlockPos pos;
|
||||
private final Direction dir;
|
||||
|
||||
public AttackBlockEvent(BlockPos pos, Direction dir) {
|
||||
this.pos = pos;
|
||||
this.dir = dir;
|
||||
}
|
||||
|
||||
public BlockPos getPos() {
|
||||
return pos;
|
||||
}
|
||||
|
||||
public Direction getDir() {
|
||||
return dir;
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onAttackEntity
|
||||
* @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onAttackEntity
|
||||
*/
|
||||
public class AttackEntityEvent extends Event {
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.shape.VoxelShape;
|
||||
|
||||
public class BlockShapeEvent extends Event {
|
||||
|
||||
private BlockState state;
|
||||
private BlockPos pos;
|
||||
private VoxelShape shape;
|
||||
|
||||
public BlockShapeEvent(BlockState state, BlockPos pos, VoxelShape shape) {
|
||||
this.state = state;
|
||||
this.pos = pos;
|
||||
this.setShape(shape);
|
||||
}
|
||||
|
||||
public BlockState getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setState(BlockState state) {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public BlockPos getPos() {
|
||||
return pos;
|
||||
}
|
||||
|
||||
public void setPos(BlockPos pos) {
|
||||
this.pos = pos;
|
||||
}
|
||||
|
||||
public VoxelShape getShape() {
|
||||
return shape;
|
||||
}
|
||||
|
||||
public void setShape(VoxelShape shape) {
|
||||
this.shape = shape;
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onBlockBreak
|
||||
* @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onBlockBreak
|
||||
*/
|
||||
public class BreakBlockEvent extends Event {
|
||||
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.EntityMixin#onRotation
|
||||
* @see me.retucio.camtweaks.mixin.EntityMixin#onChangeYaw
|
||||
* @see me.retucio.camtweaks.mixin.EntityMixin#onChangePitch
|
||||
* @see me.retucio.sputnik.mixin.EntityMixin#onRotation
|
||||
* @see me.retucio.sputnik.mixin.EntityMixin#onChangeYaw
|
||||
* @see me.retucio.sputnik.mixin.EntityMixin#onChangePitch
|
||||
*/
|
||||
public class ChangeRotationEvent extends Event {
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.sputnik.mixin.ChunkOcclusionDataBuilderMixin#onChunkOcclusion
|
||||
*/
|
||||
public class ChunkOcclusionEvent extends Event {}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.module.modules.misc.ChatPlus;
|
||||
import me.retucio.sputnik.module.modules.misc.ChatPlus;
|
||||
import net.minecraft.text.ClickEvent;
|
||||
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
public class ClipAtLedgeEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ItemStackMixin#onDamage
|
||||
* @see me.retucio.sputnik.mixin.ItemStackMixin#onDamage
|
||||
*/
|
||||
public class DamageItemEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.network.ServerInfo;
|
||||
import net.minecraft.network.DisconnectionInfo;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onDisconnect
|
||||
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onDisconnect
|
||||
*/
|
||||
public class DisconnectEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.GameRendererMixin#modifyFov
|
||||
* @see me.retucio.sputnik.mixin.GameRendererMixin#modifyFov
|
||||
*/
|
||||
public class GetFOVEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.Hand;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onEntityInteract
|
||||
* @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onEntityInteract
|
||||
*/
|
||||
public class InteractEntityEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onJoinWorld
|
||||
* @see me.retucio.sputnik.mixin.MinecraftClientMixin#onJoinWorld
|
||||
*/
|
||||
public class JoinWorldEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.KeyboardMixin#onKeyPress
|
||||
* @see me.retucio.sputnik.mixin.KeyboardMixin#onKeyPress
|
||||
*/
|
||||
public class KeyEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.MouseMixin#onMouseButton
|
||||
* @see me.retucio.sputnik.mixin.MouseMixin#onMouseButton
|
||||
*/
|
||||
public class MouseClickEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.MouseMixin#onMouseScroll
|
||||
* @see me.retucio.sputnik.mixin.MouseMixin#onMouseScroll
|
||||
*/
|
||||
public class MouseScrollEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onOpenScreen
|
||||
* @see me.retucio.sputnik.mixin.MinecraftClientMixin#onOpenScreen
|
||||
*/
|
||||
public class OpenScreenEvent extends Event {
|
||||
|
||||
+6
-8
@@ -1,16 +1,14 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.camtweaks.event.Stage;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import me.retucio.sputnik.event.Stage;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPre
|
||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPost
|
||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onReceivePacket
|
||||
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPre
|
||||
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPost
|
||||
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onReceivePacket
|
||||
*/
|
||||
public class PacketEvent {
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.option.Perspective;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.GameOptionsMixin#changePerspective
|
||||
* @see me.retucio.sputnik.mixin.GameOptionsMixin#changePerspective
|
||||
*/
|
||||
public class PerspectiveChangeEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.hit.BlockHitResult;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onBlockPlace
|
||||
* @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onBlockPlace
|
||||
*/
|
||||
public class PlaceBlockEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.gui.hud.MessageIndicator;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ChatHudMixin#onAddMessage
|
||||
* @see me.retucio.sputnik.mixin.ChatHudMixin#onAddMessage
|
||||
*/
|
||||
public class ReceiveMessageEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientWorldMixin#onRemoveEntity
|
||||
* @see me.retucio.sputnik.mixin.ClientWorldMixin#onRemoveEntity
|
||||
*/
|
||||
public class RemoveEntityEvent extends Event {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.client.render.RenderTickCounter;
|
||||
|
||||
public class Render2DEvent extends Event {
|
||||
|
||||
private final DrawContext ctx;
|
||||
private final RenderTickCounter tc;
|
||||
|
||||
public Render2DEvent(DrawContext ctx, RenderTickCounter tc) {
|
||||
this.ctx = ctx;
|
||||
this.tc = tc;
|
||||
}
|
||||
|
||||
public DrawContext getCtx() {
|
||||
return ctx;
|
||||
}
|
||||
|
||||
public RenderTickCounter getTc() {
|
||||
return tc;
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -1,21 +1,21 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.render.Camera;
|
||||
import net.minecraft.client.render.RenderTickCounter;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.WorldRendererMixin#render
|
||||
* @see me.retucio.sputnik.mixin.WorldRendererMixin#render
|
||||
*/
|
||||
public class RenderWorldEvent extends Event {
|
||||
public class Render3DEvent extends Event {
|
||||
|
||||
private final MatrixStack matrices;
|
||||
private final RenderTickCounter tc;
|
||||
private final Camera camera;
|
||||
|
||||
public RenderWorldEvent(MatrixStack matrices, RenderTickCounter tc, Camera camera) {
|
||||
public Render3DEvent(MatrixStack matrices, RenderTickCounter tc, Camera camera) {
|
||||
this.matrices = matrices;
|
||||
this.tc = tc;
|
||||
this.camera = camera;
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.Hand;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.HeldItemRendererMixin#onRenderArm
|
||||
* @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderArm
|
||||
*/
|
||||
public class RenderArmEvent extends Event {
|
||||
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.gui.hud.ClientBossBar;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
@@ -8,9 +8,9 @@ import java.util.Iterator;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifyBossBarIterator
|
||||
* @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifyBossBarName
|
||||
* @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifySpacingConstant
|
||||
* @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarIterator
|
||||
* @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarName
|
||||
* @see me.retucio.sputnik.mixin.BossBarHudMixin#modifySpacingConstant
|
||||
*/
|
||||
public class RenderBossbarEvent {
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.Hand;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.HeldItemRendererMixin#onRenderItem
|
||||
* @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderItem
|
||||
*/
|
||||
public class RenderHeldItemEvent extends Event {
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.ClientPlayNetworkHandlerMixin#onSendMessage
|
||||
* @see me.retucio.sputnik.mixin.ClientPlayNetworkHandlerMixin#onSendMessage
|
||||
*/
|
||||
public class SendMessageEvent extends Event {
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.sputnik.mixin.MinecraftClientMixin#onStop
|
||||
*/
|
||||
public class ShutdownEvent extends Event {
|
||||
|
||||
public ShutdownEvent() {}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.sputnik.mixin.MinecraftClientMixin#onTickPre
|
||||
* @see me.retucio.sputnik.mixin.MinecraftClientMixin#onTickPost
|
||||
*/
|
||||
public class TickEvent {
|
||||
|
||||
public static class Pre extends Event {}
|
||||
public static class Post extends Event {}
|
||||
}
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.retucio.camtweaks.event.events;
|
||||
package me.retucio.sputnik.event.events;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Hand;
|
||||
|
||||
|
||||
/**
|
||||
* @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onUseItem
|
||||
* @see me.retucio.sputnik.mixin.MinecraftClientMixin#onUseItem
|
||||
*/
|
||||
public class UseItemEvent extends Event {
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package me.retucio.camtweaks.event.events.camtweaks;
|
||||
package me.retucio.sputnik.event.events.sputnik;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
// se genera cada que se interactúa con el marco de ajustes de la interfaz
|
||||
public class GUISettingsFrameEvent {
|
||||
@@ -0,0 +1,6 @@
|
||||
package me.retucio.sputnik.event.events.sputnik;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
// se genera cuando carga el gestor de capas
|
||||
public class LoadCapeManagerEvent extends Event {}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package me.retucio.camtweaks.event.events.camtweaks;
|
||||
package me.retucio.sputnik.event.events.sputnik;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
// se genera cuando carga la interfaz del mod
|
||||
public class LoadClickGUIEvent extends Event {}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package me.retucio.camtweaks.event.events.camtweaks;
|
||||
package me.retucio.sputnik.event.events.sputnik;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
// se genera cuando carga el gestor de comandos
|
||||
public class LoadCommandManagerEvent extends Event {}
|
||||
@@ -0,0 +1,23 @@
|
||||
package me.retucio.sputnik.event.events.sputnik;
|
||||
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
public class LoadConfigEvent extends Event {
|
||||
|
||||
private final boolean failed;
|
||||
private final boolean fileExisted;
|
||||
|
||||
|
||||
public LoadConfigEvent(boolean failed, boolean fileExisted) {
|
||||
this.failed = failed;
|
||||
this.fileExisted = fileExisted;
|
||||
}
|
||||
|
||||
public boolean hasFailed() {
|
||||
return failed;
|
||||
}
|
||||
|
||||
public boolean didFileExist() {
|
||||
return fileExisted;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package me.retucio.camtweaks.event.events.camtweaks;
|
||||
package me.retucio.sputnik.event.events.sputnik;
|
||||
|
||||
import me.retucio.camtweaks.event.Event;
|
||||
import me.retucio.sputnik.event.Event;
|
||||
|
||||
// se genera cuando carga el gestor de módulos
|
||||
public class LoadModuleManagerEvent extends Event {}
|
||||
Loaded 100 of 428 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user