diff --git a/README.md b/README.md index 8d4e984..8671ff5 100644 --- a/README.md +++ b/README.md @@ -5,19 +5,19 @@ mod para Minecraft Fabric 1.21.10 que añade algunas cosas QOL, mayormente relac ## instalación ### para gente normal: -1. ir a [lanzamientos](https://github.com/retuci0/camera-tweaks/releases) +1. ir a [lanzamientos](https://github.com/retuci0/sputnik/releases) 2. selecionar la versión más reciente 3. descargar el .jar 4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`) -asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `1.21.10`; Fabric `0.138.3`) +asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `1.21.11`; Fabric `0.17.3`) es posible que haya problemas al usarlo junto a otros mods, especialmente junto a otros clientes, pues pueden conflictar entre ellos. ### para frikis de 200 de iq -1. clona el respositorio (`git clone https://github.com/retuci0/camera-tweaks`) -2. entra al directorio del repositorio (`cd camera-tweaks`) +1. clona el respositorio (`git clone https://github.com/retuci0/sputnik`) +2. entra al directorio del repositorio (`cd sputnik`) 3. `gradlew build` para Windows o `chmod +x gradlew` + `./gradlew build` para Linux (Mac es Linux) -4. el resultado estará en `/build/libs/camtweaks-X.X.jar` (el que no lleva "sources" en el nombre) +4. el resultado estará en `/build/libs/sputnik-X.X.jar` (el que no lleva "sources" en el nombre) ## uso diff --git a/build.gradle b/build.gradle index 86e83cb..ac3b42f 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ dependencies { } loom { - accessWidenerPath = file("src/main/resources/camtweaks.accesswidener") + accessWidenerPath = file("src/main/resources/sputnik.accesswidener") } processResources { diff --git a/cambios.md b/cambios.md index 513dfc8..64f3481 100644 --- a/cambios.md +++ b/cambios.md @@ -1,25 +1,17 @@ -# v2.2 +# v2.3 ## novedades -- elementos del hud con imágenes +- renombrado el mod a sputnik porque esmegma o cameratweaks era un asco y sputnik ta to wapo ### adiciones -- elementos del hud de dinosaurios (autismaxxing), echest (items del echest) y totems (totems restantes en el inventario) - #### módulos nuevos: -- conejo: haz el elytra-bounce más fácilmente - ### arreglos / mejoras -- ya no te puedes mover con una interfaz abierta en modo cámara libre -- minar sin interrupción ya va -- destello de enchants ya funciona -- ahora no siempre se verá a traves de paredes al renderizar (ej.: superposición de luz) -- el renderizado de líneas ya se adapta bien a la posición de la cámara -- la superposición de daño ya funciona +- ahora tienes un múltiplo en críticos, es decir, un número por el que se multiplica la cantidad de partículas a generar +- ya no se guardan los ajustes mientras se cargan ## problemas reconocidos diff --git a/gradle.properties b/gradle.properties index 6b54ee3..f3f3366 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,6 @@ loom_version=1.13-SNAPSHOT fabric_api_version=0.140.2+1.21.11 -mod_version=2.2 +mod_version=2.3 maven_group=me.retucio -archives_base_name=camtweaks \ No newline at end of file +archives_base_name=sputnik \ No newline at end of file diff --git a/src.zip b/src.zip deleted file mode 100644 index d746cad..0000000 Binary files a/src.zip and /dev/null differ diff --git a/src/main/java/me/retucio/camtweaks/event/events/ChunkOcclusionEvent.java b/src/main/java/me/retucio/camtweaks/event/events/ChunkOcclusionEvent.java deleted file mode 100644 index 26d3409..0000000 --- a/src/main/java/me/retucio/camtweaks/event/events/ChunkOcclusionEvent.java +++ /dev/null @@ -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 {} diff --git a/src/main/java/me/retucio/camtweaks/event/events/ShutdownEvent.java b/src/main/java/me/retucio/camtweaks/event/events/ShutdownEvent.java deleted file mode 100644 index a339eb9..0000000 --- a/src/main/java/me/retucio/camtweaks/event/events/ShutdownEvent.java +++ /dev/null @@ -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() {} -} diff --git a/src/main/java/me/retucio/camtweaks/event/events/TickEvent.java b/src/main/java/me/retucio/camtweaks/event/events/TickEvent.java deleted file mode 100644 index 73920b5..0000000 --- a/src/main/java/me/retucio/camtweaks/event/events/TickEvent.java +++ /dev/null @@ -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 {} -} diff --git a/src/main/java/me/retucio/camtweaks/CameraTweaks.java b/src/main/java/me/retucio/sputnik/Sputnik.java similarity index 76% rename from src/main/java/me/retucio/camtweaks/CameraTweaks.java rename to src/main/java/me/retucio/sputnik/Sputnik.java index 8a35169..d6fea20 100644 --- a/src/main/java/me/retucio/camtweaks/CameraTweaks.java +++ b/src/main/java/me/retucio/sputnik/Sputnik.java @@ -1,37 +1,36 @@ -package me.retucio.camtweaks; +package me.retucio.sputnik; -import me.retucio.camtweaks.command.CommandManager; -import me.retucio.camtweaks.command.commands.BindCommand; +import me.retucio.sputnik.command.CommandManager; +import me.retucio.sputnik.command.commands.BindCommand; -import me.retucio.camtweaks.config.ConfigManager; +import me.retucio.sputnik.config.ConfigManager; -import me.retucio.camtweaks.event.EventBus; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.ShutdownEvent; +import me.retucio.sputnik.event.EventBus; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.ShutdownEvent; -import me.retucio.camtweaks.event.events.camtweaks.LoadClickGUIEvent; -import me.retucio.camtweaks.event.events.camtweaks.LoadCommandManagerEvent; -import me.retucio.camtweaks.event.events.camtweaks.LoadModuleManagerEvent; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; +import me.retucio.sputnik.event.events.sputnik.LoadClickGUIEvent; +import me.retucio.sputnik.event.events.sputnik.LoadCommandManagerEvent; +import me.retucio.sputnik.event.events.sputnik.LoadModuleManagerEvent; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.hud.HudEditorScreen; -import me.retucio.camtweaks.ui.hud.HudRenderer; -import me.retucio.camtweaks.ui.widgets.buttons.settings.BindButton; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.widgets.buttons.settings.TextButton; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.hud.HudEditorScreen; +import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.widgets.buttons.settings.TextButton; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.ui.widgets.Button; -import me.retucio.camtweaks.util.*; +import me.retucio.sputnik.ui.widgets.Button; +import me.retucio.sputnik.util.*; -import me.retucio.camtweaks.util.render.DrawUtil; -import me.retucio.camtweaks.util.render.RenderUtil; +import me.retucio.sputnik.util.render.DrawUtil; +import me.retucio.sputnik.util.render.RenderUtil; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.loader.api.FabricLoader; @@ -50,43 +49,33 @@ import org.lwjgl.glfw.GLFW; -public class CameraTweaks implements ClientModInitializer { +public class Sputnik implements ClientModInitializer { // cosas necesarias - public static final CameraTweaks INSTANCE = new CameraTweaks(); + public static final Sputnik INSTANCE = new Sputnik(); public static final EventBus EVENT_BUS = new EventBus(); - public static final Logger LOGGER = LogManager.getLogger(CameraTweaks.class); + public static final Logger LOGGER = LogManager.getLogger(Sputnik.class); public static MinecraftClient mc; // id y versión - public static final String MOD_ID = "camtweaks"; - public static final String MOD_VERSION; - - static { - MOD_VERSION = FabricLoader.getInstance().getModContainer(MOD_ID) + public static final String MOD_ID = "sputnik"; + public static final String MOD_VERSION = FabricLoader.getInstance() + .getModContainer(MOD_ID) .orElseThrow() .getMetadata() .getVersion() .getFriendlyString(); - } - private Screen prevScreen; public static boolean settingsApplied = false; - @Override public void onInitializeClient() { - // por algún motivo aunque lo añada a los args de la JVM sigue siendo true a menos que haga esto??? puta vida - System.setProperty("java.awt.headless", "false"); - mc = MinecraftClient.getInstance(); ConfigManager.load(); EVENT_BUS.register(this); - EVENT_BUS.register(HudRenderer.class); - EVENT_BUS.register(ChatUtil.class); EVENT_BUS.register(DrawUtil.class); EVENT_BUS.register(EntityUtil.class); @@ -108,7 +97,6 @@ public class CameraTweaks implements ClientModInitializer { EVENT_BUS.post(new LoadClickGUIEvent()); Runtime.getRuntime().addShutdownHook(new Thread(() -> { - ConfigManager.save(); EVENT_BUS.post(new ShutdownEvent()); })); } @@ -127,7 +115,7 @@ public class CameraTweaks implements ClientModInitializer { // se ejecuta cada vez que se presiona una tecla - public void onKeyPress(int key, int action) { + public void onKey(int key, int action) { if (key == GLFW.GLFW_KEY_F3) return; // prevenir activación de módulos al usar combinaciones de F3 ModuleManager.INSTANCE.getEnabledModules().forEach(module -> module.onKey(key, action)); @@ -173,7 +161,7 @@ public class CameraTweaks implements ClientModInitializer { // se ocupa de hacer los botones de ajustes que lo necesiten escuchar teclas private void handleSettingButtonsKey(int key, int action) { for (SettingsFrame sf : ClickGUI.INSTANCE.getSettingsFrames()) { - for (SettingButton sb : sf.getButtons()) { + for (SettingButton sb : sf.getButtons()) { if (sb instanceof BindButton bb) bb.onKey(key, action); if (sb instanceof TextButton tb) tb.onKey(key, action); } diff --git a/src/main/java/me/retucio/camtweaks/command/Command.java b/src/main/java/me/retucio/sputnik/command/Command.java similarity index 95% rename from src/main/java/me/retucio/camtweaks/command/Command.java rename to src/main/java/me/retucio/sputnik/command/Command.java index b560d53..4cb4248 100644 --- a/src/main/java/me/retucio/camtweaks/command/Command.java +++ b/src/main/java/me/retucio/sputnik/command/Command.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.command; +package me.retucio.sputnik.command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.ArgumentType; @@ -65,7 +65,7 @@ public abstract class Command { } public String toString() { - return me.retucio.camtweaks.command.CommandManager.INSTANCE.getPrefix() + name; + return me.retucio.sputnik.command.CommandManager.INSTANCE.getPrefix() + name; } public String toString(String... args) { diff --git a/src/main/java/me/retucio/camtweaks/command/CommandManager.java b/src/main/java/me/retucio/sputnik/command/CommandManager.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/command/CommandManager.java rename to src/main/java/me/retucio/sputnik/command/CommandManager.java index 7a60b14..5e38ecb 100644 --- a/src/main/java/me/retucio/camtweaks/command/CommandManager.java +++ b/src/main/java/me/retucio/sputnik/command/CommandManager.java @@ -1,11 +1,9 @@ -package me.retucio.camtweaks.command; +package me.retucio.sputnik.command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.command.commands.*; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.module.Module; +import me.retucio.sputnik.command.commands.*; +import me.retucio.sputnik.event.SubscribeEvent; import net.minecraft.client.MinecraftClient; import net.minecraft.command.CommandSource; @@ -49,7 +47,7 @@ public class CommandManager { for (Command command : commands) { for (Method method : command.getClass().getDeclaredMethods()) { if (method.isAnnotationPresent(SubscribeEvent.class)) { - CameraTweaks.EVENT_BUS.register(command); + me.retucio.sputnik.Sputnik.EVENT_BUS.register(command); break; } } diff --git a/src/main/java/me/retucio/camtweaks/command/args/EntityArgumentType.java b/src/main/java/me/retucio/sputnik/command/args/EntityArgumentType.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/command/args/EntityArgumentType.java rename to src/main/java/me/retucio/sputnik/command/args/EntityArgumentType.java index dbacea3..8ff83f2 100644 --- a/src/main/java/me/retucio/camtweaks/command/args/EntityArgumentType.java +++ b/src/main/java/me/retucio/sputnik/command/args/EntityArgumentType.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.command.args; +package me.retucio.sputnik.command.args; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -8,18 +8,17 @@ import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import me.retucio.camtweaks.util.EntityUtil; +import me.retucio.sputnik.util.EntityUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; -import javax.swing.*; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.regex.Pattern; // para autocompletar entidades -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; public class EntityArgumentType implements ArgumentType { diff --git a/src/main/java/me/retucio/camtweaks/command/args/ModuleArgumentType.java b/src/main/java/me/retucio/sputnik/command/args/ModuleArgumentType.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/command/args/ModuleArgumentType.java rename to src/main/java/me/retucio/sputnik/command/args/ModuleArgumentType.java index 06ae578..6e45bca 100644 --- a/src/main/java/me/retucio/camtweaks/command/args/ModuleArgumentType.java +++ b/src/main/java/me/retucio/sputnik/command/args/ModuleArgumentType.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.command.args; +package me.retucio.sputnik.command.args; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -7,8 +7,8 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/command/args/PlayerArgumentType.java b/src/main/java/me/retucio/sputnik/command/args/PlayerArgumentType.java similarity index 95% rename from src/main/java/me/retucio/camtweaks/command/args/PlayerArgumentType.java rename to src/main/java/me/retucio/sputnik/command/args/PlayerArgumentType.java index 3bb5222..be26538 100644 --- a/src/main/java/me/retucio/camtweaks/command/args/PlayerArgumentType.java +++ b/src/main/java/me/retucio/sputnik/command/args/PlayerArgumentType.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.command.args; +package me.retucio.sputnik.command.args; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; // para autocompletar nombres de jugadores public class PlayerArgumentType implements ArgumentType { diff --git a/src/main/java/me/retucio/camtweaks/command/commands/BindCommand.java b/src/main/java/me/retucio/sputnik/command/commands/BindCommand.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/command/commands/BindCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/BindCommand.java index 73f9a5e..25819f0 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/BindCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/BindCommand.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.command.args.ModuleArgumentType; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.KeySetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.command.args.ModuleArgumentType; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.KeySetting; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; import net.minecraft.util.Formatting; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/CopyScreenshotCommand.java b/src/main/java/me/retucio/sputnik/command/commands/CopyScreenshotCommand.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/command/commands/CopyScreenshotCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/CopyScreenshotCommand.java index 5f8b7db..cb91fdc 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/CopyScreenshotCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/CopyScreenshotCommand.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ScreenshotPlus; import net.minecraft.command.CommandSource; // se usa principalmente para el módulo ScreenshotPlus, pero también se puede usar sin él supongo diff --git a/src/main/java/me/retucio/camtweaks/command/commands/EnderChestCommand.java b/src/main/java/me/retucio/sputnik/command/commands/EnderChestCommand.java similarity index 75% rename from src/main/java/me/retucio/camtweaks/command/commands/EnderChestCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/EnderChestCommand.java index 3379c92..64c5bee 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/EnderChestCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/EnderChestCommand.java @@ -1,13 +1,12 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.TickEvent; -import me.retucio.camtweaks.ui.screen.PreviewScreen; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.InventoryUtil; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.TickEvent; +import me.retucio.sputnik.ui.screen.PreviewScreen; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.InventoryUtil; import net.minecraft.command.CommandSource; // accede a los contenidos de tu enderchest diff --git a/src/main/java/me/retucio/camtweaks/command/commands/GarbageCleanerCommand.java b/src/main/java/me/retucio/sputnik/command/commands/GarbageCleanerCommand.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/command/commands/GarbageCleanerCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/GarbageCleanerCommand.java index 4fcf5b0..9e73081 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/GarbageCleanerCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/GarbageCleanerCommand.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.util.ChatUtil; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/PeekCommand.java b/src/main/java/me/retucio/sputnik/command/commands/PeekCommand.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/command/commands/PeekCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/PeekCommand.java index 3b8403f..e717daf 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/PeekCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/PeekCommand.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.command.args.PlayerArgumentType; -import me.retucio.camtweaks.util.MiscUtil; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.command.args.PlayerArgumentType; +import me.retucio.sputnik.util.MiscUtil; import net.minecraft.client.gui.screen.ingame.InventoryScreen; import net.minecraft.command.CommandSource; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/PrefixCommand.java b/src/main/java/me/retucio/sputnik/command/commands/PrefixCommand.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/command/commands/PrefixCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/PrefixCommand.java index 45bfe80..b010828 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/PrefixCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/PrefixCommand.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.util.ChatUtil; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; import net.minecraft.util.Formatting; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/PurgeCommand.java b/src/main/java/me/retucio/sputnik/command/commands/PurgeCommand.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/command/commands/PurgeCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/PurgeCommand.java index b2f0d78..b5cae1d 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/PurgeCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/PurgeCommand.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.util.interfaces.IChatHud; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.util.interfaces.IChatHud; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.command.CommandSource; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/SaveScreenshotCommand.java b/src/main/java/me/retucio/sputnik/command/commands/SaveScreenshotCommand.java similarity index 80% rename from src/main/java/me/retucio/camtweaks/command/commands/SaveScreenshotCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/SaveScreenshotCommand.java index 464fe24..61956c4 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/SaveScreenshotCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/SaveScreenshotCommand.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ScreenshotPlus; +import me.retucio.sputnik.util.ChatUtil; import net.minecraft.command.CommandSource; import java.io.IOException; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/SendCommand.java b/src/main/java/me/retucio/sputnik/command/commands/SendCommand.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/command/commands/SendCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/SendCommand.java index 7a86e2c..5751ca0 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/SendCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/SendCommand.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.mixin.accessor.ClientPlayNetworkHandlerAccessor; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.mixin.accessor.ClientPlayNetworkHandlerAccessor; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.command.CommandSource; import net.minecraft.network.encryption.NetworkEncryptionUtils; @@ -11,7 +11,6 @@ import net.minecraft.network.message.LastSeenMessagesCollector; import net.minecraft.network.message.MessageBody; import net.minecraft.network.message.MessageSignatureData; import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; -import net.minecraft.text.Text; import java.time.Instant; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/SpectateCommand.java b/src/main/java/me/retucio/sputnik/command/commands/SpectateCommand.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/command/commands/SpectateCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/SpectateCommand.java index 54c3166..571e32a 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/SpectateCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/SpectateCommand.java @@ -1,12 +1,11 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.command.args.EntityArgumentType; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.KeyEvent; -import me.retucio.camtweaks.util.EntityUtil; -import me.retucio.camtweaks.util.MiscUtil; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.command.args.EntityArgumentType; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.KeyEvent; +import me.retucio.sputnik.util.EntityUtil; import net.minecraft.command.CommandSource; import net.minecraft.entity.Entity; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/retucio/camtweaks/command/commands/ToggleCommand.java b/src/main/java/me/retucio/sputnik/command/commands/ToggleCommand.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/command/commands/ToggleCommand.java rename to src/main/java/me/retucio/sputnik/command/commands/ToggleCommand.java index 67a8456..124b089 100644 --- a/src/main/java/me/retucio/camtweaks/command/commands/ToggleCommand.java +++ b/src/main/java/me/retucio/sputnik/command/commands/ToggleCommand.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.command.commands; +package me.retucio.sputnik.command.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.retucio.camtweaks.command.Command; -import me.retucio.camtweaks.command.args.ModuleArgumentType; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; +import me.retucio.sputnik.command.Command; +import me.retucio.sputnik.command.args.ModuleArgumentType; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; import net.minecraft.command.CommandSource; // porque usar el ratón es más lento que escribir, a menos que tengas toque con el teclado como yo diff --git a/src/main/java/me/retucio/camtweaks/config/ClientConfig.java b/src/main/java/me/retucio/sputnik/config/ClientConfig.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/config/ClientConfig.java rename to src/main/java/me/retucio/sputnik/config/ClientConfig.java index 05b2dd5..2a6e866 100644 --- a/src/main/java/me/retucio/camtweaks/config/ClientConfig.java +++ b/src/main/java/me/retucio/sputnik/config/ClientConfig.java @@ -1,15 +1,15 @@ -package me.retucio.camtweaks.config; +package me.retucio.sputnik.config; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.camtweaks.*; -import me.retucio.camtweaks.module.settings.*; -import me.retucio.camtweaks.ui.screen.ClickGUI; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.sputnik.*; +import me.retucio.sputnik.module.settings.*; +import me.retucio.sputnik.ui.screen.ClickGUI; import java.util.HashMap; import java.util.Map; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.mc; // clase donde se guardan las configuraciones temporalmente hasta escribirlas en camera_tweaks.json public class ClientConfig { diff --git a/src/main/java/me/retucio/camtweaks/config/ConfigManager.java b/src/main/java/me/retucio/sputnik/config/ConfigManager.java similarity index 80% rename from src/main/java/me/retucio/camtweaks/config/ConfigManager.java rename to src/main/java/me/retucio/sputnik/config/ConfigManager.java index 5ec66cf..f77b877 100644 --- a/src/main/java/me/retucio/camtweaks/config/ConfigManager.java +++ b/src/main/java/me/retucio/sputnik/config/ConfigManager.java @@ -1,15 +1,15 @@ -package me.retucio.camtweaks.config; +package me.retucio.sputnik.config; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.settings.*; -import me.retucio.camtweaks.ui.widgets.frames.ModuleFrame; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.settings.*; +import me.retucio.sputnik.ui.widgets.Frame; +import me.retucio.sputnik.ui.widgets.frames.ModuleFrame; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; import java.io.File; import java.io.FileReader; @@ -23,7 +23,7 @@ import java.util.Map; public class ConfigManager { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static final File CONFIG_FILE = new File("camera_tweaks.json"); + private static final File CONFIG_FILE = new File("sputnik.json"); private static boolean loaded = false; private static ClientConfig config = null; @@ -33,19 +33,20 @@ public class ConfigManager { // guardar configuraciones public static void save() { + if (!loaded) return; ensureConfig(); try (FileWriter writer = new FileWriter(CONFIG_FILE)) { GSON.toJson(config, writer); - CameraTweaks.LOGGER.info("ajustes guardados"); + me.retucio.sputnik.Sputnik.LOGGER.info("ajustes guardados"); } catch (IOException e) { - CameraTweaks.LOGGER.error("error al guardar ajustes", e); + me.retucio.sputnik.Sputnik.LOGGER.error("error al guardar ajustes", e); } } // cargar configuraciones public static void load() { - CameraTweaks.LOGGER.info("cargando ajustes..."); + me.retucio.sputnik.Sputnik.LOGGER.info("cargando ajustes..."); if (!CONFIG_FILE.exists()) { ensureConfig(); @@ -55,9 +56,9 @@ public class ConfigManager { try (FileReader reader = new FileReader(CONFIG_FILE)) { config = GSON.fromJson(reader, ClientConfig.class); - CameraTweaks.LOGGER.info("ajustes cargados"); + me.retucio.sputnik.Sputnik.LOGGER.info("ajustes cargados"); } catch (IOException e) { - CameraTweaks.LOGGER.error("no se pudieron cargar los ajustes, usando ajustes por defecto", e); + me.retucio.sputnik.Sputnik.LOGGER.error("no se pudieron cargar los ajustes, usando ajustes por defecto", e); ensureConfig(); } } @@ -74,7 +75,7 @@ public class ConfigManager { applyExtendableFrames(); loaded = true; - CameraTweaks.LOGGER.info("ajustes aplicados"); + me.retucio.sputnik.Sputnik.LOGGER.info("ajustes aplicados"); } // obtener configuración actual @@ -159,7 +160,7 @@ public class ConfigManager { case ListSetting listSetting -> applyListSetting(listSetting, value); case ColorSetting colorSetting -> applyColorSetting(colorSetting, value); case OptionSetting optionSetting -> applyOptionSetting(optionSetting, value); - default -> CameraTweaks.LOGGER.warn("watafac queseso: {}", setting.getClass().getSimpleName()); + default -> me.retucio.sputnik.Sputnik.LOGGER.warn("watafac queseso: {}", setting.getClass().getSimpleName()); } } @@ -169,14 +170,14 @@ public class ConfigManager { module.setEnabled(config.moduleStates.get(module.getName())); } }); - CameraTweaks.LOGGER.info("estados de módulos aplicados"); + me.retucio.sputnik.Sputnik.LOGGER.info("estados de módulos aplicados"); } private static void applyModuleSettings() { ModuleManager.INSTANCE.getModules().forEach(module -> { module.getSettings().forEach(setting -> applySetting(module, setting)); }); - CameraTweaks.LOGGER.info("ajustes de módulos aplicados"); + me.retucio.sputnik.Sputnik.LOGGER.info("ajustes de módulos aplicados"); } private static void applySettingsFrames() { @@ -184,7 +185,7 @@ public class ConfigManager { Module module = ModuleManager.INSTANCE.getModuleByName(moduleName); ClickGUI.INSTANCE.openSettingsFrame(module, position[0], position[1]); }); - CameraTweaks.LOGGER.info("estados de marcos de ajustes aplicados"); + me.retucio.sputnik.Sputnik.LOGGER.info("estados de marcos de ajustes aplicados"); } private static void applySearchBarPosition() { @@ -192,7 +193,7 @@ public class ConfigManager { ClickGUI.INSTANCE.getSearchBar().setX(config.searchBarPosition[0]); ClickGUI.INSTANCE.getSearchBar().setY(config.searchBarPosition[1]); } - CameraTweaks.LOGGER.info("posición de la barra de búsqueda aplicada"); + me.retucio.sputnik.Sputnik.LOGGER.info("posición de la barra de búsqueda aplicada"); } private static void applyGuiSettings() { @@ -200,32 +201,33 @@ public class ConfigManager { ClientSettingsFrame.guiSettings.getSettings().forEach(setting -> { applySetting(ClientSettingsFrame.guiSettings, setting); }); - CameraTweaks.LOGGER.info("ajustes del cliente aplicados"); + me.retucio.sputnik.Sputnik.LOGGER.info("ajustes del cliente aplicados"); } private static void applyExtendableFrames() { applyExtendableFrame(ClickGUI.INSTANCE.getModulesFrame()); applyExtendableFrame(ClickGUI.INSTANCE.getGuiSettingsFrame()); - CameraTweaks.LOGGER.info("posiciones de marcos extendibles aplicadasa"); + me.retucio.sputnik.Sputnik.LOGGER.info("posiciones de marcos extendibles aplicadasa"); ClickGUI.INSTANCE.refreshListButtons(); } - private static void applyExtendableFrame(ModuleFrame frame) { - ClientConfig.FrameData frameData = config.extendableFrames.get("M"); - if (frameData != null) { - frame.setX(frameData.x()); - frame.setY(frameData.y()); - frame.extended = frameData.extended(); - } - } + private static void applyExtendableFrame(Frame frame) { + ClientConfig.FrameData frameData = null; + if (frame instanceof ModuleFrame) + frameData = config.extendableFrames.get("M"); + + if (frame instanceof ClientSettingsFrame) + frameData = config.extendableFrames.get("S"); - private static void applyExtendableFrame(ClientSettingsFrame frame) { - ClientConfig.FrameData frameData = config.extendableFrames.get("S"); if (frameData != null) { frame.setX(frameData.x()); frame.setY(frameData.y()); - frame.extended = frameData.extended(); + + if (frame instanceof ModuleFrame mFrame) + mFrame.extended = frameData.extended(); + if (frame instanceof ClientSettingsFrame sFrame) + sFrame.extended = frameData.extended(); } } @@ -314,7 +316,7 @@ public class ConfigManager { // ------------------ MÉTODOS DE AYUDA ------------------ private static boolean shouldApply() { - return CameraTweaks.mc != null && ModuleManager.INSTANCE != null && config != null; + return me.retucio.sputnik.Sputnik.mc != null && ModuleManager.INSTANCE != null && config != null; } @@ -329,4 +331,4 @@ public class ConfigManager { public static boolean hasLoaded() { return loaded; } -} +} \ No newline at end of file diff --git a/src/main/java/me/retucio/camtweaks/event/Event.java b/src/main/java/me/retucio/sputnik/event/Event.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/event/Event.java rename to src/main/java/me/retucio/sputnik/event/Event.java index 543f766..4ebf64c 100644 --- a/src/main/java/me/retucio/camtweaks/event/Event.java +++ b/src/main/java/me/retucio/sputnik/event/Event.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.event; +package me.retucio.sputnik.event; // evento base, cancelable (usado en mixins) public class Event { diff --git a/src/main/java/me/retucio/camtweaks/event/EventBus.java b/src/main/java/me/retucio/sputnik/event/EventBus.java similarity index 98% rename from src/main/java/me/retucio/camtweaks/event/EventBus.java rename to src/main/java/me/retucio/sputnik/event/EventBus.java index 878a53e..bdb4f8a 100644 --- a/src/main/java/me/retucio/camtweaks/event/EventBus.java +++ b/src/main/java/me/retucio/sputnik/event/EventBus.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.event; +package me.retucio.sputnik.event; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/src/main/java/me/retucio/camtweaks/event/JoinWorldEvent.java b/src/main/java/me/retucio/sputnik/event/JoinWorldEvent.java similarity index 62% rename from src/main/java/me/retucio/camtweaks/event/JoinWorldEvent.java rename to src/main/java/me/retucio/sputnik/event/JoinWorldEvent.java index 6a82e37..343fe38 100644 --- a/src/main/java/me/retucio/camtweaks/event/JoinWorldEvent.java +++ b/src/main/java/me/retucio/sputnik/event/JoinWorldEvent.java @@ -1,11 +1,10 @@ -package me.retucio.camtweaks.event; +package me.retucio.sputnik.event; import net.minecraft.client.world.ClientWorld; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** - * @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onJoinWorld + * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onJoinWorld */ public class JoinWorldEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/Stage.java b/src/main/java/me/retucio/sputnik/event/Stage.java similarity index 74% rename from src/main/java/me/retucio/camtweaks/event/Stage.java rename to src/main/java/me/retucio/sputnik/event/Stage.java index b69c70a..f3b2872 100644 --- a/src/main/java/me/retucio/camtweaks/event/Stage.java +++ b/src/main/java/me/retucio/sputnik/event/Stage.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.event; +package me.retucio.sputnik.event; public enum Stage { PRE, // antes de que haya sucedido diff --git a/src/main/java/me/retucio/camtweaks/event/SubscribeEvent.java b/src/main/java/me/retucio/sputnik/event/SubscribeEvent.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/event/SubscribeEvent.java rename to src/main/java/me/retucio/sputnik/event/SubscribeEvent.java index 7c0413f..8b7d6c3 100644 --- a/src/main/java/me/retucio/camtweaks/event/SubscribeEvent.java +++ b/src/main/java/me/retucio/sputnik/event/SubscribeEvent.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.event; +package me.retucio.sputnik.event; import java.lang.annotation.*; diff --git a/src/main/java/me/retucio/camtweaks/event/events/AddEntityEvent.java b/src/main/java/me/retucio/sputnik/event/events/AddEntityEvent.java similarity index 64% rename from src/main/java/me/retucio/camtweaks/event/events/AddEntityEvent.java rename to src/main/java/me/retucio/sputnik/event/events/AddEntityEvent.java index d9ae902..8b0f2a7 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/AddEntityEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/AddEntityEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.entity.Entity; /** - * @see me.retucio.camtweaks.mixin.ClientWorldMixin#onAddEntity + * @see me.retucio.sputnik.mixin.ClientWorldMixin#onAddEntity */ public class AddEntityEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/AttackEntityEvent.java b/src/main/java/me/retucio/sputnik/event/events/AttackEntityEvent.java similarity index 61% rename from src/main/java/me/retucio/camtweaks/event/events/AttackEntityEvent.java rename to src/main/java/me/retucio/sputnik/event/events/AttackEntityEvent.java index ba6d331..bdeb4bd 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/AttackEntityEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/AttackEntityEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.entity.Entity; /** - * @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onAttackEntity + * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onAttackEntity */ public class AttackEntityEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/BreakBlockEvent.java b/src/main/java/me/retucio/sputnik/event/events/BreakBlockEvent.java similarity index 66% rename from src/main/java/me/retucio/camtweaks/event/events/BreakBlockEvent.java rename to src/main/java/me/retucio/sputnik/event/events/BreakBlockEvent.java index 48dec84..8824ce5 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/BreakBlockEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/BreakBlockEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.util.math.BlockPos; /** - * @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onBlockBreak + * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onBlockBreak */ public class BreakBlockEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/ChangeRotationEvent.java b/src/main/java/me/retucio/sputnik/event/events/ChangeRotationEvent.java similarity index 64% rename from src/main/java/me/retucio/camtweaks/event/events/ChangeRotationEvent.java rename to src/main/java/me/retucio/sputnik/event/events/ChangeRotationEvent.java index 84be4e8..6c67419 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/ChangeRotationEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/ChangeRotationEvent.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; /** - * @see me.retucio.camtweaks.mixin.EntityMixin#onRotation - * @see me.retucio.camtweaks.mixin.EntityMixin#onChangeYaw - * @see me.retucio.camtweaks.mixin.EntityMixin#onChangePitch + * @see me.retucio.sputnik.mixin.EntityMixin#onRotation + * @see me.retucio.sputnik.mixin.EntityMixin#onChangeYaw + * @see me.retucio.sputnik.mixin.EntityMixin#onChangePitch */ public class ChangeRotationEvent extends Event { diff --git a/src/main/java/me/retucio/sputnik/event/events/ChunkOcclusionEvent.java b/src/main/java/me/retucio/sputnik/event/events/ChunkOcclusionEvent.java new file mode 100644 index 0000000..e1f196b --- /dev/null +++ b/src/main/java/me/retucio/sputnik/event/events/ChunkOcclusionEvent.java @@ -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 {} diff --git a/src/main/java/me/retucio/camtweaks/event/events/ClientClickEvent.java b/src/main/java/me/retucio/sputnik/event/events/ClientClickEvent.java similarity index 83% rename from src/main/java/me/retucio/camtweaks/event/events/ClientClickEvent.java rename to src/main/java/me/retucio/sputnik/event/events/ClientClickEvent.java index cc95d24..3cf31be 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/ClientClickEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/ClientClickEvent.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.module.modules.misc.ChatPlus; +import me.retucio.sputnik.module.modules.misc.ChatPlus; import net.minecraft.text.ClickEvent; diff --git a/src/main/java/me/retucio/camtweaks/event/events/ClipAtLedgeEvent.java b/src/main/java/me/retucio/sputnik/event/events/ClipAtLedgeEvent.java similarity index 79% rename from src/main/java/me/retucio/camtweaks/event/events/ClipAtLedgeEvent.java rename to src/main/java/me/retucio/sputnik/event/events/ClipAtLedgeEvent.java index f8c954b..75a1870 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/ClipAtLedgeEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/ClipAtLedgeEvent.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; public class ClipAtLedgeEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/DamageItemEvent.java b/src/main/java/me/retucio/sputnik/event/events/DamageItemEvent.java similarity index 73% rename from src/main/java/me/retucio/camtweaks/event/events/DamageItemEvent.java rename to src/main/java/me/retucio/sputnik/event/events/DamageItemEvent.java index 5b76aa9..7684581 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/DamageItemEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/DamageItemEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.item.ItemStack; /** - * @see me.retucio.camtweaks.mixin.ItemStackMixin#onDamage + * @see me.retucio.sputnik.mixin.ItemStackMixin#onDamage */ public class DamageItemEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/DisconnectEvent.java b/src/main/java/me/retucio/sputnik/event/events/DisconnectEvent.java similarity index 76% rename from src/main/java/me/retucio/camtweaks/event/events/DisconnectEvent.java rename to src/main/java/me/retucio/sputnik/event/events/DisconnectEvent.java index f93c006..f3c6fa3 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/DisconnectEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/DisconnectEvent.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.client.network.ServerInfo; import net.minecraft.network.DisconnectionInfo; /** - * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onDisconnect + * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onDisconnect */ public class DisconnectEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/GetFOVEvent.java b/src/main/java/me/retucio/sputnik/event/events/GetFOVEvent.java similarity index 64% rename from src/main/java/me/retucio/camtweaks/event/events/GetFOVEvent.java rename to src/main/java/me/retucio/sputnik/event/events/GetFOVEvent.java index a27a593..ce42908 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/GetFOVEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/GetFOVEvent.java @@ -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 { diff --git a/src/main/java/me/retucio/camtweaks/event/events/InteractEntityEvent.java b/src/main/java/me/retucio/sputnik/event/events/InteractEntityEvent.java similarity index 74% rename from src/main/java/me/retucio/camtweaks/event/events/InteractEntityEvent.java rename to src/main/java/me/retucio/sputnik/event/events/InteractEntityEvent.java index 3e07bc3..dbc61d8 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/InteractEntityEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/InteractEntityEvent.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.entity.Entity; import net.minecraft.util.Hand; /** - * @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onEntityInteract + * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onEntityInteract */ public class InteractEntityEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/KeyEvent.java b/src/main/java/me/retucio/sputnik/event/events/KeyEvent.java similarity index 74% rename from src/main/java/me/retucio/camtweaks/event/events/KeyEvent.java rename to src/main/java/me/retucio/sputnik/event/events/KeyEvent.java index d023662..4f05173 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/KeyEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/KeyEvent.java @@ -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 { diff --git a/src/main/java/me/retucio/camtweaks/event/events/MouseClickEvent.java b/src/main/java/me/retucio/sputnik/event/events/MouseClickEvent.java similarity index 69% rename from src/main/java/me/retucio/camtweaks/event/events/MouseClickEvent.java rename to src/main/java/me/retucio/sputnik/event/events/MouseClickEvent.java index ea52c1c..ce565b6 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/MouseClickEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/MouseClickEvent.java @@ -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 { diff --git a/src/main/java/me/retucio/camtweaks/event/events/MouseScrollEvent.java b/src/main/java/me/retucio/sputnik/event/events/MouseScrollEvent.java similarity index 79% rename from src/main/java/me/retucio/camtweaks/event/events/MouseScrollEvent.java rename to src/main/java/me/retucio/sputnik/event/events/MouseScrollEvent.java index 7eb1109..244f229 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/MouseScrollEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/MouseScrollEvent.java @@ -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 { diff --git a/src/main/java/me/retucio/camtweaks/event/events/OpenScreenEvent.java b/src/main/java/me/retucio/sputnik/event/events/OpenScreenEvent.java similarity index 64% rename from src/main/java/me/retucio/camtweaks/event/events/OpenScreenEvent.java rename to src/main/java/me/retucio/sputnik/event/events/OpenScreenEvent.java index a011a3e..87c809c 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/OpenScreenEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/OpenScreenEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.client.gui.screen.Screen; /** - * @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onOpenScreen + * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onOpenScreen */ public class OpenScreenEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/PacketEvent.java b/src/main/java/me/retucio/sputnik/event/events/PacketEvent.java similarity index 61% rename from src/main/java/me/retucio/camtweaks/event/events/PacketEvent.java rename to src/main/java/me/retucio/sputnik/event/events/PacketEvent.java index 7bc4e23..844679f 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/PacketEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/PacketEvent.java @@ -1,16 +1,14 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import io.netty.channel.ChannelFutureListener; -import me.retucio.camtweaks.event.Event; -import me.retucio.camtweaks.event.Stage; +import me.retucio.sputnik.event.Event; +import me.retucio.sputnik.event.Stage; import net.minecraft.network.packet.Packet; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** - * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPre - * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onSendPacketPost - * @see me.retucio.camtweaks.mixin.ClientConnectionMixin#onReceivePacket + * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPre + * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onSendPacketPost + * @see me.retucio.sputnik.mixin.ClientConnectionMixin#onReceivePacket */ public class PacketEvent { diff --git a/src/main/java/me/retucio/camtweaks/event/events/PerspectiveChangeEvent.java b/src/main/java/me/retucio/sputnik/event/events/PerspectiveChangeEvent.java similarity index 74% rename from src/main/java/me/retucio/camtweaks/event/events/PerspectiveChangeEvent.java rename to src/main/java/me/retucio/sputnik/event/events/PerspectiveChangeEvent.java index 5efe897..88c752c 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/PerspectiveChangeEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/PerspectiveChangeEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.client.option.Perspective; /** - * @see me.retucio.camtweaks.mixin.GameOptionsMixin#changePerspective + * @see me.retucio.sputnik.mixin.GameOptionsMixin#changePerspective */ public class PerspectiveChangeEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/PlaceBlockEvent.java b/src/main/java/me/retucio/sputnik/event/events/PlaceBlockEvent.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/event/events/PlaceBlockEvent.java rename to src/main/java/me/retucio/sputnik/event/events/PlaceBlockEvent.java index 62c4e4c..b49496e 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/PlaceBlockEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/PlaceBlockEvent.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; /** - * @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin#onBlockPlace + * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin#onBlockPlace */ public class PlaceBlockEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/ReceiveMessageEvent.java b/src/main/java/me/retucio/sputnik/event/events/ReceiveMessageEvent.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/event/events/ReceiveMessageEvent.java rename to src/main/java/me/retucio/sputnik/event/events/ReceiveMessageEvent.java index 39fdabf..161c9df 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/ReceiveMessageEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/ReceiveMessageEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.client.gui.hud.MessageIndicator; import net.minecraft.text.Text; /** - * @see me.retucio.camtweaks.mixin.ChatHudMixin#onAddMessage + * @see me.retucio.sputnik.mixin.ChatHudMixin#onAddMessage */ public class ReceiveMessageEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/RemoveEntityEvent.java b/src/main/java/me/retucio/sputnik/event/events/RemoveEntityEvent.java similarity index 64% rename from src/main/java/me/retucio/camtweaks/event/events/RemoveEntityEvent.java rename to src/main/java/me/retucio/sputnik/event/events/RemoveEntityEvent.java index d3136f1..077c66f 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/RemoveEntityEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/RemoveEntityEvent.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.entity.Entity; /** - * @see me.retucio.camtweaks.mixin.ClientWorldMixin#onRemoveEntity + * @see me.retucio.sputnik.mixin.ClientWorldMixin#onRemoveEntity */ public class RemoveEntityEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/RenderArmEvent.java b/src/main/java/me/retucio/sputnik/event/events/RenderArmEvent.java similarity index 80% rename from src/main/java/me/retucio/camtweaks/event/events/RenderArmEvent.java rename to src/main/java/me/retucio/sputnik/event/events/RenderArmEvent.java index 6be995d..6132dda 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/RenderArmEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/RenderArmEvent.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Hand; /** - * @see me.retucio.camtweaks.mixin.HeldItemRendererMixin#onRenderArm + * @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderArm */ public class RenderArmEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/RenderBossbarEvent.java b/src/main/java/me/retucio/sputnik/event/events/RenderBossbarEvent.java similarity index 83% rename from src/main/java/me/retucio/camtweaks/event/events/RenderBossbarEvent.java rename to src/main/java/me/retucio/sputnik/event/events/RenderBossbarEvent.java index b7f0447..c3e0993 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/RenderBossbarEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/RenderBossbarEvent.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.client.gui.hud.ClientBossBar; import net.minecraft.text.Text; @@ -8,9 +8,9 @@ import java.util.Iterator; /** - * @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifyBossBarIterator - * @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifyBossBarName - * @see me.retucio.camtweaks.mixin.BossBarHudMixin#modifySpacingConstant + * @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarIterator + * @see me.retucio.sputnik.mixin.BossBarHudMixin#modifyBossBarName + * @see me.retucio.sputnik.mixin.BossBarHudMixin#modifySpacingConstant */ public class RenderBossbarEvent { diff --git a/src/main/java/me/retucio/camtweaks/event/events/RenderHeldItemEvent.java b/src/main/java/me/retucio/sputnik/event/events/RenderHeldItemEvent.java similarity index 80% rename from src/main/java/me/retucio/camtweaks/event/events/RenderHeldItemEvent.java rename to src/main/java/me/retucio/sputnik/event/events/RenderHeldItemEvent.java index c76a854..c4b5ea4 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/RenderHeldItemEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/RenderHeldItemEvent.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Hand; /** - * @see me.retucio.camtweaks.mixin.HeldItemRendererMixin#onRenderItem + * @see me.retucio.sputnik.mixin.HeldItemRendererMixin#onRenderItem */ public class RenderHeldItemEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/RenderWorldEvent.java b/src/main/java/me/retucio/sputnik/event/events/RenderWorldEvent.java similarity index 83% rename from src/main/java/me/retucio/camtweaks/event/events/RenderWorldEvent.java rename to src/main/java/me/retucio/sputnik/event/events/RenderWorldEvent.java index 0c54d64..be03ce1 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/RenderWorldEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/RenderWorldEvent.java @@ -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.RenderTickCounter; import net.minecraft.client.util.math.MatrixStack; /** - * @see me.retucio.camtweaks.mixin.WorldRendererMixin#render + * @see me.retucio.sputnik.mixin.WorldRendererMixin#render */ public class RenderWorldEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/SendMessageEvent.java b/src/main/java/me/retucio/sputnik/event/events/SendMessageEvent.java similarity index 66% rename from src/main/java/me/retucio/camtweaks/event/events/SendMessageEvent.java rename to src/main/java/me/retucio/sputnik/event/events/SendMessageEvent.java index 7cbc80f..0a5047c 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/SendMessageEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/SendMessageEvent.java @@ -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 { diff --git a/src/main/java/me/retucio/sputnik/event/events/ShutdownEvent.java b/src/main/java/me/retucio/sputnik/event/events/ShutdownEvent.java new file mode 100644 index 0000000..df92039 --- /dev/null +++ b/src/main/java/me/retucio/sputnik/event/events/ShutdownEvent.java @@ -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() {} +} diff --git a/src/main/java/me/retucio/sputnik/event/events/TickEvent.java b/src/main/java/me/retucio/sputnik/event/events/TickEvent.java new file mode 100644 index 0000000..fb08bad --- /dev/null +++ b/src/main/java/me/retucio/sputnik/event/events/TickEvent.java @@ -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 {} +} diff --git a/src/main/java/me/retucio/camtweaks/event/events/UseItemEvent.java b/src/main/java/me/retucio/sputnik/event/events/UseItemEvent.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/event/events/UseItemEvent.java rename to src/main/java/me/retucio/sputnik/event/events/UseItemEvent.java index 961593c..1bc572d 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/UseItemEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/UseItemEvent.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.event.events; +package me.retucio.sputnik.event.events; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; /** - * @see me.retucio.camtweaks.mixin.MinecraftClientMixin#onUseItem + * @see me.retucio.sputnik.mixin.MinecraftClientMixin#onUseItem */ public class UseItemEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/GUISettingsFrameEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/GUISettingsFrameEvent.java similarity index 74% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/GUISettingsFrameEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/GUISettingsFrameEvent.java index f1fdf22..d6cd9c8 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/GUISettingsFrameEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/GUISettingsFrameEvent.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.event.events.camtweaks; +package me.retucio.sputnik.event.events.sputnik; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; // se genera cada que se interactúa con el marco de ajustes de la interfaz public class GUISettingsFrameEvent { diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadClickGUIEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadClickGUIEvent.java similarity index 50% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadClickGUIEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/LoadClickGUIEvent.java index 341a685..63dfd3c 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadClickGUIEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadClickGUIEvent.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.event.events.camtweaks; +package me.retucio.sputnik.event.events.sputnik; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; // se genera cuando carga la interfaz del mod public class LoadClickGUIEvent extends Event {} \ No newline at end of file diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadCommandManagerEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadCommandManagerEvent.java similarity index 52% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadCommandManagerEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/LoadCommandManagerEvent.java index ed748ba..39e8b1c 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadCommandManagerEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadCommandManagerEvent.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.event.events.camtweaks; +package me.retucio.sputnik.event.events.sputnik; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; // se genera cuando carga el gestor de comandos public class LoadCommandManagerEvent extends Event {} diff --git a/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadConfigEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadConfigEvent.java new file mode 100644 index 0000000..80c43f7 --- /dev/null +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadConfigEvent.java @@ -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; + } +} diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadModuleManagerEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadModuleManagerEvent.java similarity index 52% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadModuleManagerEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/LoadModuleManagerEvent.java index 57ea59b..ef6ec0e 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/LoadModuleManagerEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/LoadModuleManagerEvent.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.event.events.camtweaks; +package me.retucio.sputnik.event.events.sputnik; -import me.retucio.camtweaks.event.Event; +import me.retucio.sputnik.event.Event; // se genera cuando carga el gestor de módulos public class LoadModuleManagerEvent extends Event {} \ No newline at end of file diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/ModuleFrameEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/ModuleFrameEvent.java similarity index 72% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/ModuleFrameEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/ModuleFrameEvent.java index 154b341..febec77 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/ModuleFrameEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/ModuleFrameEvent.java @@ -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 public class ModuleFrameEvent { diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/SettingsFrameEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/SettingsFrameEvent.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/SettingsFrameEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/SettingsFrameEvent.java index b4c6601..0de7814 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/SettingsFrameEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/SettingsFrameEvent.java @@ -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.camtweaks.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.event.Event; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; // se genera cada que se interactúa con un marco de ajustes de un módulo public class SettingsFrameEvent { diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/ToggleModuleEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/ToggleModuleEvent.java similarity index 67% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/ToggleModuleEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/ToggleModuleEvent.java index 8670ba2..f5dd665 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/ToggleModuleEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/ToggleModuleEvent.java @@ -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.camtweaks.module.Module; +import me.retucio.sputnik.event.Event; +import me.retucio.sputnik.module.Module; // se genera cada que se enciende o apaga un módulo public class ToggleModuleEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/UpdateSettingEvent.java b/src/main/java/me/retucio/sputnik/event/events/sputnik/UpdateSettingEvent.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/event/events/camtweaks/UpdateSettingEvent.java rename to src/main/java/me/retucio/sputnik/event/events/sputnik/UpdateSettingEvent.java index 3a9d18d..1eed2f0 100644 --- a/src/main/java/me/retucio/camtweaks/event/events/camtweaks/UpdateSettingEvent.java +++ b/src/main/java/me/retucio/sputnik/event/events/sputnik/UpdateSettingEvent.java @@ -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.camtweaks.module.settings.Setting; +import me.retucio.sputnik.event.Event; +import me.retucio.sputnik.module.settings.Setting; // se genera cada que se cambia el valor de un ajuste public class UpdateSettingEvent extends Event { diff --git a/src/main/java/me/retucio/camtweaks/mixin/BossBarHudMixin.java b/src/main/java/me/retucio/sputnik/mixin/BossBarHudMixin.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/BossBarHudMixin.java rename to src/main/java/me/retucio/sputnik/mixin/BossBarHudMixin.java index ff9a0ba..9eb94b7 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/BossBarHudMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/BossBarHudMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; -import me.retucio.camtweaks.event.events.RenderBossbarEvent; +import me.retucio.sputnik.event.events.RenderBossbarEvent; import net.minecraft.client.gui.hud.BossBarHud; import net.minecraft.client.gui.hud.ClientBossBar; import net.minecraft.text.Text; @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant; import java.util.Iterator; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(BossBarHud.class) public abstract class BossBarHudMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/BufferStorageMixin.java b/src/main/java/me/retucio/sputnik/mixin/BufferStorageMixin.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/mixin/BufferStorageMixin.java rename to src/main/java/me/retucio/sputnik/mixin/BufferStorageMixin.java index c5241a6..984fe1f 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/BufferStorageMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/BufferStorageMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import me.retucio.camtweaks.util.render.GlintRenderLayer; +import me.retucio.sputnik.util.render.GlintRenderLayer; import net.minecraft.client.render.BufferBuilderStorage; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.util.BufferAllocator; diff --git a/src/main/java/me/retucio/camtweaks/mixin/CameraMixin.java b/src/main/java/me/retucio/sputnik/mixin/CameraMixin.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/CameraMixin.java rename to src/main/java/me/retucio/sputnik/mixin/CameraMixin.java index 02d743d..65cbe03 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/CameraMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/CameraMixin.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freelook; -import me.retucio.camtweaks.module.modules.camera.Freecam; -import me.retucio.camtweaks.module.modules.camera.PerspectivePlus; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freelook; +import me.retucio.sputnik.module.modules.camera.Freecam; +import me.retucio.sputnik.module.modules.camera.PerspectivePlus; import net.minecraft.client.render.Camera; import net.minecraft.entity.Entity; import net.minecraft.world.World; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ChatHudLineMixin.java b/src/main/java/me/retucio/sputnik/mixin/ChatHudLineMixin.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/mixin/ChatHudLineMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ChatHudLineMixin.java index 5eaf08e..b183d64 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ChatHudLineMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ChatHudLineMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.mojang.authlib.GameProfile; -import me.retucio.camtweaks.util.interfaces.IChatHudLine; +import me.retucio.sputnik.util.interfaces.IChatHudLine; import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ChatHudLineVisibleMixin.java b/src/main/java/me/retucio/sputnik/mixin/ChatHudLineVisibleMixin.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/ChatHudLineVisibleMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ChatHudLineVisibleMixin.java index 1e99861..669023e 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ChatHudLineVisibleMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ChatHudLineVisibleMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.mojang.authlib.GameProfile; -import me.retucio.camtweaks.util.interfaces.IChatHudLineVisible; +import me.retucio.sputnik.util.interfaces.IChatHudLineVisible; import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.text.OrderedText; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ChatHudMixin.java b/src/main/java/me/retucio/sputnik/mixin/ChatHudMixin.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/mixin/ChatHudMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ChatHudMixin.java index b97c329..79b0d46 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ChatHudMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ChatHudMixin.java @@ -1,14 +1,14 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; -import me.retucio.camtweaks.event.events.ReceiveMessageEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ChatPlus; -import me.retucio.camtweaks.util.interfaces.IChatHud; -import me.retucio.camtweaks.util.interfaces.IChatHudLine; -import me.retucio.camtweaks.util.interfaces.IChatHudLineVisible; -import me.retucio.camtweaks.util.interfaces.IMessageHandler; +import me.retucio.sputnik.event.events.ReceiveMessageEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ChatPlus; +import me.retucio.sputnik.util.interfaces.IChatHud; +import me.retucio.sputnik.util.interfaces.IChatHudLine; +import me.retucio.sputnik.util.interfaces.IChatHudLineVisible; +import me.retucio.sputnik.util.interfaces.IMessageHandler; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.client.gui.hud.ChatHudLine; @@ -27,7 +27,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.List; -import static me.retucio.camtweaks.CameraTweaks.*; +import static me.retucio.sputnik.Sputnik.*; @Mixin(ChatHud.class) public abstract class ChatHudMixin implements IChatHud { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ChatInputSuggestorMixin.java b/src/main/java/me/retucio/sputnik/mixin/ChatInputSuggestorMixin.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/mixin/ChatInputSuggestorMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ChatInputSuggestorMixin.java index 4dce8d1..85e07cd 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ChatInputSuggestorMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ChatInputSuggestorMixin.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.suggestion.Suggestions; -import me.retucio.camtweaks.command.CommandManager; +import me.retucio.sputnik.command.CommandManager; import net.minecraft.client.gui.screen.ChatInputSuggestor; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.command.CommandSource; @@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.concurrent.CompletableFuture; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(ChatInputSuggestor.class) public abstract class ChatInputSuggestorMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ChatScreenMixin.java b/src/main/java/me/retucio/sputnik/mixin/ChatScreenMixin.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/mixin/ChatScreenMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ChatScreenMixin.java index 72e8ed3..45cffe7 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ChatScreenMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ChatScreenMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ChatPlus; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ChatPlus; import net.minecraft.client.gui.screen.ChatScreen; import net.minecraft.client.gui.widget.TextFieldWidget; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ChunkBorderDebugRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/ChunkBorderDebugRendererMixin.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/mixin/ChunkBorderDebugRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ChunkBorderDebugRendererMixin.java index 6df8189..fe41215 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ChunkBorderDebugRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ChunkBorderDebugRendererMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.debug.ChunkBorderDebugRenderer; import net.minecraft.util.math.ChunkSectionPos; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ChunkOcclusionDataBuilderMixin.java b/src/main/java/me/retucio/sputnik/mixin/ChunkOcclusionDataBuilderMixin.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/mixin/ChunkOcclusionDataBuilderMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ChunkOcclusionDataBuilderMixin.java index 32b2c37..b966192 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ChunkOcclusionDataBuilderMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ChunkOcclusionDataBuilderMixin.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.event.events.ChunkOcclusionEvent; +import me.retucio.sputnik.event.events.ChunkOcclusionEvent; import net.minecraft.client.render.chunk.ChunkOcclusionDataBuilder; import net.minecraft.util.math.BlockPos; import org.spongepowered.asm.mixin.Mixin; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(ChunkOcclusionDataBuilder.class) public abstract class ChunkOcclusionDataBuilderMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ClientCommonNetworkHandlerMixin.java b/src/main/java/me/retucio/sputnik/mixin/ClientCommonNetworkHandlerMixin.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/mixin/ClientCommonNetworkHandlerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ClientCommonNetworkHandlerMixin.java index 58cc9e5..b149d79 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ClientCommonNetworkHandlerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ClientCommonNetworkHandlerMixin.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.mixin.accessor.ConfirmServerResourcePackScreenAccessor; -import me.retucio.camtweaks.mixin.accessor.PackAccessor; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.network.RPackBypass; -import me.retucio.camtweaks.util.interfaces.IConfirmScreen; +import me.retucio.sputnik.mixin.accessor.ConfirmServerResourcePackScreenAccessor; +import me.retucio.sputnik.mixin.accessor.PackAccessor; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.network.RPackBypass; +import me.retucio.sputnik.util.interfaces.IConfirmScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientCommonNetworkHandler; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ClientConnectionMixin.java b/src/main/java/me/retucio/sputnik/mixin/ClientConnectionMixin.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/mixin/ClientConnectionMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ClientConnectionMixin.java index 950789c..bdfbb17 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ClientConnectionMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ClientConnectionMixin.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; -import me.retucio.camtweaks.event.Stage; -import me.retucio.camtweaks.event.events.DisconnectEvent; -import me.retucio.camtweaks.event.events.PacketEvent; +import me.retucio.sputnik.event.Stage; +import me.retucio.sputnik.event.events.DisconnectEvent; +import me.retucio.sputnik.event.events.PacketEvent; import net.minecraft.network.ClientConnection; import net.minecraft.network.DisconnectionInfo; import net.minecraft.network.packet.Packet; @@ -13,8 +13,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(ClientConnection.class) public abstract class ClientConnectionMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/me/retucio/sputnik/mixin/ClientPlayNetworkHandlerMixin.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/mixin/ClientPlayNetworkHandlerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ClientPlayNetworkHandlerMixin.java index 4ab20f9..b449c80 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ClientPlayNetworkHandlerMixin.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import me.retucio.camtweaks.command.CommandManager; -import me.retucio.camtweaks.event.events.SendMessageEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.command.CommandManager; +import me.retucio.sputnik.event.events.SendMessageEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; +import me.retucio.sputnik.util.ChatUtil; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.render.GameRenderer; import net.minecraft.item.ItemStack; @@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.*; +import static me.retucio.sputnik.Sputnik.*; @Mixin(ClientPlayNetworkHandler.class) public abstract class ClientPlayNetworkHandlerMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ClientPlayerEntityMixin.java b/src/main/java/me/retucio/sputnik/mixin/ClientPlayerEntityMixin.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/mixin/ClientPlayerEntityMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ClientPlayerEntityMixin.java index b66d921..037a5f0 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ClientPlayerEntityMixin.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.sugar.Local; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.world.NoMiningInterruptions; -import me.retucio.camtweaks.module.modules.player.PortalGUI; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.world.NoMiningInterruptions; +import me.retucio.sputnik.module.modules.player.PortalGUI; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.util.hit.EntityHitResult; @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(ClientPlayerEntity.class) public abstract class ClientPlayerEntityMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ClientPlayerInteractionManagerMixin.java b/src/main/java/me/retucio/sputnik/mixin/ClientPlayerInteractionManagerMixin.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/mixin/ClientPlayerInteractionManagerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ClientPlayerInteractionManagerMixin.java index 43489c9..03d38c6 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ClientPlayerInteractionManagerMixin.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.event.events.AttackEntityEvent; -import me.retucio.camtweaks.event.events.BreakBlockEvent; -import me.retucio.camtweaks.event.events.InteractEntityEvent; -import me.retucio.camtweaks.event.events.PlaceBlockEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; +import me.retucio.sputnik.event.events.AttackEntityEvent; +import me.retucio.sputnik.event.events.BreakBlockEvent; +import me.retucio.sputnik.event.events.InteractEntityEvent; +import me.retucio.sputnik.event.events.PlaceBlockEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; @@ -25,8 +25,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(ClientPlayerInteractionManager.class) public abstract class ClientPlayerInteractionManagerMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ClientWorldMixin.java b/src/main/java/me/retucio/sputnik/mixin/ClientWorldMixin.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/mixin/ClientWorldMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ClientWorldMixin.java index d93e515..4e73df7 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ClientWorldMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ClientWorldMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.event.events.AddEntityEvent; -import me.retucio.camtweaks.event.events.RemoveEntityEvent; +import me.retucio.sputnik.event.events.AddEntityEvent; +import me.retucio.sputnik.event.events.RemoveEntityEvent; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.Entity; import org.jetbrains.annotations.Nullable; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(ClientWorld.class) public abstract class ClientWorldMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ClientWorldPropertiesMixin.java b/src/main/java/me/retucio/sputnik/mixin/ClientWorldPropertiesMixin.java similarity index 83% rename from src/main/java/me/retucio/camtweaks/mixin/ClientWorldPropertiesMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ClientWorldPropertiesMixin.java index 4c25534..70d0509 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ClientWorldPropertiesMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ClientWorldPropertiesMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.world.TimeChanger; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.world.TimeChanger; import net.minecraft.client.world.ClientWorld; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ConfirmScreenMixin.java b/src/main/java/me/retucio/sputnik/mixin/ConfirmScreenMixin.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/mixin/ConfirmScreenMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ConfirmScreenMixin.java index 04155bf..e20f826 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ConfirmScreenMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ConfirmScreenMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.network.RPackBypass; -import me.retucio.camtweaks.util.interfaces.IConfirmScreen; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.network.RPackBypass; +import me.retucio.sputnik.util.interfaces.IConfirmScreen; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/src/main/java/me/retucio/camtweaks/mixin/DamageParticleMixin.java b/src/main/java/me/retucio/sputnik/mixin/DamageParticleMixin.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/mixin/DamageParticleMixin.java rename to src/main/java/me/retucio/sputnik/mixin/DamageParticleMixin.java index 47efdb9..6a34d7e 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/DamageParticleMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/DamageParticleMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.CritsPlus; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.CritsPlus; import net.minecraft.client.particle.BillboardParticle; import net.minecraft.client.particle.DamageParticle; import org.spongepowered.asm.mixin.Mixin; @@ -14,7 +14,9 @@ public abstract class DamageParticleMixin { @ModifyReturnValue(method = "getRenderType", at = @At("RETURN")) private BillboardParticle.RenderType makeCritsTranslucent(BillboardParticle.RenderType original) { - if (ModuleManager.INSTANCE.getModuleByClass(CritsPlus.class).isEnabled()) return BillboardParticle.RenderType.PARTICLE_ATLAS_TRANSLUCENT; + if (ModuleManager.INSTANCE.getModuleByClass(CritsPlus.class).isEnabled()) + return BillboardParticle.RenderType.PARTICLE_ATLAS_TRANSLUCENT; + return original; } } diff --git a/src/main/java/me/retucio/camtweaks/mixin/DisconnectedScreenMixin.java b/src/main/java/me/retucio/sputnik/mixin/DisconnectedScreenMixin.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/mixin/DisconnectedScreenMixin.java rename to src/main/java/me/retucio/sputnik/mixin/DisconnectedScreenMixin.java index 647b0b5..48dab23 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/DisconnectedScreenMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/DisconnectedScreenMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.network.Reconnect; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.network.Reconnect; import net.minecraft.client.gui.screen.DisconnectedScreen; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/src/main/java/me/retucio/sputnik/mixin/EmitterParticleMixin.java b/src/main/java/me/retucio/sputnik/mixin/EmitterParticleMixin.java new file mode 100644 index 0000000..211b55b --- /dev/null +++ b/src/main/java/me/retucio/sputnik/mixin/EmitterParticleMixin.java @@ -0,0 +1,56 @@ +package me.retucio.sputnik.mixin; + +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.CritsPlus; +import net.minecraft.client.particle.EmitterParticle; +import net.minecraft.client.particle.NoRenderParticle; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.Entity; +import net.minecraft.particle.ParticleEffect; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(EmitterParticle.class) +public abstract class EmitterParticleMixin extends NoRenderParticle { + + @Final @Shadow private Entity entity; + @Final @Shadow private ParticleEffect parameters; + @Final @Shadow private int maxEmitterAge; + @Shadow private int emitterAge; + + protected EmitterParticleMixin(ClientWorld clientWorld, double d, double e, double f) { + super(clientWorld, d, e, f); + } + + /** + * @author retucio + * @reason porque no hay otra manera más fácil + */ + @Overwrite + public void tick() { + CritsPlus critsPlus = ModuleManager.INSTANCE.getModuleByClass(CritsPlus.class); + + double amount = 16 * (critsPlus.isEnabled() + ? critsPlus.multiplier.getValue() + : 1); + + for (int i = 0; i < amount; i++) { + double d = this.random.nextFloat() * 2.0F - 1.0F; + double e = this.random.nextFloat() * 2.0F - 1.0F; + double f = this.random.nextFloat() * 2.0F - 1.0F; + if (!(d * d + e * e + f * f > 1.0)) { + double g = this.entity.getBodyX(d / 4.0); + double h = this.entity.getBodyY(0.5 + e / 4.0); + double j = this.entity.getBodyZ(f / 4.0); + this.world.addParticleClient(this.parameters, g, h, j, d, e + 0.2, f); + } + } + + this.emitterAge++; + if (this.emitterAge >= this.maxEmitterAge) { + this.markDead(); + } + } +} diff --git a/src/main/java/me/retucio/camtweaks/mixin/EntityMixin.java b/src/main/java/me/retucio/sputnik/mixin/EntityMixin.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/EntityMixin.java rename to src/main/java/me/retucio/sputnik/mixin/EntityMixin.java index dab1099..87e2142 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/EntityMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/EntityMixin.java @@ -1,13 +1,13 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.event.events.ChangeRotationEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; -import me.retucio.camtweaks.module.modules.camera.Freelook; -import me.retucio.camtweaks.module.modules.camera.Rotations; -import me.retucio.camtweaks.module.modules.misc.AntiInvis; -import me.retucio.camtweaks.module.modules.render.Nametags; +import me.retucio.sputnik.event.events.ChangeRotationEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; +import me.retucio.sputnik.module.modules.camera.Freelook; +import me.retucio.sputnik.module.modules.camera.Rotations; +import me.retucio.sputnik.module.modules.misc.AntiInvis; +import me.retucio.sputnik.module.modules.render.Nametags; import net.minecraft.entity.*; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -23,8 +23,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(Entity.class) public abstract class EntityMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/EquipmentRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/EquipmentRendererMixin.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/mixin/EquipmentRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/EquipmentRendererMixin.java index 32e47e7..22a52c9 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/EquipmentRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/EquipmentRendererMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.GlintPlus; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.GlintPlus; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.equipment.EquipmentRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/FogRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/FogRendererMixin.java similarity index 95% rename from src/main/java/me/retucio/camtweaks/mixin/FogRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/FogRendererMixin.java index 9b62bc4..0967b5d 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/FogRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/FogRendererMixin.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.block.enums.CameraSubmersionType; import net.minecraft.client.render.Camera; import net.minecraft.client.render.fog.FogModifier; diff --git a/src/main/java/me/retucio/camtweaks/mixin/GameOptionsMixin.java b/src/main/java/me/retucio/sputnik/mixin/GameOptionsMixin.java similarity index 77% rename from src/main/java/me/retucio/camtweaks/mixin/GameOptionsMixin.java rename to src/main/java/me/retucio/sputnik/mixin/GameOptionsMixin.java index fd51ee9..5a36265 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/GameOptionsMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/GameOptionsMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.event.events.PerspectiveChangeEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; +import me.retucio.sputnik.event.events.PerspectiveChangeEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; import net.minecraft.client.option.GameOptions; import net.minecraft.client.option.Perspective; import org.spongepowered.asm.mixin.Mixin; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(GameOptions.class) public abstract class GameOptionsMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/GameRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/GameRendererMixin.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/GameRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/GameRendererMixin.java index 4dd909b..8d57889 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/GameRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/GameRendererMixin.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.event.events.GetFOVEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; -import me.retucio.camtweaks.module.modules.render.NoRender; -import me.retucio.camtweaks.module.modules.camera.Zoom; -import me.retucio.camtweaks.util.interfaces.IVec3d; +import me.retucio.sputnik.event.events.GetFOVEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; +import me.retucio.sputnik.module.modules.render.NoRender; +import me.retucio.sputnik.module.modules.camera.Zoom; +import me.retucio.sputnik.util.interfaces.IVec3d; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.BufferBuilderStorage; @@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(GameRenderer.class) diff --git a/src/main/java/me/retucio/camtweaks/mixin/HandshakeC2SPacketMixin.java b/src/main/java/me/retucio/sputnik/mixin/HandshakeC2SPacketMixin.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/mixin/HandshakeC2SPacketMixin.java rename to src/main/java/me/retucio/sputnik/mixin/HandshakeC2SPacketMixin.java index 0b666ab..7a0fb20 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/HandshakeC2SPacketMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/HandshakeC2SPacketMixin.java @@ -1,11 +1,10 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.network.BungeecordSpoofer; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.network.BungeecordSpoofer; import net.minecraft.network.packet.c2s.handshake.ConnectionIntent; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import org.spongepowered.asm.mixin.*; @@ -19,7 +18,7 @@ import java.net.URL; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(HandshakeC2SPacket.class) public abstract class HandshakeC2SPacketMixin { @@ -44,7 +43,7 @@ public abstract class HandshakeC2SPacketMixin { if (this.intendedState() != ConnectionIntent.LOGIN) return; - final String[] spoofedUUID = {CameraTweaks.mc.getSession().getUuidOrNull().toString()}; + final String[] spoofedUUID = {me.retucio.sputnik.Sputnik.mc.getSession().getUuidOrNull().toString()}; String URL = "https://api.mojang.com/users/profiles/minecraft/" + mc.getSession().getUsername(); executor.execute(() -> { diff --git a/src/main/java/me/retucio/camtweaks/mixin/HeldItemRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/HeldItemRendererMixin.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/mixin/HeldItemRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/HeldItemRendererMixin.java index 191704a..3bb314e 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/HeldItemRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/HeldItemRendererMixin.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.event.events.RenderHeldItemEvent; -import me.retucio.camtweaks.event.events.RenderArmEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.player.HandView; +import me.retucio.sputnik.event.events.RenderHeldItemEvent; +import me.retucio.sputnik.event.events.RenderArmEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.player.HandView; import net.minecraft.client.MinecraftClient; import net.minecraft.client.item.ItemModelManager; import net.minecraft.client.network.AbstractClientPlayerEntity; @@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.*; +import static me.retucio.sputnik.Sputnik.*; @Mixin(HeldItemRenderer.class) public abstract class HeldItemRendererMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/InGameHudMixin.java b/src/main/java/me/retucio/sputnik/mixin/InGameHudMixin.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/InGameHudMixin.java rename to src/main/java/me/retucio/sputnik/mixin/InGameHudMixin.java index e1ba41f..b7e7d30 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/InGameHudMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/InGameHudMixin.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ChatPlus; -import me.retucio.camtweaks.module.modules.camera.Freecam; -import me.retucio.camtweaks.module.modules.render.NoRender; -import me.retucio.camtweaks.ui.hud.HudRenderer; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ChatPlus; +import me.retucio.sputnik.module.modules.camera.Freecam; +import me.retucio.sputnik.module.modules.render.NoRender; +import me.retucio.sputnik.ui.hud.HudRenderer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; diff --git a/src/main/java/me/retucio/camtweaks/mixin/InGameOverlayRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/InGameOverlayRendererMixin.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/InGameOverlayRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/InGameOverlayRendererMixin.java index 7d7e25c..63569bb 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/InGameOverlayRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/InGameOverlayRendererMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.InGameOverlayRenderer; import net.minecraft.client.render.VertexConsumerProvider; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ItemEntityMixin.java b/src/main/java/me/retucio/sputnik/mixin/ItemEntityMixin.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/mixin/ItemEntityMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ItemEntityMixin.java index 49baf66..8b876ec 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ItemEntityMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ItemEntityMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.Nametags; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.Nametags; import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.text.MutableText; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ItemMixin.java b/src/main/java/me/retucio/sputnik/mixin/ItemMixin.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/ItemMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ItemMixin.java index 82f3499..76319f8 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ItemMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ItemMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ShulkerPeek; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ShulkerPeek; import net.minecraft.block.ShulkerBoxBlock; import net.minecraft.component.type.TooltipDisplayComponent; import net.minecraft.item.BlockItem; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ItemRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/ItemRendererMixin.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/mixin/ItemRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ItemRendererMixin.java index 9d622a5..cb62ceb 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ItemRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ItemRendererMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.GlintPlus; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.GlintPlus; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.item.ItemRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ItemStackMixin.java b/src/main/java/me/retucio/sputnik/mixin/ItemStackMixin.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/mixin/ItemStackMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ItemStackMixin.java index 61a9cbf..292190d 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ItemStackMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ItemStackMixin.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.event.events.DamageItemEvent; +import me.retucio.sputnik.event.events.DamageItemEvent; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.function.Consumer; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(ItemStack.class) public abstract class ItemStackMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/KeyInputMixin.java b/src/main/java/me/retucio/sputnik/mixin/KeyInputMixin.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/mixin/KeyInputMixin.java rename to src/main/java/me/retucio/sputnik/mixin/KeyInputMixin.java index 08433b7..d0ed554 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/KeyInputMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/KeyInputMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; import net.minecraft.client.input.Input; import net.minecraft.client.input.KeyboardInput; import net.minecraft.util.PlayerInput; diff --git a/src/main/java/me/retucio/camtweaks/mixin/KeyboardMixin.java b/src/main/java/me/retucio/sputnik/mixin/KeyboardMixin.java similarity index 70% rename from src/main/java/me/retucio/camtweaks/mixin/KeyboardMixin.java rename to src/main/java/me/retucio/sputnik/mixin/KeyboardMixin.java index c78afd6..7db7543 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/KeyboardMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/KeyboardMixin.java @@ -1,8 +1,6 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.KeyEvent; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.event.events.KeyEvent; import net.minecraft.client.Keyboard; import net.minecraft.client.input.KeyInput; import org.spongepowered.asm.mixin.Mixin; @@ -10,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(Keyboard.class) public abstract class KeyboardMixin { @@ -18,7 +16,7 @@ public abstract class KeyboardMixin { @Inject(method = "onKey", at = @At("HEAD"), cancellable = true) private void onKeyPress(long window, int action, KeyInput input, CallbackInfo ci) { if (input.key() == -1) return; - CameraTweaks.INSTANCE.onKeyPress(input.key(), action); + me.retucio.sputnik.Sputnik.INSTANCE.onKey(input.key(), action); KeyEvent event = EVENT_BUS.post(new KeyEvent(input.key(), input.scancode(), action)); if (event.isCancelled()) ci.cancel(); } diff --git a/src/main/java/me/retucio/camtweaks/mixin/LightmapTextureManagerMixin.java b/src/main/java/me/retucio/sputnik/mixin/LightmapTextureManagerMixin.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/LightmapTextureManagerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/LightmapTextureManagerMixin.java index 36d2870..e462f04 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/LightmapTextureManagerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/LightmapTextureManagerMixin.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.GpuTexture; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Fullbright; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Fullbright; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.LightmapTextureManager; diff --git a/src/main/java/me/retucio/camtweaks/mixin/LivingEntityMixin.java b/src/main/java/me/retucio/sputnik/mixin/LivingEntityMixin.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/mixin/LivingEntityMixin.java rename to src/main/java/me/retucio/sputnik/mixin/LivingEntityMixin.java index 18c65b9..d7478ed 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/LivingEntityMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/LivingEntityMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.player.ElytraBounce; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.player.ElytraBounce; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.sound.SoundCategory; @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(LivingEntity.class) public abstract class LivingEntityMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/LivingEntityRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/LivingEntityRendererMixin.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/LivingEntityRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/LivingEntityRendererMixin.java index d2f18c5..313dab7 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/LivingEntityRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/LivingEntityRendererMixin.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.sugar.Local; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; -import me.retucio.camtweaks.module.modules.render.Nametags; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; +import me.retucio.sputnik.module.modules.render.Nametags; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.model.EntityModel; @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(LivingEntityRenderer.class) public abstract class LivingEntityRendererMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/MessageHandlerMixin.java b/src/main/java/me/retucio/sputnik/mixin/MessageHandlerMixin.java similarity index 95% rename from src/main/java/me/retucio/camtweaks/mixin/MessageHandlerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/MessageHandlerMixin.java index 09029d7..09a2dcd 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/MessageHandlerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/MessageHandlerMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.mojang.authlib.GameProfile; -import me.retucio.camtweaks.util.interfaces.IMessageHandler; +import me.retucio.sputnik.util.interfaces.IMessageHandler; import net.minecraft.client.network.message.MessageHandler; import net.minecraft.network.message.MessageType; import net.minecraft.network.message.SignedMessage; diff --git a/src/main/java/me/retucio/camtweaks/mixin/MinecraftClientMixin.java b/src/main/java/me/retucio/sputnik/mixin/MinecraftClientMixin.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/mixin/MinecraftClientMixin.java rename to src/main/java/me/retucio/sputnik/mixin/MinecraftClientMixin.java index 46f4ea2..9d888cf 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/MinecraftClientMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/MinecraftClientMixin.java @@ -1,14 +1,13 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.sugar.Local; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.JoinWorldEvent; -import me.retucio.camtweaks.event.events.OpenScreenEvent; -import me.retucio.camtweaks.event.events.ShutdownEvent; -import me.retucio.camtweaks.event.events.TickEvent; -import me.retucio.camtweaks.event.events.UseItemEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.player.FastUse; +import me.retucio.sputnik.event.JoinWorldEvent; +import me.retucio.sputnik.event.events.OpenScreenEvent; +import me.retucio.sputnik.event.events.ShutdownEvent; +import me.retucio.sputnik.event.events.TickEvent; +import me.retucio.sputnik.event.events.UseItemEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.player.FastUse; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.world.ClientWorld; @@ -21,8 +20,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(MinecraftClient.class) public abstract class MinecraftClientMixin { @@ -32,7 +31,7 @@ public abstract class MinecraftClientMixin { @Inject(method = "tick", at = @At("HEAD")) private void onTickPre(CallbackInfo ci) { - CameraTweaks.INSTANCE.onTick(); + me.retucio.sputnik.Sputnik.INSTANCE.onTick(); EVENT_BUS.post(new TickEvent.Pre()); } diff --git a/src/main/java/me/retucio/camtweaks/mixin/MouseMixin.java b/src/main/java/me/retucio/sputnik/mixin/MouseMixin.java similarity index 79% rename from src/main/java/me/retucio/camtweaks/mixin/MouseMixin.java rename to src/main/java/me/retucio/sputnik/mixin/MouseMixin.java index 3176d1a..c78e97f 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/MouseMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/MouseMixin.java @@ -1,8 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.MouseClickEvent; -import me.retucio.camtweaks.event.events.MouseScrollEvent; +import me.retucio.sputnik.event.events.MouseClickEvent; +import me.retucio.sputnik.event.events.MouseScrollEvent; import net.minecraft.client.Mouse; import net.minecraft.client.input.MouseInput; import org.spongepowered.asm.mixin.Mixin; @@ -10,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; @Mixin(Mouse.class) public abstract class MouseMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/OverlayTextureMixin.java b/src/main/java/me/retucio/sputnik/mixin/OverlayTextureMixin.java similarity index 83% rename from src/main/java/me/retucio/camtweaks/mixin/OverlayTextureMixin.java rename to src/main/java/me/retucio/sputnik/mixin/OverlayTextureMixin.java index 380ecb9..237033f 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/OverlayTextureMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/OverlayTextureMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.DamageOverlay; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.DamageOverlay; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.texture.NativeImageBackedTexture; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ParticleManagerMixin.java b/src/main/java/me/retucio/sputnik/mixin/ParticleManagerMixin.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/mixin/ParticleManagerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ParticleManagerMixin.java index e3ec3ce..a745873 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ParticleManagerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ParticleManagerMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleManager; import net.minecraft.particle.ParticleEffect; diff --git a/src/main/java/me/retucio/camtweaks/mixin/PlayerEntityMixin.java b/src/main/java/me/retucio/sputnik/mixin/PlayerEntityMixin.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/mixin/PlayerEntityMixin.java rename to src/main/java/me/retucio/sputnik/mixin/PlayerEntityMixin.java index f61f904..a5bf87f 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/PlayerEntityMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/PlayerEntityMixin.java @@ -1,10 +1,9 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.ClipAtLedgeEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.Nametags; +import me.retucio.sputnik.event.events.ClipAtLedgeEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.Nametags; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -57,7 +56,7 @@ public abstract class PlayerEntityMixin extends LivingEntity { @Inject(method = "clipAtLedge", at = @At("HEAD"), cancellable = true) private void clipAtLedge(CallbackInfoReturnable cir) { if (!getEntityWorld().isClient()) return; - ClipAtLedgeEvent event = CameraTweaks.EVENT_BUS.post(new ClipAtLedgeEvent(isSneaking())); + ClipAtLedgeEvent event = me.retucio.sputnik.Sputnik.EVENT_BUS.post(new ClipAtLedgeEvent(isSneaking())); cir.setReturnValue(event.isClipping()); } } \ No newline at end of file diff --git a/src/main/java/me/retucio/camtweaks/mixin/ResourcePackPolicyMixin.java b/src/main/java/me/retucio/sputnik/mixin/ResourcePackPolicyMixin.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/ResourcePackPolicyMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ResourcePackPolicyMixin.java index 1b2023f..edccaee 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ResourcePackPolicyMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ResourcePackPolicyMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.network.RPackBypass; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.network.RPackBypass; import net.minecraft.client.network.ServerInfo; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ScreenMixin.java b/src/main/java/me/retucio/sputnik/mixin/ScreenMixin.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/mixin/ScreenMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ScreenMixin.java index 177ef49..efad3b8 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ScreenMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ScreenMixin.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import me.retucio.camtweaks.command.CommandManager; -import me.retucio.camtweaks.config.ConfigManager; -import me.retucio.camtweaks.event.events.ClientClickEvent; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.command.CommandManager; +import me.retucio.sputnik.config.ConfigManager; +import me.retucio.sputnik.event.events.ClientClickEvent; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(Screen.class) public class ScreenMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ScreenshotRecorderMixin.java b/src/main/java/me/retucio/sputnik/mixin/ScreenshotRecorderMixin.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/ScreenshotRecorderMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ScreenshotRecorderMixin.java index 5fc0035..2f72493 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ScreenshotRecorderMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ScreenshotRecorderMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ScreenshotPlus; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ScreenshotPlus; import net.minecraft.client.texture.NativeImage; import net.minecraft.client.util.ScreenshotRecorder; import net.minecraft.text.Text; @@ -15,7 +15,7 @@ import java.io.File; import java.io.IOException; import java.util.function.Consumer; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(ScreenshotRecorder.class) public abstract class ScreenshotRecorderMixin { diff --git a/src/main/java/me/retucio/camtweaks/mixin/ServerConnectorMixin.java b/src/main/java/me/retucio/sputnik/mixin/ServerConnectorMixin.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/mixin/ServerConnectorMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ServerConnectorMixin.java index b614e9e..ccb527c 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ServerConnectorMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ServerConnectorMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.network.RPackBypass; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.network.RPackBypass; import net.minecraft.client.network.ServerInfo; import net.minecraft.client.resource.server.ServerResourcePackManager; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/ServerInfoMixin.java b/src/main/java/me/retucio/sputnik/mixin/ServerInfoMixin.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/mixin/ServerInfoMixin.java rename to src/main/java/me/retucio/sputnik/mixin/ServerInfoMixin.java index 121c049..82f7b2d 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/ServerInfoMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/ServerInfoMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.network.RPackBypass; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.network.RPackBypass; import net.minecraft.client.network.ServerInfo; import net.minecraft.nbt.NbtCompound; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/SkyRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/SkyRendererMixin.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/SkyRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/SkyRendererMixin.java index a8146d6..5ea089b 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/SkyRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/SkyRendererMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; -import me.retucio.camtweaks.module.modules.world.TimeChanger; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; +import me.retucio.sputnik.module.modules.world.TimeChanger; import net.minecraft.client.render.SkyRendering; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.world.MoonPhase; diff --git a/src/main/java/me/retucio/camtweaks/mixin/StatusEffectFogModifierMixin.java b/src/main/java/me/retucio/sputnik/mixin/StatusEffectFogModifierMixin.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/mixin/StatusEffectFogModifierMixin.java rename to src/main/java/me/retucio/sputnik/mixin/StatusEffectFogModifierMixin.java index fd0e50c..9d6dcab 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/StatusEffectFogModifierMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/StatusEffectFogModifierMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.render.fog.StatusEffectFogModifier; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffects; diff --git a/src/main/java/me/retucio/camtweaks/mixin/StringHelperMixin.java b/src/main/java/me/retucio/sputnik/mixin/StringHelperMixin.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/mixin/StringHelperMixin.java rename to src/main/java/me/retucio/sputnik/mixin/StringHelperMixin.java index b191f50..4be214e 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/StringHelperMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/StringHelperMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ChatPlus; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ChatPlus; import net.minecraft.util.StringHelper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/me/retucio/camtweaks/mixin/StuckArrowsFeatureRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/StuckArrowsFeatureRendererMixin.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/mixin/StuckArrowsFeatureRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/StuckArrowsFeatureRendererMixin.java index 1e71ae9..aba9ad1 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/StuckArrowsFeatureRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/StuckArrowsFeatureRendererMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.render.entity.feature.StuckArrowsFeatureRenderer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/me/retucio/camtweaks/mixin/TelemetryManagerMixin.java b/src/main/java/me/retucio/sputnik/mixin/TelemetryManagerMixin.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/mixin/TelemetryManagerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/TelemetryManagerMixin.java index eb0a5d7..88700a2 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/TelemetryManagerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/TelemetryManagerMixin.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import net.minecraft.client.session.telemetry.TelemetryManager; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/TextRendererDrawerMixin.java b/src/main/java/me/retucio/sputnik/mixin/TextRendererDrawerMixin.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/mixin/TextRendererDrawerMixin.java rename to src/main/java/me/retucio/sputnik/mixin/TextRendererDrawerMixin.java index a8df198..b893ad5 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/TextRendererDrawerMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/TextRendererDrawerMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.font.TextRenderer; import net.minecraft.text.Style; import net.minecraft.text.TextColor; diff --git a/src/main/java/me/retucio/camtweaks/mixin/TextRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/TextRendererMixin.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/mixin/TextRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/TextRendererMixin.java index 5f74056..598182a 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/TextRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/TextRendererMixin.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.font.TextRenderer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/me/retucio/camtweaks/mixin/Vec3dMixin.java b/src/main/java/me/retucio/sputnik/mixin/Vec3dMixin.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/mixin/Vec3dMixin.java rename to src/main/java/me/retucio/sputnik/mixin/Vec3dMixin.java index 5549be6..52cb8ac 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/Vec3dMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/Vec3dMixin.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.util.interfaces.IVec3d; +import me.retucio.sputnik.util.interfaces.IVec3d; import net.minecraft.util.math.Vec3d; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/WeatherRenderingMixin.java b/src/main/java/me/retucio/sputnik/mixin/WeatherRenderingMixin.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/WeatherRenderingMixin.java rename to src/main/java/me/retucio/sputnik/mixin/WeatherRenderingMixin.java index 06628e3..2e2d209 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/WeatherRenderingMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/WeatherRenderingMixin.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.render.Camera; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.WeatherRendering; diff --git a/src/main/java/me/retucio/camtweaks/mixin/WorldRendererMixin.java b/src/main/java/me/retucio/sputnik/mixin/WorldRendererMixin.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/mixin/WorldRendererMixin.java rename to src/main/java/me/retucio/sputnik/mixin/WorldRendererMixin.java index 0b5f154..f384c83 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/WorldRendererMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/WorldRendererMixin.java @@ -1,13 +1,12 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.buffers.GpuBufferSlice; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.RenderWorldEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.render.BlockOutline; -import me.retucio.camtweaks.module.modules.camera.Freecam; -import me.retucio.camtweaks.module.modules.render.NoRender; +import me.retucio.sputnik.event.events.RenderWorldEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.render.BlockOutline; +import me.retucio.sputnik.module.modules.camera.Freecam; +import me.retucio.sputnik.module.modules.render.NoRender; import net.minecraft.client.render.*; import net.minecraft.client.render.state.WorldRenderState; import net.minecraft.client.util.ObjectAllocator; @@ -25,8 +24,8 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static me.retucio.camtweaks.CameraTweaks.EVENT_BUS; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.EVENT_BUS; +import static me.retucio.sputnik.Sputnik.mc; @Mixin(WorldRenderer.class) public abstract class WorldRendererMixin { @@ -46,7 +45,7 @@ public abstract class WorldRendererMixin { matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(camera.getPitch())); matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(camera.getYaw() + 180f)); - profiler.push(CameraTweaks.MOD_ID + "-3d"); + profiler.push(me.retucio.sputnik.Sputnik.MOD_ID + "-3d"); EVENT_BUS.post(new RenderWorldEvent(matrices, tickCounter, camera)); profiler.pop(); diff --git a/src/main/java/me/retucio/camtweaks/mixin/YggdrasilUserApiServiceMixin.java b/src/main/java/me/retucio/sputnik/mixin/YggdrasilUserApiServiceMixin.java similarity index 95% rename from src/main/java/me/retucio/camtweaks/mixin/YggdrasilUserApiServiceMixin.java rename to src/main/java/me/retucio/sputnik/mixin/YggdrasilUserApiServiceMixin.java index c26907d..2abaaa2 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/YggdrasilUserApiServiceMixin.java +++ b/src/main/java/me/retucio/sputnik/mixin/YggdrasilUserApiServiceMixin.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin; +package me.retucio.sputnik.mixin; import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; import com.mojang.authlib.yggdrasil.response.UserAttributesResponse; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/AbstractSignEditScreenAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/AbstractSignEditScreenAccessor.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/AbstractSignEditScreenAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/AbstractSignEditScreenAccessor.java index bbd75ad..e3a0a71 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/AbstractSignEditScreenAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/AbstractSignEditScreenAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/AnvilScreenAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/AnvilScreenAccessor.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/AnvilScreenAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/AnvilScreenAccessor.java index ca99837..b68ac1d 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/AnvilScreenAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/AnvilScreenAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.client.gui.screen.ingame.AnvilScreen; import net.minecraft.client.gui.widget.TextFieldWidget; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/ClientPlayNetworkHandlerAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/ClientPlayNetworkHandlerAccessor.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/ClientPlayNetworkHandlerAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/ClientPlayNetworkHandlerAccessor.java index b01662e..93f0963 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/ClientPlayNetworkHandlerAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/ClientPlayNetworkHandlerAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.message.LastSeenMessagesCollector; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/ConfirmServerResourcePackScreenAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/ConfirmServerResourcePackScreenAccessor.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/ConfirmServerResourcePackScreenAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/ConfirmServerResourcePackScreenAccessor.java index 59ed28a..7531a05 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/ConfirmServerResourcePackScreenAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/ConfirmServerResourcePackScreenAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientCommonNetworkHandler; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/HandledScreenAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/HandledScreenAccessor.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/HandledScreenAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/HandledScreenAccessor.java index 459aa3f..9f0f4cd 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/HandledScreenAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/HandledScreenAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.screen.slot.Slot; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/KeyBindingAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/KeyBindingAccessor.java similarity index 76% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/KeyBindingAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/KeyBindingAccessor.java index d851546..66bf727 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/KeyBindingAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/KeyBindingAccessor.java @@ -1,10 +1,9 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(KeyBinding.class) public interface KeyBindingAccessor { diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/OverlayTextureAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/OverlayTextureAccessor.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/OverlayTextureAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/OverlayTextureAccessor.java index ec383ec..b711d01 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/OverlayTextureAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/OverlayTextureAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.texture.NativeImageBackedTexture; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/PackAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/PackAccessor.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/PackAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/PackAccessor.java index 9767164..993f63d 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/PackAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/PackAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.client.network.ClientCommonNetworkHandler; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/mixin/accessor/StatusEffectInstanceAccessor.java b/src/main/java/me/retucio/sputnik/mixin/accessor/StatusEffectInstanceAccessor.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/mixin/accessor/StatusEffectInstanceAccessor.java rename to src/main/java/me/retucio/sputnik/mixin/accessor/StatusEffectInstanceAccessor.java index 4882be7..263b6a7 100644 --- a/src/main/java/me/retucio/camtweaks/mixin/accessor/StatusEffectInstanceAccessor.java +++ b/src/main/java/me/retucio/sputnik/mixin/accessor/StatusEffectInstanceAccessor.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.mixin.accessor; +package me.retucio.sputnik.mixin.accessor; import net.minecraft.entity.effect.StatusEffectInstance; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/retucio/camtweaks/module/Category.java b/src/main/java/me/retucio/sputnik/module/Category.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/module/Category.java rename to src/main/java/me/retucio/sputnik/module/Category.java index 0093693..d256fc3 100644 --- a/src/main/java/me/retucio/camtweaks/module/Category.java +++ b/src/main/java/me/retucio/sputnik/module/Category.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.module; +package me.retucio.sputnik.module; public enum Category { diff --git a/src/main/java/me/retucio/camtweaks/module/Module.java b/src/main/java/me/retucio/sputnik/module/Module.java similarity index 83% rename from src/main/java/me/retucio/camtweaks/module/Module.java rename to src/main/java/me/retucio/sputnik/module/Module.java index 7be92c1..83fa144 100644 --- a/src/main/java/me/retucio/camtweaks/module/Module.java +++ b/src/main/java/me/retucio/sputnik/module/Module.java @@ -1,15 +1,13 @@ -package me.retucio.camtweaks.module; +package me.retucio.sputnik.module; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.config.ClientConfig; -import me.retucio.camtweaks.config.ConfigManager; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.camtweaks.ToggleModuleEvent; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.module.settings.KeySetting; -import me.retucio.camtweaks.module.settings.Setting; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.config.ConfigManager; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.sputnik.ToggleModuleEvent; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.module.settings.KeySetting; +import me.retucio.sputnik.module.settings.Setting; +import me.retucio.sputnik.util.ChatUtil; import net.minecraft.client.MinecraftClient; import org.lwjgl.glfw.GLFW; @@ -80,24 +78,24 @@ public class Module { enabled = !enabled; if (enabled) onEnable(); else onDisable(); - CameraTweaks.EVENT_BUS.post(new ToggleModuleEvent(this)); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new ToggleModuleEvent(this)); } public void onEnable() { if (notify.isEnabled()) ChatUtil.info(getName() + " fue activado"); for (Method method : getClass().getDeclaredMethods()) if (method.isAnnotationPresent(SubscribeEvent.class)) { - CameraTweaks.EVENT_BUS.register(this); + me.retucio.sputnik.Sputnik.EVENT_BUS.register(this); break; } - CameraTweaks.EVENT_BUS.post(new ToggleModuleEvent(this)); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new ToggleModuleEvent(this)); } public void onDisable() { if (notify.isEnabled()) ChatUtil.info(getName() + " fue desactivado"); - if (CameraTweaks.EVENT_BUS.isRegistered(this)) - CameraTweaks.EVENT_BUS.unregister(this); - CameraTweaks.EVENT_BUS.post(new ToggleModuleEvent(this)); + if (me.retucio.sputnik.Sputnik.EVENT_BUS.isRegistered(this)) + me.retucio.sputnik.Sputnik.EVENT_BUS.unregister(this); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new ToggleModuleEvent(this)); } diff --git a/src/main/java/me/retucio/camtweaks/module/ModuleManager.java b/src/main/java/me/retucio/sputnik/module/ModuleManager.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/module/ModuleManager.java rename to src/main/java/me/retucio/sputnik/module/ModuleManager.java index 79ce845..06c6684 100644 --- a/src/main/java/me/retucio/camtweaks/module/ModuleManager.java +++ b/src/main/java/me/retucio/sputnik/module/ModuleManager.java @@ -1,15 +1,14 @@ -package me.retucio.camtweaks.module; +package me.retucio.sputnik.module; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.module.modules.camera.*; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.module.modules.misc.*; -import me.retucio.camtweaks.module.modules.network.*; -import me.retucio.camtweaks.module.modules.player.*; -import me.retucio.camtweaks.module.modules.render.*; -import me.retucio.camtweaks.module.modules.render.CritsPlus; -import me.retucio.camtweaks.module.modules.world.*; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.module.modules.camera.*; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.module.modules.misc.*; +import me.retucio.sputnik.module.modules.network.*; +import me.retucio.sputnik.module.modules.player.*; +import me.retucio.sputnik.module.modules.render.*; +import me.retucio.sputnik.module.modules.render.CritsPlus; +import me.retucio.sputnik.module.modules.world.*; import java.lang.reflect.Method; import java.util.ArrayList; @@ -81,7 +80,7 @@ public class ModuleManager { for (Module module : getEnabledModules()) { for (Method method : module.getClass().getDeclaredMethods()) { if (method.isAnnotationPresent(SubscribeEvent.class)) { - CameraTweaks.EVENT_BUS.register(module); + me.retucio.sputnik.Sputnik.EVENT_BUS.register(module); break; } } diff --git a/src/main/java/me/retucio/camtweaks/module/modules/camera/Freecam.java b/src/main/java/me/retucio/sputnik/module/modules/camera/Freecam.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/module/modules/camera/Freecam.java rename to src/main/java/me/retucio/sputnik/module/modules/camera/Freecam.java index 65da008..654f723 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/camera/Freecam.java +++ b/src/main/java/me/retucio/sputnik/module/modules/camera/Freecam.java @@ -1,16 +1,16 @@ -package me.retucio.camtweaks.module.modules.camera; +package me.retucio.sputnik.module.modules.camera; -import me.retucio.camtweaks.event.Stage; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.*; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.KeySetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.KeyUtil; -import me.retucio.camtweaks.util.MiscUtil; +import me.retucio.sputnik.event.Stage; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.*; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.KeySetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.KeyUtil; +import me.retucio.sputnik.util.MiscUtil; import net.minecraft.client.gui.Click; import net.minecraft.client.input.KeyInput; import net.minecraft.client.input.MouseInput; @@ -28,14 +28,14 @@ import org.joml.Vector3d; import org.lwjgl.glfw.GLFW; /** continúa en: - * @see me.retucio.camtweaks.mixin.CameraMixin - * @see me.retucio.camtweaks.mixin.ChunkBorderDebugRendererMixin - * @see me.retucio.camtweaks.mixin.ClientPlayerInteractionManagerMixin - * @see me.retucio.camtweaks.mixin.EntityMixin - * @see me.retucio.camtweaks.mixin.GameRendererMixin - * @see me.retucio.camtweaks.mixin.KeyInputMixin - * @see me.retucio.camtweaks.mixin.LivingEntityRendererMixin - * @see me.retucio.camtweaks.mixin.WorldRendererMixin + * @see me.retucio.sputnik.mixin.CameraMixin + * @see me.retucio.sputnik.mixin.ChunkBorderDebugRendererMixin + * @see me.retucio.sputnik.mixin.ClientPlayerInteractionManagerMixin + * @see me.retucio.sputnik.mixin.EntityMixin + * @see me.retucio.sputnik.mixin.GameRendererMixin + * @see me.retucio.sputnik.mixin.KeyInputMixin + * @see me.retucio.sputnik.mixin.LivingEntityRendererMixin + * @see me.retucio.sputnik.mixin.WorldRendererMixin */ public class Freecam extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/camera/Freelook.java b/src/main/java/me/retucio/sputnik/module/modules/camera/Freelook.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/module/modules/camera/Freelook.java rename to src/main/java/me/retucio/sputnik/module/modules/camera/Freelook.java index 48ffb52..318dd35 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/camera/Freelook.java +++ b/src/main/java/me/retucio/sputnik/module/modules/camera/Freelook.java @@ -1,17 +1,17 @@ -package me.retucio.camtweaks.module.modules.camera; +package me.retucio.sputnik.module.modules.camera; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.option.Perspective; import net.minecraft.util.math.MathHelper; import org.lwjgl.glfw.GLFW; /** continúa en: - * @see me.retucio.camtweaks.mixin.CameraMixin - * @see me.retucio.camtweaks.mixin.EntityMixin + * @see me.retucio.sputnik.mixin.CameraMixin + * @see me.retucio.sputnik.mixin.EntityMixin */ public class Freelook extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/camera/Fullbright.java b/src/main/java/me/retucio/sputnik/module/modules/camera/Fullbright.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/module/modules/camera/Fullbright.java rename to src/main/java/me/retucio/sputnik/module/modules/camera/Fullbright.java index 142b3c6..ab0dc93 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/camera/Fullbright.java +++ b/src/main/java/me/retucio/sputnik/module/modules/camera/Fullbright.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.module.modules.camera; +package me.retucio.sputnik.module.modules.camera; -import me.retucio.camtweaks.mixin.accessor.StatusEffectInstanceAccessor; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; +import me.retucio.sputnik.mixin.accessor.StatusEffectInstanceAccessor; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.EnumSetting; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.registry.Registries; @@ -13,7 +13,7 @@ import org.lwjgl.glfw.GLFW; import java.awt.*; /** continúa en: - * @see me.retucio.camtweaks.mixin.LightmapTextureManagerMixin + * @see me.retucio.sputnik.mixin.LightmapTextureManagerMixin */ public class Fullbright extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/camera/PerspectivePlus.java b/src/main/java/me/retucio/sputnik/module/modules/camera/PerspectivePlus.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/module/modules/camera/PerspectivePlus.java rename to src/main/java/me/retucio/sputnik/module/modules/camera/PerspectivePlus.java index 4d7005c..15fd09d 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/camera/PerspectivePlus.java +++ b/src/main/java/me/retucio/sputnik/module/modules/camera/PerspectivePlus.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.module.modules.camera; +package me.retucio.sputnik.module.modules.camera; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.MouseScrollEvent; -import me.retucio.camtweaks.event.events.PerspectiveChangeEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.*; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.MouseScrollEvent; +import me.retucio.sputnik.event.events.PerspectiveChangeEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.*; +import me.retucio.sputnik.util.KeyUtil; import org.lwjgl.glfw.GLFW; // continúa en CameraMixin diff --git a/src/main/java/me/retucio/camtweaks/module/modules/camera/Rotations.java b/src/main/java/me/retucio/sputnik/module/modules/camera/Rotations.java similarity index 80% rename from src/main/java/me/retucio/camtweaks/module/modules/camera/Rotations.java rename to src/main/java/me/retucio/sputnik/module/modules/camera/Rotations.java index a5de9c4..3c315e8 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/camera/Rotations.java +++ b/src/main/java/me/retucio/sputnik/module/modules/camera/Rotations.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.module.modules.camera; +package me.retucio.sputnik.module.modules.camera; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.ChangeRotationEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.ChangeRotationEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; public class Rotations extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/camera/Zoom.java b/src/main/java/me/retucio/sputnik/module/modules/camera/Zoom.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/module/modules/camera/Zoom.java rename to src/main/java/me/retucio/sputnik/module/modules/camera/Zoom.java index 680ed9d..33bebf3 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/camera/Zoom.java +++ b/src/main/java/me/retucio/sputnik/module/modules/camera/Zoom.java @@ -1,14 +1,14 @@ -package me.retucio.camtweaks.module.modules.camera; +package me.retucio.sputnik.module.modules.camera; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.GetFOVEvent; -import me.retucio.camtweaks.event.events.MouseScrollEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.KeySetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.GetFOVEvent; +import me.retucio.sputnik.event.events.MouseScrollEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.KeySetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.KeyUtil; import org.lwjgl.glfw.GLFW; // continúa en GameRendererMixin diff --git a/src/main/java/me/retucio/camtweaks/module/modules/client/GUI.java b/src/main/java/me/retucio/sputnik/module/modules/client/GUI.java similarity index 76% rename from src/main/java/me/retucio/camtweaks/module/modules/client/GUI.java rename to src/main/java/me/retucio/sputnik/module/modules/client/GUI.java index 53ae1d6..6260450 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/client/GUI.java +++ b/src/main/java/me/retucio/sputnik/module/modules/client/GUI.java @@ -1,21 +1,20 @@ -package me.retucio.camtweaks.module.modules.client; +package me.retucio.sputnik.module.modules.client; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.command.CommandManager; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.TickEvent; -import me.retucio.camtweaks.event.events.camtweaks.LoadClickGUIEvent; -import me.retucio.camtweaks.event.events.camtweaks.LoadCommandManagerEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.ChatPlus; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.module.settings.StringSetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.command.CommandManager; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.TickEvent; +import me.retucio.sputnik.event.events.sputnik.LoadClickGUIEvent; +import me.retucio.sputnik.event.events.sputnik.LoadCommandManagerEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.ChatPlus; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.module.settings.StringSetting; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.Colors; import org.lwjgl.glfw.GLFW; import java.awt.*; @@ -36,7 +35,7 @@ public class GUI extends Module { // ^^^ no sé de qué sirve porque está todo en minúsculas pero bueno public BooleanSetting blur = addSetting(new BooleanSetting("desenfoque", "desenfocar el fondo mientras la interfaz está abierta", true)); - public StringSetting watermark = addSetting(new StringSetting("marca de agua", "marca de agua para interfaces (dejar vacío para desactivar)", CameraTweaks.getVersionName(), 40)); + public StringSetting watermark = addSetting(new StringSetting("marca de agua", "marca de agua para interfaces (dejar vacío para desactivar)", me.retucio.sputnik.Sputnik.getVersionName(), 40)); public StringSetting commandPrefix = addSetting(new StringSetting("prefijo", "prefijo de los comandos", "$", 10)); public StringSetting chatName = addSetting(new StringSetting("nombre", "qué nombre usar en notificaciones por el chat", "smegma", 20)); @@ -49,7 +48,7 @@ public class GUI extends Module { Category.CLIENT, GLFW.GLFW_KEY_RIGHT_SHIFT); - CameraTweaks.EVENT_BUS.register(this); + me.retucio.sputnik.Sputnik.EVENT_BUS.register(this); keyMode.setVisible(false); notify.setVisible(false); searchBar.onUpdate(v -> matchCase.setVisible(v)); diff --git a/src/main/java/me/retucio/camtweaks/module/modules/client/HUD.java b/src/main/java/me/retucio/sputnik/module/modules/client/HUD.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/module/modules/client/HUD.java rename to src/main/java/me/retucio/sputnik/module/modules/client/HUD.java index 61bec28..f50f699 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/client/HUD.java +++ b/src/main/java/me/retucio/sputnik/module/modules/client/HUD.java @@ -1,13 +1,12 @@ -package me.retucio.camtweaks.module.modules.client; +package me.retucio.sputnik.module.modules.client; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.*; -import me.retucio.camtweaks.ui.hud.HudElement; -import me.retucio.camtweaks.ui.hud.HudRenderer; -import me.retucio.camtweaks.ui.hud.HudEditorScreen; -import me.retucio.camtweaks.ui.hud.elements.DynoElement; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.*; +import me.retucio.sputnik.ui.hud.HudElement; +import me.retucio.sputnik.ui.hud.HudRenderer; +import me.retucio.sputnik.ui.hud.HudEditorScreen; +import me.retucio.sputnik.ui.hud.elements.DynoElement; import org.lwjgl.glfw.GLFW; import java.awt.*; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/misc/AntiInvis.java b/src/main/java/me/retucio/sputnik/module/modules/misc/AntiInvis.java similarity index 54% rename from src/main/java/me/retucio/camtweaks/module/modules/misc/AntiInvis.java rename to src/main/java/me/retucio/sputnik/module/modules/misc/AntiInvis.java index a7d1cac..cae386e 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/misc/AntiInvis.java +++ b/src/main/java/me/retucio/sputnik/module/modules/misc/AntiInvis.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.module.modules.misc; +package me.retucio.sputnik.module.modules.misc; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; /** continúa en: - * @see me.retucio.camtweaks.mixin.EntityMixin + * @see me.retucio.sputnik.mixin.EntityMixin */ public class AntiInvis extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/misc/AnvilFont.java b/src/main/java/me/retucio/sputnik/module/modules/misc/AnvilFont.java similarity index 95% rename from src/main/java/me/retucio/camtweaks/module/modules/misc/AnvilFont.java rename to src/main/java/me/retucio/sputnik/module/modules/misc/AnvilFont.java index d3d7002..e3df1cf 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/misc/AnvilFont.java +++ b/src/main/java/me/retucio/sputnik/module/modules/misc/AnvilFont.java @@ -1,13 +1,13 @@ -package me.retucio.camtweaks.module.modules.misc; +package me.retucio.sputnik.module.modules.misc; -import me.retucio.camtweaks.mixin.accessor.AnvilScreenAccessor; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.EnumSetting; +import me.retucio.sputnik.mixin.accessor.AnvilScreenAccessor; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.EnumSetting; import net.minecraft.client.gui.screen.ingame.AnvilScreen; import net.minecraft.client.gui.widget.TextFieldWidget; -import me.retucio.camtweaks.module.modules.misc.AnvilFont.CustomFont.CharMap; +import me.retucio.sputnik.module.modules.misc.AnvilFont.CustomFont.CharMap; import java.util.Arrays; import java.util.HashMap; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/misc/BossbarStack.java b/src/main/java/me/retucio/sputnik/module/modules/misc/BossbarStack.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/module/modules/misc/BossbarStack.java rename to src/main/java/me/retucio/sputnik/module/modules/misc/BossbarStack.java index dfecf6f..f4b39e2 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/misc/BossbarStack.java +++ b/src/main/java/me/retucio/sputnik/module/modules/misc/BossbarStack.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.module.modules.misc; +package me.retucio.sputnik.module.modules.misc; -import me.retucio.camtweaks.event.events.RenderBossbarEvent; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.event.events.RenderBossbarEvent; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; import net.minecraft.client.gui.hud.ClientBossBar; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/misc/ChatPlus.java b/src/main/java/me/retucio/sputnik/module/modules/misc/ChatPlus.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/module/modules/misc/ChatPlus.java rename to src/main/java/me/retucio/sputnik/module/modules/misc/ChatPlus.java index 904483b..c4d35c1 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/misc/ChatPlus.java +++ b/src/main/java/me/retucio/sputnik/module/modules/misc/ChatPlus.java @@ -1,22 +1,21 @@ -package me.retucio.camtweaks.module.modules.misc; +package me.retucio.sputnik.module.modules.misc; import com.mojang.authlib.GameProfile; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.command.CommandManager; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.ClientClickEvent; -import me.retucio.camtweaks.event.events.ReceiveMessageEvent; -import me.retucio.camtweaks.event.events.SendMessageEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.interfaces.IChatHudLine; -import me.retucio.camtweaks.util.interfaces.IChatHudLineVisible; -import me.retucio.camtweaks.util.interfaces.TextVisitor; +import me.retucio.sputnik.command.CommandManager; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.ClientClickEvent; +import me.retucio.sputnik.event.events.ReceiveMessageEvent; +import me.retucio.sputnik.event.events.SendMessageEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.interfaces.IChatHudLine; +import me.retucio.sputnik.util.interfaces.IChatHudLineVisible; +import me.retucio.sputnik.util.interfaces.TextVisitor; import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.PlayerSkinDrawer; @@ -35,10 +34,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** continúa en: - * @see me.retucio.camtweaks.mixin.ChatHudMixin - * @see me.retucio.camtweaks.mixin.ChatScreenMixin - * @see me.retucio.camtweaks.mixin.InGameHudMixin - * @see me.retucio.camtweaks.mixin.StringHelperMixin + * @see me.retucio.sputnik.mixin.ChatHudMixin + * @see me.retucio.sputnik.mixin.ChatScreenMixin + * @see me.retucio.sputnik.mixin.InGameHudMixin + * @see me.retucio.sputnik.mixin.StringHelperMixin */ public class ChatPlus extends Module { @@ -119,8 +118,8 @@ public class ChatPlus extends Module { } public void updateClientName() { - CUSTOM_HEAD_ENTRIES.add(new CustomHeadEntry(ChatUtil.getPrefixNoFormatting(), Identifier.of(CameraTweaks.MOD_ID, "icon_chat.png"))); // no funciona con formato de colores - CUSTOM_HEAD_ENTRIES.add(new CustomHeadEntry("[Debug]", Identifier.of(CameraTweaks.MOD_ID, "icon_mc.png"))); + CUSTOM_HEAD_ENTRIES.add(new CustomHeadEntry(ChatUtil.getPrefixNoFormatting(), Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "icon_chat.png"))); // no funciona con formato de colores + CUSTOM_HEAD_ENTRIES.add(new CustomHeadEntry("[Debug]", Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "icon_mc.png"))); } @SuppressWarnings("DataFlowIssue") diff --git a/src/main/java/me/retucio/camtweaks/module/modules/misc/FakePlayer.java b/src/main/java/me/retucio/sputnik/module/modules/misc/FakePlayer.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/module/modules/misc/FakePlayer.java rename to src/main/java/me/retucio/sputnik/module/modules/misc/FakePlayer.java index 2ff2d38..8d29728 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/misc/FakePlayer.java +++ b/src/main/java/me/retucio/sputnik/module/modules/misc/FakePlayer.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.module.modules.misc; +package me.retucio.sputnik.module.modules.misc; import com.mojang.authlib.GameProfile; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.StringSetting; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.StringSetting; import net.minecraft.client.network.OtherClientPlayerEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/misc/ScreenshotPlus.java b/src/main/java/me/retucio/sputnik/module/modules/misc/ScreenshotPlus.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/module/modules/misc/ScreenshotPlus.java rename to src/main/java/me/retucio/sputnik/module/modules/misc/ScreenshotPlus.java index 710e2bb..9f0f981 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/misc/ScreenshotPlus.java +++ b/src/main/java/me/retucio/sputnik/module/modules/misc/ScreenshotPlus.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.module.modules.misc; +package me.retucio.sputnik.module.modules.misc; -import me.retucio.camtweaks.command.CommandManager; -import me.retucio.camtweaks.event.events.ClientClickEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.command.CommandManager; +import me.retucio.sputnik.event.events.ClientClickEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.util.ChatUtil; import net.minecraft.client.texture.NativeImage; import net.minecraft.text.ClickEvent; import net.minecraft.text.HoverEvent; @@ -25,7 +25,7 @@ import java.io.IOException; /** continúa en: - * @see me.retucio.camtweaks.mixin.ScreenshotRecorderMixin + * @see me.retucio.sputnik.mixin.ScreenshotRecorderMixin */ public class ScreenshotPlus extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/misc/ShulkerPeek.java b/src/main/java/me/retucio/sputnik/module/modules/misc/ShulkerPeek.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/module/modules/misc/ShulkerPeek.java rename to src/main/java/me/retucio/sputnik/module/modules/misc/ShulkerPeek.java index 654cdb3..89cee67 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/misc/ShulkerPeek.java +++ b/src/main/java/me/retucio/sputnik/module/modules/misc/ShulkerPeek.java @@ -1,17 +1,17 @@ -package me.retucio.camtweaks.module.modules.misc; +package me.retucio.sputnik.module.modules.misc; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.KeyEvent; -import me.retucio.camtweaks.mixin.accessor.HandledScreenAccessor; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.KeySetting; -import me.retucio.camtweaks.ui.screen.PreviewScreen; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.KeyEvent; +import me.retucio.sputnik.mixin.accessor.HandledScreenAccessor; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.KeySetting; +import me.retucio.sputnik.ui.screen.PreviewScreen; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.Colors; -import me.retucio.camtweaks.util.InventoryUtil; +import me.retucio.sputnik.util.InventoryUtil; import net.minecraft.block.ShulkerBoxBlock; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.component.DataComponentTypes; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/network/BungeecordSpoofer.java b/src/main/java/me/retucio/sputnik/module/modules/network/BungeecordSpoofer.java similarity index 73% rename from src/main/java/me/retucio/camtweaks/module/modules/network/BungeecordSpoofer.java rename to src/main/java/me/retucio/sputnik/module/modules/network/BungeecordSpoofer.java index f383b47..d18c995 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/network/BungeecordSpoofer.java +++ b/src/main/java/me/retucio/sputnik/module/modules/network/BungeecordSpoofer.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.module.modules.network; +package me.retucio.sputnik.module.modules.network; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.StringSetting; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.StringSetting; +import me.retucio.sputnik.util.ChatUtil; public class BungeecordSpoofer extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/network/LogoutSpots.java b/src/main/java/me/retucio/sputnik/module/modules/network/LogoutSpots.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/module/modules/network/LogoutSpots.java rename to src/main/java/me/retucio/sputnik/module/modules/network/LogoutSpots.java index 541cad9..b02391e 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/network/LogoutSpots.java +++ b/src/main/java/me/retucio/sputnik/module/modules/network/LogoutSpots.java @@ -1,17 +1,17 @@ -package me.retucio.camtweaks.module.modules.network; +package me.retucio.sputnik.module.modules.network; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.AddEntityEvent; -import me.retucio.camtweaks.event.events.RenderWorldEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.misc.FakePlayer; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.MiscUtil; -import me.retucio.camtweaks.util.render.RenderUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.AddEntityEvent; +import me.retucio.sputnik.event.events.RenderWorldEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.misc.FakePlayer; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.MiscUtil; +import me.retucio.sputnik.util.render.RenderUtil; import net.minecraft.client.network.OtherClientPlayerEntity; import net.minecraft.client.network.PlayerListEntry; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/network/PacketDelay.java b/src/main/java/me/retucio/sputnik/module/modules/network/PacketDelay.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/module/modules/network/PacketDelay.java rename to src/main/java/me/retucio/sputnik/module/modules/network/PacketDelay.java index 0c40f29..cd75406 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/network/PacketDelay.java +++ b/src/main/java/me/retucio/sputnik/module/modules/network/PacketDelay.java @@ -1,14 +1,14 @@ -package me.retucio.camtweaks.module.modules.network; +package me.retucio.sputnik.module.modules.network; -import me.retucio.camtweaks.event.JoinWorldEvent; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.PacketEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.NetworkUtil; +import me.retucio.sputnik.event.JoinWorldEvent; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.PacketEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.NetworkUtil; import net.minecraft.network.ClientConnection; import net.minecraft.network.listener.PacketListener; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/network/RPackBypass.java b/src/main/java/me/retucio/sputnik/module/modules/network/RPackBypass.java similarity index 58% rename from src/main/java/me/retucio/camtweaks/module/modules/network/RPackBypass.java rename to src/main/java/me/retucio/sputnik/module/modules/network/RPackBypass.java index 4b06fbb..230ff21 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/network/RPackBypass.java +++ b/src/main/java/me/retucio/sputnik/module/modules/network/RPackBypass.java @@ -1,17 +1,17 @@ -package me.retucio.camtweaks.module.modules.network; +package me.retucio.sputnik.module.modules.network; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.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 + * @see me.retucio.sputnik.mixin.ClientCommonNetworkHandlerMixin + * @see me.retucio.sputnik.mixin.ConfirmScreenMixin + * @see me.retucio.sputnik.mixin.ResourcePackPolicyMixin + * @see me.retucio.sputnik.mixin.ServerConnectorMixin + * @see me.retucio.sputnik.mixin.ServerInfoMixin */ public class RPackBypass extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/network/Reconnect.java b/src/main/java/me/retucio/sputnik/module/modules/network/Reconnect.java similarity index 77% rename from src/main/java/me/retucio/camtweaks/module/modules/network/Reconnect.java rename to src/main/java/me/retucio/sputnik/module/modules/network/Reconnect.java index 7c7f168..9484bb3 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/network/Reconnect.java +++ b/src/main/java/me/retucio/sputnik/module/modules/network/Reconnect.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.module.modules.network; +package me.retucio.sputnik.module.modules.network; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.DisconnectEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.DisconnectEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; import net.minecraft.client.gui.screen.multiplayer.ConnectScreen; import net.minecraft.client.network.ServerAddress; import net.minecraft.client.network.ServerInfo; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/AttributeSwapper.java b/src/main/java/me/retucio/sputnik/module/modules/player/AttributeSwapper.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/module/modules/player/AttributeSwapper.java rename to src/main/java/me/retucio/sputnik/module/modules/player/AttributeSwapper.java index 4d2f51d..7b9516d 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/AttributeSwapper.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/AttributeSwapper.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.AttackEntityEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.AttackEntityEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; public class AttributeSwapper extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/ElytraBounce.java b/src/main/java/me/retucio/sputnik/module/modules/player/ElytraBounce.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/module/modules/player/ElytraBounce.java rename to src/main/java/me/retucio/sputnik/module/modules/player/ElytraBounce.java index 471a993..c14d3c1 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/ElytraBounce.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/ElytraBounce.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffects; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/FastUse.java b/src/main/java/me/retucio/sputnik/module/modules/player/FastUse.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/module/modules/player/FastUse.java rename to src/main/java/me/retucio/sputnik/module/modules/player/FastUse.java index a44bb1e..ef66e6b 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/FastUse.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/FastUse.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/HandView.java b/src/main/java/me/retucio/sputnik/module/modules/player/HandView.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/module/modules/player/HandView.java rename to src/main/java/me/retucio/sputnik/module/modules/player/HandView.java index 2b97ae0..82299d5 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/HandView.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/HandView.java @@ -1,19 +1,19 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.RenderHeldItemEvent; -import me.retucio.camtweaks.event.events.RenderArmEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.RenderHeldItemEvent; +import me.retucio.sputnik.event.events.RenderArmEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Hand; import net.minecraft.util.math.RotationAxis; import org.joml.Vector3d; /** continúa en: - * @see me.retucio.camtweaks.mixin.HeldItemRendererMixin + * @see me.retucio.sputnik.mixin.HeldItemRendererMixin */ public class HandView extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/Headhitters.java b/src/main/java/me/retucio/sputnik/module/modules/player/Headhitters.java similarity index 70% rename from src/main/java/me/retucio/camtweaks/module/modules/player/Headhitters.java rename to src/main/java/me/retucio/sputnik/module/modules/player/Headhitters.java index c04e390..b46e219 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/Headhitters.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/Headhitters.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.NumberSetting; public class Headhitters extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/InventoryPlus.java b/src/main/java/me/retucio/sputnik/module/modules/player/InventoryPlus.java similarity index 81% rename from src/main/java/me/retucio/camtweaks/module/modules/player/InventoryPlus.java rename to src/main/java/me/retucio/sputnik/module/modules/player/InventoryPlus.java index fc351af..741a752 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/InventoryPlus.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/InventoryPlus.java @@ -1,15 +1,15 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.event.Event; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.KeyEvent; -import me.retucio.camtweaks.event.events.MouseClickEvent; -import me.retucio.camtweaks.mixin.accessor.HandledScreenAccessor; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.KeySetting; -import me.retucio.camtweaks.util.InventoryUtil; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.event.Event; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.KeyEvent; +import me.retucio.sputnik.event.events.MouseClickEvent; +import me.retucio.sputnik.mixin.accessor.HandledScreenAccessor; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.KeySetting; +import me.retucio.sputnik.util.InventoryUtil; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.screen.slot.Slot; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/Offhand.java b/src/main/java/me/retucio/sputnik/module/modules/player/Offhand.java similarity index 90% rename from src/main/java/me/retucio/camtweaks/module/modules/player/Offhand.java rename to src/main/java/me/retucio/sputnik/module/modules/player/Offhand.java index b6441a5..c6af19e 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/Offhand.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/Offhand.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.module.settings.OptionSetting; -import me.retucio.camtweaks.util.Lists; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.module.settings.OptionSetting; +import me.retucio.sputnik.util.Lists; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/PortalGUI.java b/src/main/java/me/retucio/sputnik/module/modules/player/PortalGUI.java similarity index 57% rename from src/main/java/me/retucio/camtweaks/module/modules/player/PortalGUI.java rename to src/main/java/me/retucio/sputnik/module/modules/player/PortalGUI.java index 8da7ffd..6f901ca 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/PortalGUI.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/PortalGUI.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; /** continúa en: - * @see me.retucio.camtweaks.mixin.ClientPlayerEntityMixin + * @see me.retucio.sputnik.mixin.ClientPlayerEntityMixin */ public class PortalGUI extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/SafeWalk.java b/src/main/java/me/retucio/sputnik/module/modules/player/SafeWalk.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/module/modules/player/SafeWalk.java rename to src/main/java/me/retucio/sputnik/module/modules/player/SafeWalk.java index 1461e63..ebdc44b 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/SafeWalk.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/SafeWalk.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.ClipAtLedgeEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.ClipAtLedgeEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.NumberSetting; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/UIMove.java b/src/main/java/me/retucio/sputnik/module/modules/player/UIMove.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/module/modules/player/UIMove.java rename to src/main/java/me/retucio/sputnik/module/modules/player/UIMove.java index fca1c60..59c53fa 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/UIMove.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/UIMove.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.mixin.accessor.KeyBindingAccessor; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.ListSetting; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.util.KeyUtil; -import me.retucio.camtweaks.util.Lists; +import me.retucio.sputnik.mixin.accessor.KeyBindingAccessor; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.ListSetting; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.util.KeyUtil; +import me.retucio.sputnik.util.Lists; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.option.KeyBinding; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/player/WarnLowDurability.java b/src/main/java/me/retucio/sputnik/module/modules/player/WarnLowDurability.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/module/modules/player/WarnLowDurability.java rename to src/main/java/me/retucio/sputnik/module/modules/player/WarnLowDurability.java index 604c066..0f4a673 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/player/WarnLowDurability.java +++ b/src/main/java/me/retucio/sputnik/module/modules/player/WarnLowDurability.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.module.modules.player; +package me.retucio.sputnik.module.modules.player; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.module.settings.OptionSetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.Lists; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.module.settings.OptionSetting; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.Lists; import net.minecraft.item.ItemStack; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/BlockESP.java b/src/main/java/me/retucio/sputnik/module/modules/render/BlockESP.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/module/modules/render/BlockESP.java rename to src/main/java/me/retucio/sputnik/module/modules/render/BlockESP.java index dc0b75b..128d756 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/BlockESP.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/BlockESP.java @@ -1,20 +1,17 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.RenderWorldEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.ListSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.Lists; -import me.retucio.camtweaks.util.render.RenderUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.RenderWorldEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.ListSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.Lists; +import me.retucio.sputnik.util.render.RenderUtil; import net.minecraft.block.Block; -import net.minecraft.client.render.OverlayTexture; -import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3i; import net.minecraft.util.shape.VoxelShape; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/BlockOutline.java b/src/main/java/me/retucio/sputnik/module/modules/render/BlockOutline.java similarity index 60% rename from src/main/java/me/retucio/camtweaks/module/modules/render/BlockOutline.java rename to src/main/java/me/retucio/sputnik/module/modules/render/BlockOutline.java index 49accb9..7303117 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/BlockOutline.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/BlockOutline.java @@ -1,13 +1,13 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.ColorSetting; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.ColorSetting; import java.awt.*; /** continúa en: - * @see me.retucio.camtweaks.mixin.WorldRendererMixin + * @see me.retucio.sputnik.mixin.WorldRendererMixin */ public class BlockOutline extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/BreakingProgress.java b/src/main/java/me/retucio/sputnik/module/modules/render/BreakingProgress.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/module/modules/render/BreakingProgress.java rename to src/main/java/me/retucio/sputnik/module/modules/render/BreakingProgress.java index bdac511..c109396 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/BreakingProgress.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/BreakingProgress.java @@ -1,14 +1,14 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.RenderWorldEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.render.RenderUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.RenderWorldEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.render.RenderUtil; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/CritsPlus.java b/src/main/java/me/retucio/sputnik/module/modules/render/CritsPlus.java similarity index 63% rename from src/main/java/me/retucio/camtweaks/module/modules/render/CritsPlus.java rename to src/main/java/me/retucio/sputnik/module/modules/render/CritsPlus.java index 4228f9d..398a601 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/CritsPlus.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/CritsPlus.java @@ -1,16 +1,16 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.NumberSetting; import java.awt.*; /** continúa en: - * @see me.retucio.camtweaks.mixin.DamageParticleMixin - * @see me.retucio.camtweaks.mixin.DamageParticleFactoryMixin + * @see me.retucio.sputnik.mixin.DamageParticleMixin + * @see me.retucio.sputnik.mixin.DamageParticleFactoryMixin */ public class CritsPlus extends Module { @@ -18,7 +18,7 @@ public class CritsPlus extends Module { public ColorSetting color = addSetting(new ColorSetting("color", "color de las partículas", new Color(0, 0, 255, 255), false)); public NumberSetting scale = addSetting(new NumberSetting("escala", "tamaño", 1, 0, 2, 0.05)); - public NumberSetting multiplier; // no sé dónde se calcula cuántas partículas aparecen :/ + public NumberSetting multiplier = addSetting(new NumberSetting("múltiplo", "número por el que multiplicar la cantidad de partículas generadas", 1, 0, 10, 0.1)); public NumberSetting velocityMultipler = addSetting(new NumberSetting("dispersión", "multiplicador de la velocidad de dispersión", 1, 0, 10, 0.1)); public NumberSetting gravity = addSetting(new NumberSetting("gravedad", "multiplicador de fuerza de gravedad", 1, 0, 10, 0.1)); public NumberSetting maxAge = addSetting(new NumberSetting("vida máxima", "cuánto persiste la partícula", 10, 0, 50, 1)); diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/DamageOverlay.java b/src/main/java/me/retucio/sputnik/module/modules/render/DamageOverlay.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/module/modules/render/DamageOverlay.java rename to src/main/java/me/retucio/sputnik/module/modules/render/DamageOverlay.java index a3fad24..4a1f3de 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/DamageOverlay.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/DamageOverlay.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; -import me.retucio.camtweaks.mixin.accessor.OverlayTextureAccessor; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.ColorSetting; +import me.retucio.sputnik.mixin.accessor.OverlayTextureAccessor; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.ColorSetting; import net.minecraft.client.texture.NativeImage; import net.minecraft.client.texture.NativeImageBackedTexture; @@ -11,7 +11,7 @@ import net.minecraft.client.texture.NativeImageBackedTexture; import java.awt.*; /** continúa en: - * @see me.retucio.camtweaks.mixin.OverlayTextureMixin + * @see me.retucio.sputnik.mixin.OverlayTextureMixin */ public class DamageOverlay extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/GlintPlus.java b/src/main/java/me/retucio/sputnik/module/modules/render/GlintPlus.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/module/modules/render/GlintPlus.java rename to src/main/java/me/retucio/sputnik/module/modules/render/GlintPlus.java index 908f566..86e2512 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/GlintPlus.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/GlintPlus.java @@ -1,18 +1,18 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.util.render.GlintRenderLayer; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.util.render.GlintRenderLayer; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayers; import net.minecraft.util.DyeColor; /** continúa en: - * @see me.retucio.camtweaks.mixin.BufferStorageMixin - * @see me.retucio.camtweaks.mixin.EquipmentRendererMixin - * @see me.retucio.camtweaks.mixin.ItemRendererMixin + * @see me.retucio.sputnik.mixin.BufferStorageMixin + * @see me.retucio.sputnik.mixin.EquipmentRendererMixin + * @see me.retucio.sputnik.mixin.ItemRendererMixin */ public class GlintPlus extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/Nametags.java b/src/main/java/me/retucio/sputnik/module/modules/render/Nametags.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/module/modules/render/Nametags.java rename to src/main/java/me/retucio/sputnik/module/modules/render/Nametags.java index fc60d5d..35d98b5 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/Nametags.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/Nametags.java @@ -1,13 +1,13 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.module.settings.ListSetting; -import me.retucio.camtweaks.util.Lists; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.module.settings.ListSetting; +import me.retucio.sputnik.util.Lists; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityType; import net.minecraft.entity.LazyEntityReference; @@ -30,10 +30,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** continúa en: - * @see me.retucio.camtweaks.mixin.EntityMixin - * @see me.retucio.camtweaks.mixin.ItemEntityMixin - * @see me.retucio.camtweaks.mixin.LivingEntityRendererMixin - * @see me.retucio.camtweaks.mixin.PlayerEntityMixin + * @see me.retucio.sputnik.mixin.EntityMixin + * @see me.retucio.sputnik.mixin.ItemEntityMixin + * @see me.retucio.sputnik.mixin.LivingEntityRendererMixin + * @see me.retucio.sputnik.mixin.PlayerEntityMixin */ public class Nametags extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/render/NoRender.java b/src/main/java/me/retucio/sputnik/module/modules/render/NoRender.java similarity index 80% rename from src/main/java/me/retucio/camtweaks/module/modules/render/NoRender.java rename to src/main/java/me/retucio/sputnik/module/modules/render/NoRender.java index 3cd89f3..784a4eb 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/render/NoRender.java +++ b/src/main/java/me/retucio/sputnik/module/modules/render/NoRender.java @@ -1,25 +1,25 @@ -package me.retucio.camtweaks.module.modules.render; +package me.retucio.sputnik.module.modules.render; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.module.settings.ListSetting; -import me.retucio.camtweaks.util.Lists; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.module.settings.ListSetting; +import me.retucio.sputnik.util.Lists; import net.minecraft.particle.ParticleType; import net.minecraft.util.Formatting; /** continúa en: - * @see me.retucio.camtweaks.mixin.ClientPlayNetworkHandlerMixin - * @see me.retucio.camtweaks.mixin.FogRendererMixin - * @see me.retucio.camtweaks.mixin.GameRendererMixin - * @see me.retucio.camtweaks.mixin.InGameHudMixin - * @see me.retucio.camtweaks.mixin.InGameOverlayRendererMixin - * @see me.retucio.camtweaks.mixin.ParticleManagerMixin - * @see me.retucio.camtweaks.mixin.StatusEffectFogModifierMixin - * @see me.retucio.camtweaks.mixin.StuckArrowsFeatureRendererMixin - * @see me.retucio.camtweaks.mixin.TextRendererDrawerMixin - * @see me.retucio.camtweaks.mixin.WeatherRenderingMixin + * @see me.retucio.sputnik.mixin.ClientPlayNetworkHandlerMixin + * @see me.retucio.sputnik.mixin.FogRendererMixin + * @see me.retucio.sputnik.mixin.GameRendererMixin + * @see me.retucio.sputnik.mixin.InGameHudMixin + * @see me.retucio.sputnik.mixin.InGameOverlayRendererMixin + * @see me.retucio.sputnik.mixin.ParticleManagerMixin + * @see me.retucio.sputnik.mixin.StatusEffectFogModifierMixin + * @see me.retucio.sputnik.mixin.StuckArrowsFeatureRendererMixin + * @see me.retucio.sputnik.mixin.TextRendererDrawerMixin + * @see me.retucio.sputnik.mixin.WeatherRenderingMixin */ public class NoRender extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/world/AutoSign.java b/src/main/java/me/retucio/sputnik/module/modules/world/AutoSign.java similarity index 80% rename from src/main/java/me/retucio/camtweaks/module/modules/world/AutoSign.java rename to src/main/java/me/retucio/sputnik/module/modules/world/AutoSign.java index 88b8bb6..e8a047d 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/world/AutoSign.java +++ b/src/main/java/me/retucio/sputnik/module/modules/world/AutoSign.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.module.modules.world; +package me.retucio.sputnik.module.modules.world; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.OpenScreenEvent; -import me.retucio.camtweaks.event.events.PacketEvent; -import me.retucio.camtweaks.mixin.accessor.AbstractSignEditScreenAccessor; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.util.ChatUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.OpenScreenEvent; +import me.retucio.sputnik.event.events.PacketEvent; +import me.retucio.sputnik.mixin.accessor.AbstractSignEditScreenAccessor; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.util.ChatUtil; import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen; import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/world/ColoredSigns.java b/src/main/java/me/retucio/sputnik/module/modules/world/ColoredSigns.java similarity index 71% rename from src/main/java/me/retucio/camtweaks/module/modules/world/ColoredSigns.java rename to src/main/java/me/retucio/sputnik/module/modules/world/ColoredSigns.java index 478a278..e206ef9 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/world/ColoredSigns.java +++ b/src/main/java/me/retucio/sputnik/module/modules/world/ColoredSigns.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.module.modules.world; +package me.retucio.sputnik.module.modules.world; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.PacketEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.StringSetting; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.PacketEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.StringSetting; import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket; public class ColoredSigns extends Module { diff --git a/src/main/java/me/retucio/camtweaks/module/modules/world/LightOverlay.java b/src/main/java/me/retucio/sputnik/module/modules/world/LightOverlay.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/module/modules/world/LightOverlay.java rename to src/main/java/me/retucio/sputnik/module/modules/world/LightOverlay.java index faa5938..a842d9f 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/world/LightOverlay.java +++ b/src/main/java/me/retucio/sputnik/module/modules/world/LightOverlay.java @@ -1,16 +1,15 @@ -package me.retucio.camtweaks.module.modules.world; +package me.retucio.sputnik.module.modules.world; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.RenderWorldEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.util.render.RenderUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.RenderWorldEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.util.render.RenderUtil; import net.minecraft.block.*; import net.minecraft.block.Blocks; -import net.minecraft.entity.EntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.LightType; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/world/NoMiningInterruptions.java b/src/main/java/me/retucio/sputnik/module/modules/world/NoMiningInterruptions.java similarity index 77% rename from src/main/java/me/retucio/camtweaks/module/modules/world/NoMiningInterruptions.java rename to src/main/java/me/retucio/sputnik/module/modules/world/NoMiningInterruptions.java index a1666d8..c5c1f34 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/world/NoMiningInterruptions.java +++ b/src/main/java/me/retucio/sputnik/module/modules/world/NoMiningInterruptions.java @@ -1,11 +1,10 @@ -package me.retucio.camtweaks.module.modules.world; +package me.retucio.sputnik.module.modules.world; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ListSetting; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.Lists; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ListSetting; +import me.retucio.sputnik.util.Lists; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.registry.tag.ItemTags; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/world/Racist.java b/src/main/java/me/retucio/sputnik/module/modules/world/Racist.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/module/modules/world/Racist.java rename to src/main/java/me/retucio/sputnik/module/modules/world/Racist.java index 6c7a279..36f1ceb 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/world/Racist.java +++ b/src/main/java/me/retucio/sputnik/module/modules/world/Racist.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.module.modules.world; +package me.retucio.sputnik.module.modules.world; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.util.EntityUtil; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.util.EntityUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.mob.EndermanEntity; diff --git a/src/main/java/me/retucio/camtweaks/module/modules/world/TimeChanger.java b/src/main/java/me/retucio/sputnik/module/modules/world/TimeChanger.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/module/modules/world/TimeChanger.java rename to src/main/java/me/retucio/sputnik/module/modules/world/TimeChanger.java index 370bd7a..e242c7f 100644 --- a/src/main/java/me/retucio/camtweaks/module/modules/world/TimeChanger.java +++ b/src/main/java/me/retucio/sputnik/module/modules/world/TimeChanger.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.module.modules.world; +package me.retucio.sputnik.module.modules.world; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.PacketEvent; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.PacketEvent; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.module.settings.NumberSetting; import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket; // continúa en ClientWorldPropertiesMixin, DimensionTypeMixin, diff --git a/src/main/java/me/retucio/camtweaks/module/settings/BooleanSetting.java b/src/main/java/me/retucio/sputnik/module/settings/BooleanSetting.java similarity index 96% rename from src/main/java/me/retucio/camtweaks/module/settings/BooleanSetting.java rename to src/main/java/me/retucio/sputnik/module/settings/BooleanSetting.java index 66bd66c..53b6207 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/BooleanSetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/BooleanSetting.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; import java.util.function.Consumer; diff --git a/src/main/java/me/retucio/camtweaks/module/settings/ColorSetting.java b/src/main/java/me/retucio/sputnik/module/settings/ColorSetting.java similarity index 98% rename from src/main/java/me/retucio/camtweaks/module/settings/ColorSetting.java rename to src/main/java/me/retucio/sputnik/module/settings/ColorSetting.java index 03c7c35..d9d5924 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/ColorSetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/ColorSetting.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.util.Colors; import net.minecraft.text.Text; import java.awt.*; diff --git a/src/main/java/me/retucio/camtweaks/module/settings/EnumSetting.java b/src/main/java/me/retucio/sputnik/module/settings/EnumSetting.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/module/settings/EnumSetting.java rename to src/main/java/me/retucio/sputnik/module/settings/EnumSetting.java index 1387a2a..421d08d 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/EnumSetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/EnumSetting.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/me/retucio/camtweaks/module/settings/KeySetting.java b/src/main/java/me/retucio/sputnik/module/settings/KeySetting.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/module/settings/KeySetting.java rename to src/main/java/me/retucio/sputnik/module/settings/KeySetting.java index 47160a6..395bfde 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/KeySetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/KeySetting.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.KeyUtil; import org.lwjgl.glfw.GLFW; import java.util.function.Consumer; diff --git a/src/main/java/me/retucio/camtweaks/module/settings/ListSetting.java b/src/main/java/me/retucio/sputnik/module/settings/ListSetting.java similarity index 98% rename from src/main/java/me/retucio/camtweaks/module/settings/ListSetting.java rename to src/main/java/me/retucio/sputnik/module/settings/ListSetting.java index b7cbd3e..ef5d427 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/ListSetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/ListSetting.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/me/retucio/camtweaks/module/settings/NumberSetting.java b/src/main/java/me/retucio/sputnik/module/settings/NumberSetting.java similarity index 98% rename from src/main/java/me/retucio/camtweaks/module/settings/NumberSetting.java rename to src/main/java/me/retucio/sputnik/module/settings/NumberSetting.java index bbe2aee..eca22fc 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/NumberSetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/NumberSetting.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; import java.util.function.Consumer; diff --git a/src/main/java/me/retucio/camtweaks/module/settings/OptionSetting.java b/src/main/java/me/retucio/sputnik/module/settings/OptionSetting.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/module/settings/OptionSetting.java rename to src/main/java/me/retucio/sputnik/module/settings/OptionSetting.java index b2781f3..bd5efc9 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/OptionSetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/OptionSetting.java @@ -1,7 +1,6 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Consumer; diff --git a/src/main/java/me/retucio/camtweaks/module/settings/Setting.java b/src/main/java/me/retucio/sputnik/module/settings/Setting.java similarity index 77% rename from src/main/java/me/retucio/camtweaks/module/settings/Setting.java rename to src/main/java/me/retucio/sputnik/module/settings/Setting.java index 59e17e8..51e670b 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/Setting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/Setting.java @@ -1,8 +1,7 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.camtweaks.UpdateSettingEvent; -import me.retucio.camtweaks.module.Module; +import me.retucio.sputnik.event.events.sputnik.UpdateSettingEvent; +import me.retucio.sputnik.module.Module; // base para los tipos de ajustes public abstract class Setting { @@ -53,6 +52,6 @@ public abstract class Setting { } public void fireUpdateEvent() { - CameraTweaks.EVENT_BUS.post(new UpdateSettingEvent(this, module.shouldSaveSettings())); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new UpdateSettingEvent(this, module.shouldSaveSettings())); } } diff --git a/src/main/java/me/retucio/camtweaks/module/settings/StringSetting.java b/src/main/java/me/retucio/sputnik/module/settings/StringSetting.java similarity index 96% rename from src/main/java/me/retucio/camtweaks/module/settings/StringSetting.java rename to src/main/java/me/retucio/sputnik/module/settings/StringSetting.java index fad224c..9a0e621 100644 --- a/src/main/java/me/retucio/camtweaks/module/settings/StringSetting.java +++ b/src/main/java/me/retucio/sputnik/module/settings/StringSetting.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.module.settings; +package me.retucio.sputnik.module.settings; import java.util.function.Consumer; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/HudEditorScreen.java b/src/main/java/me/retucio/sputnik/ui/hud/HudEditorScreen.java similarity index 96% rename from src/main/java/me/retucio/camtweaks/ui/hud/HudEditorScreen.java rename to src/main/java/me/retucio/sputnik/ui/hud/HudEditorScreen.java index fd962d0..f01b89b 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/HudEditorScreen.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/HudEditorScreen.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.ui.hud; +package me.retucio.sputnik.ui.hud; -import me.retucio.camtweaks.config.ConfigManager; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.config.ConfigManager; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Click; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/HudElement.java b/src/main/java/me/retucio/sputnik/ui/hud/HudElement.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/ui/hud/HudElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/HudElement.java index 87a0668..35c0dc6 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/HudElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/HudElement.java @@ -1,8 +1,7 @@ -package me.retucio.camtweaks.ui.hud; +package me.retucio.sputnik.ui.hud; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.widgets.Widget; -import net.minecraft.client.MinecraftClient; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.widgets.Widget; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/HudRenderer.java b/src/main/java/me/retucio/sputnik/ui/hud/HudRenderer.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/ui/hud/HudRenderer.java rename to src/main/java/me/retucio/sputnik/ui/hud/HudRenderer.java index 8f84b7f..cf493e4 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/HudRenderer.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/HudRenderer.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.ui.hud; +package me.retucio.sputnik.ui.hud; -import me.retucio.camtweaks.config.ConfigManager; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.elements.*; +import me.retucio.sputnik.config.ConfigManager; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.elements.*; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/ImageHudElement.java b/src/main/java/me/retucio/sputnik/ui/hud/ImageHudElement.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/ui/hud/ImageHudElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/ImageHudElement.java index 635d2ad..99269b4 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/ImageHudElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/ImageHudElement.java @@ -1,8 +1,7 @@ -package me.retucio.camtweaks.ui.hud; +package me.retucio.sputnik.ui.hud; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gui.DrawContext; @@ -23,7 +22,7 @@ public abstract class ImageHudElement extends HudElement { public ImageHudElement(String id, int defaultX, int defaultY) { super(id, defaultX, defaultY); - this.textureId = Identifier.of(CameraTweaks.MOD_ID, "textures/" + id); + this.textureId = Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "textures/" + id); this.w = imageWidth; this.h = imageHeight; } @@ -37,7 +36,7 @@ public abstract class ImageHudElement extends HudElement { try { // cargar - Identifier resourceId = Identifier.of(CameraTweaks.MOD_ID, imagePath); + Identifier resourceId = Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, imagePath); try (InputStream stream = mc.getResourceManager().getResource(resourceId).get().getInputStream()) { NativeImage image = NativeImage.read(stream); @@ -58,10 +57,10 @@ public abstract class ImageHudElement extends HudElement { mc.getTextureManager().registerTexture(textureId, texture); textureLoaded = true; - CameraTweaks.LOGGER.info("textura para el elemento del HUD {} cargada", getId()); + me.retucio.sputnik.Sputnik.LOGGER.info("textura para el elemento del HUD {} cargada", getId()); } } catch (Exception e) { - CameraTweaks.LOGGER.error("no se pudo cargar la textura para el elemento del HUD {}: {}", getId(), e.getMessage()); + me.retucio.sputnik.Sputnik.LOGGER.error("no se pudo cargar la textura para el elemento del HUD {}: {}", getId(), e.getMessage()); } } diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/TextHudElement.java b/src/main/java/me/retucio/sputnik/ui/hud/TextHudElement.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/ui/hud/TextHudElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/TextHudElement.java index 70a76bd..ba53b68 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/TextHudElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/TextHudElement.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.ui.hud; +package me.retucio.sputnik.ui.hud; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/CoordsElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/CoordsElement.java similarity index 79% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/CoordsElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/CoordsElement.java index 815ad18..4bff08e 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/CoordsElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/CoordsElement.java @@ -1,12 +1,9 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.camera.Freecam; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.HudElement; -import me.retucio.camtweaks.ui.hud.TextHudElement; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawContext; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.camera.Freecam; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.TextHudElement; import net.minecraft.text.Text; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/CustomTextElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/CustomTextElement.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/CustomTextElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/CustomTextElement.java index 22590ab..567b2eb 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/CustomTextElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/CustomTextElement.java @@ -1,11 +1,10 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.camtweaks.UpdateSettingEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.HudElement; -import me.retucio.camtweaks.ui.hud.TextHudElement; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.sputnik.UpdateSettingEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.TextHudElement; import net.minecraft.text.Text; import java.util.List; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/DynoElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/DynoElement.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/DynoElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/DynoElement.java index 7f76cf0..303b3d3 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/DynoElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/DynoElement.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.ImageHudElement; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.ImageHudElement; import net.minecraft.text.Text; import java.util.List; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/EchestElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/EchestElement.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/EchestElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/EchestElement.java index b352f64..c79ee90 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/EchestElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/EchestElement.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.ImageHudElement; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.InventoryUtil; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.ImageHudElement; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.InventoryUtil; import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gui.DrawContext; import net.minecraft.inventory.Inventory; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/FpsElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/FpsElement.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/FpsElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/FpsElement.java index c889a4f..be1bcca 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/FpsElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/FpsElement.java @@ -1,8 +1,7 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.HudElement; -import me.retucio.camtweaks.ui.hud.TextHudElement; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.TextHudElement; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/PingElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/PingElement.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/PingElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/PingElement.java index ebda2a5..a87dc2c 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/PingElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/PingElement.java @@ -1,8 +1,7 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.HudElement; -import me.retucio.camtweaks.ui.hud.TextHudElement; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.TextHudElement; import net.minecraft.client.network.PlayerListEntry; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/TimeElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/TimeElement.java similarity index 73% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/TimeElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/TimeElement.java index 5dda4e3..c3888ab 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/TimeElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/TimeElement.java @@ -1,9 +1,8 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.HudElement; -import me.retucio.camtweaks.ui.hud.TextHudElement; -import me.retucio.camtweaks.util.MiscUtil; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.TextHudElement; +import me.retucio.sputnik.util.MiscUtil; import net.minecraft.text.Text; import java.util.List; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/TotemsElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/TotemsElement.java similarity index 92% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/TotemsElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/TotemsElement.java index e9bd8a8..cbc4deb 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/TotemsElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/TotemsElement.java @@ -1,7 +1,7 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.ImageHudElement; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.ImageHudElement; import net.minecraft.client.gui.DrawContext; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/me/retucio/camtweaks/ui/hud/elements/TpsElement.java b/src/main/java/me/retucio/sputnik/ui/hud/elements/TpsElement.java similarity index 72% rename from src/main/java/me/retucio/camtweaks/ui/hud/elements/TpsElement.java rename to src/main/java/me/retucio/sputnik/ui/hud/elements/TpsElement.java index 6138d39..ddd8da1 100644 --- a/src/main/java/me/retucio/camtweaks/ui/hud/elements/TpsElement.java +++ b/src/main/java/me/retucio/sputnik/ui/hud/elements/TpsElement.java @@ -1,9 +1,8 @@ -package me.retucio.camtweaks.ui.hud.elements; +package me.retucio.sputnik.ui.hud.elements; -import me.retucio.camtweaks.module.modules.client.HUD; -import me.retucio.camtweaks.ui.hud.HudElement; -import me.retucio.camtweaks.ui.hud.TextHudElement; -import me.retucio.camtweaks.util.NetworkUtil; +import me.retucio.sputnik.module.modules.client.HUD; +import me.retucio.sputnik.ui.hud.TextHudElement; +import me.retucio.sputnik.util.NetworkUtil; import net.minecraft.text.Text; import java.util.List; diff --git a/src/main/java/me/retucio/camtweaks/ui/screen/ClickGUI.java b/src/main/java/me/retucio/sputnik/ui/screen/ClickGUI.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/ui/screen/ClickGUI.java rename to src/main/java/me/retucio/sputnik/ui/screen/ClickGUI.java index 973d7d6..00a3bff 100644 --- a/src/main/java/me/retucio/camtweaks/ui/screen/ClickGUI.java +++ b/src/main/java/me/retucio/sputnik/ui/screen/ClickGUI.java @@ -1,29 +1,28 @@ -package me.retucio.camtweaks.ui.screen; +package me.retucio.sputnik.ui.screen; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.KeyEvent; -import me.retucio.camtweaks.event.events.MouseClickEvent; -import me.retucio.camtweaks.event.events.MouseScrollEvent; -import me.retucio.camtweaks.event.events.camtweaks.SettingsFrameEvent; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.Setting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.ui.widgets.buttons.settings.ListButton; -import me.retucio.camtweaks.ui.widgets.buttons.ModuleButton; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.ui.widgets.frames.settings.ColorPickerFrame; -import me.retucio.camtweaks.ui.widgets.frames.ModuleFrame; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.ui.widgets.Button; -import me.retucio.camtweaks.ui.widgets.Frame; -import me.retucio.camtweaks.ui.widgets.Widget; -import me.retucio.camtweaks.ui.widgets.misc.ScrollBarWidget; -import me.retucio.camtweaks.ui.widgets.misc.SearchBarWidget; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.KeyEvent; +import me.retucio.sputnik.event.events.MouseClickEvent; +import me.retucio.sputnik.event.events.MouseScrollEvent; +import me.retucio.sputnik.event.events.sputnik.SettingsFrameEvent; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.Setting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.ui.widgets.buttons.settings.ListButton; +import me.retucio.sputnik.ui.widgets.buttons.ModuleButton; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.ui.widgets.frames.settings.ColorPickerFrame; +import me.retucio.sputnik.ui.widgets.frames.ModuleFrame; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.ui.widgets.Button; +import me.retucio.sputnik.ui.widgets.Frame; +import me.retucio.sputnik.ui.widgets.Widget; +import me.retucio.sputnik.ui.widgets.misc.ScrollBarWidget; +import me.retucio.sputnik.ui.widgets.misc.SearchBarWidget; +import me.retucio.sputnik.util.KeyUtil; -import me.retucio.camtweaks.util.MiscUtil; +import me.retucio.sputnik.util.MiscUtil; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Click; import net.minecraft.client.gui.DrawContext; @@ -36,7 +35,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame.guiSettings; +import static me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame.guiSettings; // interfaz gráfica, se abre con el shift derecho por defecto. aquí se encuentran los módulos y sus ajustes public class ClickGUI extends Screen { @@ -58,7 +57,7 @@ public class ClickGUI extends Screen { public ClickGUI() { super(Text.of("interfaz")); settingsFrames.add(guiSettingsFrame); - CameraTweaks.EVENT_BUS.register(this); + me.retucio.sputnik.Sputnik.EVENT_BUS.register(this); } @Override @@ -180,9 +179,9 @@ public class ClickGUI extends Screen { @SubscribeEvent public void onMouseMiddleButton(MouseClickEvent event) { // mover todos los marcos a un punto visible al presionar shift + la rueda del ratón - if (CameraTweaks.mc.currentScreen != this || event.getButton() != 2 || !KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_SHIFT)) return; + if (me.retucio.sputnik.Sputnik.mc.currentScreen != this || event.getButton() != 2 || !KeyUtil.isKeyDown(GLFW.GLFW_KEY_LEFT_SHIFT)) return; - int h = CameraTweaks.mc.getWindow().getScaledHeight(); + int h = me.retucio.sputnik.Sputnik.mc.getWindow().getScaledHeight(); int minY = Math.min(modulesFrame.getY(), settingsFrames.stream().mapToInt(Frame::getY).min().orElse(modulesFrame.getY())); int maxY = Math.max(modulesFrame.getY() + modulesFrame.getH(), settingsFrames.stream().mapToInt(sf -> sf.getY() + sf.getH()).max().orElse(modulesFrame.getY() + modulesFrame.getH())); int correction = minY < 0 ? -minY + 4 : (maxY > h ? h - maxY - 4 : 0); @@ -251,7 +250,7 @@ public class ClickGUI extends Screen { if (isSettingsFrameOpen(module)) return; // permitir un solo marco de ajustes por módulo SettingsFrame frame = new SettingsFrame(module, x, y, 120, 20); settingsFrames.add(frame); - CameraTweaks.EVENT_BUS.post(new SettingsFrameEvent.Open(frame)); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new SettingsFrameEvent.Open(frame)); } // abrir un marco de ajustes específicamente para ajustes de selección múltiple @@ -269,7 +268,7 @@ public class ClickGUI extends Screen { if ((sf instanceof ColorPickerFrame cpf && cpf.dummyModule == module) // para los selectores de colores || (!(sf instanceof ColorPickerFrame) && sf.module == module)) { // lógica muy mierdas, lo sé, pero paso de hacerlo bien toRemove.add(sf); - CameraTweaks.EVENT_BUS.post(new SettingsFrameEvent.Close(sf)); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new SettingsFrameEvent.Close(sf)); unselect(sf); } } diff --git a/src/main/java/me/retucio/camtweaks/ui/screen/PreviewScreen.java b/src/main/java/me/retucio/sputnik/ui/screen/PreviewScreen.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/ui/screen/PreviewScreen.java rename to src/main/java/me/retucio/sputnik/ui/screen/PreviewScreen.java index c7a5f86..e3ec257 100644 --- a/src/main/java/me/retucio/camtweaks/ui/screen/PreviewScreen.java +++ b/src/main/java/me/retucio/sputnik/ui/screen/PreviewScreen.java @@ -1,9 +1,8 @@ -package me.retucio.camtweaks.ui.screen; +package me.retucio.sputnik.ui.screen; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.module.modules.misc.ShulkerPeek; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.module.modules.misc.ShulkerPeek; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; @@ -20,7 +19,7 @@ import java.util.List; public class PreviewScreen extends Screen { - private static final Identifier TEXTURE = Identifier.of(CameraTweaks.MOD_ID, "textures/gui/preview.png"); + private static final Identifier TEXTURE = Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "textures/gui/preview.png"); private int x, y; private final int bgWidth = 176; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/Button.java b/src/main/java/me/retucio/sputnik/ui/widgets/Button.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/ui/widgets/Button.java rename to src/main/java/me/retucio/sputnik/ui/widgets/Button.java index 01134ae..8ebbbf9 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/Button.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/Button.java @@ -1,6 +1,5 @@ -package me.retucio.camtweaks.ui.widgets; +package me.retucio.sputnik.ui.widgets; -import me.retucio.camtweaks.ui.screen.ClickGUI; import net.minecraft.client.gui.DrawContext; public abstract class Button extends Widget { diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/Frame.java b/src/main/java/me/retucio/sputnik/ui/widgets/Frame.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/ui/widgets/Frame.java rename to src/main/java/me/retucio/sputnik/ui/widgets/Frame.java index 9116bed..15ecd5c 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/Frame.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/Frame.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.ui.widgets; +package me.retucio.sputnik.ui.widgets; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/Widget.java b/src/main/java/me/retucio/sputnik/ui/widgets/Widget.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/ui/widgets/Widget.java rename to src/main/java/me/retucio/sputnik/ui/widgets/Widget.java index e29f50b..db1880e 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/Widget.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/Widget.java @@ -1,6 +1,6 @@ -package me.retucio.camtweaks.ui.widgets; +package me.retucio.sputnik.ui.widgets; -import me.retucio.camtweaks.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.screen.ClickGUI; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/ModuleButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/ModuleButton.java similarity index 91% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/ModuleButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/ModuleButton.java index 8ce7f95..055bfd0 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/ModuleButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/ModuleButton.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.ui.widgets.buttons; +package me.retucio.sputnik.ui.widgets.buttons; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.ModuleFrame; -import me.retucio.camtweaks.ui.widgets.Button; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.ModuleFrame; +import me.retucio.sputnik.ui.widgets.Button; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/SettingButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/SettingButton.java similarity index 79% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/SettingButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/SettingButton.java index 3962096..416a3c9 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/SettingButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/SettingButton.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.ui.widgets.buttons; +package me.retucio.sputnik.ui.widgets.buttons; -import me.retucio.camtweaks.module.settings.Setting; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.ui.widgets.Button; +import me.retucio.sputnik.module.settings.Setting; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.ui.widgets.Button; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/BindButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/BindButton.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/BindButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/BindButton.java index c87c3c8..30f3417 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/BindButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/BindButton.java @@ -1,13 +1,13 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.settings.KeySetting; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.util.ChatUtil; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.settings.KeySetting; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.util.ChatUtil; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.input.KeyInput; import net.minecraft.client.option.KeyBinding; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ChooseButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ChooseButton.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ChooseButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ChooseButton.java index 68d93b6..f041050 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ChooseButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ChooseButton.java @@ -1,14 +1,14 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.OptionSetting; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.OptionSetting; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import java.util.Comparator; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ColorButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ColorButton.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ColorButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ColorButton.java index 1397a9b..4bf0844 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ColorButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ColorButton.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; -import me.retucio.camtweaks.util.render.DrawUtil; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; +import me.retucio.sputnik.util.render.DrawUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/CycleButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/CycleButton.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/CycleButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/CycleButton.java index c79cefc..235fad7 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/CycleButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/CycleButton.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.settings.EnumSetting; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.settings.EnumSetting; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ListButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ListButton.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ListButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ListButton.java index f5d933c..24979c9 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ListButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ListButton.java @@ -1,14 +1,14 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ListSetting; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ListSetting; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/SliderButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/SliderButton.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/SliderButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/SliderButton.java index a3b95fd..8c77773 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/SliderButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/SliderButton.java @@ -1,12 +1,12 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/TextButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/TextButton.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/TextButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/TextButton.java index 581d43a..3de2511 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/TextButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/TextButton.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.settings.StringSetting; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.settings.StringSetting; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ToggleButton.java b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ToggleButton.java similarity index 78% rename from src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ToggleButton.java rename to src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ToggleButton.java index d248d9a..2befa4d 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/buttons/settings/ToggleButton.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/buttons/settings/ToggleButton.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.ui.widgets.buttons.settings; +package me.retucio.sputnik.ui.widgets.buttons.settings; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import java.awt.*; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/ModuleFrame.java b/src/main/java/me/retucio/sputnik/ui/widgets/frames/ModuleFrame.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/ui/widgets/frames/ModuleFrame.java rename to src/main/java/me/retucio/sputnik/ui/widgets/frames/ModuleFrame.java index a20d84f..9b89142 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/ModuleFrame.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/frames/ModuleFrame.java @@ -1,13 +1,12 @@ -package me.retucio.camtweaks.ui.widgets.frames; +package me.retucio.sputnik.ui.widgets.frames; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.camtweaks.ModuleFrameEvent; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.buttons.ModuleButton; -import me.retucio.camtweaks.ui.widgets.Frame; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.event.events.sputnik.ModuleFrameEvent; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.buttons.ModuleButton; +import me.retucio.sputnik.ui.widgets.Frame; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; @@ -102,7 +101,7 @@ public class ModuleFrame extends Frame { dragY = mouseY - y; } else if (button == 1) { // clic derecho para extenderlo extended = !extended; - CameraTweaks.EVENT_BUS.post(new ModuleFrameEvent.Extend()); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new ModuleFrameEvent.Extend()); } } @@ -133,7 +132,7 @@ public class ModuleFrame extends Frame { } if (isHovered(mouseX, mouseY)) - CameraTweaks.EVENT_BUS.post(new ModuleFrameEvent.Move()); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new ModuleFrameEvent.Move()); } @Override diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/SettingsFrame.java b/src/main/java/me/retucio/sputnik/ui/widgets/frames/SettingsFrame.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/ui/widgets/frames/SettingsFrame.java rename to src/main/java/me/retucio/sputnik/ui/widgets/frames/SettingsFrame.java index 651d887..7611f57 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/SettingsFrame.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/frames/SettingsFrame.java @@ -1,14 +1,13 @@ -package me.retucio.camtweaks.ui.widgets.frames; +package me.retucio.sputnik.ui.widgets.frames; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.camtweaks.SettingsFrameEvent; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.*; -import me.retucio.camtweaks.ui.widgets.buttons.settings.*; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.buttons.*; -import me.retucio.camtweaks.ui.widgets.Frame; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.event.events.sputnik.SettingsFrameEvent; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.*; +import me.retucio.sputnik.ui.widgets.buttons.settings.*; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.buttons.*; +import me.retucio.sputnik.ui.widgets.Frame; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.gui.DrawContext; @@ -131,7 +130,7 @@ public class SettingsFrame extends Frame> { super.mouseReleased(mouseX, mouseY, button); if (button == 0) { dragging = false; - CameraTweaks.EVENT_BUS.post(new SettingsFrameEvent.Move(this)); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new SettingsFrameEvent.Move(this)); } for (SettingButton sb : visibleButtons) diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/settings/ClientSettingsFrame.java b/src/main/java/me/retucio/sputnik/ui/widgets/frames/settings/ClientSettingsFrame.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/ui/widgets/frames/settings/ClientSettingsFrame.java rename to src/main/java/me/retucio/sputnik/ui/widgets/frames/settings/ClientSettingsFrame.java index 5743085..9d7dd28 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/settings/ClientSettingsFrame.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/frames/settings/ClientSettingsFrame.java @@ -1,12 +1,11 @@ -package me.retucio.camtweaks.ui.widgets.frames.settings; +package me.retucio.sputnik.ui.widgets.frames.settings; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.events.camtweaks.GUISettingsFrameEvent; -import me.retucio.camtweaks.module.modules.client.GUI; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.buttons.SettingButton; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.event.events.sputnik.GUISettingsFrameEvent; +import me.retucio.sputnik.module.modules.client.GUI; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.buttons.SettingButton; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.gui.DrawContext; import java.util.List; @@ -66,7 +65,7 @@ public class ClientSettingsFrame extends SettingsFrame { dragY = mouseY - y; } else if (button == 1) { extended = !extended; - CameraTweaks.EVENT_BUS.post(new GUISettingsFrameEvent.Extend()); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new GUISettingsFrameEvent.Extend()); } } @@ -79,7 +78,7 @@ public class ClientSettingsFrame extends SettingsFrame { public void mouseReleased(int mouseX, int mouseY, int button) { ClickGUI.INSTANCE.unselect(this); if (button == 0 && dragging) - CameraTweaks.EVENT_BUS.post(new GUISettingsFrameEvent.Move()); + me.retucio.sputnik.Sputnik.EVENT_BUS.post(new GUISettingsFrameEvent.Move()); super.mouseReleased(mouseX, mouseY, button); } diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/settings/ColorPickerFrame.java b/src/main/java/me/retucio/sputnik/ui/widgets/frames/settings/ColorPickerFrame.java similarity index 96% rename from src/main/java/me/retucio/camtweaks/ui/widgets/frames/settings/ColorPickerFrame.java rename to src/main/java/me/retucio/sputnik/ui/widgets/frames/settings/ColorPickerFrame.java index a9ae6db..bfac183 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/frames/settings/ColorPickerFrame.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/frames/settings/ColorPickerFrame.java @@ -1,18 +1,18 @@ -package me.retucio.camtweaks.ui.widgets.frames.settings; +package me.retucio.sputnik.ui.widgets.frames.settings; -import me.retucio.camtweaks.module.Category; -import me.retucio.camtweaks.module.Module; -import me.retucio.camtweaks.module.settings.Setting; -import me.retucio.camtweaks.module.settings.BooleanSetting; -import me.retucio.camtweaks.module.settings.ColorSetting; -import me.retucio.camtweaks.module.settings.NumberSetting; -import me.retucio.camtweaks.ui.widgets.buttons.*; -import me.retucio.camtweaks.ui.widgets.buttons.settings.SliderButton; -import me.retucio.camtweaks.ui.widgets.buttons.settings.ToggleButton; -import me.retucio.camtweaks.ui.widgets.frames.SettingsFrame; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.render.DrawUtil; +import me.retucio.sputnik.module.Category; +import me.retucio.sputnik.module.Module; +import me.retucio.sputnik.module.settings.Setting; +import me.retucio.sputnik.module.settings.BooleanSetting; +import me.retucio.sputnik.module.settings.ColorSetting; +import me.retucio.sputnik.module.settings.NumberSetting; +import me.retucio.sputnik.ui.widgets.buttons.*; +import me.retucio.sputnik.ui.widgets.buttons.settings.SliderButton; +import me.retucio.sputnik.ui.widgets.buttons.settings.ToggleButton; +import me.retucio.sputnik.ui.widgets.frames.SettingsFrame; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.render.DrawUtil; import net.minecraft.client.gui.DrawContext; import java.awt.*; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/misc/ScrollBarWidget.java b/src/main/java/me/retucio/sputnik/ui/widgets/misc/ScrollBarWidget.java similarity index 93% rename from src/main/java/me/retucio/camtweaks/ui/widgets/misc/ScrollBarWidget.java rename to src/main/java/me/retucio/sputnik/ui/widgets/misc/ScrollBarWidget.java index b3c27b6..1940f2d 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/misc/ScrollBarWidget.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/misc/ScrollBarWidget.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.ui.widgets.misc; +package me.retucio.sputnik.ui.widgets.misc; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.ui.widgets.Widget; -import me.retucio.camtweaks.util.Colors; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.ui.widgets.Widget; +import me.retucio.sputnik.util.Colors; import net.minecraft.client.gui.DrawContext; import java.awt.*; diff --git a/src/main/java/me/retucio/camtweaks/ui/widgets/misc/SearchBarWidget.java b/src/main/java/me/retucio/sputnik/ui/widgets/misc/SearchBarWidget.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/ui/widgets/misc/SearchBarWidget.java rename to src/main/java/me/retucio/sputnik/ui/widgets/misc/SearchBarWidget.java index e931454..d97b396 100644 --- a/src/main/java/me/retucio/camtweaks/ui/widgets/misc/SearchBarWidget.java +++ b/src/main/java/me/retucio/sputnik/ui/widgets/misc/SearchBarWidget.java @@ -1,11 +1,11 @@ -package me.retucio.camtweaks.ui.widgets.misc; +package me.retucio.sputnik.ui.widgets.misc; -import me.retucio.camtweaks.config.ConfigManager; -import me.retucio.camtweaks.ui.screen.ClickGUI; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; -import me.retucio.camtweaks.ui.widgets.Widget; -import me.retucio.camtweaks.util.Colors; -import me.retucio.camtweaks.util.KeyUtil; +import me.retucio.sputnik.config.ConfigManager; +import me.retucio.sputnik.ui.screen.ClickGUI; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.ui.widgets.Widget; +import me.retucio.sputnik.util.Colors; +import me.retucio.sputnik.util.KeyUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import net.minecraft.util.Formatting; diff --git a/src/main/java/me/retucio/camtweaks/util/ChatUtil.java b/src/main/java/me/retucio/sputnik/util/ChatUtil.java similarity index 88% rename from src/main/java/me/retucio/camtweaks/util/ChatUtil.java rename to src/main/java/me/retucio/sputnik/util/ChatUtil.java index 5e8bfea..13af915 100644 --- a/src/main/java/me/retucio/camtweaks/util/ChatUtil.java +++ b/src/main/java/me/retucio/sputnik/util/ChatUtil.java @@ -1,9 +1,8 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.camtweaks.LoadModuleManagerEvent; -import me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.sputnik.LoadModuleManagerEvent; +import me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -25,7 +24,7 @@ public class ChatUtil { } public static void addMessage(Text text) { - if (mc.inGameHud == null || !CameraTweaks.settingsApplied) return; + if (mc.inGameHud == null || !me.retucio.sputnik.Sputnik.settingsApplied) return; mc.inGameHud.getChatHud().addMessage(text); } diff --git a/src/main/java/me/retucio/camtweaks/util/Colors.java b/src/main/java/me/retucio/sputnik/util/Colors.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/util/Colors.java rename to src/main/java/me/retucio/sputnik/util/Colors.java index d03fad2..7763498 100644 --- a/src/main/java/me/retucio/camtweaks/util/Colors.java +++ b/src/main/java/me/retucio/sputnik/util/Colors.java @@ -1,10 +1,10 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; import net.minecraft.util.Formatting; import java.awt.Color; -import static me.retucio.camtweaks.ui.widgets.frames.settings.ClientSettingsFrame.guiSettings; +import static me.retucio.sputnik.ui.widgets.frames.settings.ClientSettingsFrame.guiSettings; // clase para los colores diff --git a/src/main/java/me/retucio/camtweaks/util/EntityUtil.java b/src/main/java/me/retucio/sputnik/util/EntityUtil.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/util/EntityUtil.java rename to src/main/java/me/retucio/sputnik/util/EntityUtil.java index f667aca..f32f5de 100644 --- a/src/main/java/me/retucio/camtweaks/util/EntityUtil.java +++ b/src/main/java/me/retucio/sputnik/util/EntityUtil.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.ProjectileUtil; @@ -10,7 +10,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.RaycastContext; import org.joml.Vector3d; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; public class EntityUtil { diff --git a/src/main/java/me/retucio/camtweaks/util/InventoryUtil.java b/src/main/java/me/retucio/sputnik/util/InventoryUtil.java similarity index 96% rename from src/main/java/me/retucio/camtweaks/util/InventoryUtil.java rename to src/main/java/me/retucio/sputnik/util/InventoryUtil.java index 5f2003d..563617b 100644 --- a/src/main/java/me/retucio/camtweaks/util/InventoryUtil.java +++ b/src/main/java/me/retucio/sputnik/util/InventoryUtil.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.DisconnectEvent; -import me.retucio.camtweaks.event.events.OpenScreenEvent; -import me.retucio.camtweaks.mixin.accessor.KeyBindingAccessor; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.DisconnectEvent; +import me.retucio.sputnik.event.events.OpenScreenEvent; +import me.retucio.sputnik.mixin.accessor.KeyBindingAccessor; import net.minecraft.client.gui.screen.ingame.GenericContainerScreen; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.entity.player.PlayerInventory; @@ -20,7 +20,7 @@ import net.minecraft.text.Text; import java.util.ArrayList; import java.util.List; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; public class InventoryUtil { diff --git a/src/main/java/me/retucio/camtweaks/util/KeyUtil.java b/src/main/java/me/retucio/sputnik/util/KeyUtil.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/util/KeyUtil.java rename to src/main/java/me/retucio/sputnik/util/KeyUtil.java index 503f18d..6f4bde4 100644 --- a/src/main/java/me/retucio/camtweaks/util/KeyUtil.java +++ b/src/main/java/me/retucio/sputnik/util/KeyUtil.java @@ -1,12 +1,11 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.mixin.accessor.KeyBindingAccessor; +import me.retucio.sputnik.mixin.accessor.KeyBindingAccessor; import net.minecraft.client.input.KeyInput; import net.minecraft.client.option.KeyBinding; import org.lwjgl.glfw.GLFW; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; // cosas útiles relacionadas a las teclas public class KeyUtil { diff --git a/src/main/java/me/retucio/camtweaks/util/Lists.java b/src/main/java/me/retucio/sputnik/util/Lists.java similarity index 87% rename from src/main/java/me/retucio/camtweaks/util/Lists.java rename to src/main/java/me/retucio/sputnik/util/Lists.java index fa03536..8576bd2 100644 --- a/src/main/java/me/retucio/camtweaks/util/Lists.java +++ b/src/main/java/me/retucio/sputnik/util/Lists.java @@ -1,18 +1,10 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; -import com.ibm.icu.impl.locale.XCldrStub; import net.minecraft.block.Block; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.sound.Sound; import net.minecraft.entity.EntityType; import net.minecraft.item.Item; -import net.minecraft.network.packet.PacketType; import net.minecraft.particle.ParticleType; import net.minecraft.registry.Registries; -import net.minecraft.resource.featuretoggle.FeatureFlag; -import net.minecraft.resource.featuretoggle.FeatureFlags; -import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.minecraft.text.Text; @@ -21,9 +13,7 @@ import java.awt.*; import java.util.*; import java.util.List; -import static me.retucio.camtweaks.util.Colors.*; - -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.util.Colors.*; public class Lists { diff --git a/src/main/java/me/retucio/camtweaks/util/MiscUtil.java b/src/main/java/me/retucio/sputnik/util/MiscUtil.java similarity index 86% rename from src/main/java/me/retucio/camtweaks/util/MiscUtil.java rename to src/main/java/me/retucio/sputnik/util/MiscUtil.java index 23eaf54..91ad0b6 100644 --- a/src/main/java/me/retucio/camtweaks/util/MiscUtil.java +++ b/src/main/java/me/retucio/sputnik/util/MiscUtil.java @@ -1,9 +1,9 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.TickEvent; -import me.retucio.camtweaks.module.ModuleManager; -import me.retucio.camtweaks.module.modules.client.HUD; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.TickEvent; +import me.retucio.sputnik.module.ModuleManager; +import me.retucio.sputnik.module.modules.client.HUD; import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.math.Vec3d; import org.joml.Vector3d; @@ -13,7 +13,7 @@ import java.time.LocalTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import static me.retucio.camtweaks.CameraTweaks.mc; +import static me.retucio.sputnik.Sputnik.mc; public class MiscUtil { diff --git a/src/main/java/me/retucio/camtweaks/util/NetworkUtil.java b/src/main/java/me/retucio/sputnik/util/NetworkUtil.java similarity index 94% rename from src/main/java/me/retucio/camtweaks/util/NetworkUtil.java rename to src/main/java/me/retucio/sputnik/util/NetworkUtil.java index 988d547..8cc3b10 100644 --- a/src/main/java/me/retucio/camtweaks/util/NetworkUtil.java +++ b/src/main/java/me/retucio/sputnik/util/NetworkUtil.java @@ -1,8 +1,8 @@ -package me.retucio.camtweaks.util; +package me.retucio.sputnik.util; -import me.retucio.camtweaks.event.SubscribeEvent; -import me.retucio.camtweaks.event.events.PacketEvent; +import me.retucio.sputnik.event.SubscribeEvent; +import me.retucio.sputnik.event.events.PacketEvent; import net.minecraft.client.MinecraftClient; import net.minecraft.network.ClientConnection; import net.minecraft.network.listener.PacketListener; diff --git a/src/main/java/me/retucio/camtweaks/util/interfaces/IChatHud.java b/src/main/java/me/retucio/sputnik/util/interfaces/IChatHud.java similarity index 83% rename from src/main/java/me/retucio/camtweaks/util/interfaces/IChatHud.java rename to src/main/java/me/retucio/sputnik/util/interfaces/IChatHud.java index 01017bb..d7e913f 100644 --- a/src/main/java/me/retucio/camtweaks/util/interfaces/IChatHud.java +++ b/src/main/java/me/retucio/sputnik/util/interfaces/IChatHud.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util.interfaces; +package me.retucio.sputnik.util.interfaces; import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.text.Text; diff --git a/src/main/java/me/retucio/camtweaks/util/interfaces/IChatHudLine.java b/src/main/java/me/retucio/sputnik/util/interfaces/IChatHudLine.java similarity index 84% rename from src/main/java/me/retucio/camtweaks/util/interfaces/IChatHudLine.java rename to src/main/java/me/retucio/sputnik/util/interfaces/IChatHudLine.java index fa5724a..8313318 100644 --- a/src/main/java/me/retucio/camtweaks/util/interfaces/IChatHudLine.java +++ b/src/main/java/me/retucio/sputnik/util/interfaces/IChatHudLine.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util.interfaces; +package me.retucio.sputnik.util.interfaces; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/me/retucio/camtweaks/util/interfaces/IChatHudLineVisible.java b/src/main/java/me/retucio/sputnik/util/interfaces/IChatHudLineVisible.java similarity index 76% rename from src/main/java/me/retucio/camtweaks/util/interfaces/IChatHudLineVisible.java rename to src/main/java/me/retucio/sputnik/util/interfaces/IChatHudLineVisible.java index 3013a07..1482b3f 100644 --- a/src/main/java/me/retucio/camtweaks/util/interfaces/IChatHudLineVisible.java +++ b/src/main/java/me/retucio/sputnik/util/interfaces/IChatHudLineVisible.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util.interfaces; +package me.retucio.sputnik.util.interfaces; public interface IChatHudLineVisible extends IChatHudLine { diff --git a/src/main/java/me/retucio/camtweaks/util/interfaces/IConfirmScreen.java b/src/main/java/me/retucio/sputnik/util/interfaces/IConfirmScreen.java similarity index 65% rename from src/main/java/me/retucio/camtweaks/util/interfaces/IConfirmScreen.java rename to src/main/java/me/retucio/sputnik/util/interfaces/IConfirmScreen.java index 9358166..938eccb 100644 --- a/src/main/java/me/retucio/camtweaks/util/interfaces/IConfirmScreen.java +++ b/src/main/java/me/retucio/sputnik/util/interfaces/IConfirmScreen.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util.interfaces; +package me.retucio.sputnik.util.interfaces; public interface IConfirmScreen { diff --git a/src/main/java/me/retucio/camtweaks/util/interfaces/IMessageHandler.java b/src/main/java/me/retucio/sputnik/util/interfaces/IMessageHandler.java similarity index 71% rename from src/main/java/me/retucio/camtweaks/util/interfaces/IMessageHandler.java rename to src/main/java/me/retucio/sputnik/util/interfaces/IMessageHandler.java index 531eaa6..bb0ada7 100644 --- a/src/main/java/me/retucio/camtweaks/util/interfaces/IMessageHandler.java +++ b/src/main/java/me/retucio/sputnik/util/interfaces/IMessageHandler.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util.interfaces; +package me.retucio.sputnik.util.interfaces; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/me/retucio/camtweaks/util/interfaces/IVec3d.java b/src/main/java/me/retucio/sputnik/util/interfaces/IVec3d.java similarity index 89% rename from src/main/java/me/retucio/camtweaks/util/interfaces/IVec3d.java rename to src/main/java/me/retucio/sputnik/util/interfaces/IVec3d.java index d3fd230..85fad3e 100644 --- a/src/main/java/me/retucio/camtweaks/util/interfaces/IVec3d.java +++ b/src/main/java/me/retucio/sputnik/util/interfaces/IVec3d.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util.interfaces; +package me.retucio.sputnik.util.interfaces; import net.minecraft.util.math.Vec3i; import org.joml.Vector3d; diff --git a/src/main/java/me/retucio/camtweaks/util/interfaces/TextVisitor.java b/src/main/java/me/retucio/sputnik/util/interfaces/TextVisitor.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/util/interfaces/TextVisitor.java rename to src/main/java/me/retucio/sputnik/util/interfaces/TextVisitor.java index 8d5a50e..16440b3 100644 --- a/src/main/java/me/retucio/camtweaks/util/interfaces/TextVisitor.java +++ b/src/main/java/me/retucio/sputnik/util/interfaces/TextVisitor.java @@ -1,6 +1,6 @@ /* code by meteorclient dev team */ -package me.retucio.camtweaks.util.interfaces; +package me.retucio.sputnik.util.interfaces; import net.minecraft.text.PlainTextContent; import net.minecraft.text.StringVisitable; diff --git a/src/main/java/me/retucio/camtweaks/util/render/DrawUtil.java b/src/main/java/me/retucio/sputnik/util/render/DrawUtil.java similarity index 97% rename from src/main/java/me/retucio/camtweaks/util/render/DrawUtil.java rename to src/main/java/me/retucio/sputnik/util/render/DrawUtil.java index 4e2a55f..3d76411 100644 --- a/src/main/java/me/retucio/camtweaks/util/render/DrawUtil.java +++ b/src/main/java/me/retucio/sputnik/util/render/DrawUtil.java @@ -1,4 +1,4 @@ -package me.retucio.camtweaks.util.render; +package me.retucio.sputnik.util.render; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/me/retucio/camtweaks/util/render/GlintRenderLayer.java b/src/main/java/me/retucio/sputnik/util/render/GlintRenderLayer.java similarity index 85% rename from src/main/java/me/retucio/camtweaks/util/render/GlintRenderLayer.java rename to src/main/java/me/retucio/sputnik/util/render/GlintRenderLayer.java index e22a579..72bc9c9 100644 --- a/src/main/java/me/retucio/camtweaks/util/render/GlintRenderLayer.java +++ b/src/main/java/me/retucio/sputnik/util/render/GlintRenderLayer.java @@ -1,12 +1,9 @@ -package me.retucio.camtweaks.util.render; +package me.retucio.sputnik.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 it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import me.retucio.camtweaks.CameraTweaks; -import me.retucio.camtweaks.module.modules.render.GlintPlus; +import me.retucio.sputnik.module.modules.render.GlintPlus; import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.render.*; import net.minecraft.client.util.BufferAllocator; @@ -58,7 +55,7 @@ public class GlintRenderLayer extends RenderLayer { } private static RenderLayer buildGlintRenderLayer(String name) { - final Identifier res = Identifier.of(CameraTweaks.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png"); + final Identifier res = Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png"); return RenderLayer.of("glint_" + name, RenderSetup.builder(RenderPipelines.GLINT) .texture("Sampler0", res) @@ -69,7 +66,7 @@ public class GlintRenderLayer extends RenderLayer { } private static RenderLayer buildEntityGlintRenderLayer(String name) { - final Identifier res = Identifier.of(CameraTweaks.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png"); + final Identifier res = Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png"); return RenderLayer.of("entity_glint_" + name, RenderSetup.builder(RenderPipelines.GLINT) .texture("Sampler0", res) @@ -81,7 +78,7 @@ public class GlintRenderLayer extends RenderLayer { private static RenderLayer buildArmorEntityGlintRenderLayer(String name) { - final Identifier res = Identifier.of(CameraTweaks.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png"); + final Identifier res = Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "textures/misc/glint_" + name.toLowerCase() + ".png"); return RenderLayer.of("armor_glint_" + name, RenderSetup.builder(RenderPipelines.GLINT) .texture("Sampler0", res) diff --git a/src/main/java/me/retucio/camtweaks/util/render/Layers.java b/src/main/java/me/retucio/sputnik/util/render/Layers.java similarity index 50% rename from src/main/java/me/retucio/camtweaks/util/render/Layers.java rename to src/main/java/me/retucio/sputnik/util/render/Layers.java index a5e2aa1..11cc095 100644 --- a/src/main/java/me/retucio/camtweaks/util/render/Layers.java +++ b/src/main/java/me/retucio/sputnik/util/render/Layers.java @@ -1,10 +1,9 @@ -package me.retucio.camtweaks.util.render; +package me.retucio.sputnik.util.render; -import me.retucio.camtweaks.CameraTweaks; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderSetup; -import static me.retucio.camtweaks.util.render.Pipelines.*; +import static me.retucio.sputnik.util.render.Pipelines.*; public class Layers { @@ -32,11 +31,11 @@ public class Layers { } static { - LINES = RenderLayer.of(CameraTweaks.MOD_ID + "_lines", RenderSetup.builder(LINES_PIPELINE).build()); - LINES_CULL = RenderLayer.of(CameraTweaks.MOD_ID + "_lines_cull", RenderSetup.builder(LINES_CULL_PIPELINE).build()); + LINES = RenderLayer.of(me.retucio.sputnik.Sputnik.MOD_ID + "_lines", RenderSetup.builder(LINES_PIPELINE).build()); + LINES_CULL = RenderLayer.of(me.retucio.sputnik.Sputnik.MOD_ID + "_lines_cull", RenderSetup.builder(LINES_CULL_PIPELINE).build()); - QUADS = RenderLayer.of(CameraTweaks.MOD_ID + "_quads", RenderSetup.builder(QUADS_PIPELINE).build()); - QUADS_CULL = RenderLayer.of(CameraTweaks.MOD_ID + "quads_cull", RenderSetup.builder(QUADS_CULL_PIPELINE).build()); + QUADS = RenderLayer.of(me.retucio.sputnik.Sputnik.MOD_ID + "_quads", RenderSetup.builder(QUADS_PIPELINE).build()); + QUADS_CULL = RenderLayer.of(me.retucio.sputnik.Sputnik.MOD_ID + "quads_cull", RenderSetup.builder(QUADS_CULL_PIPELINE).build()); } } \ No newline at end of file diff --git a/src/main/java/me/retucio/camtweaks/util/render/Pipelines.java b/src/main/java/me/retucio/sputnik/util/render/Pipelines.java similarity index 82% rename from src/main/java/me/retucio/camtweaks/util/render/Pipelines.java rename to src/main/java/me/retucio/sputnik/util/render/Pipelines.java index 9e3c25f..f2204ad 100644 --- a/src/main/java/me/retucio/camtweaks/util/render/Pipelines.java +++ b/src/main/java/me/retucio/sputnik/util/render/Pipelines.java @@ -1,10 +1,9 @@ -package me.retucio.camtweaks.util.render; +package me.retucio.sputnik.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.VertexFormats; import net.minecraft.util.Identifier; @@ -13,7 +12,7 @@ import net.minecraft.util.Identifier; public class Pipelines { static final RenderPipeline LINES_PIPELINE = RenderPipeline.builder(RenderPipelines.RENDERTYPE_LINES_SNIPPET) - .withLocation(Identifier.of(CameraTweaks.MOD_ID, "pipeline/lines")) + .withLocation(Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "pipeline/lines")) .withVertexFormat(VertexFormats.POSITION_COLOR_NORMAL_LINE_WIDTH, VertexFormat.DrawMode.LINES) .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) .withDepthWrite(false) @@ -21,7 +20,7 @@ public class Pipelines { .build(); static final RenderPipeline LINES_CULL_PIPELINE = RenderPipeline.builder(RenderPipelines.RENDERTYPE_LINES_SNIPPET) - .withLocation(Identifier.of(CameraTweaks.MOD_ID, "pipeline/lines_cull")) + .withLocation(Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "pipeline/lines_cull")) .withVertexFormat(VertexFormats.POSITION_COLOR_NORMAL_LINE_WIDTH, VertexFormat.DrawMode.LINES) .withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST) .withDepthWrite(false) @@ -29,7 +28,7 @@ public class Pipelines { .build(); static final RenderPipeline QUADS_PIPELINE = RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET) - .withLocation(Identifier.of(CameraTweaks.MOD_ID, "pipeline/quads")) + .withLocation(Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "pipeline/quads")) .withVertexFormat(VertexFormats.POSITION_COLOR, VertexFormat.DrawMode.QUADS) .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) .withBlend(BlendFunction.TRANSLUCENT) @@ -38,7 +37,7 @@ public class Pipelines { .build(); static final RenderPipeline QUADS_CULL_PIPELINE = RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET) - .withLocation(Identifier.of(CameraTweaks.MOD_ID, "pipeline/quads_cull")) + .withLocation(Identifier.of(me.retucio.sputnik.Sputnik.MOD_ID, "pipeline/quads_cull")) .withVertexFormat(VertexFormats.POSITION_COLOR, VertexFormat.DrawMode.QUADS) .withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST) .withBlend(BlendFunction.TRANSLUCENT) diff --git a/src/main/java/me/retucio/camtweaks/util/render/RenderUtil.java b/src/main/java/me/retucio/sputnik/util/render/RenderUtil.java similarity index 99% rename from src/main/java/me/retucio/camtweaks/util/render/RenderUtil.java rename to src/main/java/me/retucio/sputnik/util/render/RenderUtil.java index 6e4729d..303deda 100644 --- a/src/main/java/me/retucio/camtweaks/util/render/RenderUtil.java +++ b/src/main/java/me/retucio/sputnik/util/render/RenderUtil.java @@ -1,14 +1,11 @@ -package me.retucio.camtweaks.util.render; +package me.retucio.sputnik.util.render; import com.mojang.blaze3d.vertex.VertexFormat; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.*; -import net.minecraft.client.util.BufferAllocator; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.Colors; import net.minecraft.util.math.*; import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; import java.awt.*; diff --git a/src/main/resources/assets/sputnik/icon.png b/src/main/resources/assets/sputnik/icon.png new file mode 100644 index 0000000..bb77d2f Binary files /dev/null and b/src/main/resources/assets/sputnik/icon.png differ diff --git a/src/main/resources/assets/camtweaks/icon_chat.png b/src/main/resources/assets/sputnik/icon_chat.png similarity index 100% rename from src/main/resources/assets/camtweaks/icon_chat.png rename to src/main/resources/assets/sputnik/icon_chat.png diff --git a/src/main/resources/assets/camtweaks/icon_mc.png b/src/main/resources/assets/sputnik/icon_mc.png similarity index 100% rename from src/main/resources/assets/camtweaks/icon_mc.png rename to src/main/resources/assets/sputnik/icon_mc.png diff --git a/src/main/resources/assets/camtweaks/icon.png b/src/main/resources/assets/sputnik/icon_old.png similarity index 100% rename from src/main/resources/assets/camtweaks/icon.png rename to src/main/resources/assets/sputnik/icon_old.png diff --git a/src/main/resources/assets/camtweaks/icon_old.png b/src/main/resources/assets/sputnik/icon_old_old.png similarity index 100% rename from src/main/resources/assets/camtweaks/icon_old.png rename to src/main/resources/assets/sputnik/icon_old_old.png diff --git a/src/main/resources/assets/camtweaks/textures/dynos/ankylosaurus.png b/src/main/resources/assets/sputnik/textures/dynos/ankylosaurus.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/dynos/ankylosaurus.png rename to src/main/resources/assets/sputnik/textures/dynos/ankylosaurus.png diff --git a/src/main/resources/assets/camtweaks/textures/dynos/pterodactyl.png b/src/main/resources/assets/sputnik/textures/dynos/pterodactyl.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/dynos/pterodactyl.png rename to src/main/resources/assets/sputnik/textures/dynos/pterodactyl.png diff --git a/src/main/resources/assets/camtweaks/textures/dynos/spinosaurus.png b/src/main/resources/assets/sputnik/textures/dynos/spinosaurus.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/dynos/spinosaurus.png rename to src/main/resources/assets/sputnik/textures/dynos/spinosaurus.png diff --git a/src/main/resources/assets/camtweaks/textures/dynos/trex.png b/src/main/resources/assets/sputnik/textures/dynos/trex.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/dynos/trex.png rename to src/main/resources/assets/sputnik/textures/dynos/trex.png diff --git a/src/main/resources/assets/camtweaks/textures/dynos/triceratops.png b/src/main/resources/assets/sputnik/textures/dynos/triceratops.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/dynos/triceratops.png rename to src/main/resources/assets/sputnik/textures/dynos/triceratops.png diff --git a/src/main/resources/assets/camtweaks/textures/dynos/velocirraptor.png b/src/main/resources/assets/sputnik/textures/dynos/velocirraptor.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/dynos/velocirraptor.png rename to src/main/resources/assets/sputnik/textures/dynos/velocirraptor.png diff --git a/src/main/resources/assets/camtweaks/textures/gui/preview-hud.png b/src/main/resources/assets/sputnik/textures/gui/preview-hud.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/gui/preview-hud.png rename to src/main/resources/assets/sputnik/textures/gui/preview-hud.png diff --git a/src/main/resources/assets/camtweaks/textures/gui/preview.png b/src/main/resources/assets/sputnik/textures/gui/preview.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/gui/preview.png rename to src/main/resources/assets/sputnik/textures/gui/preview.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_black.png b/src/main/resources/assets/sputnik/textures/misc/glint_black.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_black.png rename to src/main/resources/assets/sputnik/textures/misc/glint_black.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_black.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_black.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_black.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_black.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_blue.png b/src/main/resources/assets/sputnik/textures/misc/glint_blue.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_blue.png rename to src/main/resources/assets/sputnik/textures/misc/glint_blue.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_blue.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_blue.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_blue.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_blue.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_brown.png b/src/main/resources/assets/sputnik/textures/misc/glint_brown.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_brown.png rename to src/main/resources/assets/sputnik/textures/misc/glint_brown.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_brown.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_brown.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_brown.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_brown.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_cyan.png b/src/main/resources/assets/sputnik/textures/misc/glint_cyan.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_cyan.png rename to src/main/resources/assets/sputnik/textures/misc/glint_cyan.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_cyan.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_cyan.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_cyan.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_cyan.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_gray.png b/src/main/resources/assets/sputnik/textures/misc/glint_gray.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_gray.png rename to src/main/resources/assets/sputnik/textures/misc/glint_gray.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_gray.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_gray.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_gray.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_gray.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_green.png b/src/main/resources/assets/sputnik/textures/misc/glint_green.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_green.png rename to src/main/resources/assets/sputnik/textures/misc/glint_green.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_green.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_green.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_green.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_green.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_light.png b/src/main/resources/assets/sputnik/textures/misc/glint_light.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_light.png rename to src/main/resources/assets/sputnik/textures/misc/glint_light.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_light.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_light.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_light.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_light.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_light_blue.png b/src/main/resources/assets/sputnik/textures/misc/glint_light_blue.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_light_blue.png rename to src/main/resources/assets/sputnik/textures/misc/glint_light_blue.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_light_blue.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_light_blue.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_light_blue.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_light_blue.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_light_gray.png b/src/main/resources/assets/sputnik/textures/misc/glint_light_gray.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_light_gray.png rename to src/main/resources/assets/sputnik/textures/misc/glint_light_gray.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_light_gray.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_light_gray.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_light_gray.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_light_gray.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_lime.png b/src/main/resources/assets/sputnik/textures/misc/glint_lime.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_lime.png rename to src/main/resources/assets/sputnik/textures/misc/glint_lime.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_lime.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_lime.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_lime.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_lime.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_magenta.png b/src/main/resources/assets/sputnik/textures/misc/glint_magenta.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_magenta.png rename to src/main/resources/assets/sputnik/textures/misc/glint_magenta.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_magenta.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_magenta.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_magenta.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_magenta.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_none.png b/src/main/resources/assets/sputnik/textures/misc/glint_none.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_none.png rename to src/main/resources/assets/sputnik/textures/misc/glint_none.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_none.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_none.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_none.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_none.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_orange.png b/src/main/resources/assets/sputnik/textures/misc/glint_orange.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_orange.png rename to src/main/resources/assets/sputnik/textures/misc/glint_orange.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_orange.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_orange.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_orange.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_orange.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_pink.png b/src/main/resources/assets/sputnik/textures/misc/glint_pink.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_pink.png rename to src/main/resources/assets/sputnik/textures/misc/glint_pink.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_pink.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_pink.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_pink.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_pink.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_purple.png b/src/main/resources/assets/sputnik/textures/misc/glint_purple.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_purple.png rename to src/main/resources/assets/sputnik/textures/misc/glint_purple.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_purple.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_purple.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_purple.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_purple.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_rainbow.png b/src/main/resources/assets/sputnik/textures/misc/glint_rainbow.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_rainbow.png rename to src/main/resources/assets/sputnik/textures/misc/glint_rainbow.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_rainbow.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_rainbow.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_rainbow.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_rainbow.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_red.png b/src/main/resources/assets/sputnik/textures/misc/glint_red.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_red.png rename to src/main/resources/assets/sputnik/textures/misc/glint_red.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_red.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_red.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_red.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_red.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_white.png b/src/main/resources/assets/sputnik/textures/misc/glint_white.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_white.png rename to src/main/resources/assets/sputnik/textures/misc/glint_white.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_white.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_white.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_white.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_white.png.mcmeta diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_yellow.png b/src/main/resources/assets/sputnik/textures/misc/glint_yellow.png similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_yellow.png rename to src/main/resources/assets/sputnik/textures/misc/glint_yellow.png diff --git a/src/main/resources/assets/camtweaks/textures/misc/glint_yellow.png.mcmeta b/src/main/resources/assets/sputnik/textures/misc/glint_yellow.png.mcmeta similarity index 100% rename from src/main/resources/assets/camtweaks/textures/misc/glint_yellow.png.mcmeta rename to src/main/resources/assets/sputnik/textures/misc/glint_yellow.png.mcmeta diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 434d78d..f0e66e5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,29 +1,29 @@ { "schemaVersion": 1, - "id": "camtweaks", + "id": "sputnik", "version": "${version}", "name": "mod de putas de retucio", - "description": "cositas chulas pa la cámara", + "description": "cositas chulas pal jueguito de los cuadrados", "authors": [ "el prepu" ], "contact": { "homepage": "https://github.com/retuci0", - "sources": "https://github.com/retuci0/camera-tweaks" + "sources": "https://github.com/retuci0/sputnik" }, "license": "CC0-1.0", - "icon": "assets/camtweaks/icon.png", + "icon": "assets/sputnik/icon.png", "environment": "*", "entrypoints": { "main": [ ], "client": [ - "me.retucio.camtweaks.CameraTweaks" + "me.retucio.sputnik.Sputnik" ] }, "mixins": [ - "camtweaks.mixins.json" + "sputnik.mixins.json" ], - "accessWidener": "camtweaks.accesswidener", + "accessWidener": "sputnik.accesswidener", "depends": { "fabricloader": ">=0.17.3", "minecraft": "~1.21.10", diff --git a/src/main/resources/camtweaks.accesswidener b/src/main/resources/sputnik.accesswidener similarity index 100% rename from src/main/resources/camtweaks.accesswidener rename to src/main/resources/sputnik.accesswidener diff --git a/src/main/resources/camtweaks.mixins.json b/src/main/resources/sputnik.mixins.json similarity index 97% rename from src/main/resources/camtweaks.mixins.json rename to src/main/resources/sputnik.mixins.json index 5d9ade0..7d6fd86 100644 --- a/src/main/resources/camtweaks.mixins.json +++ b/src/main/resources/sputnik.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "me.retucio.camtweaks.mixin", + "package": "me.retucio.sputnik.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ "ClientConnectionMixin", @@ -47,6 +47,7 @@ "DamageParticleFactoryMixin", "DamageParticleMixin", "DisconnectedScreenMixin", + "EmitterParticleMixin", "EquipmentRendererMixin", "FogRendererMixin", "GameOptionsMixin",