Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec3e633cec | ||
|
|
8f17bd8e67 | ||
|
|
dc2429918e | ||
|
|
94a9b1dade | ||
|
|
48899f85f9 |
No files matched your search
+1
-3
@@ -43,6 +43,4 @@ replay_*.log
|
|||||||
|
|
||||||
todo.txt
|
todo.txt
|
||||||
cambios.md
|
cambios.md
|
||||||
remappedSrc/
|
remappedSrc/
|
||||||
src/main/java/me/retucio/camtweaks/ui/widgets/Frame.java
|
|
||||||
src/main/java/me/retucio/camtweaks/ui/widgets/Button.java
|
|
||||||
@@ -5,19 +5,19 @@ mod para Minecraft Fabric 1.21.10 que añade algunas cosas QOL, mayormente relac
|
|||||||
## instalación
|
## instalación
|
||||||
|
|
||||||
### para gente normal:
|
### 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
|
2. selecionar la versión más reciente
|
||||||
3. descargar el .jar
|
3. descargar el .jar
|
||||||
4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`)
|
4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`)
|
||||||
|
|
||||||
asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `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.
|
es posible que haya problemas al usarlo junto a otros mods, especialmente junto a otros clientes, pues pueden conflictar entre ellos.
|
||||||
|
|
||||||
### para frikis de 200 de iq
|
### para frikis de 200 de iq
|
||||||
1. clona el respositorio (`git clone https://github.com/retuci0/camera-tweaks`)
|
1. clona el respositorio (`git clone https://github.com/retuci0/sputnik`)
|
||||||
2. entra al directorio del repositorio (`cd camera-tweaks`)
|
2. entra al directorio del repositorio (`cd sputnik`)
|
||||||
3. `gradlew build` para Windows o `chmod +x gradlew` + `./gradlew build` para Linux (Mac es Linux)
|
3. `gradlew build` para Windows 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
|
## uso
|
||||||
|
|
||||||
@@ -54,6 +54,7 @@ algunos módulos tienen teclas asignadas por defecto, asígnales `ESC` para desa
|
|||||||
<img src="screenshots/fullbright.png" alt="fullbright en modo gamma cambiando el color de los shaders">
|
<img src="screenshots/fullbright.png" alt="fullbright en modo gamma cambiando el color de los shaders">
|
||||||
<img src="screenshots/hud.png" alt="HUD">
|
<img src="screenshots/hud.png" alt="HUD">
|
||||||
<img src="screenshots/hudeditor.png" alt="editor de HUD">
|
<img src="screenshots/hudeditor.png" alt="editor de HUD">
|
||||||
|
<img src="screenshots/colorpicker.png" alt="selector de colores">
|
||||||
|
|
||||||
## contibuciones
|
## contibuciones
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -24,12 +24,12 @@ dependencies {
|
|||||||
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
||||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||||
|
|
||||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
loom {
|
loom {
|
||||||
accessWidenerPath = file("src/main/resources/camtweaks.accesswidener")
|
accessWidenerPath = file("src/main/resources/sputnik.accesswidener")
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
|
|||||||
+5
-14
@@ -1,27 +1,18 @@
|
|||||||
# v2.0
|
# v2.4
|
||||||
|
|
||||||
## novedades
|
## novedades
|
||||||
|
|
||||||
### adiciones
|
ahora se usa el formato binario (.dat) en vez de .json para guardar ajustes, lo que los hace más rápidos, y el archivo más liviano
|
||||||
|
|
||||||
- ajuste de opción: similar a enumsetting, pero abre un marco de selección, igual que listsetting.
|
### adiciones
|
||||||
|
|
||||||
#### módulos nuevos:
|
#### módulos nuevos:
|
||||||
|
|
||||||
- resaltado de bloques: resalta bloques de cierto tipo renderizando una caja con su forma, visible a través de paredes
|
- capas: cambia (solo visualmente, para ti) la capa que usas a una custom de las disponibles
|
||||||
- delay de paquetes: simula un ping alto añadiendo delay a los paquetes
|
|
||||||
- inventario plus: te permite mover items a cualquier slot del inventario mediante teclas (ej.: d + tecla para slot 4);
|
|
||||||
- progreso de minado: muestra el progreso de minado de un bloque de una manera más visual, mediante cajas de color
|
|
||||||
- mano secundaria: equipa de manera automática un ítem en tu mano secundaria
|
|
||||||
- moverse en interfaz: te permite utilizar las teclas de movimiento con ciertas interfaces abiertas (configurable)
|
|
||||||
|
|
||||||
### arreglos / mejoras
|
### arreglos / mejoras
|
||||||
|
|
||||||
- ahora se pueden mostrar también las coordenadas del nether en el elemento del hud para coordenadas
|
- renombrado bien todo que lo hice con prisa
|
||||||
- ahora ChatPlus utilizará los corchetes [] para mostrar la hora (antes era <>), además de también detectar cuando un jugador se une a la hora de dibujar las cabezas
|
|
||||||
- ahora puedes elegir el sonido en aviso de baja dur., junto a la altura y volumen de este
|
|
||||||
- ya no se pueden abrir interfaces del mod estando en pantallas donde se suele escribir (chat, carteles, etc.)
|
|
||||||
- arreglado algunos problemas con las configuraciones
|
|
||||||
|
|
||||||
## problemas reconocidos
|
## problemas reconocidos
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ No Telemetry: https://modrinth.com/mod/no-telemetry
|
|||||||
Trouser Streak: https://github.com/etianl/Trouser-Streak
|
Trouser Streak: https://github.com/etianl/Trouser-Streak
|
||||||
No More Purple: https://github.com/Pepperoni-Jabroni/NoMorePurple/
|
No More Purple: https://github.com/Pepperoni-Jabroni/NoMorePurple/
|
||||||
bypass-resource-pack: https://github.com/emilyy-dev/bypass-resource-pack
|
bypass-resource-pack: https://github.com/emilyy-dev/bypass-resource-pack
|
||||||
|
elytra-recast: https://github.com/InLieuOfLuna/elytra-recast/
|
||||||
|
|
||||||
probablemente más pero como tengo demencia se me olvida
|
probablemente más pero como tengo demencia se me olvida
|
||||||
si quieres que te acredite o quite tu código de mi mod, mándame un mensaje en discord (username: retucio) y sin problemas :)
|
si quieres que te acredite o quite tu código de mi mod, mándame un mensaje en discord (username: retucio) y sin problemas :)
|
||||||
+9
-9
@@ -1,13 +1,13 @@
|
|||||||
org.gradle.jvmargs=-Xmx1G
|
org.gradle.jvmargs=-Xmx2G
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
minecraft_version=1.21.10
|
minecraft_version=1.21.11
|
||||||
yarn_mappings=1.21.10+build.2
|
yarn_mappings=1.21.11+build.3
|
||||||
loader_version=0.17.3
|
loader_version=0.18.4
|
||||||
loom_version=1.11-SNAPSHOT
|
loom_version=1.13-SNAPSHOT
|
||||||
|
|
||||||
mod_version=2.0
|
fabric_api_version=0.140.2+1.21.11
|
||||||
|
|
||||||
|
mod_version=2.4
|
||||||
maven_group=me.retucio
|
maven_group=me.retucio
|
||||||
archives_base_name=camtweaks
|
archives_base_name=sputnik
|
||||||
|
|
||||||
fabric_version=0.135.0+1.21.10
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 915 KiB |
@@ -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,19 +0,0 @@
|
|||||||
package me.retucio.camtweaks.mixin;
|
|
||||||
|
|
||||||
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
|
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
|
||||||
import me.retucio.camtweaks.module.modules.PortalGUI;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.network.ClientPlayerEntity;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
|
|
||||||
@Mixin(ClientPlayerEntity.class)
|
|
||||||
public abstract class ClientPlayerEntityMixin {
|
|
||||||
|
|
||||||
@ModifyExpressionValue(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
|
|
||||||
private Screen allowScreensInPortals(Screen original) {
|
|
||||||
if (ModuleManager.INSTANCE.getModuleByClass(PortalGUI.class).isEnabled()) return null;
|
|
||||||
return original;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
package me.retucio.camtweaks.mixin;
|
|
||||||
|
|
||||||
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
|
|
||||||
import com.llamalad7.mixinextras.sugar.Local;
|
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
|
||||||
import me.retucio.camtweaks.module.modules.TimeChanger;
|
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
|
|
||||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
|
||||||
|
|
||||||
@Mixin(DimensionType.class)
|
|
||||||
public abstract class DimensionTypeMixin {
|
|
||||||
|
|
||||||
// no consigo arreglar lo de que la fase lunar por defecto siempre sea luna llena
|
|
||||||
@ModifyReturnValue(method = "getMoonPhase", at = @At("RETURN"))
|
|
||||||
private int overrideMoonPhase(int original, @Local(argsOnly = true) long time) {
|
|
||||||
TimeChanger timeChanger = ModuleManager.INSTANCE.getModuleByClass(TimeChanger.class);
|
|
||||||
if (timeChanger == null || !timeChanger.isEnabled() || mc.world == null) {
|
|
||||||
return original;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (timeChanger.moonPhase.is(TimeChanger.MoonPhases.DEFAULT))
|
|
||||||
return (int) (time / 24000L % 8L + 8L) % 8;
|
|
||||||
|
|
||||||
return timeChanger.getMoonPhase();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package me.retucio.camtweaks.module.modules;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
|
|
||||||
/** continúa en:
|
|
||||||
* @see me.retucio.camtweaks.mixin.EntityMixin
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class AntiInvis extends Module {
|
|
||||||
|
|
||||||
public AntiInvis() {
|
|
||||||
super("anti invis", "te permite ver a los jugadores invisibles");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package me.retucio.camtweaks.module.modules;
|
|
||||||
|
|
||||||
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.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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package me.retucio.camtweaks.module.modules;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
|
|
||||||
public class Headhitters extends Module {
|
|
||||||
|
|
||||||
public Headhitters() {
|
|
||||||
super("headhitters", "mantén pulsado el espacio para hacer headhitting sin tener que espamearlo");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTick() {
|
|
||||||
if (mc.player == null) return;
|
|
||||||
mc.player.jumpingCooldown = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package me.retucio.camtweaks.module.modules;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
import net.minecraft.registry.tag.ItemTags;
|
|
||||||
|
|
||||||
public class NoMiningInterruptions extends Module {
|
|
||||||
|
|
||||||
public BooleanSetting withPickaxeOnly = addSetting(new BooleanSetting("solo con pico", "ignorar entidades solamente cuando se sujeta un pico", false));
|
|
||||||
|
|
||||||
public NoMiningInterruptions() {
|
|
||||||
super("minar sin interrupción", "te permite minar bloques a través de entidades");
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean shouldIgnoreEntity(Entity entity) {
|
|
||||||
if (entity == null || !this.isEnabled()) return false;
|
|
||||||
if (withPickaxeOnly.isEnabled())
|
|
||||||
return (mc.player.getMainHandStack().isIn(ItemTags.PICKAXES) || mc.player.getOffHandStack().isIn(ItemTags.PICKAXES));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package me.retucio.camtweaks.module.modules;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
|
|
||||||
/** continúa en:
|
|
||||||
* @see me.retucio.camtweaks.mixin.ClientPlayerEntityMixin
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class PortalGUI extends Module {
|
|
||||||
|
|
||||||
public PortalGUI() {
|
|
||||||
super("interfaz en portales", "te permite abrir interfaces dentro de portales, como el chat o el inventario");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package me.retucio.camtweaks.module.modules;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
import net.minecraft.client.network.ServerInfo;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
|
|
||||||
/** continúa en:
|
|
||||||
* @see me.retucio.camtweaks.mixin.ClientCommonNetworkHandlerMixin
|
|
||||||
* @see me.retucio.camtweaks.mixin.ConfirmScreenMixin
|
|
||||||
* @see me.retucio.camtweaks.mixin.ResourcePackPolicyMixin
|
|
||||||
* @see me.retucio.camtweaks.mixin.ServerConnectorMixin
|
|
||||||
* @see me.retucio.camtweaks.mixin.ServerInfoMixin
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class RPackBypass extends Module {
|
|
||||||
|
|
||||||
public String TAG_NAME = "bypassTextures";
|
|
||||||
public String ENUM_NAME = "BYPASS";
|
|
||||||
public Text BYPASS_TEXT = Text.literal("nuh uh");
|
|
||||||
|
|
||||||
public RPackBypass() {
|
|
||||||
super("bypassear packs", "te permite omitir packs de recursos forzados por servers");
|
|
||||||
}
|
|
||||||
|
|
||||||
public ServerInfo.ResourcePackPolicy getPolicy() {
|
|
||||||
return ServerInfo.ResourcePackPolicy.valueOf(ENUM_NAME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
package me.retucio.camtweaks.ui.buttons;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
import me.retucio.camtweaks.module.settings.ColorSetting;
|
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
|
||||||
import me.retucio.camtweaks.ui.frames.SettingsFrame;
|
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
|
||||||
import me.retucio.camtweaks.util.Colors;
|
|
||||||
import me.retucio.camtweaks.util.render.DrawUtil;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
import java.awt.*;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
|
||||||
|
|
||||||
public class ColorButton extends SettingButton {
|
|
||||||
|
|
||||||
private final ColorSetting setting;
|
|
||||||
|
|
||||||
public ColorButton(ColorSetting setting, SettingsFrame parent, int offset) {
|
|
||||||
super(setting, parent, offset);
|
|
||||||
this.setting = setting;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(DrawContext ctx, double mouseX, double mouseY, float delta) {
|
|
||||||
// fondo
|
|
||||||
Color bgColor = isHovered((int) mouseX, (int) mouseY)
|
|
||||||
? Colors.buttonColor.brighter()
|
|
||||||
: Colors.buttonColor;
|
|
||||||
|
|
||||||
ctx.fill(x, y, x + w, y + h, bgColor.getRGB());
|
|
||||||
|
|
||||||
// prev. del color
|
|
||||||
int previewSize = h - 6;
|
|
||||||
int previewX = x + 5;
|
|
||||||
int previewY = y + 3;
|
|
||||||
|
|
||||||
DrawUtil.drawBorder(ctx, previewX - 1, previewY - 1, previewSize + 2, previewSize + 2, setting.isRainbow() ? Colors.mainColor.getRGB() : -1);
|
|
||||||
ctx.fill(previewX, previewY, previewX + previewSize, previewY + previewSize, setting.getColor().getRGB());
|
|
||||||
|
|
||||||
// texto
|
|
||||||
String label = setting.getName();
|
|
||||||
int textX = previewX + previewSize + 5;
|
|
||||||
ctx.drawText(parent.mc.textRenderer, label, textX, y + 3, -1, true);
|
|
||||||
|
|
||||||
// valor actual
|
|
||||||
String valueText = setting.isRainbow() ? "gay." : Colors.ARGBtoHex(setting.getA(), setting.getR(), setting.getG(), setting.getB());
|
|
||||||
int valueWidth = parent.mc.textRenderer.getWidth(valueText);
|
|
||||||
ctx.drawText(parent.mc.textRenderer, valueText, x + w - valueWidth - 5, y + 3, -1, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawTooltip(DrawContext ctx, double mouseX, double mouseY) {
|
|
||||||
if (isHovered((int) mouseX, (int) mouseY)) {
|
|
||||||
List<Text> tooltip = new ArrayList<>();
|
|
||||||
tooltip.add(Text.of(setting.getDescription()));
|
|
||||||
tooltip.add(setting.getTooltipText());
|
|
||||||
|
|
||||||
ctx.drawTooltip(mc.textRenderer, tooltip, (int) mouseX, (int) mouseY + 20);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseClicked(double mouseX, double mouseY, int button) {
|
|
||||||
if (isHovered((int) mouseX, (int) mouseY) && ClickGUI.INSTANCE.trySelect(this)) {
|
|
||||||
if (button == 0) {
|
|
||||||
// click izq.: abrir selector de colores
|
|
||||||
ClickGUI.INSTANCE.openColorPickerFrame(setting.getModule(), setting, parent.x + parent.w + 120, parent.renderY + offset);
|
|
||||||
} else if (button == 1 && mc.isShiftPressed()) {
|
|
||||||
// shift + clic dcho.: restablecer color
|
|
||||||
setting.reset();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseReleased(double mouseX, double mouseY, int button) {
|
|
||||||
ClickGUI.INSTANCE.unselect(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseDragged(double mouseX, double mouseY) {}
|
|
||||||
|
|
||||||
public ColorSetting getSetting() {
|
|
||||||
return setting;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void refreshDummy() {
|
|
||||||
// This is called when the color picker frame needs to be refreshed
|
|
||||||
// We'll update any linked dummy module in the color picker frame
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
package me.retucio.camtweaks.ui.buttons;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
|
||||||
import me.retucio.camtweaks.ui.frames.ModuleFrame;
|
|
||||||
import me.retucio.camtweaks.util.Colors;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
// clase para el botón para cada módulo
|
|
||||||
public class ModuleButton {
|
|
||||||
|
|
||||||
private final Module module;
|
|
||||||
public ModuleFrame parent;
|
|
||||||
public int offset;
|
|
||||||
public final int height = 18;
|
|
||||||
|
|
||||||
public ModuleButton(Module module, ModuleFrame parent, int offset) {
|
|
||||||
this.module = module;
|
|
||||||
this.parent = parent;
|
|
||||||
this.offset = offset;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void render(DrawContext ctx, double mouseX, double mouseY, float delta) {
|
|
||||||
ctx.fill( // dibujar el contorno del botón
|
|
||||||
parent.x + 2, parent.renderY + offset + 3,
|
|
||||||
parent.x + parent.w - 2 , parent.renderY + height + offset,
|
|
||||||
determineColor(mouseX, mouseY));
|
|
||||||
|
|
||||||
ctx.drawText( // dibujar el nombre del módulo
|
|
||||||
parent.mc.textRenderer, module.getName(),
|
|
||||||
parent.x + 5, parent.renderY + offset + (height / 2) - (parent.mc.textRenderer.fontHeight / 2) + 2,
|
|
||||||
-1, true);
|
|
||||||
|
|
||||||
// dibujar "tooltips" (cajas de texto) al pasar el puntero encima del botón, para mostrar su descripción
|
|
||||||
if (isHovered((int) mouseX, (int) mouseY))
|
|
||||||
ctx.drawTooltip(Text.of(module.getDescription()), (int) mouseX, (int) mouseY + 20);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void mouseClicked(double mouseX, double mouseY, int button) {
|
|
||||||
if (isHovered((int) mouseX, (int) mouseY) && ClickGUI.INSTANCE.trySelect(this)) {
|
|
||||||
if (button == 0) { // clic izquierdo para activar / desactivar el módulo
|
|
||||||
module.toggle();
|
|
||||||
} else if (button == 1) { // clic derecho para el marco de ajustes (también lo cierra si está abierto)
|
|
||||||
if (ClickGUI.INSTANCE.isSettingsFrameOpen(module))
|
|
||||||
ClickGUI.INSTANCE.closeSettingsFrame(module);
|
|
||||||
else
|
|
||||||
ClickGUI.INSTANCE.openSettingsFrame(module,
|
|
||||||
parent.x + parent.w + 120, parent.renderY + offset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void mouseReleased(double mouseX, double mouseY, int button) {
|
|
||||||
ClickGUI.INSTANCE.unselect(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// verifica si el puntero del ratón se encuentra sobre el botón del módulo
|
|
||||||
public boolean isHovered(int mouseX, int mouseY) {
|
|
||||||
return ClickGUI.INSTANCE.canSelect(this)
|
|
||||||
&& mouseX > parent.x
|
|
||||||
&& mouseX < parent.x + parent.w
|
|
||||||
&& mouseY > parent.renderY + offset
|
|
||||||
&& mouseY < parent.renderY + height + offset;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int determineColor(double mouseX, double mouseY) {
|
|
||||||
// determina el color del botón, dependiendo de si está el puntero encima y si está activado
|
|
||||||
if (module.isEnabled())
|
|
||||||
return isHovered((int) mouseX, (int) mouseY) ? Colors.mainColor.brighter().getRGB() : Colors.mainColor.getRGB();
|
|
||||||
return isHovered((int) mouseX, (int) mouseY) ? Colors.buttonColor.brighter().getRGB() : Colors.buttonColor.getRGB();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Module getModule() {
|
|
||||||
return module;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
package me.retucio.camtweaks.ui.buttons;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.settings.Setting;
|
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
|
||||||
import me.retucio.camtweaks.ui.frames.SettingsFrame;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
// clase base para los botones de los ajustes
|
|
||||||
public abstract class SettingButton {
|
|
||||||
|
|
||||||
protected final Setting setting;
|
|
||||||
protected final SettingsFrame parent;
|
|
||||||
protected int offset;
|
|
||||||
|
|
||||||
protected int x, y, w, h;
|
|
||||||
|
|
||||||
public SettingButton(Setting setting, SettingsFrame parent, int offset) {
|
|
||||||
this.setting = setting;
|
|
||||||
this.parent = parent;
|
|
||||||
this.offset = offset;
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void render(DrawContext ctx, double mouseX, double mouseY, float delta);
|
|
||||||
public abstract void mouseClicked(double mouseX, double mouseY, int button);
|
|
||||||
public abstract void mouseReleased(double mouseX, double mouseY, int button);
|
|
||||||
public abstract void mouseDragged(double mouseX, double mouseY);
|
|
||||||
|
|
||||||
// dibujar "tooltips" (cajitas de texto bajo el puntero del ratón) con la descripción para asistir al usuario en el caso de que tenga down
|
|
||||||
public void drawTooltip(DrawContext ctx, double mouseX, double mouseY) {
|
|
||||||
if (isHovered((int) mouseX, (int) mouseY))
|
|
||||||
ctx.drawTooltip(Text.of(setting.getDescription()), (int) mouseX, (int) mouseY + 20);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean isHovered(double mouseX, double mouseY) {
|
|
||||||
return isHovered((int) mouseX, (int) mouseY);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean isHovered(int mouseX, int mouseY) {
|
|
||||||
if (!ClickGUI.INSTANCE.canSelect(this)) return false;
|
|
||||||
return mouseX > x && mouseX < x + w &&
|
|
||||||
mouseY > y && mouseY < y + h;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Setting getSetting() {
|
|
||||||
return setting;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getX() {
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setX(int x) {
|
|
||||||
this.x = x;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getY() {
|
|
||||||
return y;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setY(int y) {
|
|
||||||
this.y = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getW() {
|
|
||||||
return w;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setW(int w) {
|
|
||||||
this.w = w;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getH() {
|
|
||||||
return h;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setH(int h) {
|
|
||||||
this.h = h;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
package me.retucio.camtweaks.ui.buttons;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.settings.BooleanSetting;
|
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
|
||||||
import me.retucio.camtweaks.ui.frames.SettingsFrame;
|
|
||||||
import me.retucio.camtweaks.util.Colors;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
|
|
||||||
import java.awt.*;
|
|
||||||
|
|
||||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
|
||||||
|
|
||||||
// botón para los ajustes booleanos (funciona como un interruptor)
|
|
||||||
public class ToggleButton extends SettingButton {
|
|
||||||
|
|
||||||
private final BooleanSetting setting;
|
|
||||||
|
|
||||||
public ToggleButton(BooleanSetting setting, SettingsFrame parent, int offset) {
|
|
||||||
super(setting, parent, offset);
|
|
||||||
this.setting = setting;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(DrawContext ctx, double mouseX, double mouseY, float delta) {
|
|
||||||
Color color = setting.isEnabled()
|
|
||||||
? Colors.enabledToggleButtonColor
|
|
||||||
: Colors.disabledToggleButtonColor;
|
|
||||||
|
|
||||||
if (isHovered((int) mouseX, (int) mouseY))
|
|
||||||
color = color.brighter();
|
|
||||||
|
|
||||||
ctx.fill(x, y, x + w, y + h, color.getRGB());
|
|
||||||
ctx.drawText(parent.mc.textRenderer, setting.getName(), x + 5, y + 3, -1, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseClicked(double mouseX, double mouseY, int button) {
|
|
||||||
if (isHovered((int) mouseX, (int) mouseY) && ClickGUI.INSTANCE.trySelect(this)) {
|
|
||||||
if (button == 0) setting.toggle(); // clic izquierdo para alternar
|
|
||||||
else if (button == 1 && mc.isShiftPressed()) // shift izquierdo + clic derecho para restablecer al valor por defecto
|
|
||||||
setting.reset();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseReleased(double mouseX, double mouseY, int button) {
|
|
||||||
ClickGUI.INSTANCE.unselect(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseDragged(double mouseX, double mouseY) {}
|
|
||||||
|
|
||||||
public BooleanSetting getSetting() {
|
|
||||||
return setting;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
package me.retucio.camtweaks.ui.hud;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.modules.HUD;
|
|
||||||
import me.retucio.camtweaks.util.Colors;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public abstract class HudElement {
|
|
||||||
|
|
||||||
protected static final MinecraftClient mc = MinecraftClient.getInstance();
|
|
||||||
|
|
||||||
private final String id;
|
|
||||||
protected boolean visible;
|
|
||||||
protected int x, y;
|
|
||||||
protected final int defaultX, defaultY;
|
|
||||||
protected int width = 85, height = 14;
|
|
||||||
|
|
||||||
public HudElement(String id, int defaultX, int defaultY) {
|
|
||||||
this.id = id;
|
|
||||||
this.defaultX = defaultX;
|
|
||||||
this.defaultY = defaultY;
|
|
||||||
this.visible = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract String getText(float delta, HUD hud);
|
|
||||||
public abstract String getPreviewText();
|
|
||||||
|
|
||||||
public void renderInGame(DrawContext ctx, float delta, HUD hud) {
|
|
||||||
String text = getText(delta, hud);
|
|
||||||
int color = hud != null ? HudRenderer.getColor(hud).getRGB() : -1;
|
|
||||||
boolean shadow = hud != null && hud.shadow.isEnabled();
|
|
||||||
HudRenderer.drawSnappedText(ctx, text, x, y, color, shadow);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void renderInEditor(DrawContext ctx, HUD hud) {
|
|
||||||
String previewText = getPreviewText();
|
|
||||||
width = mc.textRenderer.getWidth(previewText);
|
|
||||||
height = mc.textRenderer.fontHeight;
|
|
||||||
|
|
||||||
drawEditorBackground(ctx);
|
|
||||||
|
|
||||||
int color = hud != null ? HudRenderer.getColor(hud).getRGB() : -1;
|
|
||||||
boolean shadow = hud != null && hud.shadow.isEnabled();
|
|
||||||
HudRenderer.drawSnappedText(ctx, previewText, x, y, color, shadow);
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract List<Text> getTooltip();
|
|
||||||
|
|
||||||
private void drawEditorBackground(DrawContext ctx) {
|
|
||||||
int bg = visible ? Colors.visibleHudElementColor.getRGB() : Colors.disabledHudElementColor.getRGB();
|
|
||||||
int outline = HudEditorScreen.INSTANCE != null && HudEditorScreen.INSTANCE.isSelected(this)
|
|
||||||
? Colors.selectedHudElementOutlineColor.getRGB()
|
|
||||||
: Colors.unselectedHudElementOutlineColor.getRGB();
|
|
||||||
|
|
||||||
// fondo
|
|
||||||
ctx.fill(x - 1, y - 1, x + width + 1, y + height + 1, bg);
|
|
||||||
|
|
||||||
// contorno
|
|
||||||
ctx.fill(x - 1, y - 1, x + width + 1, y, outline);
|
|
||||||
ctx.fill(x - 1, y + height, x + width + 1, y + height + 1, outline);
|
|
||||||
ctx.fill(x - 1, y, x, y + height, outline);
|
|
||||||
ctx.fill(x + width, y, x + width + 1, y + height, outline);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isHovered(int mouseX, int mouseY) {
|
|
||||||
return mouseX >= x && mouseX <= x + width
|
|
||||||
&& mouseY >= y && mouseY <= y + height;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Getters and setters
|
|
||||||
public String getId() { return id; }
|
|
||||||
public int getX() { return x; }
|
|
||||||
public int getY() { return y; }
|
|
||||||
public int getWidth() { return width; }
|
|
||||||
public int getHeight() { return height; }
|
|
||||||
public boolean isVisible() { return visible; }
|
|
||||||
public void setVisible(boolean visible) { this.visible = visible; }
|
|
||||||
|
|
||||||
public void resetPosition() {
|
|
||||||
this.x = defaultX;
|
|
||||||
this.y = defaultY;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPosition(int x, int y) {
|
|
||||||
this.x = x;
|
|
||||||
this.y = y;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
package me.retucio.camtweaks.ui.widgets;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.settings.Setting;
|
|
||||||
import me.retucio.camtweaks.ui.frames.SettingsFrame;
|
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
public abstract class Button {
|
|
||||||
|
|
||||||
protected Frame parent;
|
|
||||||
protected int offset;
|
|
||||||
|
|
||||||
protected int x, y, w, h;
|
|
||||||
|
|
||||||
public Button(Frame parent, int offset) {
|
|
||||||
this.parent = parent;
|
|
||||||
this.offset = offset;
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void render(DrawContext ctx, int mouseX, int mouseY, float delta);
|
|
||||||
|
|
||||||
public abstract void mouseClicked(int mouseX, int mouseY, int button);
|
|
||||||
public abstract void mouseDragged(int mouseX, int mouseY);
|
|
||||||
public void mouseReleased(int mouseX, int mouseY, int button) {
|
|
||||||
ClickGUI.INSTANCE.unselect(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void drawTooltip(DrawContext ctx, double mouseX, double mouseY);
|
|
||||||
|
|
||||||
protected boolean isHovered(int mouseX, int mouseY) {
|
|
||||||
if (!ClickGUI.INSTANCE.canSelect(this)) return false;
|
|
||||||
return mouseX > x && mouseX < x + w &&
|
|
||||||
mouseY > y && mouseY < y + h;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
package me.retucio.camtweaks.ui.widgets;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public abstract class Frame {
|
|
||||||
|
|
||||||
private final MinecraftClient mc = MinecraftClient.getInstance();
|
|
||||||
|
|
||||||
public final String title;
|
|
||||||
private final List<Button> buttons = new ArrayList<>();
|
|
||||||
private List<Button> visibleButtons = new ArrayList<>();
|
|
||||||
|
|
||||||
private int x, y, w, h;
|
|
||||||
private int renderY;
|
|
||||||
private int dragX, dragY;
|
|
||||||
private boolean dragging;
|
|
||||||
public int totalHeight = 0;
|
|
||||||
|
|
||||||
public Frame(String title, int x, int y, int w, int h) {
|
|
||||||
this.title = title;
|
|
||||||
|
|
||||||
this.x = x;
|
|
||||||
this.y = y;
|
|
||||||
this.w = w;
|
|
||||||
this.h = h;
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void render(DrawContext ctx, int mouseX, int mouseY, float delta);
|
|
||||||
|
|
||||||
public void drawTooltips(DrawContext ctx, int mouseX, int mouseY) {
|
|
||||||
for (Button button : visibleButtons) button.drawTooltip(ctx, mouseX, mouseY);
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void mouseClicked(int mouseX, int mouseY, int button);
|
|
||||||
public abstract void mouseDragged(int mouseX, int mouseY);
|
|
||||||
public void mouseReleased(int mouseX, int mouseY, int button) {
|
|
||||||
ClickGUI.INSTANCE.unselect(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void updateWidth();
|
|
||||||
|
|
||||||
public List<Button> getButtons() {
|
|
||||||
return buttons;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Button> getVisibleButtons() {
|
|
||||||
return visibleButtons;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isHovered(double mouseX, double mouseY) {
|
|
||||||
return mouseX > x && mouseX < x + w && mouseY > renderY && mouseY < renderY + h;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void updateRenderY(int scrollOffset) {
|
|
||||||
renderY = y - scrollOffset;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -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,122 +0,0 @@
|
|||||||
package me.retucio.camtweaks.util.render;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.pipeline.RenderPipeline;
|
|
||||||
import com.mojang.blaze3d.vertex.VertexFormat;
|
|
||||||
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
|
|
||||||
import me.retucio.camtweaks.CameraTweaks;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.client.gl.RenderPipelines;
|
|
||||||
import net.minecraft.client.render.BuiltBuffer;
|
|
||||||
import net.minecraft.client.render.RenderLayer;
|
|
||||||
import net.minecraft.client.render.RenderPhase;
|
|
||||||
import net.minecraft.client.util.BufferAllocator;
|
|
||||||
import net.minecraft.util.DyeColor;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/** clase modificada de RenderLayer para modificar el color del destello de encantamientos
|
|
||||||
* @see me.retucio.camtweaks.module.modules.GlintPlus
|
|
||||||
* yoinkeado de: https://github.com/Pepperoni-Jabroni/NoMorePurple/blob/main/src/main/java/pepjebs/no_more_purple/client/GlintRenderLayer.java
|
|
||||||
* (y actualizado)
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class GlintRenderLayer extends RenderLayer {
|
|
||||||
|
|
||||||
public static List<RenderLayer> glintColor = newRenderList(GlintRenderLayer::buildGlintRenderLayer);
|
|
||||||
public static List<RenderLayer> entityGlintColor = newRenderList(GlintRenderLayer::buildEntityGlintRenderLayer);
|
|
||||||
public static List<RenderLayer> armorGlintColor = newRenderList(GlintRenderLayer::buildArmorGlintRenderLayer);
|
|
||||||
public static List<RenderLayer> armorEntityGlintColor = newRenderList(GlintRenderLayer::buildArmorEntityGlintRenderLayer);
|
|
||||||
|
|
||||||
public static void addGlintTypes(Object2ObjectLinkedOpenHashMap<RenderLayer, BufferAllocator> map) {
|
|
||||||
addGlintTypes(map, glintColor);
|
|
||||||
addGlintTypes(map, entityGlintColor);
|
|
||||||
addGlintTypes(map, armorGlintColor);
|
|
||||||
addGlintTypes(map, armorEntityGlintColor);
|
|
||||||
}
|
|
||||||
|
|
||||||
public GlintRenderLayer(String name, VertexFormat vertexFormat, VertexFormat.DrawMode drawMode, int expectedBufferSize, boolean hasCrumbling, boolean translucent, Runnable startAction, Runnable endAction) {
|
|
||||||
super(name, expectedBufferSize, hasCrumbling, translucent, startAction, endAction);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<RenderLayer> newRenderList(Function<String, RenderLayer> func) {
|
|
||||||
ArrayList<RenderLayer> list = new ArrayList<>(DyeColor.values().length);
|
|
||||||
|
|
||||||
for (DyeColor color : DyeColor.values())
|
|
||||||
list.add(func.apply(color.name()));
|
|
||||||
|
|
||||||
list.add(func.apply("rainbow"));
|
|
||||||
list.add(func.apply("none"));
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void addGlintTypes(Object2ObjectLinkedOpenHashMap<RenderLayer, BufferAllocator> map, List<RenderLayer> typeList) {
|
|
||||||
for(RenderLayer renderType : typeList)
|
|
||||||
if (!map.containsKey(renderType))
|
|
||||||
map.put(renderType, new BufferAllocator(renderType.getExpectedBufferSize()));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static RenderLayer buildGlintRenderLayer(String name) {
|
|
||||||
final Identifier res = Identifier.of(CameraTweaks.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png");
|
|
||||||
|
|
||||||
return RenderLayer.of("glint_" + name, 256, RenderPipelines.GLINT, MultiPhaseParameters.builder()
|
|
||||||
.texturing(RenderPhase.GLINT_TEXTURING)
|
|
||||||
.texture(new Texture(res, false))
|
|
||||||
.texturing(GLINT_TEXTURING)
|
|
||||||
.build(false));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static RenderLayer buildEntityGlintRenderLayer(String name) {
|
|
||||||
final Identifier res = Identifier.of(CameraTweaks.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png");
|
|
||||||
|
|
||||||
return RenderLayer.of("entity_glint_" + name, 256, RenderPipelines.GLINT, MultiPhaseParameters.builder()
|
|
||||||
.texturing(RenderPhase.ENTITY_GLINT_TEXTURING)
|
|
||||||
.texture(new Texture(res, false))
|
|
||||||
.target(ITEM_ENTITY_TARGET)
|
|
||||||
.texturing(ENTITY_GLINT_TEXTURING)
|
|
||||||
.build(false));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private static RenderLayer buildArmorGlintRenderLayer(String name) {
|
|
||||||
final Identifier res = Identifier.of(CameraTweaks.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png");
|
|
||||||
|
|
||||||
return RenderLayer.of("armor_glint_" + name, 256, RenderPipelines.GLINT, MultiPhaseParameters.builder()
|
|
||||||
.texturing(RenderPhase.ARMOR_ENTITY_GLINT_TEXTURING)
|
|
||||||
.texture(new Texture(res, false))
|
|
||||||
.texturing(GLINT_TEXTURING)
|
|
||||||
.layering(VIEW_OFFSET_Z_LAYERING)
|
|
||||||
.build(false));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static RenderLayer buildArmorEntityGlintRenderLayer(String name) {
|
|
||||||
final Identifier res = Identifier.of(CameraTweaks.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png");
|
|
||||||
|
|
||||||
return RenderLayer.of("armor_entity_glint_" + name, 256, RenderPipelines.GLINT, MultiPhaseParameters.builder()
|
|
||||||
.texturing(RenderPhase.ARMOR_ENTITY_GLINT_TEXTURING)
|
|
||||||
.texture(new Texture(res, false))
|
|
||||||
.texturing(ENTITY_GLINT_TEXTURING)
|
|
||||||
.layering(VIEW_OFFSET_Z_LAYERING)
|
|
||||||
.build(false));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(BuiltBuffer buffer) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public VertexFormat getVertexFormat() { return VertexFormat.builder().build(); }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public VertexFormat.DrawMode getDrawMode() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public RenderPipeline getRenderPipeline() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
package me.retucio.camtweaks.util.render;
|
|
||||||
|
|
||||||
import net.minecraft.client.render.RenderLayer;
|
|
||||||
import net.minecraft.client.render.RenderPhase;
|
|
||||||
import net.minecraft.util.Util;
|
|
||||||
|
|
||||||
import java.util.OptionalDouble;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
import static me.retucio.camtweaks.util.render.Pipelines.GLOBAL_LINES_PIPELINE;
|
|
||||||
import static me.retucio.camtweaks.util.render.Pipelines.GLOBAL_QUADS_PIPELINE;
|
|
||||||
|
|
||||||
public class Layers {
|
|
||||||
|
|
||||||
private static final RenderLayer GLOBAL_QUADS;
|
|
||||||
private static final Function<Double, RenderLayer> GLOBAL_LINES;
|
|
||||||
|
|
||||||
public static RenderLayer getGlobalLines(double width) {
|
|
||||||
return GLOBAL_LINES.apply(width);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RenderLayer getGlobalQuads() {
|
|
||||||
return GLOBAL_QUADS;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static RenderLayer.MultiPhaseParameters.Builder builder() {
|
|
||||||
return RenderLayer.MultiPhaseParameters.builder();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static RenderLayer.MultiPhaseParameters empty() {
|
|
||||||
return builder().build(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
static {
|
|
||||||
GLOBAL_QUADS = RenderLayer.of("global_fill", 156, GLOBAL_QUADS_PIPELINE, empty());
|
|
||||||
|
|
||||||
GLOBAL_LINES = Util.memoize(l -> {
|
|
||||||
RenderPhase.LineWidth width = new RenderPhase.LineWidth(OptionalDouble.of(l));
|
|
||||||
return RenderLayer.of("global_lines", 156, GLOBAL_LINES_PIPELINE, builder().lineWidth(width).build(false));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
package me.retucio.camtweaks.util.render;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.pipeline.BlendFunction;
|
|
||||||
import com.mojang.blaze3d.pipeline.RenderPipeline;
|
|
||||||
import com.mojang.blaze3d.platform.DepthTestFunction;
|
|
||||||
import com.mojang.blaze3d.vertex.VertexFormat;
|
|
||||||
import me.retucio.camtweaks.CameraTweaks;
|
|
||||||
import net.minecraft.client.gl.RenderPipelines;
|
|
||||||
import net.minecraft.client.render.RenderLayer;
|
|
||||||
import net.minecraft.client.render.RenderPhase;
|
|
||||||
import net.minecraft.client.render.VertexFormats;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.Util;
|
|
||||||
|
|
||||||
import java.util.OptionalDouble;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
|
|
||||||
public class Pipelines {
|
|
||||||
|
|
||||||
static final RenderPipeline GLOBAL_LINES_PIPELINE = RenderPipeline.builder(RenderPipelines.RENDERTYPE_LINES_SNIPPET)
|
|
||||||
.withLocation(Identifier.of(CameraTweaks.MOD_ID, "pipeline/global_lines"))
|
|
||||||
.withVertexFormat(VertexFormats.POSITION_COLOR_NORMAL, VertexFormat.DrawMode.LINES)
|
|
||||||
.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
|
|
||||||
.withDepthWrite(false)
|
|
||||||
.withCull(false)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
static final RenderPipeline GLOBAL_QUADS_PIPELINE = RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET)
|
|
||||||
.withLocation("pipeline/global_fill_pipeline")
|
|
||||||
.withVertexFormat(VertexFormats.POSITION_COLOR, VertexFormat.DrawMode.QUADS)
|
|
||||||
.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
|
|
||||||
.withBlend(BlendFunction.TRANSLUCENT)
|
|
||||||
.withDepthWrite(false)
|
|
||||||
.withCull(false)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
static final Function<Double, RenderLayer> GLOBAL_LINES_LAYER = Util.memoize(lineWidth -> {
|
|
||||||
RenderPhase.LineWidth lineState = new RenderPhase.LineWidth(OptionalDouble.of(lineWidth));
|
|
||||||
RenderLayer.MultiPhaseParameters compositeState = RenderLayer.MultiPhaseParameters.builder()
|
|
||||||
.lineWidth(lineState)
|
|
||||||
.build(false);
|
|
||||||
return RenderLayer.of("global_lines", RenderLayer.DEFAULT_BUFFER_SIZE, GLOBAL_LINES_PIPELINE, compositeState);
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static RenderLayer getGlobalLinesLayer(double lineWidth) {
|
|
||||||
return GLOBAL_LINES_LAYER.apply(lineWidth);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,283 +0,0 @@
|
|||||||
package me.retucio.camtweaks.util.render;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.vertex.VertexFormat;
|
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
|
||||||
import net.minecraft.SharedConstants;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.gui.DrawContext;
|
|
||||||
import net.minecraft.client.render.*;
|
|
||||||
import net.minecraft.client.render.state.OutlineRenderState;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.util.math.*;
|
|
||||||
import net.minecraft.util.shape.VoxelShape;
|
|
||||||
import net.minecraft.util.shape.VoxelShapes;
|
|
||||||
|
|
||||||
import java.awt.*;
|
|
||||||
|
|
||||||
// literalmente robado de https://github.com/mioclient/oyvey-ported/ (perdón)
|
|
||||||
public class RenderUtil {
|
|
||||||
|
|
||||||
private static final MinecraftClient mc = MinecraftClient.getInstance();
|
|
||||||
private static final Tessellator tesselator = Tessellator.getInstance();
|
|
||||||
|
|
||||||
|
|
||||||
// líneas
|
|
||||||
|
|
||||||
public static void drawHorizontalLine(MatrixStack matrices, float x1, float x2, float y, Color color) {
|
|
||||||
if (x2 < x1) {
|
|
||||||
float i = x1;
|
|
||||||
x1 = x2;
|
|
||||||
x2 = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
drawFilledRect(matrices, x1, y, x2 + 1, y + 1, color);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawVerticalLine(MatrixStack matrices, float x, float y1, float y2, Color color) {
|
|
||||||
if (y2 < y1) {
|
|
||||||
float i = y1;
|
|
||||||
y1 = y2;
|
|
||||||
y2 = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
drawFilledRect(matrices, x, y1 + 1, x + 1, y2, color);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawHorizontalLine(MatrixStack matrices, float x1, float x2, float y, Color color, float width) {
|
|
||||||
if (x2 < x1) {
|
|
||||||
float i = x1;
|
|
||||||
x1 = x2;
|
|
||||||
x2 = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
drawFilledRect(matrices, x1, y, x2 + width, y + width, color);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawVerticalLine(MatrixStack matrices, float x, float y1, float y2, Color color, float width) {
|
|
||||||
if (y2 < y1) {
|
|
||||||
float i = y1;
|
|
||||||
y1 = y2;
|
|
||||||
y2 = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
drawFilledRect(matrices, x, y1 + width, x + width, y2, color);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// caras
|
|
||||||
|
|
||||||
public static void drawFilledRect(MatrixStack matrices, float x, float y, float width, float height, Color color) {
|
|
||||||
float r = color.getRed() / 255f;
|
|
||||||
float g = color.getGreen() / 255f;
|
|
||||||
float b = color.getBlue() / 255f;
|
|
||||||
float a = color.getAlpha() / 255f;
|
|
||||||
|
|
||||||
matrices.push();
|
|
||||||
matrices.translate(0, 0, 0);
|
|
||||||
|
|
||||||
BufferBuilder buffer = tesselator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
|
|
||||||
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), x, y + height, 0).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), x + width, y + height, 0).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), x + width, y, 0).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), x, y, 0).color(r, g, b, a);
|
|
||||||
|
|
||||||
Layers.getGlobalQuads().draw(buffer.end());
|
|
||||||
matrices.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawRectOutlines(MatrixStack stack, float x1, float y1, float x2, float y2, Color color, float width) {
|
|
||||||
drawHorizontalLine(stack, x1, x2, y1, color, width);
|
|
||||||
drawVerticalLine(stack, x2, y1, y2, color, width);
|
|
||||||
drawHorizontalLine(stack, x1, x2, y2, color, width);
|
|
||||||
drawVerticalLine(stack, x1, y1, y2, color, width);
|
|
||||||
}
|
|
||||||
|
|
||||||
// expand es para evitar z-fighting
|
|
||||||
public static void drawBlockFaceFilled(MatrixStack matrices, BlockPos pos, Direction face, Color color, float expand) {
|
|
||||||
Vec3d cameraPos = mc.gameRenderer.getCamera().getPos();
|
|
||||||
|
|
||||||
float minX = (float) (pos.getX() - cameraPos.x);
|
|
||||||
float minY = (float) (pos.getY() - cameraPos.y);
|
|
||||||
float minZ = (float) (pos.getZ() - cameraPos.z);
|
|
||||||
float maxX = minX + 1;
|
|
||||||
float maxY = minY + 1;
|
|
||||||
float maxZ = minZ + 1;
|
|
||||||
|
|
||||||
float r = color.getRed() / 255f;
|
|
||||||
float g = color.getGreen() / 255f;
|
|
||||||
float b = color.getBlue() / 255f;
|
|
||||||
float a = color.getAlpha() / 255f;
|
|
||||||
|
|
||||||
if (expand != 0) {
|
|
||||||
switch (face) {
|
|
||||||
case DOWN: minY -= expand; maxY = minY + 0.001f; break;
|
|
||||||
case UP: minY = maxY; maxY += expand; break;
|
|
||||||
case NORTH: minZ -= expand; maxZ = minZ + 0.001f; break;
|
|
||||||
case SOUTH: minZ = maxZ; maxZ += expand; break;
|
|
||||||
case WEST: minX -= expand; maxX = minX + 0.001f; break;
|
|
||||||
case EAST: minX = maxX; maxX += expand; break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BufferBuilder buffer = tesselator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
|
|
||||||
|
|
||||||
switch (face) {
|
|
||||||
case DOWN:
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, maxZ).color(r, g, b, a);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case UP:
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, minZ).color(r, g, b, a);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NORTH:
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, minZ).color(r, g, b, a);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SOUTH:
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, maxZ).color(r, g, b, a);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case WEST:
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, minZ).color(r, g, b, a);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case EAST:
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, minZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, maxZ).color(r, g, b, a);
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, maxZ).color(r, g, b, a);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
Layers.getGlobalQuads().draw(buffer.end());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// cajas
|
|
||||||
|
|
||||||
public static void drawOutlineBox(MatrixStack matrices, Box box, Color color, float lineWidth) {
|
|
||||||
float r = color.getRed() / 255f;
|
|
||||||
float g = color.getGreen() / 255f;
|
|
||||||
float b = color.getBlue() / 255f;
|
|
||||||
float a = color.getAlpha() / 255f;
|
|
||||||
|
|
||||||
Vec3d cameraPos = mc.gameRenderer.getCamera().getPos();
|
|
||||||
float minX = (float) (box.minX - cameraPos.x);
|
|
||||||
float minY = (float) (box.minY - cameraPos.y);
|
|
||||||
float minZ = (float) (box.minZ - cameraPos.z);
|
|
||||||
float maxX = (float) (box.maxX - cameraPos.x);
|
|
||||||
float maxY = (float) (box.maxY - cameraPos.y);
|
|
||||||
float maxZ = (float) (box.maxZ - cameraPos.z);
|
|
||||||
|
|
||||||
BufferBuilder buffer = tesselator.begin(VertexFormat.DrawMode.LINES, VertexFormats.POSITION_COLOR_NORMAL);
|
|
||||||
|
|
||||||
VertexRendering.drawBox(matrices.peek(), buffer, minX, minY, minZ, maxX, maxY, maxZ, r, g, b, a);
|
|
||||||
|
|
||||||
Layers.getGlobalLines(lineWidth).draw(buffer.end());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawFilledBox(MatrixStack matrices, Box box, Color color) {
|
|
||||||
Vec3d cameraPos = mc.gameRenderer.getCamera().getPos();
|
|
||||||
float minX = (float) (box.minX - cameraPos.x);
|
|
||||||
float minY = (float) (box.minY - cameraPos.y);
|
|
||||||
float minZ = (float) (box.minZ - cameraPos.z);
|
|
||||||
float maxX = (float) (box.maxX - cameraPos.x);
|
|
||||||
float maxY = (float) (box.maxY - cameraPos.y);
|
|
||||||
float maxZ = (float) (box.maxZ - cameraPos.z);
|
|
||||||
|
|
||||||
BufferBuilder buffer = tesselator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
|
|
||||||
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, maxZ).color(color.getRGB());
|
|
||||||
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, minZ).color(color.getRGB());
|
|
||||||
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, minZ).color(color.getRGB());
|
|
||||||
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, maxZ).color(color.getRGB());
|
|
||||||
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, minY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), maxX, maxY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, maxZ).color(color.getRGB());
|
|
||||||
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, minZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, minY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, maxZ).color(color.getRGB());
|
|
||||||
buffer.vertex(matrices.peek().getPositionMatrix(), minX, maxY, minZ).color(color.getRGB());
|
|
||||||
|
|
||||||
Layers.getGlobalQuads().draw(buffer.end());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// formas custom
|
|
||||||
|
|
||||||
public static void drawVoxelShapeOutline(MatrixStack matrices, VoxelShape voxelShape, BlockPos pos, Color color, float lineWidth) {
|
|
||||||
if (voxelShape.isEmpty()) return;
|
|
||||||
|
|
||||||
voxelShape.forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> {
|
|
||||||
Box box = new Box(
|
|
||||||
pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ,
|
|
||||||
pos.getX() + maxX, pos.getY() + maxY, pos.getZ() + maxZ
|
|
||||||
);
|
|
||||||
|
|
||||||
drawOutlineBox(matrices, box, color, lineWidth);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawVoxelShapeFilled(MatrixStack matrices, VoxelShape voxelShape, BlockPos pos, Color color) {
|
|
||||||
if (voxelShape.isEmpty()) return;
|
|
||||||
|
|
||||||
voxelShape.forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> {
|
|
||||||
Box box = new Box(
|
|
||||||
pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ,
|
|
||||||
pos.getX() + maxX, pos.getY() + maxY, pos.getZ() + maxZ
|
|
||||||
);
|
|
||||||
|
|
||||||
drawFilledBox(matrices, box, color);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// bloques
|
|
||||||
|
|
||||||
public static void drawBlockOutline(MatrixStack matrices, BlockPos pos, Color color, float lineWidth) {
|
|
||||||
Box box = new Box(pos.getX(), pos.getY(), pos.getZ(),
|
|
||||||
pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1);
|
|
||||||
drawOutlineBox(matrices, box, color, lineWidth);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawBlockFilled(MatrixStack matrices, BlockPos pos, Color color) {
|
|
||||||
Box box = new Box(pos.getX(), pos.getY(), pos.getZ(),
|
|
||||||
pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1);
|
|
||||||
drawFilledBox(matrices, box, color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+41
-49
@@ -1,44 +1,44 @@
|
|||||||
package me.retucio.camtweaks;
|
package me.retucio.sputnik;
|
||||||
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.command.CommandManager;
|
import me.retucio.sputnik.cape.CapeManager;
|
||||||
import me.retucio.camtweaks.command.commands.BindCommand;
|
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.sputnik.event.EventBus;
|
||||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
import me.retucio.sputnik.event.SubscribeEvent;
|
||||||
import me.retucio.camtweaks.event.events.ShutdownEvent;
|
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.sputnik.module.Module;
|
||||||
import me.retucio.camtweaks.event.events.camtweaks.LoadCommandManagerEvent;
|
import me.retucio.sputnik.module.ModuleManager;
|
||||||
import me.retucio.camtweaks.event.events.camtweaks.LoadModuleManagerEvent;
|
import me.retucio.sputnik.module.modules.client.HUD;
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.module.modules.HUD;
|
import me.retucio.sputnik.ui.screen.ClickGUI;
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
import me.retucio.sputnik.ui.hud.HudEditorScreen;
|
||||||
import me.retucio.camtweaks.ui.hud.HudEditorScreen;
|
import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton;
|
||||||
import me.retucio.camtweaks.ui.hud.HudRenderer;
|
import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
|
||||||
import me.retucio.camtweaks.ui.buttons.BindButton;
|
import me.retucio.sputnik.ui.widgets.buttons.settings.TextButton;
|
||||||
import me.retucio.camtweaks.ui.buttons.SettingButton;
|
import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||||
import me.retucio.camtweaks.ui.buttons.TextButton;
|
import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
|
||||||
import me.retucio.camtweaks.ui.frames.ClientSettingsFrame;
|
import me.retucio.sputnik.ui.widgets.Button;
|
||||||
import me.retucio.camtweaks.ui.frames.SettingsFrame;
|
|
||||||
|
|
||||||
import me.retucio.camtweaks.util.*;
|
import me.retucio.sputnik.util.*;
|
||||||
|
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 net.fabricmc.api.ClientModInitializer;
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
|
|
||||||
import net.minecraft.SharedConstants;
|
import net.minecraft.SharedConstants;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.gui.screen.ChatScreen;
|
import net.minecraft.client.gui.screen.ChatScreen;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
|
||||||
import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen;
|
import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen;
|
||||||
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
|
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
|
||||||
import net.minecraft.client.gui.screen.ingame.AnvilScreen;
|
import net.minecraft.client.gui.screen.ingame.AnvilScreen;
|
||||||
@@ -49,43 +49,33 @@ import org.lwjgl.glfw.GLFW;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
public class CameraTweaks implements ClientModInitializer {
|
public class Sputnik implements ClientModInitializer {
|
||||||
|
|
||||||
// cosas necesarias
|
// 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 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;
|
public static MinecraftClient mc;
|
||||||
|
|
||||||
// id y versión
|
// id y versión
|
||||||
public static final String MOD_ID = "camtweaks";
|
public static final String MOD_ID = "sputnik";
|
||||||
public static final String MOD_VERSION;
|
public static final String MOD_VERSION = FabricLoader.getInstance()
|
||||||
|
.getModContainer(MOD_ID)
|
||||||
static {
|
|
||||||
MOD_VERSION = FabricLoader.getInstance().getModContainer(MOD_ID)
|
|
||||||
.orElseThrow()
|
.orElseThrow()
|
||||||
.getMetadata()
|
.getMetadata()
|
||||||
.getVersion()
|
.getVersion()
|
||||||
.getFriendlyString();
|
.getFriendlyString();
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private Screen prevScreen;
|
private Screen prevScreen;
|
||||||
public static boolean settingsApplied = false;
|
public static boolean settingsApplied = false;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
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();
|
mc = MinecraftClient.getInstance();
|
||||||
ConfigManager.load();
|
ConfigManager.load();
|
||||||
|
|
||||||
EVENT_BUS.register(this);
|
EVENT_BUS.register(this);
|
||||||
|
|
||||||
EVENT_BUS.register(new HudRenderer());
|
|
||||||
|
|
||||||
EVENT_BUS.register(ChatUtil.class);
|
EVENT_BUS.register(ChatUtil.class);
|
||||||
EVENT_BUS.register(DrawUtil.class);
|
EVENT_BUS.register(DrawUtil.class);
|
||||||
EVENT_BUS.register(EntityUtil.class);
|
EVENT_BUS.register(EntityUtil.class);
|
||||||
@@ -96,6 +86,9 @@ public class CameraTweaks implements ClientModInitializer {
|
|||||||
|
|
||||||
Lists.init();
|
Lists.init();
|
||||||
|
|
||||||
|
CapeManager.INSTANCE = new CapeManager();
|
||||||
|
EVENT_BUS.post(new LoadCapeManagerEvent());
|
||||||
|
|
||||||
ModuleManager.INSTANCE = new ModuleManager();
|
ModuleManager.INSTANCE = new ModuleManager();
|
||||||
EVENT_BUS.post(new LoadModuleManagerEvent());
|
EVENT_BUS.post(new LoadModuleManagerEvent());
|
||||||
|
|
||||||
@@ -107,7 +100,6 @@ public class CameraTweaks implements ClientModInitializer {
|
|||||||
EVENT_BUS.post(new LoadClickGUIEvent());
|
EVENT_BUS.post(new LoadClickGUIEvent());
|
||||||
|
|
||||||
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
|
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
|
||||||
ConfigManager.save();
|
|
||||||
EVENT_BUS.post(new ShutdownEvent());
|
EVENT_BUS.post(new ShutdownEvent());
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@@ -126,7 +118,7 @@ public class CameraTweaks implements ClientModInitializer {
|
|||||||
|
|
||||||
|
|
||||||
// se ejecuta cada vez que se presiona una tecla
|
// 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
|
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));
|
ModuleManager.INSTANCE.getEnabledModules().forEach(module -> module.onKey(key, action));
|
||||||
|
|
||||||
@@ -149,7 +141,7 @@ public class CameraTweaks implements ClientModInitializer {
|
|||||||
// verifica si algún botón de ajustes está escuchando
|
// verifica si algún botón de ajustes está escuchando
|
||||||
private boolean isAnySettingButtonFocused() {
|
private boolean isAnySettingButtonFocused() {
|
||||||
for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames())
|
for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames())
|
||||||
for (SettingButton sb : sf.getButtons())
|
for (Button sb : sf.getButtons())
|
||||||
if ((sb instanceof BindButton b && b.isFocused()) || (sb instanceof TextButton t && t.isFocused()))
|
if ((sb instanceof BindButton b && b.isFocused()) || (sb instanceof TextButton t && t.isFocused()))
|
||||||
return true;
|
return true;
|
||||||
return false;
|
return false;
|
||||||
@@ -172,9 +164,9 @@ public class CameraTweaks implements ClientModInitializer {
|
|||||||
// se ocupa de hacer los botones de ajustes que lo necesiten escuchar teclas
|
// se ocupa de hacer los botones de ajustes que lo necesiten escuchar teclas
|
||||||
private void handleSettingButtonsKey(int key, int action) {
|
private void handleSettingButtonsKey(int key, int action) {
|
||||||
for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames()) {
|
for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames()) {
|
||||||
for (SettingButton sb : sf.getButtons()) {
|
for (SettingButton<?> sb : sf.getButtons()) {
|
||||||
if (sb instanceof BindButton b) b.onKey(key, action);
|
if (sb instanceof BindButton bb) bb.onKey(key, action);
|
||||||
else if (sb instanceof TextButton t) t.onKey(key, action);
|
if (sb instanceof TextButton tb) tb.onKey(key, action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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.CommandDispatcher;
|
||||||
import com.mojang.brigadier.arguments.ArgumentType;
|
import com.mojang.brigadier.arguments.ArgumentType;
|
||||||
@@ -65,7 +65,7 @@ public abstract class Command {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String toString() {
|
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) {
|
public String toString(String... args) {
|
||||||
+5
-6
@@ -1,11 +1,10 @@
|
|||||||
package me.retucio.camtweaks.command;
|
package me.retucio.sputnik.command;
|
||||||
|
|
||||||
import com.mojang.brigadier.CommandDispatcher;
|
import com.mojang.brigadier.CommandDispatcher;
|
||||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||||
import me.retucio.camtweaks.CameraTweaks;
|
import me.retucio.sputnik.Sputnik;
|
||||||
import me.retucio.camtweaks.command.commands.*;
|
import me.retucio.sputnik.command.commands.*;
|
||||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
import me.retucio.sputnik.event.SubscribeEvent;
|
||||||
import me.retucio.camtweaks.module.Module;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
|
|
||||||
@@ -49,7 +48,7 @@ public class CommandManager {
|
|||||||
for (Command command : commands) {
|
for (Command command : commands) {
|
||||||
for (Method method : command.getClass().getDeclaredMethods()) {
|
for (Method method : command.getClass().getDeclaredMethods()) {
|
||||||
if (method.isAnnotationPresent(SubscribeEvent.class)) {
|
if (method.isAnnotationPresent(SubscribeEvent.class)) {
|
||||||
CameraTweaks.EVENT_BUS.register(command);
|
Sputnik.EVENT_BUS.register(command);
|
||||||
break;
|
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.StringReader;
|
||||||
import com.mojang.brigadier.arguments.ArgumentType;
|
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.Suggestions;
|
||||||
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
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.Entity;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
import javax.swing.*;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
// para autocompletar entidades
|
import static me.retucio.sputnik.Sputnik.mc;
|
||||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
|
||||||
|
|
||||||
|
|
||||||
|
// para autocompletar entidades
|
||||||
public class EntityArgumentType implements ArgumentType<Entity> {
|
public class EntityArgumentType implements ArgumentType<Entity> {
|
||||||
|
|
||||||
public static final EntityArgumentType INSTANCE = new EntityArgumentType();
|
public static final EntityArgumentType INSTANCE = new EntityArgumentType();
|
||||||
+3
-3
@@ -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.StringReader;
|
||||||
import com.mojang.brigadier.arguments.ArgumentType;
|
import com.mojang.brigadier.arguments.ArgumentType;
|
||||||
@@ -7,8 +7,8 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
|||||||
import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
|
import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
|
||||||
import com.mojang.brigadier.suggestion.Suggestions;
|
import com.mojang.brigadier.suggestion.Suggestions;
|
||||||
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
||||||
import me.retucio.camtweaks.module.Module;
|
import me.retucio.sputnik.module.Module;
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
import me.retucio.sputnik.module.ModuleManager;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
+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.StringReader;
|
||||||
import com.mojang.brigadier.arguments.ArgumentType;
|
import com.mojang.brigadier.arguments.ArgumentType;
|
||||||
@@ -15,7 +15,7 @@ import java.util.Collection;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
import static me.retucio.sputnik.Sputnik.mc;
|
||||||
|
|
||||||
// para autocompletar nombres de jugadores
|
// para autocompletar nombres de jugadores
|
||||||
public class PlayerArgumentType implements ArgumentType<PlayerEntity> {
|
public class PlayerArgumentType implements ArgumentType<PlayerEntity> {
|
||||||
+7
-7
@@ -1,12 +1,12 @@
|
|||||||
package me.retucio.camtweaks.command.commands;
|
package me.retucio.sputnik.command.commands;
|
||||||
|
|
||||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.command.args.ModuleArgumentType;
|
import me.retucio.sputnik.command.args.ModuleArgumentType;
|
||||||
import me.retucio.camtweaks.module.Module;
|
import me.retucio.sputnik.module.Module;
|
||||||
import me.retucio.camtweaks.module.settings.KeySetting;
|
import me.retucio.sputnik.module.settings.KeySetting;
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
import me.retucio.sputnik.util.ChatUtil;
|
||||||
import me.retucio.camtweaks.util.KeyUtil;
|
import me.retucio.sputnik.util.KeyUtil;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.Formatting;
|
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.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
import me.retucio.sputnik.module.ModuleManager;
|
||||||
import me.retucio.camtweaks.module.modules.ScreenshotPlus;
|
import me.retucio.sputnik.module.modules.misc.ScreenshotPlus;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
|
|
||||||
// se usa principalmente para el módulo ScreenshotPlus, pero también se puede usar sin él supongo
|
// 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 com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.CameraTweaks;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.event.SubscribeEvent;
|
||||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
import me.retucio.sputnik.event.events.TickEvent;
|
||||||
import me.retucio.camtweaks.event.events.TickEvent;
|
import me.retucio.sputnik.ui.screen.PreviewScreen;
|
||||||
import me.retucio.camtweaks.ui.screen.PreviewScreen;
|
import me.retucio.sputnik.util.ChatUtil;
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
import me.retucio.sputnik.util.InventoryUtil;
|
||||||
import me.retucio.camtweaks.util.InventoryUtil;
|
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
|
|
||||||
// accede a los contenidos de tu enderchest
|
// 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 com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
import me.retucio.sputnik.util.ChatUtil;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
import net.minecraft.text.Text;
|
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 com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.command.args.PlayerArgumentType;
|
import me.retucio.sputnik.command.args.PlayerArgumentType;
|
||||||
import me.retucio.camtweaks.util.MiscUtil;
|
import me.retucio.sputnik.util.MiscUtil;
|
||||||
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
||||||
import net.minecraft.command.CommandSource;
|
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.arguments.StringArgumentType;
|
||||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.ui.frames.ClientSettingsFrame;
|
import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
import me.retucio.sputnik.util.ChatUtil;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.Formatting;
|
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.arguments.IntegerArgumentType;
|
||||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.util.interfaces.IChatHud;
|
import me.retucio.sputnik.util.interfaces.IChatHud;
|
||||||
import net.minecraft.client.gui.hud.ChatHud;
|
import net.minecraft.client.gui.hud.ChatHud;
|
||||||
import net.minecraft.client.gui.hud.ChatHudLine;
|
import net.minecraft.client.gui.hud.ChatHudLine;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
@@ -31,7 +31,7 @@ public class PurgeCommand extends Command {
|
|||||||
ChatHud chatHud = mc.inGameHud.getChatHud();
|
ChatHud chatHud = mc.inGameHud.getChatHud();
|
||||||
|
|
||||||
synchronized (chatHud) {
|
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());
|
int toRemove = Math.min(amount, visibleMessages.size());
|
||||||
for (int i = 0; i < toRemove; i++)
|
for (int i = 0; i < toRemove; i++)
|
||||||
visibleMessages.removeFirst();
|
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 com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
import me.retucio.sputnik.module.ModuleManager;
|
||||||
import me.retucio.camtweaks.module.modules.ScreenshotPlus;
|
import me.retucio.sputnik.module.modules.misc.ScreenshotPlus;
|
||||||
import me.retucio.camtweaks.util.ChatUtil;
|
import me.retucio.sputnik.util.ChatUtil;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
|
|
||||||
import java.io.IOException;
|
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.arguments.StringArgumentType;
|
||||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.mixin.accessor.ClientPlayNetworkHandlerAccessor;
|
import me.retucio.sputnik.mixin.accessor.ClientPlayNetworkHandlerAccessor;
|
||||||
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
import net.minecraft.network.encryption.NetworkEncryptionUtils;
|
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.MessageBody;
|
||||||
import net.minecraft.network.message.MessageSignatureData;
|
import net.minecraft.network.message.MessageSignatureData;
|
||||||
import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
|
import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
import java.time.Instant;
|
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 com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.command.args.EntityArgumentType;
|
import me.retucio.sputnik.command.args.EntityArgumentType;
|
||||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
import me.retucio.sputnik.event.SubscribeEvent;
|
||||||
import me.retucio.camtweaks.event.events.KeyEvent;
|
import me.retucio.sputnik.event.events.KeyEvent;
|
||||||
import me.retucio.camtweaks.util.EntityUtil;
|
import me.retucio.sputnik.util.EntityUtil;
|
||||||
import me.retucio.camtweaks.util.MiscUtil;
|
|
||||||
import net.minecraft.command.CommandSource;
|
import net.minecraft.command.CommandSource;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import org.lwjgl.glfw.GLFW;
|
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 com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import me.retucio.camtweaks.command.Command;
|
import me.retucio.sputnik.command.Command;
|
||||||
import me.retucio.camtweaks.command.args.ModuleArgumentType;
|
import me.retucio.sputnik.command.args.ModuleArgumentType;
|
||||||
import me.retucio.camtweaks.module.Module;
|
import me.retucio.sputnik.module.Module;
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
import me.retucio.sputnik.module.ModuleManager;
|
||||||
import net.minecraft.command.CommandSource;
|
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
|
// 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");
|
||||||
|
}
|
||||||
|
}
|
||||||
+25
-19
@@ -1,15 +1,17 @@
|
|||||||
package me.retucio.camtweaks.config;
|
package me.retucio.sputnik.config;
|
||||||
|
|
||||||
import me.retucio.camtweaks.event.SubscribeEvent;
|
import me.retucio.sputnik.event.SubscribeEvent;
|
||||||
import me.retucio.camtweaks.event.events.camtweaks.*;
|
import me.retucio.sputnik.event.events.sputnik.*;
|
||||||
import me.retucio.camtweaks.module.settings.*;
|
import me.retucio.sputnik.module.settings.*;
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
import me.retucio.sputnik.ui.screen.ClickGUI;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
import java.io.Serializable;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS;
|
import static me.retucio.sputnik.Sputnik.EVENT_BUS;
|
||||||
import static me.retucio.camtweaks.CameraTweaks.mc;
|
import static me.retucio.sputnik.Sputnik.mc;
|
||||||
|
|
||||||
// clase donde se guardan las configuraciones temporalmente hasta escribirlas en camera_tweaks.json
|
// clase donde se guardan las configuraciones temporalmente hasta escribirlas en camera_tweaks.json
|
||||||
public class ClientConfig {
|
public class ClientConfig {
|
||||||
@@ -32,6 +34,9 @@ public class ClientConfig {
|
|||||||
// id del elemento del hud -> true: visible / false: no visible
|
// id del elemento del hud -> true: visible / false: no visible
|
||||||
public Map<String, Boolean> hudVisibilities = new HashMap<>();
|
public Map<String, Boolean> hudVisibilities = new HashMap<>();
|
||||||
|
|
||||||
|
// id del elemento del hud -> ruta de la imagen (NEW)
|
||||||
|
public Map<String, String> hudImagePaths = new HashMap<>();
|
||||||
|
|
||||||
// posición de la barra de búsqueda (x, y)
|
// posición de la barra de búsqueda (x, y)
|
||||||
public int[] searchBarPosition = new int[]{340, 16};
|
public int[] searchBarPosition = new int[]{340, 16};
|
||||||
|
|
||||||
@@ -59,7 +64,7 @@ public class ClientConfig {
|
|||||||
case StringSetting s: value = s.getValue(); break;
|
case StringSetting s: value = s.getValue(); break;
|
||||||
case ListSetting l: value = l.getConfigValues(); break;
|
case ListSetting l: value = l.getConfigValues(); break;
|
||||||
case ColorSetting c: value = c.getConfigValue(); break;
|
case ColorSetting c: value = c.getConfigValue(); break;
|
||||||
case OptionSetting o: value = o.getIndex(); break;
|
case OptionSetting o: value = o.getDisplayName(); break;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,7 +73,6 @@ public class ClientConfig {
|
|||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onOpenSettingsFrame(SettingsFrameEvent.Open event) {
|
public void onOpenSettingsFrame(SettingsFrameEvent.Open event) {
|
||||||
if (settingsFrames.containsKey(event.getFrame().module.getName())) return;
|
|
||||||
ConfigManager.setFramePosition(event.getFrame());
|
ConfigManager.setFramePosition(event.getFrame());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,41 +84,43 @@ public class ClientConfig {
|
|||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onMoveSettingsFrame(SettingsFrameEvent.Move event) {
|
public void onMoveSettingsFrame(SettingsFrameEvent.Move event) {
|
||||||
settingsFrames.replace(event.getFrame().module.getName(), new int[]{event.getFrame().x, event.getFrame().y});
|
settingsFrames.replace(event.getFrame().module.getName(), new int[]{event.getFrame().getX(), event.getFrame().getY()});
|
||||||
ConfigManager.save();
|
ConfigManager.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onExtendModuleFrame(ModuleFrameEvent.Extend event) {
|
public void onExtendModuleFrame(ModuleFrameEvent.Extend event) {
|
||||||
extendableFrames.put("M", new FrameData(
|
extendableFrames.put("M", new FrameData(
|
||||||
ClickGUI.INSTANCE.getModulesFrame().x,
|
ClickGUI.INSTANCE.getModulesFrame().getX(),
|
||||||
ClickGUI.INSTANCE.getModulesFrame().y,
|
ClickGUI.INSTANCE.getModulesFrame().getY(),
|
||||||
ClickGUI.INSTANCE.getModulesFrame().extended));
|
ClickGUI.INSTANCE.getModulesFrame().extended));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onMoveModuleFrame(ModuleFrameEvent.Move event) {
|
public void onMoveModuleFrame(ModuleFrameEvent.Move event) {
|
||||||
extendableFrames.replace("M", new FrameData(
|
extendableFrames.replace("M", new FrameData(
|
||||||
ClickGUI.INSTANCE.getModulesFrame().x,
|
ClickGUI.INSTANCE.getModulesFrame().getX(),
|
||||||
ClickGUI.INSTANCE.getModulesFrame().y,
|
ClickGUI.INSTANCE.getModulesFrame().getY(),
|
||||||
ClickGUI.INSTANCE.getModulesFrame().extended));
|
ClickGUI.INSTANCE.getModulesFrame().extended));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onExtendGUISettingsFrame(GUISettingsFrameEvent.Extend event) {
|
public void onExtendGUISettingsFrame(GUISettingsFrameEvent.Extend event) {
|
||||||
extendableFrames.put("S", new FrameData(
|
extendableFrames.put("S", new FrameData(
|
||||||
ClickGUI.INSTANCE.getGuiSettingsFrame().x,
|
ClickGUI.INSTANCE.getGuiSettingsFrame().getX(),
|
||||||
ClickGUI.INSTANCE.getGuiSettingsFrame().y,
|
ClickGUI.INSTANCE.getGuiSettingsFrame().getY(),
|
||||||
ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
|
ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onMoveGUISettingsFrame(GUISettingsFrameEvent.Move event) {
|
public void onMoveGUISettingsFrame(GUISettingsFrameEvent.Move event) {
|
||||||
extendableFrames.replace("S", new FrameData(
|
extendableFrames.replace("S", new FrameData(
|
||||||
ClickGUI.INSTANCE.getGuiSettingsFrame().x,
|
ClickGUI.INSTANCE.getGuiSettingsFrame().getX(),
|
||||||
ClickGUI.INSTANCE.getGuiSettingsFrame().y,
|
ClickGUI.INSTANCE.getGuiSettingsFrame().getY(),
|
||||||
ClickGUI.INSTANCE.getGuiSettingsFrame().extended));
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+85
-57
@@ -1,29 +1,30 @@
|
|||||||
package me.retucio.camtweaks.config;
|
package me.retucio.sputnik.config;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
import me.retucio.camtweaks.CameraTweaks;
|
import me.retucio.sputnik.Sputnik;
|
||||||
import me.retucio.camtweaks.module.Module;
|
import me.retucio.sputnik.module.Module;
|
||||||
import me.retucio.camtweaks.module.ModuleManager;
|
import me.retucio.sputnik.module.ModuleManager;
|
||||||
import me.retucio.camtweaks.module.settings.*;
|
import me.retucio.sputnik.module.settings.*;
|
||||||
import me.retucio.camtweaks.ui.frames.ModuleFrame;
|
import me.retucio.sputnik.ui.widgets.Frame;
|
||||||
import me.retucio.camtweaks.ui.screen.ClickGUI;
|
import me.retucio.sputnik.ui.widgets.frames.ModuleFrame;
|
||||||
import me.retucio.camtweaks.ui.frames.ClientSettingsFrame;
|
import me.retucio.sputnik.ui.screen.ClickGUI;
|
||||||
import me.retucio.camtweaks.ui.frames.SettingsFrame;
|
import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame;
|
||||||
|
import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
|
||||||
|
import me.retucio.sputnik.util.ChatUtil;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
import java.io.FileWriter;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
// se ocupa de guardar, cargar y aplicar ajustes
|
// 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 {
|
public class ConfigManager {
|
||||||
|
|
||||||
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
|
private static final File CONFIG_FILE = new File("sputnik.dat");
|
||||||
private static final File CONFIG_FILE = new File("camera_tweaks.json");
|
private static final File LEGACY_JSON_FILE = new File("sputnik.json");
|
||||||
|
|
||||||
private static boolean loaded = false;
|
private static boolean loaded = false;
|
||||||
private static ClientConfig config = null;
|
private static ClientConfig config = null;
|
||||||
@@ -33,33 +34,47 @@ public class ConfigManager {
|
|||||||
|
|
||||||
// guardar configuraciones
|
// guardar configuraciones
|
||||||
public static void save() {
|
public static void save() {
|
||||||
|
if (!loaded) return;
|
||||||
ensureConfig();
|
ensureConfig();
|
||||||
|
|
||||||
try (FileWriter writer = new FileWriter(CONFIG_FILE)) {
|
try {
|
||||||
GSON.toJson(config, writer);
|
BinarySerializer.writeConfig(config, CONFIG_FILE);
|
||||||
CameraTweaks.LOGGER.info("ajustes guardados");
|
Sputnik.LOGGER.info("ajustes guardados");
|
||||||
} catch (IOException e) {
|
} 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() {
|
public static void load() {
|
||||||
CameraTweaks.LOGGER.info("cargando ajustes...");
|
Sputnik.LOGGER.info("cargando ajustes...");
|
||||||
|
|
||||||
if (!CONFIG_FILE.exists()) {
|
if (CONFIG_FILE.exists()) {
|
||||||
ensureConfig();
|
try {
|
||||||
save();
|
config = BinarySerializer.readConfig(CONFIG_FILE);
|
||||||
return;
|
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)) {
|
// Fallback to legacy JSON
|
||||||
config = GSON.fromJson(reader, ClientConfig.class);
|
if (LEGACY_JSON_FILE.exists()) {
|
||||||
CameraTweaks.LOGGER.info("ajustes cargados");
|
try (FileReader reader = new FileReader(LEGACY_JSON_FILE)) {
|
||||||
} catch (IOException e) {
|
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||||
CameraTweaks.LOGGER.error("no se pudieron cargar los ajustes, usando ajustes por defecto", e);
|
config = gson.fromJson(reader, ClientConfig.class);
|
||||||
ensureConfig();
|
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
|
// aplicar configuraciones cargadas
|
||||||
@@ -74,7 +89,7 @@ public class ConfigManager {
|
|||||||
applyExtendableFrames();
|
applyExtendableFrames();
|
||||||
|
|
||||||
loaded = true;
|
loaded = true;
|
||||||
CameraTweaks.LOGGER.info("ajustes aplicados");
|
Sputnik.LOGGER.info("ajustes aplicados");
|
||||||
}
|
}
|
||||||
|
|
||||||
// obtener configuración actual
|
// obtener configuración actual
|
||||||
@@ -100,7 +115,10 @@ public class ConfigManager {
|
|||||||
|
|
||||||
public static void setFramePosition(SettingsFrame frame) {
|
public static void setFramePosition(SettingsFrame frame) {
|
||||||
ensureConfig();
|
ensureConfig();
|
||||||
config.settingsFrames.put(frame.module.getName(), new int[] {frame.x, frame.y});
|
if (!config.settingsFrames.containsKey(frame.module.getName()))
|
||||||
|
config.settingsFrames.put(frame.module.getName(), new int[] {frame.getX(), frame.getY()});
|
||||||
|
else
|
||||||
|
config.settingsFrames.replace(frame.module.getName(), new int[] {frame.getX(), frame.getY()});
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,6 +140,17 @@ public class ConfigManager {
|
|||||||
save();
|
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) {
|
public static void setSearchBarPosition(int x, int y) {
|
||||||
ensureConfig();
|
ensureConfig();
|
||||||
config.searchBarPosition = new int[] {x, y};
|
config.searchBarPosition = new int[] {x, y};
|
||||||
@@ -148,7 +177,7 @@ public class ConfigManager {
|
|||||||
case ListSetting listSetting -> applyListSetting(listSetting, value);
|
case ListSetting listSetting -> applyListSetting(listSetting, value);
|
||||||
case ColorSetting colorSetting -> applyColorSetting(colorSetting, value);
|
case ColorSetting colorSetting -> applyColorSetting(colorSetting, value);
|
||||||
case OptionSetting optionSetting -> applyOptionSetting(optionSetting, 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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,14 +187,14 @@ public class ConfigManager {
|
|||||||
module.setEnabled(config.moduleStates.get(module.getName()));
|
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() {
|
private static void applyModuleSettings() {
|
||||||
ModuleManager.INSTANCE.getModules().forEach(module -> {
|
ModuleManager.INSTANCE.getModules().forEach(module -> {
|
||||||
module.getSettings().forEach(setting -> applySetting(module, setting));
|
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() {
|
private static void applySettingsFrames() {
|
||||||
@@ -173,7 +202,7 @@ public class ConfigManager {
|
|||||||
Module module = ModuleManager.INSTANCE.getModuleByName(moduleName);
|
Module module = ModuleManager.INSTANCE.getModuleByName(moduleName);
|
||||||
ClickGUI.INSTANCE.openSettingsFrame(module, position[0], position[1]);
|
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() {
|
private static void applySearchBarPosition() {
|
||||||
@@ -181,7 +210,7 @@ public class ConfigManager {
|
|||||||
ClickGUI.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]);
|
ClickGUI.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]);
|
||||||
ClickGUI.INSTANCE.getSearchBar().setY(config.searchBarPosition[1]);
|
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() {
|
private static void applyGuiSettings() {
|
||||||
@@ -189,32 +218,33 @@ public class ConfigManager {
|
|||||||
ClientSettingsFrame.guiSettings.getSettings().forEach(setting -> {
|
ClientSettingsFrame.guiSettings.getSettings().forEach(setting -> {
|
||||||
applySetting(ClientSettingsFrame.guiSettings, setting);
|
applySetting(ClientSettingsFrame.guiSettings, setting);
|
||||||
});
|
});
|
||||||
CameraTweaks.LOGGER.info("ajustes del cliente aplicados");
|
Sputnik.LOGGER.info("ajustes del cliente aplicados");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void applyExtendableFrames() {
|
private static void applyExtendableFrames() {
|
||||||
applyExtendableFrame(ClickGUI.INSTANCE.getModulesFrame());
|
applyExtendableFrame(ClickGUI.INSTANCE.getModulesFrame());
|
||||||
applyExtendableFrame(ClickGUI.INSTANCE.getGuiSettingsFrame());
|
applyExtendableFrame(ClickGUI.INSTANCE.getGuiSettingsFrame());
|
||||||
|
|
||||||
CameraTweaks.LOGGER.info("posiciones de marcos extendibles aplicadasa");
|
Sputnik.LOGGER.info("posiciones de marcos extendibles aplicadas");
|
||||||
ClickGUI.INSTANCE.refreshListButtons();
|
ClickGUI.INSTANCE.refreshListButtons();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void applyExtendableFrame(ModuleFrame frame) {
|
private static void applyExtendableFrame(Frame<?> frame) {
|
||||||
ClientConfig.FrameData frameData = config.extendableFrames.get("M");
|
ClientConfig.FrameData frameData = null;
|
||||||
if (frameData != null) {
|
if (frame instanceof ModuleFrame)
|
||||||
frame.x = frameData.x();
|
frameData = config.extendableFrames.get("M");
|
||||||
frame.y = frameData.y();
|
|
||||||
frame.extended = frameData.extended();
|
if (frame instanceof ClientSettingsFrame)
|
||||||
}
|
frameData = config.extendableFrames.get("S");
|
||||||
}
|
|
||||||
|
|
||||||
private static void applyExtendableFrame(ClientSettingsFrame frame) {
|
|
||||||
ClientConfig.FrameData frameData = config.extendableFrames.get("S");
|
|
||||||
if (frameData != null) {
|
if (frameData != null) {
|
||||||
frame.x = frameData.x();
|
frame.setX(frameData.x());
|
||||||
frame.y = frameData.y();
|
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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,9 +316,8 @@ public class ConfigManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static <T> void applyOptionSetting(OptionSetting<T> setting, Object value) {
|
private static <T> void applyOptionSetting(OptionSetting<T> setting, Object value) {
|
||||||
if (value instanceof Double) {
|
if (value instanceof String name) {
|
||||||
int index = ((Double) value).intValue();
|
setting.setValueByName(name);
|
||||||
setting.setValue(setting.getOption(index));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,10 +332,9 @@ public class ConfigManager {
|
|||||||
// ------------------ MÉTODOS DE AYUDA ------------------
|
// ------------------ MÉTODOS DE AYUDA ------------------
|
||||||
|
|
||||||
private static boolean shouldApply() {
|
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() {
|
private static void ensureConfig() {
|
||||||
if (config == null) config = new ClientConfig();
|
if (config == null) config = new ClientConfig();
|
||||||
}
|
}
|
||||||
@@ -318,4 +346,4 @@ public class ConfigManager {
|
|||||||
public static boolean hasLoaded() {
|
public static boolean hasLoaded() {
|
||||||
return loaded;
|
return loaded;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.retucio.camtweaks.event;
|
package me.retucio.sputnik.event;
|
||||||
|
|
||||||
// evento base, cancelable (usado en mixins)
|
// evento base, cancelable (usado en mixins)
|
||||||
public class Event {
|
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.Method;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.retucio.camtweaks.event;
|
package me.retucio.sputnik.event;
|
||||||
|
|
||||||
public enum Stage {
|
public enum Stage {
|
||||||
PRE, // antes de que haya sucedido
|
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.*;
|
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;
|
import net.minecraft.entity.Entity;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ClientWorldMixin#onAddEntity
|
* @see me.retucio.sputnik.mixin.ClientWorldMixin#onAddEntity
|
||||||
*/
|
*/
|
||||||
public class AddEntityEvent extends Event {
|
public class AddEntityEvent 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;
|
import net.minecraft.entity.Entity;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onAttackEntity
|
* @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onAttackEntity
|
||||||
*/
|
*/
|
||||||
public class AttackEntityEvent extends Event {
|
public class AttackEntityEvent 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.util.math.BlockPos;
|
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 {
|
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.sputnik.mixin.EntityMixin#onRotation
|
||||||
* @see me.retucio.camtweaks.mixin.EntityMixin#onChangeYaw
|
* @see me.retucio.sputnik.mixin.EntityMixin#onChangeYaw
|
||||||
* @see me.retucio.camtweaks.mixin.EntityMixin#onChangePitch
|
* @see me.retucio.sputnik.mixin.EntityMixin#onChangePitch
|
||||||
*/
|
*/
|
||||||
public class ChangeRotationEvent extends Event {
|
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 {}
|
||||||
+3
-2
@@ -1,10 +1,11 @@
|
|||||||
package me.retucio.camtweaks.event.events;
|
package me.retucio.sputnik.event.events;
|
||||||
|
|
||||||
|
import me.retucio.sputnik.module.modules.misc.ChatPlus;
|
||||||
import net.minecraft.text.ClickEvent;
|
import net.minecraft.text.ClickEvent;
|
||||||
|
|
||||||
|
|
||||||
/** este evento es solo para asegurarse de que comandos del mod se puedan ejecutar solo desde el lado del cliente
|
/** este evento es solo para asegurarse de que comandos del mod se puedan ejecutar solo desde el lado del cliente
|
||||||
* @see me.retucio.camtweaks.module.modules.ChatPlus#getSendButton
|
* @see ChatPlus#getSendButton
|
||||||
*/
|
*/
|
||||||
public class ClientClickEvent implements ClickEvent {
|
public class ClientClickEvent implements ClickEvent {
|
||||||
|
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package me.retucio.sputnik.event.events;
|
||||||
|
|
||||||
|
import me.retucio.sputnik.event.Event;
|
||||||
|
|
||||||
|
public class ClipAtLedgeEvent extends Event {
|
||||||
|
|
||||||
|
private boolean clipping;
|
||||||
|
|
||||||
|
public ClipAtLedgeEvent(boolean clipping) {
|
||||||
|
this.clipping = clipping;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isClipping() {
|
||||||
|
return clipping;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setClipping(boolean clipping) {
|
||||||
|
this.clipping = clipping;
|
||||||
|
}
|
||||||
|
}
|
||||||
+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;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ItemStackMixin#onDamage
|
* @see me.retucio.sputnik.mixin.ItemStackMixin#onDamage
|
||||||
*/
|
*/
|
||||||
public class DamageItemEvent extends Event {
|
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.client.network.ServerInfo;
|
||||||
import net.minecraft.network.DisconnectionInfo;
|
import net.minecraft.network.DisconnectionInfo;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onDisconnect
|
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onDisconnect
|
||||||
*/
|
*/
|
||||||
public class DisconnectEvent extends Event {
|
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 {
|
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.entity.Entity;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onEntityInteract
|
* @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onEntityInteract
|
||||||
*/
|
*/
|
||||||
public class InteractEntityEvent extends Event {
|
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 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 {
|
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 {
|
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 {
|
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 {
|
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;
|
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 {
|
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.sputnik.event.Event;
|
||||||
import me.retucio.camtweaks.event.Event;
|
import me.retucio.sputnik.event.Stage;
|
||||||
import me.retucio.camtweaks.event.Stage;
|
|
||||||
import net.minecraft.network.packet.Packet;
|
import net.minecraft.network.packet.Packet;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPre
|
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPre
|
||||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPost
|
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPost
|
||||||
* @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onReceivePacket
|
* @see me.retucio.sputnik.mixin.ClientConnectionMixin#onReceivePacket
|
||||||
*/
|
*/
|
||||||
public class PacketEvent {
|
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;
|
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 {
|
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.Hand;
|
||||||
import net.minecraft.util.hit.BlockHitResult;
|
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 {
|
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.client.gui.hud.MessageIndicator;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ChatHudMixin#onAddMessage
|
* @see me.retucio.sputnik.mixin.ChatHudMixin#onAddMessage
|
||||||
*/
|
*/
|
||||||
public class ReceiveMessageEvent extends Event {
|
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;
|
import net.minecraft.entity.Entity;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.ClientWorldMixin#onRemoveEntity
|
* @see me.retucio.sputnik.mixin.ClientWorldMixin#onRemoveEntity
|
||||||
*/
|
*/
|
||||||
public class RemoveEntityEvent extends Event {
|
public class RemoveEntityEvent 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.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.HeldItemRendererMixin#onRenderArm
|
* @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderArm
|
||||||
*/
|
*/
|
||||||
public class RenderArmEvent extends Event {
|
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.client.gui.hud.ClientBossBar;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
@@ -8,9 +8,9 @@ import java.util.Iterator;
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifyBossBarIterator
|
* @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarIterator
|
||||||
* @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifyBossBarName
|
* @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarName
|
||||||
* @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifySpacingConstant
|
* @see me.retucio.sputnik.mixin.BossBarHudMixin#modifySpacingConstant
|
||||||
*/
|
*/
|
||||||
public class RenderBossbarEvent {
|
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.client.util.math.MatrixStack;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.HeldItemRendererMixin#onRenderItem
|
* @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderItem
|
||||||
*/
|
*/
|
||||||
public class RenderHeldItemEvent extends Event {
|
public class RenderHeldItemEvent extends Event {
|
||||||
|
|
||||||
+3
-3
@@ -1,13 +1,13 @@
|
|||||||
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.Camera;
|
||||||
import net.minecraft.client.render.RenderTickCounter;
|
import net.minecraft.client.render.RenderTickCounter;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
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 RenderWorldEvent 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 {
|
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.item.ItemStack;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onUseItem
|
* @see me.retucio.sputnik.mixin.MinecraftClientMixin#onUseItem
|
||||||
*/
|
*/
|
||||||
public class UseItemEvent extends Event {
|
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
|
// se genera cada que se interactúa con el marco de ajustes de la interfaz
|
||||||
public class GUISettingsFrameEvent {
|
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
|
// se genera cuando carga la interfaz del mod
|
||||||
public class LoadClickGUIEvent extends Event {}
|
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
|
// se genera cuando carga el gestor de comandos
|
||||||
public class LoadCommandManagerEvent extends Event {}
|
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
|
// se genera cuando carga el gestor de módulos
|
||||||
public class LoadModuleManagerEvent extends Event {}
|
public class LoadModuleManagerEvent 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 módulos
|
// se genera cada que se interactúa con el marco de módulos
|
||||||
public class ModuleFrameEvent {
|
public class ModuleFrameEvent {
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
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;
|
||||||
import me.retucio.camtweaks.ui.frames.SettingsFrame;
|
import me.retucio.sputnik.ui.widgets.frames.SettingsFrame;
|
||||||
|
|
||||||
// se genera cada que se interactúa con un marco de ajustes de un módulo
|
// se genera cada que se interactúa con un marco de ajustes de un módulo
|
||||||
public class SettingsFrameEvent {
|
public class SettingsFrameEvent {
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
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;
|
||||||
import me.retucio.camtweaks.module.Module;
|
import me.retucio.sputnik.module.Module;
|
||||||
|
|
||||||
// se genera cada que se enciende o apaga un módulo
|
// se genera cada que se enciende o apaga un módulo
|
||||||
public class ToggleModuleEvent extends Event {
|
public class ToggleModuleEvent extends Event {
|
||||||
Loaded 100 of 379 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user