diff --git a/build.gradle.kts b/build.gradle.kts index 17301c7..13aa1bb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,7 @@ repositories { } loom { - accessWidenerPath.set(file("src/main/resources/oyvey.accesswidener")) + accessWidenerPath.set(file("src/main/resources/fros.accesswidener")) } dependencies { diff --git a/gradle.properties b/gradle.properties index e7b8197..a3cb709 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,10 +6,10 @@ minecraft_version=1.21.11 loader_version=0.18.4 loom_version=1.14-SNAPSHOT # Mod Properties -maven_group=me.alpha432.oyvey +maven_group=cc.fros mod_version=1.0.0 -mod_name=OyVey -archives_base_name=oyvey +mod_name=fros.cc +archives_base_name=fros # Dependencies # check this on https://modmuss50.me/fabric.html fabric_version=0.141.1+1.21.11 diff --git a/settings.gradle.kts b/settings.gradle.kts index 854d175..44c1aff 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,4 +14,4 @@ pluginManagement { } } -rootProject.name = "oyvey-ported" \ No newline at end of file +rootProject.name = "fros.cc" \ No newline at end of file diff --git a/src/main/java/me/alpha432/oyvey/OyVey.java b/src/main/java/cc/fros/Fros.java similarity index 87% rename from src/main/java/me/alpha432/oyvey/OyVey.java rename to src/main/java/cc/fros/Fros.java index f9a1154..75f4429 100644 --- a/src/main/java/me/alpha432/oyvey/OyVey.java +++ b/src/main/java/cc/fros/Fros.java @@ -1,17 +1,17 @@ -package me.alpha432.oyvey; +package cc.fros; -import me.alpha432.oyvey.manager.*; -import me.alpha432.oyvey.util.BuildConfig; -import me.alpha432.oyvey.util.TextUtil; +import cc.fros.manager.*; +import cc.fros.util.BuildConfig; +import cc.fros.util.TextUtil; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ModInitializer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class OyVey implements ModInitializer, ClientModInitializer { +public class Fros implements ModInitializer, ClientModInitializer { public static float TIMER = 1f; - public static final Logger LOGGER = LogManager.getLogger("OyVey"); + public static final Logger LOGGER = LogManager.getLogger("fros.cc"); public static ServerManager serverManager; public static ColorManager colorManager; public static RotationManager rotationManager; diff --git a/src/main/java/cc/fros/ducks/render/IChatComponent.java b/src/main/java/cc/fros/ducks/render/IChatComponent.java new file mode 100644 index 0000000..3b9983c --- /dev/null +++ b/src/main/java/cc/fros/ducks/render/IChatComponent.java @@ -0,0 +1,9 @@ +package cc.fros.ducks.render; + +import net.minecraft.client.GuiMessage; +import net.minecraft.network.chat.MessageSignature; + +public interface IChatComponent { + void fros$addMessage(GuiMessage message); + void fros$removeMessage(MessageSignature signature); +} \ No newline at end of file diff --git a/src/main/java/me/alpha432/oyvey/event/Event.java b/src/main/java/cc/fros/event/Event.java similarity index 84% rename from src/main/java/me/alpha432/oyvey/event/Event.java rename to src/main/java/cc/fros/event/Event.java index 68fac19..442379a 100644 --- a/src/main/java/me/alpha432/oyvey/event/Event.java +++ b/src/main/java/cc/fros/event/Event.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.event; +package cc.fros.event; public class Event { private boolean cancelled; diff --git a/src/main/java/me/alpha432/oyvey/event/Stage.java b/src/main/java/cc/fros/event/Stage.java similarity index 55% rename from src/main/java/me/alpha432/oyvey/event/Stage.java rename to src/main/java/cc/fros/event/Stage.java index 861daf8..024dc65 100644 --- a/src/main/java/me/alpha432/oyvey/event/Stage.java +++ b/src/main/java/cc/fros/event/Stage.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.event; +package cc.fros.event; public enum Stage { PRE, diff --git a/src/main/java/me/alpha432/oyvey/event/impl/ClientEvent.java b/src/main/java/cc/fros/event/impl/ClientEvent.java similarity index 79% rename from src/main/java/me/alpha432/oyvey/event/impl/ClientEvent.java rename to src/main/java/cc/fros/event/impl/ClientEvent.java index 6722b27..24701b3 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/ClientEvent.java +++ b/src/main/java/cc/fros/event/impl/ClientEvent.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.event.impl; +package cc.fros.event.impl; -import me.alpha432.oyvey.event.Event; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.settings.Setting; +import cc.fros.event.Event; +import cc.fros.features.Feature; +import cc.fros.features.settings.Setting; public class ClientEvent extends Event { private final Type type; diff --git a/src/main/java/me/alpha432/oyvey/event/impl/entity/DeathEvent.java b/src/main/java/cc/fros/event/impl/entity/DeathEvent.java similarity index 77% rename from src/main/java/me/alpha432/oyvey/event/impl/entity/DeathEvent.java rename to src/main/java/cc/fros/event/impl/entity/DeathEvent.java index 5bdb8d2..66741f2 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/entity/DeathEvent.java +++ b/src/main/java/cc/fros/event/impl/entity/DeathEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.entity; +package cc.fros.event.impl.entity; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; import net.minecraft.world.entity.LivingEntity; public class DeathEvent extends Event { diff --git a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/MoveEvent.java b/src/main/java/cc/fros/event/impl/entity/player/MoveEvent.java similarity index 87% rename from src/main/java/me/alpha432/oyvey/event/impl/entity/player/MoveEvent.java rename to src/main/java/cc/fros/event/impl/entity/player/MoveEvent.java index 48a9429..0ba8315 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/MoveEvent.java +++ b/src/main/java/cc/fros/event/impl/entity/player/MoveEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.entity.player; +package cc.fros.event.impl.entity.player; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; import net.minecraft.world.entity.MoverType; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/TickEvent.java b/src/main/java/cc/fros/event/impl/entity/player/TickEvent.java similarity index 61% rename from src/main/java/me/alpha432/oyvey/event/impl/entity/player/TickEvent.java rename to src/main/java/cc/fros/event/impl/entity/player/TickEvent.java index 4311f08..0178a1a 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/TickEvent.java +++ b/src/main/java/cc/fros/event/impl/entity/player/TickEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.entity.player; +package cc.fros.event.impl.entity.player; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; public class TickEvent extends Event { public static class Post extends TickEvent { } diff --git a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/TravelEvent.java b/src/main/java/cc/fros/event/impl/entity/player/TravelEvent.java similarity index 62% rename from src/main/java/me/alpha432/oyvey/event/impl/entity/player/TravelEvent.java rename to src/main/java/cc/fros/event/impl/entity/player/TravelEvent.java index 557d293..5530d54 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/TravelEvent.java +++ b/src/main/java/cc/fros/event/impl/entity/player/TravelEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.entity.player; +package cc.fros.event.impl.entity.player; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; public class TravelEvent extends Event { public static class Post extends TravelEvent { } diff --git a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/UpdateWalkingPlayerEvent.java b/src/main/java/cc/fros/event/impl/entity/player/UpdateWalkingPlayerEvent.java similarity index 64% rename from src/main/java/me/alpha432/oyvey/event/impl/entity/player/UpdateWalkingPlayerEvent.java rename to src/main/java/cc/fros/event/impl/entity/player/UpdateWalkingPlayerEvent.java index ba82bc8..38d6d10 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/entity/player/UpdateWalkingPlayerEvent.java +++ b/src/main/java/cc/fros/event/impl/entity/player/UpdateWalkingPlayerEvent.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.event.impl.entity.player; +package cc.fros.event.impl.entity.player; -import me.alpha432.oyvey.event.Event; -import me.alpha432.oyvey.event.Stage; +import cc.fros.event.Event; +import cc.fros.event.Stage; public class UpdateWalkingPlayerEvent extends Event { private final Stage stage; diff --git a/src/main/java/me/alpha432/oyvey/event/impl/input/KeyInputEvent.java b/src/main/java/cc/fros/event/impl/input/KeyInputEvent.java similarity index 70% rename from src/main/java/me/alpha432/oyvey/event/impl/input/KeyInputEvent.java rename to src/main/java/cc/fros/event/impl/input/KeyInputEvent.java index 8bdee21..8db6080 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/input/KeyInputEvent.java +++ b/src/main/java/cc/fros/event/impl/input/KeyInputEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.input; +package cc.fros.event.impl.input; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; public class KeyInputEvent extends Event { private final int key; diff --git a/src/main/java/me/alpha432/oyvey/event/impl/input/MouseInputEvent.java b/src/main/java/cc/fros/event/impl/input/MouseInputEvent.java similarity index 80% rename from src/main/java/me/alpha432/oyvey/event/impl/input/MouseInputEvent.java rename to src/main/java/cc/fros/event/impl/input/MouseInputEvent.java index b17c7c4..20dc9ea 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/input/MouseInputEvent.java +++ b/src/main/java/cc/fros/event/impl/input/MouseInputEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.input; +package cc.fros.event.impl.input; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; public class MouseInputEvent extends Event { private final int button; diff --git a/src/main/java/me/alpha432/oyvey/event/impl/network/ChatEvent.java b/src/main/java/cc/fros/event/impl/network/ChatEvent.java similarity index 72% rename from src/main/java/me/alpha432/oyvey/event/impl/network/ChatEvent.java rename to src/main/java/cc/fros/event/impl/network/ChatEvent.java index 65291a1..3af9c04 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/network/ChatEvent.java +++ b/src/main/java/cc/fros/event/impl/network/ChatEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.network; +package cc.fros.event.impl.network; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; public class ChatEvent extends Event { private final String content; diff --git a/src/main/java/me/alpha432/oyvey/event/impl/network/PacketEvent.java b/src/main/java/cc/fros/event/impl/network/PacketEvent.java similarity index 86% rename from src/main/java/me/alpha432/oyvey/event/impl/network/PacketEvent.java rename to src/main/java/cc/fros/event/impl/network/PacketEvent.java index 8f9d7b5..370fb11 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/network/PacketEvent.java +++ b/src/main/java/cc/fros/event/impl/network/PacketEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.network; +package cc.fros.event.impl.network; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; import net.minecraft.network.protocol.Packet; public abstract class PacketEvent extends Event { diff --git a/src/main/java/me/alpha432/oyvey/event/impl/render/Render2DEvent.java b/src/main/java/cc/fros/event/impl/render/Render2DEvent.java similarity index 83% rename from src/main/java/me/alpha432/oyvey/event/impl/render/Render2DEvent.java rename to src/main/java/cc/fros/event/impl/render/Render2DEvent.java index 37da00a..ab7776b 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/render/Render2DEvent.java +++ b/src/main/java/cc/fros/event/impl/render/Render2DEvent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.impl.render; +package cc.fros.event.impl.render; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; import net.minecraft.client.gui.GuiGraphics; public class Render2DEvent extends Event { diff --git a/src/main/java/me/alpha432/oyvey/event/impl/render/Render3DEvent.java b/src/main/java/cc/fros/event/impl/render/Render3DEvent.java similarity index 82% rename from src/main/java/me/alpha432/oyvey/event/impl/render/Render3DEvent.java rename to src/main/java/cc/fros/event/impl/render/Render3DEvent.java index adf8786..97260b8 100644 --- a/src/main/java/me/alpha432/oyvey/event/impl/render/Render3DEvent.java +++ b/src/main/java/cc/fros/event/impl/render/Render3DEvent.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.event.impl.render; +package cc.fros.event.impl.render; import com.mojang.blaze3d.vertex.PoseStack; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; public class Render3DEvent extends Event { private final PoseStack matrix; diff --git a/src/main/java/cc/fros/event/impl/render/RenderBlockOutlineEvent.java b/src/main/java/cc/fros/event/impl/render/RenderBlockOutlineEvent.java new file mode 100644 index 0000000..749068b --- /dev/null +++ b/src/main/java/cc/fros/event/impl/render/RenderBlockOutlineEvent.java @@ -0,0 +1,6 @@ +package cc.fros.event.impl.render; + +import cc.fros.event.Event; + +public class RenderBlockOutlineEvent extends Event { +} diff --git a/src/main/java/me/alpha432/oyvey/event/system/EventBus.java b/src/main/java/cc/fros/event/system/EventBus.java similarity index 96% rename from src/main/java/me/alpha432/oyvey/event/system/EventBus.java rename to src/main/java/cc/fros/event/system/EventBus.java index baea470..7c70858 100644 --- a/src/main/java/me/alpha432/oyvey/event/system/EventBus.java +++ b/src/main/java/cc/fros/event/system/EventBus.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.event.system; +package cc.fros.event.system; -import me.alpha432.oyvey.event.Event; +import cc.fros.event.Event; import java.lang.reflect.Method; import java.util.List; diff --git a/src/main/java/me/alpha432/oyvey/event/system/Listener.java b/src/main/java/cc/fros/event/system/Listener.java similarity index 97% rename from src/main/java/me/alpha432/oyvey/event/system/Listener.java rename to src/main/java/cc/fros/event/system/Listener.java index 196e968..bdf249a 100644 --- a/src/main/java/me/alpha432/oyvey/event/system/Listener.java +++ b/src/main/java/cc/fros/event/system/Listener.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.event.system; +package cc.fros.event.system; import java.lang.invoke.*; import java.lang.reflect.Method; diff --git a/src/main/java/me/alpha432/oyvey/event/system/Subscribe.java b/src/main/java/cc/fros/event/system/Subscribe.java similarity index 87% rename from src/main/java/me/alpha432/oyvey/event/system/Subscribe.java rename to src/main/java/cc/fros/event/system/Subscribe.java index 241042d..bfcb205 100644 --- a/src/main/java/me/alpha432/oyvey/event/system/Subscribe.java +++ b/src/main/java/cc/fros/event/system/Subscribe.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.event.system; +package cc.fros.event.system; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/me/alpha432/oyvey/features/Feature.java b/src/main/java/cc/fros/features/Feature.java similarity index 87% rename from src/main/java/me/alpha432/oyvey/features/Feature.java rename to src/main/java/cc/fros/features/Feature.java index 322443b..68e8326 100644 --- a/src/main/java/me/alpha432/oyvey/features/Feature.java +++ b/src/main/java/cc/fros/features/Feature.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.features; +package cc.fros.features; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.features.settings.SettingFactory; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.features.settings.Setting; +import cc.fros.features.settings.SettingFactory; +import cc.fros.util.traits.Util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/ArgumentSuggestions.java b/src/main/java/cc/fros/features/commands/ArgumentSuggestions.java similarity index 96% rename from src/main/java/me/alpha432/oyvey/features/commands/ArgumentSuggestions.java rename to src/main/java/cc/fros/features/commands/ArgumentSuggestions.java index df39a4a..408bad6 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/ArgumentSuggestions.java +++ b/src/main/java/cc/fros/features/commands/ArgumentSuggestions.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands; +package cc.fros.features.commands; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/Command.java b/src/main/java/cc/fros/features/commands/Command.java similarity index 83% rename from src/main/java/me/alpha432/oyvey/features/commands/Command.java rename to src/main/java/cc/fros/features/commands/Command.java index c654be1..c077d24 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/Command.java +++ b/src/main/java/cc/fros/features/commands/Command.java @@ -1,17 +1,17 @@ -package me.alpha432.oyvey.features.commands; +package cc.fros.features.commands; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.manager.CommandManager; -import me.alpha432.oyvey.util.TextUtil; -import me.alpha432.oyvey.util.chat.ChatUtil; -import me.alpha432.oyvey.util.chat.Signature; +import cc.fros.features.Feature; +import cc.fros.manager.CommandManager; +import cc.fros.util.TextUtil; +import cc.fros.util.chat.ChatUtil; +import cc.fros.util.chat.Signature; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; -import static me.alpha432.oyvey.features.commands.MessageSignatures.FAIL; -import static me.alpha432.oyvey.features.commands.MessageSignatures.SUCCESS; +import static cc.fros.features.commands.MessageSignatures.FAIL; +import static cc.fros.features.commands.MessageSignatures.SUCCESS; public abstract class Command extends Feature { public static final int NO_OP = -1; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/CommandExceptions.java b/src/main/java/cc/fros/features/commands/CommandExceptions.java similarity index 88% rename from src/main/java/me/alpha432/oyvey/features/commands/CommandExceptions.java rename to src/main/java/cc/fros/features/commands/CommandExceptions.java index f728abc..b02eb30 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/CommandExceptions.java +++ b/src/main/java/cc/fros/features/commands/CommandExceptions.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands; +package cc.fros.features.commands; import com.mojang.brigadier.LiteralMessage; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/MessageSignatures.java b/src/main/java/cc/fros/features/commands/MessageSignatures.java similarity index 64% rename from src/main/java/me/alpha432/oyvey/features/commands/MessageSignatures.java rename to src/main/java/cc/fros/features/commands/MessageSignatures.java index ca8782a..3707e72 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/MessageSignatures.java +++ b/src/main/java/cc/fros/features/commands/MessageSignatures.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.features.commands; +package cc.fros.features.commands; -import me.alpha432.oyvey.util.chat.Signature; -import me.alpha432.oyvey.util.chat.SimpleSignature; +import cc.fros.util.chat.Signature; +import cc.fros.util.chat.SimpleSignature; public class MessageSignatures { public static final Signature GENERAL = SimpleSignature.fromLong(-1L); diff --git a/src/main/java/me/alpha432/oyvey/features/commands/ModuleCommand.java b/src/main/java/cc/fros/features/commands/ModuleCommand.java similarity index 89% rename from src/main/java/me/alpha432/oyvey/features/commands/ModuleCommand.java rename to src/main/java/cc/fros/features/commands/ModuleCommand.java index 1960918..03c3e07 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/ModuleCommand.java +++ b/src/main/java/cc/fros/features/commands/ModuleCommand.java @@ -1,13 +1,13 @@ -package me.alpha432.oyvey.features.commands; +package cc.fros.features.commands; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.commands.argument.ColorArgumentType; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.manager.CommandManager; -import me.alpha432.oyvey.util.chat.ChatUtil; +import cc.fros.Fros; +import cc.fros.features.commands.argument.ColorArgumentType; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; +import cc.fros.manager.CommandManager; +import cc.fros.util.chat.ChatUtil; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; @@ -18,10 +18,10 @@ import java.awt.*; import static com.mojang.brigadier.arguments.BoolArgumentType.getBool; import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -import static me.alpha432.oyvey.features.commands.argument.ColorArgumentType.getColor; -import static me.alpha432.oyvey.features.commands.argument.EnumArgumentType._enum; -import static me.alpha432.oyvey.features.commands.argument.EnumArgumentType.getEnum; -import static me.alpha432.oyvey.features.commands.argument.NumberArgumentType.*; +import static cc.fros.features.commands.argument.ColorArgumentType.getColor; +import static cc.fros.features.commands.argument.EnumArgumentType._enum; +import static cc.fros.features.commands.argument.EnumArgumentType.getEnum; +import static cc.fros.features.commands.argument.NumberArgumentType.*; public class ModuleCommand extends Command { private final Module module; @@ -141,7 +141,7 @@ public class ModuleCommand extends Command { } private static ClickEvent suggestCommand(String command) { - return new ClickEvent.SuggestCommand(OyVey.commandManager.getCommandPrefix() + command); + return new ClickEvent.SuggestCommand(Fros.commandManager.getCommandPrefix() + command); } private static Style styledValue(Setting setting, Style style) { diff --git a/src/main/java/me/alpha432/oyvey/features/commands/argument/ColorArgumentType.java b/src/main/java/cc/fros/features/commands/argument/ColorArgumentType.java similarity index 96% rename from src/main/java/me/alpha432/oyvey/features/commands/argument/ColorArgumentType.java rename to src/main/java/cc/fros/features/commands/argument/ColorArgumentType.java index e4ebe92..a1fbdd5 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/argument/ColorArgumentType.java +++ b/src/main/java/cc/fros/features/commands/argument/ColorArgumentType.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands.argument; +package cc.fros.features.commands.argument; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -6,7 +6,7 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import me.alpha432.oyvey.features.commands.CommandExceptions; +import cc.fros.features.commands.CommandExceptions; import net.minecraft.ChatFormatting; import java.awt.*; @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; -import static me.alpha432.oyvey.features.commands.ArgumentSuggestions.suggest; +import static cc.fros.features.commands.ArgumentSuggestions.suggest; public final class ColorArgumentType implements ArgumentType { private static final List EXAMPLES = List.of("hsb:55,100,100", "255,0,255", "0,255,255,80"); diff --git a/src/main/java/me/alpha432/oyvey/features/commands/argument/CommandArgumentType.java b/src/main/java/cc/fros/features/commands/argument/CommandArgumentType.java similarity index 71% rename from src/main/java/me/alpha432/oyvey/features/commands/argument/CommandArgumentType.java rename to src/main/java/cc/fros/features/commands/argument/CommandArgumentType.java index bb358e8..904c33a 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/argument/CommandArgumentType.java +++ b/src/main/java/cc/fros/features/commands/argument/CommandArgumentType.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands.argument; +package cc.fros.features.commands.argument; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -7,22 +7,22 @@ import com.mojang.brigadier.exceptions.CommandExceptionType; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.commands.CommandExceptions; +import cc.fros.Fros; +import cc.fros.features.commands.Command; +import cc.fros.features.commands.CommandExceptions; import java.util.concurrent.CompletableFuture; -import static me.alpha432.oyvey.features.commands.ArgumentSuggestions.suggest; +import static cc.fros.features.commands.ArgumentSuggestions.suggest; public final class CommandArgumentType implements ArgumentType, CommandExceptionType { @Override public Command parse(StringReader reader) throws CommandSyntaxException { String value = reader.readString().toLowerCase(); - for (String alias : OyVey.commandManager.getCommandAliases()) { + for (String alias : Fros.commandManager.getCommandAliases()) { if (value.equalsIgnoreCase(alias)) { - return OyVey.commandManager.getCommand(alias); + return Fros.commandManager.getCommand(alias); } } @@ -31,7 +31,7 @@ public final class CommandArgumentType implements ArgumentType, Command @Override public CompletableFuture listSuggestions(CommandContext context, SuggestionsBuilder builder) { - return suggest(OyVey.commandManager.getCommandAliases(), builder); + return suggest(Fros.commandManager.getCommandAliases(), builder); } public static Command getCommand(CommandContext ctx, String name) { diff --git a/src/main/java/me/alpha432/oyvey/features/commands/argument/EnumArgumentType.java b/src/main/java/cc/fros/features/commands/argument/EnumArgumentType.java similarity index 91% rename from src/main/java/me/alpha432/oyvey/features/commands/argument/EnumArgumentType.java rename to src/main/java/cc/fros/features/commands/argument/EnumArgumentType.java index 663a167..3576789 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/argument/EnumArgumentType.java +++ b/src/main/java/cc/fros/features/commands/argument/EnumArgumentType.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands.argument; +package cc.fros.features.commands.argument; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -6,13 +6,13 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import me.alpha432.oyvey.features.commands.CommandExceptions; +import cc.fros.features.commands.CommandExceptions; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; -import static me.alpha432.oyvey.features.commands.ArgumentSuggestions.suggest; +import static cc.fros.features.commands.ArgumentSuggestions.suggest; public final class EnumArgumentType> implements ArgumentType { private final Map enumNameMap = new HashMap<>(); diff --git a/src/main/java/me/alpha432/oyvey/features/commands/argument/GreedyArgumentType.java b/src/main/java/cc/fros/features/commands/argument/GreedyArgumentType.java similarity index 96% rename from src/main/java/me/alpha432/oyvey/features/commands/argument/GreedyArgumentType.java rename to src/main/java/cc/fros/features/commands/argument/GreedyArgumentType.java index b0a4366..72d446a 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/argument/GreedyArgumentType.java +++ b/src/main/java/cc/fros/features/commands/argument/GreedyArgumentType.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands.argument; +package cc.fros.features.commands.argument; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/argument/KeybindArgumentType.java b/src/main/java/cc/fros/features/commands/argument/KeybindArgumentType.java similarity index 82% rename from src/main/java/me/alpha432/oyvey/features/commands/argument/KeybindArgumentType.java rename to src/main/java/cc/fros/features/commands/argument/KeybindArgumentType.java index 96f41e4..1c87364 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/argument/KeybindArgumentType.java +++ b/src/main/java/cc/fros/features/commands/argument/KeybindArgumentType.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands.argument; +package cc.fros.features.commands.argument; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -6,15 +6,15 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import me.alpha432.oyvey.features.commands.CommandExceptions; -import me.alpha432.oyvey.features.settings.Bind; -import me.alpha432.oyvey.util.KeyboardUtil; +import cc.fros.features.commands.CommandExceptions; +import cc.fros.features.settings.Bind; +import cc.fros.util.KeyboardUtil; import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; -import static me.alpha432.oyvey.features.commands.ArgumentSuggestions.suggest; +import static cc.fros.features.commands.ArgumentSuggestions.suggest; public final class KeybindArgumentType implements ArgumentType { private static final List EXAMPLES = List.of("A", "RIGHT_SHIFT", "MOUSE0"); diff --git a/src/main/java/me/alpha432/oyvey/features/commands/argument/ModuleArgumentType.java b/src/main/java/cc/fros/features/commands/argument/ModuleArgumentType.java similarity index 73% rename from src/main/java/me/alpha432/oyvey/features/commands/argument/ModuleArgumentType.java rename to src/main/java/cc/fros/features/commands/argument/ModuleArgumentType.java index 08bffec..bdeae44 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/argument/ModuleArgumentType.java +++ b/src/main/java/cc/fros/features/commands/argument/ModuleArgumentType.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.commands.argument; +package cc.fros.features.commands.argument; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -6,29 +6,29 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.commands.CommandExceptions; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.Fros; +import cc.fros.features.Feature; +import cc.fros.features.commands.CommandExceptions; +import cc.fros.features.modules.Module; import java.util.Locale; import java.util.concurrent.CompletableFuture; -import static me.alpha432.oyvey.features.commands.ArgumentSuggestions.suggest; +import static cc.fros.features.commands.ArgumentSuggestions.suggest; public record ModuleArgumentType(boolean fullName) implements ArgumentType { @Override public Module parse(StringReader reader) throws CommandSyntaxException { String value = reader.readString().toLowerCase(Locale.ROOT); - for (Module module : OyVey.moduleManager.getModules()) { + for (Module module : Fros.moduleManager.getModules()) { if (value.equalsIgnoreCase(module.getName())) { return module; } } if (!fullName) { - for (Module module : OyVey.moduleManager.getModules()) { + for (Module module : Fros.moduleManager.getModules()) { if (module.getName().toLowerCase(Locale.ROOT).startsWith(value)) { return module; } @@ -40,7 +40,7 @@ public record ModuleArgumentType(boolean fullName) implements ArgumentType CompletableFuture listSuggestions(CommandContext context, SuggestionsBuilder builder) { - return suggest(OyVey.moduleManager.getModules(), Feature::getName, builder); + return suggest(Fros.moduleManager.getModules(), Feature::getName, builder); } public static ModuleArgumentType module() { diff --git a/src/main/java/me/alpha432/oyvey/features/commands/argument/NumberArgumentType.java b/src/main/java/cc/fros/features/commands/argument/NumberArgumentType.java similarity index 95% rename from src/main/java/me/alpha432/oyvey/features/commands/argument/NumberArgumentType.java rename to src/main/java/cc/fros/features/commands/argument/NumberArgumentType.java index 01c7ea8..2ee45e2 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/argument/NumberArgumentType.java +++ b/src/main/java/cc/fros/features/commands/argument/NumberArgumentType.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.features.commands.argument; +package cc.fros.features.commands.argument; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import me.alpha432.oyvey.features.commands.CommandExceptions; +import cc.fros.features.commands.CommandExceptions; public record NumberArgumentType(Class type, Constraint constraint) implements ArgumentType { @SuppressWarnings("unchecked") diff --git a/src/main/java/me/alpha432/oyvey/features/commands/impl/BindCommand.java b/src/main/java/cc/fros/features/commands/impl/BindCommand.java similarity index 75% rename from src/main/java/me/alpha432/oyvey/features/commands/impl/BindCommand.java rename to src/main/java/cc/fros/features/commands/impl/BindCommand.java index 8294664..a293b03 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/impl/BindCommand.java +++ b/src/main/java/cc/fros/features/commands/impl/BindCommand.java @@ -1,16 +1,16 @@ -package me.alpha432.oyvey.features.commands.impl; +package cc.fros.features.commands.impl; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.alpha432.oyvey.event.impl.input.KeyInputEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Bind; -import me.alpha432.oyvey.manager.CommandManager; -import me.alpha432.oyvey.util.KeyboardUtil; +import cc.fros.event.impl.input.KeyInputEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.commands.Command; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Bind; +import cc.fros.manager.CommandManager; +import cc.fros.util.KeyboardUtil; -import static me.alpha432.oyvey.features.commands.argument.KeybindArgumentType.keybind; -import static me.alpha432.oyvey.features.commands.argument.ModuleArgumentType.module; +import static cc.fros.features.commands.argument.KeybindArgumentType.keybind; +import static cc.fros.features.commands.argument.ModuleArgumentType.module; import static org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE; import static org.lwjgl.glfw.GLFW.GLFW_KEY_UNKNOWN; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/impl/DrawnCommand.java b/src/main/java/cc/fros/features/commands/impl/DrawnCommand.java similarity index 69% rename from src/main/java/me/alpha432/oyvey/features/commands/impl/DrawnCommand.java rename to src/main/java/cc/fros/features/commands/impl/DrawnCommand.java index 93ae5cd..1c1371a 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/impl/DrawnCommand.java +++ b/src/main/java/cc/fros/features/commands/impl/DrawnCommand.java @@ -1,12 +1,12 @@ -package me.alpha432.oyvey.features.commands.impl; +package cc.fros.features.commands.impl; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.manager.CommandManager; +import cc.fros.features.commands.Command; +import cc.fros.features.modules.Module; +import cc.fros.manager.CommandManager; -import static me.alpha432.oyvey.features.commands.argument.ModuleArgumentType.getModule; -import static me.alpha432.oyvey.features.commands.argument.ModuleArgumentType.module; +import static cc.fros.features.commands.argument.ModuleArgumentType.getModule; +import static cc.fros.features.commands.argument.ModuleArgumentType.module; public class DrawnCommand extends Command { public DrawnCommand() { diff --git a/src/main/java/me/alpha432/oyvey/features/commands/impl/FriendCommand.java b/src/main/java/cc/fros/features/commands/impl/FriendCommand.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/features/commands/impl/FriendCommand.java rename to src/main/java/cc/fros/features/commands/impl/FriendCommand.java index 3f95668..b79b256 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/impl/FriendCommand.java +++ b/src/main/java/cc/fros/features/commands/impl/FriendCommand.java @@ -1,9 +1,9 @@ -package me.alpha432.oyvey.features.commands.impl; +package cc.fros.features.commands.impl; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.manager.CommandManager; +import cc.fros.Fros; +import cc.fros.features.commands.Command; +import cc.fros.manager.CommandManager; import java.util.List; import java.util.StringJoiner; @@ -21,7 +21,7 @@ public class FriendCommand extends Command { public void createArgumentBuilder(LiteralArgumentBuilder builder) { builder.then(literal("list") .executes((ctx) -> { - List friends = OyVey.friendManager.getFriends(); + List friends = Fros.friendManager.getFriends(); if (friends.isEmpty()) { return success("You have no friends :("); } @@ -31,27 +31,27 @@ public class FriendCommand extends Command { })) .then(literal("clear") .executes((ctx) -> { - OyVey.friendManager.getFriends().clear(); + Fros.friendManager.getFriends().clear(); return success("Cleared friends list"); })) .then(literal("add") .then(argument("username", word()) .executes((ctx) -> { String username = getString(ctx, "username"); - if (OyVey.friendManager.isFriend(username)) { + if (Fros.friendManager.isFriend(username)) { return success("{green} %s {reset} is already on your friends list.", username); } - OyVey.friendManager.addFriend(username); + Fros.friendManager.addFriend(username); return success("Added {green} %s {reset} to your friends list", username); }))) .then(literal("remove") .then(argument("username", word()) .executes((ctx) -> { String username = getString(ctx, "username"); - if (!OyVey.friendManager.isFriend(username)) { + if (!Fros.friendManager.isFriend(username)) { return success("{green} %s {reset} is not on your friends list.", username); } - OyVey.friendManager.removeFriend(username); + Fros.friendManager.removeFriend(username); return success("Removed {green} %s {reset} from your friends list", username); }))); } diff --git a/src/main/java/me/alpha432/oyvey/features/commands/impl/HelpCommand.java b/src/main/java/cc/fros/features/commands/impl/HelpCommand.java similarity index 81% rename from src/main/java/me/alpha432/oyvey/features/commands/impl/HelpCommand.java rename to src/main/java/cc/fros/features/commands/impl/HelpCommand.java index 3ddc5ab..288dc39 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/impl/HelpCommand.java +++ b/src/main/java/cc/fros/features/commands/impl/HelpCommand.java @@ -1,14 +1,14 @@ -package me.alpha432.oyvey.features.commands.impl; +package cc.fros.features.commands.impl; import com.google.common.collect.Iterables; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.tree.CommandNode; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.manager.CommandManager; -import me.alpha432.oyvey.util.chat.ChatUtil; +import cc.fros.Fros; +import cc.fros.features.commands.Command; +import cc.fros.manager.CommandManager; +import cc.fros.util.chat.ChatUtil; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentUtils; @@ -18,14 +18,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static me.alpha432.oyvey.features.commands.MessageSignatures.GENERAL; -import static me.alpha432.oyvey.features.commands.argument.CommandArgumentType.command; -import static me.alpha432.oyvey.features.commands.argument.CommandArgumentType.getCommand; -import static me.alpha432.oyvey.features.commands.argument.NumberArgumentType.get; -import static me.alpha432.oyvey.features.commands.argument.NumberArgumentType.number; -import static me.alpha432.oyvey.util.TextUtil.text; -import static me.alpha432.oyvey.util.chat.ChatUtil.prefix; -import static me.alpha432.oyvey.util.chat.ChatUtil.withPrefix; +import static cc.fros.features.commands.MessageSignatures.GENERAL; +import static cc.fros.features.commands.argument.CommandArgumentType.command; +import static cc.fros.features.commands.argument.CommandArgumentType.getCommand; +import static cc.fros.features.commands.argument.NumberArgumentType.get; +import static cc.fros.features.commands.argument.NumberArgumentType.number; +import static cc.fros.util.TextUtil.text; +import static cc.fros.util.chat.ChatUtil.prefix; +import static cc.fros.util.chat.ChatUtil.withPrefix; public class HelpCommand extends Command { private static final int ITEMS_PER_PAGE = 5; @@ -97,7 +97,7 @@ public class HelpCommand extends Command { } private static Component buildPages(int index, int pages) { - String command = OyVey.commandManager.getCommandPrefix() + "help "; + String command = Fros.commandManager.getCommandPrefix() + "help "; MutableComponent text = prefix(); boolean hasPages = pages > 1; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/impl/PrefixCommand.java b/src/main/java/cc/fros/features/commands/impl/PrefixCommand.java similarity index 86% rename from src/main/java/me/alpha432/oyvey/features/commands/impl/PrefixCommand.java rename to src/main/java/cc/fros/features/commands/impl/PrefixCommand.java index bc2ed9f..84196cd 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/impl/PrefixCommand.java +++ b/src/main/java/cc/fros/features/commands/impl/PrefixCommand.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.features.commands.impl; +package cc.fros.features.commands.impl; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.manager.CommandManager; +import cc.fros.features.commands.Command; +import cc.fros.manager.CommandManager; import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; diff --git a/src/main/java/me/alpha432/oyvey/features/commands/impl/ToggleCommand.java b/src/main/java/cc/fros/features/commands/impl/ToggleCommand.java similarity index 69% rename from src/main/java/me/alpha432/oyvey/features/commands/impl/ToggleCommand.java rename to src/main/java/cc/fros/features/commands/impl/ToggleCommand.java index 67493c5..cfa5511 100644 --- a/src/main/java/me/alpha432/oyvey/features/commands/impl/ToggleCommand.java +++ b/src/main/java/cc/fros/features/commands/impl/ToggleCommand.java @@ -1,12 +1,12 @@ -package me.alpha432.oyvey.features.commands.impl; +package cc.fros.features.commands.impl; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.manager.CommandManager; +import cc.fros.features.commands.Command; +import cc.fros.features.modules.Module; +import cc.fros.manager.CommandManager; -import static me.alpha432.oyvey.features.commands.argument.ModuleArgumentType.getModule; -import static me.alpha432.oyvey.features.commands.argument.ModuleArgumentType.module; +import static cc.fros.features.commands.argument.ModuleArgumentType.getModule; +import static cc.fros.features.commands.argument.ModuleArgumentType.module; public class ToggleCommand extends Command { public ToggleCommand() { diff --git a/src/main/java/me/alpha432/oyvey/features/gui/OyVeyGui.java b/src/main/java/cc/fros/features/gui/FrosGui.java similarity index 84% rename from src/main/java/me/alpha432/oyvey/features/gui/OyVeyGui.java rename to src/main/java/cc/fros/features/gui/FrosGui.java index 6b3ebb9..3ebce1c 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/OyVeyGui.java +++ b/src/main/java/cc/fros/features/gui/FrosGui.java @@ -1,9 +1,9 @@ -package me.alpha432.oyvey.features.gui; +package cc.fros.features.gui; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.gui.items.buttons.ModuleButton; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.Fros; +import cc.fros.features.Feature; +import cc.fros.features.gui.items.buttons.ModuleButton; +import cc.fros.features.modules.Module; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; @@ -16,36 +16,36 @@ import java.awt.*; import java.util.ArrayList; import java.util.Comparator; -public class OyVeyGui extends Screen { - private static OyVeyGui INSTANCE; +public class FrosGui extends Screen { + private static FrosGui INSTANCE; private static Color colorClipboard = null; static { - INSTANCE = new OyVeyGui(); + INSTANCE = new FrosGui(); } private Screen lastScreen; private final ArrayList widgets = new ArrayList<>(); - public OyVeyGui() { - super(Component.literal("OyVey")); + public FrosGui() { + super(Component.literal("fros.cc")); setInstance(); load(); } - public static OyVeyGui getInstance() { + public static FrosGui getInstance() { if (INSTANCE == null) { - INSTANCE = new OyVeyGui(); + INSTANCE = new FrosGui(); } return INSTANCE; } - public static OyVeyGui getClickGui() { - return OyVeyGui.getInstance(); + public static FrosGui getClickGui() { + return FrosGui.getInstance(); } public static void open(Screen previous) { - OyVeyGui gui = getInstance(); + FrosGui gui = getInstance(); gui.lastScreen = previous; Minecraft.getInstance().setScreen(gui); } @@ -63,10 +63,10 @@ public class OyVeyGui extends Screen { private void load() { int x = -84; - for (Module.Category category : OyVey.moduleManager.getCategories()) { + for (Module.Category category : Fros.moduleManager.getCategories()) { if (category == Module.Category.HUD) continue; Widget panel = new Widget(category.getName(), x += 90, 4, true); - OyVey.moduleManager.stream() + Fros.moduleManager.stream() .filter(m -> m.getCategory() == category && !m.hidden) .map(ModuleButton::new) .forEach(panel::addButton); diff --git a/src/main/java/me/alpha432/oyvey/features/gui/HudEditorScreen.java b/src/main/java/cc/fros/features/gui/HudEditorScreen.java similarity index 89% rename from src/main/java/me/alpha432/oyvey/features/gui/HudEditorScreen.java rename to src/main/java/cc/fros/features/gui/HudEditorScreen.java index b1ceff6..80aee19 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/HudEditorScreen.java +++ b/src/main/java/cc/fros/features/gui/HudEditorScreen.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.features.gui; +package cc.fros.features.gui; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.gui.items.buttons.ModuleButton; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.modules.client.HudModule; +import cc.fros.Fros; +import cc.fros.features.Feature; +import cc.fros.features.gui.items.buttons.ModuleButton; +import cc.fros.features.modules.Module; +import cc.fros.features.modules.client.HudModule; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.input.CharacterEvent; @@ -23,13 +23,13 @@ public class HudEditorScreen extends Screen { public boolean anyHover; private HudEditorScreen() { - super(Component.literal("oyvey-hudeditor")); + super(Component.literal("fros-hudeditor")); load(); } private void load() { Widget hud = new Widget("Hud", 50, 50, true); - OyVey.moduleManager.stream() + Fros.moduleManager.stream() .filter(m -> m.getCategory() == Module.Category.HUD && !m.hidden) .map(ModuleButton::new) .forEach(hud::addButton); diff --git a/src/main/java/me/alpha432/oyvey/features/gui/Widget.java b/src/main/java/cc/fros/features/gui/Widget.java similarity index 91% rename from src/main/java/me/alpha432/oyvey/features/gui/Widget.java rename to src/main/java/cc/fros/features/gui/Widget.java index d321f1b..9e0f5a3 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/Widget.java +++ b/src/main/java/cc/fros/features/gui/Widget.java @@ -1,12 +1,12 @@ -package me.alpha432.oyvey.features.gui; +package cc.fros.features.gui; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.gui.items.Item; -import me.alpha432.oyvey.features.gui.items.buttons.Button; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.util.ColorUtil; -import me.alpha432.oyvey.util.render.RenderUtil; -import me.alpha432.oyvey.util.render.ScissorUtil; +import cc.fros.features.Feature; +import cc.fros.features.gui.items.Item; +import cc.fros.features.gui.items.buttons.Button; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.util.ColorUtil; +import cc.fros.util.render.RenderUtil; +import cc.fros.util.render.ScissorUtil; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.sounds.SoundEvents; @@ -55,7 +55,7 @@ public class Widget if (this.open) { RenderUtil.rect(context, this.x, (float) this.y + 12.5f, this.x + this.width, (float) (this.y + this.height) + totalItemHeight, 0x77000000); } - drawString(this.getName(), (float) this.x + 3.0f, (float) this.y - 4.0f - (float) OyVeyGui.getClickGui().getTextOffset(), -1); + drawString(this.getName(), (float) this.x + 3.0f, (float) this.y - 4.0f - (float) FrosGui.getClickGui().getTextOffset(), -1); ScissorUtil.enable(context, x, 0, x + width, mc.getWindow().getGuiScaledHeight()); if (this.open) { @@ -83,7 +83,7 @@ public class Widget if (mouseButton == 0 && this.isHovering(mouseX, mouseY)) { this.x2 = this.x - mouseX; this.y2 = this.y - mouseY; - OyVeyGui.getClickGui().getComponents().forEach(component -> { + FrosGui.getClickGui().getComponents().forEach(component -> { if (component.drag) { component.drag = false; } diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/Item.java b/src/main/java/cc/fros/features/gui/items/Item.java similarity index 95% rename from src/main/java/me/alpha432/oyvey/features/gui/items/Item.java rename to src/main/java/cc/fros/features/gui/items/Item.java index bf35c1b..fbf2c30 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/Item.java +++ b/src/main/java/cc/fros/features/gui/items/Item.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.features.gui.items; +package cc.fros.features.gui.items; -import me.alpha432.oyvey.features.Feature; +import cc.fros.features.Feature; import net.minecraft.client.gui.GuiGraphics; import java.awt.*; diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/BindButton.java b/src/main/java/cc/fros/features/gui/items/buttons/BindButton.java similarity index 75% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/BindButton.java rename to src/main/java/cc/fros/features/gui/items/buttons/BindButton.java index 2c81276..be8b565 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/BindButton.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/BindButton.java @@ -1,12 +1,12 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.features.settings.Bind; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.KeyboardUtil; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.features.settings.Bind; +import cc.fros.features.settings.Setting; +import cc.fros.util.KeyboardUtil; +import cc.fros.util.render.RenderUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -27,12 +27,12 @@ public class BindButton @Override public void drawScreen(GuiGraphics context, int mouseX, int mouseY, float partialTicks) { int color = ClickGuiModule.getInstance().color.getValue().getRGB(); - RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515) : (!this.isHovering(mouseX, mouseY) ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha()))); + RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515) : (!this.isHovering(mouseX, mouseY) ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha()))); if (this.isListening) { - drawString(context, "Press a Key...", this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), -1); + drawString(context, "Press a Key...", this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), -1); } else { String str = KeyboardUtil.getKeyName(setting.getValue()); - drawString(context, this.setting.getName() + " " + ChatFormatting.GRAY + str, this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); + drawString(context, this.setting.getName() + " " + ChatFormatting.GRAY + str, this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); } } diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/BooleanButton.java b/src/main/java/cc/fros/features/gui/items/buttons/BooleanButton.java similarity index 64% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/BooleanButton.java rename to src/main/java/cc/fros/features/gui/items/buttons/BooleanButton.java index 358ffad..2bd00f5 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/BooleanButton.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/BooleanButton.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.features.settings.Setting; +import cc.fros.util.render.RenderUtil; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.sounds.SoundEvents; @@ -22,8 +22,8 @@ public class BooleanButton @Override public void drawScreen(GuiGraphics context, int mouseX, int mouseY, float partialTicks) { - RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); - drawString(context, this.getName(), this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); + RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); + drawString(context, this.getName(), this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); } @Override diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/Button.java b/src/main/java/cc/fros/features/gui/items/buttons/Button.java similarity index 64% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/Button.java rename to src/main/java/cc/fros/features/gui/items/buttons/Button.java index 583e853..589c096 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/Button.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/Button.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.gui.Widget; -import me.alpha432.oyvey.features.gui.items.Item; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.gui.Widget; +import cc.fros.features.gui.items.Item; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.util.render.RenderUtil; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.sounds.SoundEvents; @@ -21,8 +21,8 @@ public class Button @Override public void drawScreen(GuiGraphics context, int mouseX, int mouseY, float partialTicks) { - RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); - drawString(context, this.getName(), this.x + 2.3f, this.y - 2.0f - (float) OyVeyGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); + RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); + drawString(context, this.getName(), this.x + 2.3f, this.y - 2.0f - (float) FrosGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); } @Override @@ -51,7 +51,7 @@ public class Button } public boolean isHovering(int mouseX, int mouseY) { - for (Widget widget : OyVeyGui.getClickGui().getComponents()) { + for (Widget widget : FrosGui.getClickGui().getComponents()) { if (!widget.drag) continue; return false; } diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/ColorButton.java b/src/main/java/cc/fros/features/gui/items/buttons/ColorButton.java similarity index 90% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/ColorButton.java rename to src/main/java/cc/fros/features/gui/items/buttons/ColorButton.java index 9489ea5..7c4dc31 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/ColorButton.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/ColorButton.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.gui.Widget; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.gui.Widget; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.features.settings.Setting; +import cc.fros.util.render.RenderUtil; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.sounds.SoundEvents; @@ -42,7 +42,7 @@ public class ColorButton extends Button { this.x + (float) this.width + 5.0f, this.y + (float) this.height - 2.5f, new Color(currentColor.getRGB(), false).getRGB()); - drawString(context, this.getName(), this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), -1); + drawString(context, this.getName(), this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), -1); if (open) { float yOffset = this.height + 1; @@ -118,12 +118,12 @@ public class ColorButton extends Button { int buttonWidth = availableWidth / 2; RenderUtil.rect(context, pickerX, this.y + yOffset, pickerX + buttonWidth, this.y + yOffset + 14, - hoveringCopy ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha()) : 0x11555555); + hoveringCopy ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha()) : 0x11555555); drawString(context, "Copy", pickerX + buttonWidth / 2.0 - mc.font.width("Copy") / 2.0, this.y + yOffset + 3, -1); hoveringCopy = isHoveringArea(mouseX, mouseY, pickerX, this.y + yOffset, pickerX + buttonWidth, this.y + yOffset + 14); RenderUtil.rect(context, pickerX + buttonWidth + 1, this.y + yOffset, pickerX + buttonWidth * 2 + 1, this.y + yOffset + 14, - hoveringPaste ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha()) : 0x11555555); + hoveringPaste ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha()) : 0x11555555); drawString(context, "Paste", pickerX + buttonWidth + buttonWidth / 2.0 - mc.font.width("Paste") / 2.0 + 1, this.y + yOffset + 3, -1); hoveringPaste = isHoveringArea(mouseX, mouseY, pickerX + buttonWidth + 1, this.y + yOffset, pickerX + buttonWidth * 2 + 1, this.y + yOffset + 14); } @@ -142,11 +142,11 @@ public class ColorButton extends Button { if (hoveringAlpha) draggingAlpha = true; if (hoveringCopy) { - OyVeyGui.setColorClipboard(setting.getValue()); + FrosGui.setColorClipboard(setting.getValue()); mc.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1f)); } - if (hoveringPaste && OyVeyGui.getColorClipboard() != null) { - setting.setValue(OyVeyGui.getColorClipboard()); + if (hoveringPaste && FrosGui.getColorClipboard() != null) { + setting.setValue(FrosGui.getColorClipboard()); hsb = Color.RGBtoHSB(setting.getValue().getRed(), setting.getValue().getGreen(), setting.getValue().getBlue(), null); mc.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1f)); } @@ -176,7 +176,7 @@ public class ColorButton extends Button { @Override public boolean isHovering(int mouseX, int mouseY) { - for (Widget widget : OyVeyGui.getClickGui().getComponents()) { + for (Widget widget : FrosGui.getClickGui().getComponents()) { if (widget.drag) return false; } return (float) mouseX >= this.getX() && (float) mouseX <= this.getX() + (float) this.getWidth() + 8.0f @@ -184,7 +184,7 @@ public class ColorButton extends Button { } private boolean isHoveringArea(int mouseX, int mouseY, float left, float top, float right, float bottom) { - for (Widget widget : OyVeyGui.getClickGui().getComponents()) { + for (Widget widget : FrosGui.getClickGui().getComponents()) { if (widget.drag) return false; } return left <= mouseX && top <= mouseY && right > mouseX && bottom > mouseY; diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/EnumButton.java b/src/main/java/cc/fros/features/gui/items/buttons/EnumButton.java similarity index 66% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/EnumButton.java rename to src/main/java/cc/fros/features/gui/items/buttons/EnumButton.java index 0e22751..dbfeef5 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/EnumButton.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/EnumButton.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.features.settings.Setting; +import cc.fros.util.render.RenderUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -23,8 +23,8 @@ public class EnumButton @Override public void drawScreen(GuiGraphics context, int mouseX, int mouseY, float partialTicks) { - RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); - drawString(context, this.setting.getName() + " " + ChatFormatting.GRAY + (this.setting.currentEnumName().equalsIgnoreCase("ABC") ? "ABC" : this.setting.currentEnumName()), this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); + RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); + drawString(context, this.setting.getName() + " " + ChatFormatting.GRAY + (this.setting.currentEnumName().equalsIgnoreCase("ABC") ? "ABC" : this.setting.currentEnumName()), this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); } @Override diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/ModuleButton.java b/src/main/java/cc/fros/features/gui/items/buttons/ModuleButton.java similarity index 95% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/ModuleButton.java rename to src/main/java/cc/fros/features/gui/items/buttons/ModuleButton.java index ff84f69..4707234 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/ModuleButton.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/ModuleButton.java @@ -1,9 +1,9 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.features.gui.items.Item; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Bind; -import me.alpha432.oyvey.features.settings.Setting; +import cc.fros.features.gui.items.Item; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Bind; +import cc.fros.features.settings.Setting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/Slider.java b/src/main/java/cc/fros/features/gui/items/buttons/Slider.java similarity index 82% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/Slider.java rename to src/main/java/cc/fros/features/gui/items/buttons/Slider.java index b6c36a9..233e0df 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/Slider.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/Slider.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.gui.Widget; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.gui.Widget; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.features.settings.Setting; +import cc.fros.util.render.RenderUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import org.lwjgl.glfw.GLFW; @@ -31,8 +31,8 @@ public class Slider public void drawScreen(GuiGraphics context, int mouseX, int mouseY, float partialTicks) { this.dragSetting(mouseX, mouseY); RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, !(this.dragging || this.isHovering(mouseX, mouseY)) ? 0x11555555 : -2007673515); - RenderUtil.rect(context, this.x, this.y, (this.setting.getValue()).floatValue() <= this.min.floatValue() ? this.x : this.x + ((float) this.width + 7.4f) * this.partialMultiplier(), this.y + (float) this.height - 0.5f, !(this.dragging || this.isHovering(mouseX, mouseY)) ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())); - drawString(context, this.getName() + " " + ChatFormatting.GRAY + (this.setting.getValue() instanceof Float ? this.setting.getValue() : Double.valueOf((this.setting.getValue()).doubleValue())), this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), -1); + RenderUtil.rect(context, this.x, this.y, (this.setting.getValue()).floatValue() <= this.min.floatValue() ? this.x : this.x + ((float) this.width + 7.4f) * this.partialMultiplier(), this.y + (float) this.height - 0.5f, !(this.dragging || this.isHovering(mouseX, mouseY)) ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())); + drawString(context, this.getName() + " " + ChatFormatting.GRAY + (this.setting.getValue() instanceof Float ? this.setting.getValue() : Double.valueOf((this.setting.getValue()).doubleValue())), this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), -1); } @Override @@ -46,7 +46,7 @@ public class Slider @Override public boolean isHovering(int mouseX, int mouseY) { - for (Widget widget : OyVeyGui.getClickGui().getComponents()) { + for (Widget widget : FrosGui.getClickGui().getComponents()) { if (!widget.drag) continue; return false; } diff --git a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/StringButton.java b/src/main/java/cc/fros/features/gui/items/buttons/StringButton.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/features/gui/items/buttons/StringButton.java rename to src/main/java/cc/fros/features/gui/items/buttons/StringButton.java index 27c167f..b01f94d 100644 --- a/src/main/java/me/alpha432/oyvey/features/gui/items/buttons/StringButton.java +++ b/src/main/java/cc/fros/features/gui/items/buttons/StringButton.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.gui.items.buttons; +package cc.fros.features.gui.items.buttons; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.models.Timer; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.features.settings.Setting; +import cc.fros.util.models.Timer; +import cc.fros.util.render.RenderUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -36,11 +36,11 @@ public class StringButton @Override public void drawScreen(GuiGraphics context, int mouseX, int mouseY, float partialTicks) { - RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : OyVey.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); + RenderUtil.rect(context, this.x, this.y, this.x + (float) this.width + 7.4f, this.y + (float) this.height - 0.5f, this.getState() ? (!this.isHovering(mouseX, mouseY) ? Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().color.getValue().getAlpha()) : Fros.colorManager.getColorWithAlpha(y, ClickGuiModule.getInstance().topColor.getValue().getAlpha())) : (!this.isHovering(mouseX, mouseY) ? 0x11555555 : -2007673515)); if (this.isListening) { - drawString(context, this.currentString.string() + getIdleSign(), this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); + drawString(context, this.currentString.string() + getIdleSign(), this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); } else { - drawString(context, (this.setting.getName().equals("Buttons") ? "Buttons " : (this.setting.getName().equals("Prefix") ? "Prefix " + ChatFormatting.GRAY : "")) + this.setting.getValue(), this.x + 2.3f, this.y - 1.7f - (float) OyVeyGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); + drawString(context, (this.setting.getName().equals("Buttons") ? "Buttons " : (this.setting.getName().equals("Prefix") ? "Prefix " + ChatFormatting.GRAY : "")) + this.setting.getValue(), this.x + 2.3f, this.y - 1.7f - (float) FrosGui.getClickGui().getTextOffset(), this.getState() ? -1 : -5592406); } } diff --git a/src/main/java/me/alpha432/oyvey/features/modules/Module.java b/src/main/java/cc/fros/features/modules/Module.java similarity index 85% rename from src/main/java/me/alpha432/oyvey/features/modules/Module.java rename to src/main/java/cc/fros/features/modules/Module.java index fe9ff80..dc22ae8 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/Module.java +++ b/src/main/java/cc/fros/features/modules/Module.java @@ -1,19 +1,19 @@ -package me.alpha432.oyvey.features.modules; +package cc.fros.features.modules; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.event.impl.ClientEvent; -import me.alpha432.oyvey.event.impl.render.Render2DEvent; -import me.alpha432.oyvey.event.impl.render.Render3DEvent; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.commands.MessageSignatures; -import me.alpha432.oyvey.features.settings.Bind; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.manager.ConfigManager; -import me.alpha432.oyvey.util.traits.Jsonable; -import me.alpha432.oyvey.util.traits.Toggleable; +import cc.fros.Fros; +import cc.fros.event.impl.ClientEvent; +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.event.impl.render.Render3DEvent; +import cc.fros.features.Feature; +import cc.fros.features.commands.Command; +import cc.fros.features.commands.MessageSignatures; +import cc.fros.features.settings.Bind; +import cc.fros.features.settings.Setting; +import cc.fros.manager.ConfigManager; +import cc.fros.util.traits.Jsonable; +import cc.fros.util.traits.Toggleable; import net.minecraft.ChatFormatting; import org.joml.Vector2f; @@ -86,8 +86,8 @@ public class Module extends Feature implements Jsonable, Toggleable { } public void setDisplayName(String name) { - Module module = OyVey.moduleManager.getModuleByDisplayName(name); - Module originalModule = OyVey.moduleManager.getModuleByName(name); + Module module = Fros.moduleManager.getModuleByDisplayName(name); + Module originalModule = Fros.moduleManager.getModuleByName(name); if (module == null && originalModule == null) { Command.sendMessage("%s, name: %s, has been renamed to: %s", MessageSignatures.GENERAL, getDisplayName(), getName(), name); @@ -155,7 +155,7 @@ public class Module extends Feature implements Jsonable, Toggleable { object.addProperty(setting.getName(), setting.getValueAsString()); } } catch (Throwable e) { - OyVey.LOGGER.error("Failed to create JSON field", e); + Fros.LOGGER.error("Failed to create JSON field", e); } } return object; @@ -177,7 +177,7 @@ public class Module extends Feature implements Jsonable, Toggleable { ConfigManager.setValueFromJson(this, setting, settingElement); } } catch (Throwable throwable) { - OyVey.LOGGER.error("Failed to load from JSON", throwable); + Fros.LOGGER.error("Failed to load from JSON", throwable); } } } diff --git a/src/main/java/me/alpha432/oyvey/features/modules/client/ClickGuiModule.java b/src/main/java/cc/fros/features/modules/client/ClickGuiModule.java similarity index 66% rename from src/main/java/me/alpha432/oyvey/features/modules/client/ClickGuiModule.java rename to src/main/java/cc/fros/features/modules/client/ClickGuiModule.java index d065657..0eb46cb 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/client/ClickGuiModule.java +++ b/src/main/java/cc/fros/features/modules/client/ClickGuiModule.java @@ -1,17 +1,17 @@ -package me.alpha432.oyvey.features.modules.client; +package cc.fros.features.modules.client; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.event.impl.ClientEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.gui.OyVeyGui; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; +import cc.fros.Fros; +import cc.fros.event.impl.ClientEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.commands.Command; +import cc.fros.features.gui.FrosGui; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; import org.lwjgl.glfw.GLFW; import java.awt.*; -import static me.alpha432.oyvey.features.commands.MessageSignatures.GENERAL; +import static cc.fros.features.commands.MessageSignatures.GENERAL; public class ClickGuiModule extends Module { private static ClickGuiModule INSTANCE; @@ -37,11 +37,11 @@ public class ClickGuiModule extends Module { public void onSettingChange(ClientEvent event) { if (event.getType() == ClientEvent.Type.SETTING_UPDATE && event.getSetting().getFeature().equals(this)) { if (event.getSetting().equals(this.prefix)) { - OyVey.commandManager.setCommandPrefix(this.prefix.getPlannedValue()); - Command.sendMessage("Prefix set to {global} %s", GENERAL, OyVey.commandManager.getCommandPrefix()); + Fros.commandManager.setCommandPrefix(this.prefix.getPlannedValue()); + Command.sendMessage("Prefix set to {global} %s", GENERAL, Fros.commandManager.getCommandPrefix()); } if (event.getSetting().equals(this.color)) { - OyVey.colorManager.setColor(this.color.getPlannedValue()); + Fros.colorManager.setColor(this.color.getPlannedValue()); } } } @@ -51,18 +51,18 @@ public class ClickGuiModule extends Module { if (nullCheck()) { return; } - mc.setScreen(OyVeyGui.getClickGui()); + mc.setScreen(FrosGui.getClickGui()); } @Override public void onLoad() { - OyVey.colorManager.setColor(this.color.getValue()); - OyVey.commandManager.setCommandPrefix(this.prefix.getValue()); + Fros.colorManager.setColor(this.color.getValue()); + Fros.commandManager.setCommandPrefix(this.prefix.getValue()); } @Override public void onTick() { - if (!(ClickGuiModule.mc.screen instanceof OyVeyGui)) { + if (!(ClickGuiModule.mc.screen instanceof FrosGui)) { this.disable(); } } diff --git a/src/main/java/me/alpha432/oyvey/features/modules/client/HudEditorModule.java b/src/main/java/cc/fros/features/modules/client/HudEditorModule.java similarity index 70% rename from src/main/java/me/alpha432/oyvey/features/modules/client/HudEditorModule.java rename to src/main/java/cc/fros/features/modules/client/HudEditorModule.java index 7771fb2..cd7738a 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/client/HudEditorModule.java +++ b/src/main/java/cc/fros/features/modules/client/HudEditorModule.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.features.modules.client; +package cc.fros.features.modules.client; -import me.alpha432.oyvey.features.gui.HudEditorScreen; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.features.gui.HudEditorScreen; +import cc.fros.features.modules.Module; public class HudEditorModule extends Module { public HudEditorModule() { diff --git a/src/main/java/me/alpha432/oyvey/features/modules/client/HudModule.java b/src/main/java/cc/fros/features/modules/client/HudModule.java similarity index 89% rename from src/main/java/me/alpha432/oyvey/features/modules/client/HudModule.java rename to src/main/java/cc/fros/features/modules/client/HudModule.java index 7dfa8b1..932bf92 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/client/HudModule.java +++ b/src/main/java/cc/fros/features/modules/client/HudModule.java @@ -1,13 +1,13 @@ -package me.alpha432.oyvey.features.modules.client; +package cc.fros.features.modules.client; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.event.impl.input.MouseInputEvent; -import me.alpha432.oyvey.event.impl.render.Render2DEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.gui.HudEditorScreen; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.Fros; +import cc.fros.event.impl.input.MouseInputEvent; +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.gui.HudEditorScreen; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; +import cc.fros.util.render.RenderUtil; import net.minecraft.client.gui.screens.ChatScreen; import org.joml.Vector2f; @@ -104,7 +104,7 @@ public abstract class HudModule extends Module { RenderUtil.rect(e.getContext(), x - 1, y - 1, x + width + 1, y + height + 1, - OyVey.colorManager.getColor().getRGB(), 1.0f); + Fros.colorManager.getColor().getRGB(), 1.0f); } public int getMouseX() { diff --git a/src/main/java/me/alpha432/oyvey/features/modules/client/NotificationsModule.java b/src/main/java/cc/fros/features/modules/client/NotificationsModule.java similarity index 72% rename from src/main/java/me/alpha432/oyvey/features/modules/client/NotificationsModule.java rename to src/main/java/cc/fros/features/modules/client/NotificationsModule.java index 4bdbbba..502759d 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/client/NotificationsModule.java +++ b/src/main/java/cc/fros/features/modules/client/NotificationsModule.java @@ -1,13 +1,13 @@ -package me.alpha432.oyvey.features.modules.client; +package cc.fros.features.modules.client; -import me.alpha432.oyvey.event.impl.ClientEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.TextUtil; -import me.alpha432.oyvey.util.chat.ChatUtil; +import cc.fros.event.impl.ClientEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; +import cc.fros.util.TextUtil; +import cc.fros.util.chat.ChatUtil; -import static me.alpha432.oyvey.util.chat.SimpleSignature.from; +import static cc.fros.util.chat.SimpleSignature.from; public class NotificationsModule extends Module { private static final String MODULE_FORMAT = "{gray} %s %s%s"; diff --git a/src/main/java/me/alpha432/oyvey/features/modules/combat/CriticalsModule.java b/src/main/java/cc/fros/features/modules/combat/CriticalsModule.java similarity index 87% rename from src/main/java/me/alpha432/oyvey/features/modules/combat/CriticalsModule.java rename to src/main/java/cc/fros/features/modules/combat/CriticalsModule.java index eaadfee..12ed323 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/combat/CriticalsModule.java +++ b/src/main/java/cc/fros/features/modules/combat/CriticalsModule.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.features.modules.combat; +package cc.fros.features.modules.combat; -import me.alpha432.oyvey.event.impl.network.PacketEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.event.impl.network.PacketEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.modules.Module; import net.minecraft.network.protocol.game.ServerboundInteractPacket; import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/me/alpha432/oyvey/features/modules/combat/KeyPearlModule.java b/src/main/java/cc/fros/features/modules/combat/KeyPearlModule.java similarity index 59% rename from src/main/java/me/alpha432/oyvey/features/modules/combat/KeyPearlModule.java rename to src/main/java/cc/fros/features/modules/combat/KeyPearlModule.java index 8c7ee44..51264f1 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/combat/KeyPearlModule.java +++ b/src/main/java/cc/fros/features/modules/combat/KeyPearlModule.java @@ -1,13 +1,13 @@ -package me.alpha432.oyvey.features.modules.combat; +package cc.fros.features.modules.combat; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.inventory.InventoryUtil; -import me.alpha432.oyvey.util.inventory.Result; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; +import cc.fros.util.inventory.InventoryUtil; +import cc.fros.util.inventory.Result; import net.minecraft.world.item.Items; -import static me.alpha432.oyvey.util.inventory.InventoryUtil.FULL_SCOPE; -import static me.alpha432.oyvey.util.inventory.InventoryUtil.HOTBAR_SCOPE; +import static cc.fros.util.inventory.InventoryUtil.FULL_SCOPE; +import static cc.fros.util.inventory.InventoryUtil.HOTBAR_SCOPE; public class KeyPearlModule extends Module { private final Setting inventory = bool("Inventory", false); diff --git a/src/main/java/me/alpha432/oyvey/features/modules/combat/KillAuraModule.java b/src/main/java/cc/fros/features/modules/combat/KillAuraModule.java similarity index 79% rename from src/main/java/me/alpha432/oyvey/features/modules/combat/KillAuraModule.java rename to src/main/java/cc/fros/features/modules/combat/KillAuraModule.java index bbf8cee..e0adce4 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/combat/KillAuraModule.java +++ b/src/main/java/cc/fros/features/modules/combat/KillAuraModule.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.modules.combat; +package cc.fros.features.modules.combat; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.event.impl.entity.player.TickEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.models.Angles; +import cc.fros.Fros; +import cc.fros.event.impl.entity.player.TickEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; +import cc.fros.util.models.Angles; import net.minecraft.tags.ItemTags; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; @@ -38,9 +38,9 @@ public class KillAuraModule extends Module { int priority = 0; if (sync.getValue()) { - OyVey.rotationManager.sync(angles, priority, () -> attack(target)); + Fros.rotationManager.sync(angles, priority, () -> attack(target)); } else { - OyVey.rotationManager.motion(angles, priority, () -> attack(target)); + Fros.rotationManager.motion(angles, priority, () -> attack(target)); } } @@ -68,7 +68,7 @@ public class KillAuraModule extends Module { for (Player entity : mc.level.players()) { float dist = entity.distanceTo(mc.player); if (entity == mc.player || dist > min) continue; - if (OyVey.friendManager.isFriend(entity)) continue; + if (Fros.friendManager.isFriend(entity)) continue; target = entity; min = dist; } diff --git a/src/main/java/me/alpha432/oyvey/features/modules/hud/CoordinatesHudModule.java b/src/main/java/cc/fros/features/modules/hud/CoordinatesHudModule.java similarity index 85% rename from src/main/java/me/alpha432/oyvey/features/modules/hud/CoordinatesHudModule.java rename to src/main/java/cc/fros/features/modules/hud/CoordinatesHudModule.java index 668b342..0ab0026 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/hud/CoordinatesHudModule.java +++ b/src/main/java/cc/fros/features/modules/hud/CoordinatesHudModule.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.features.modules.hud; +package cc.fros.features.modules.hud; -import me.alpha432.oyvey.event.impl.render.Render2DEvent; -import me.alpha432.oyvey.features.modules.client.HudModule; -import me.alpha432.oyvey.features.settings.Setting; +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.features.modules.client.HudModule; +import cc.fros.features.settings.Setting; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; diff --git a/src/main/java/cc/fros/features/modules/hud/FpsHudModule.java b/src/main/java/cc/fros/features/modules/hud/FpsHudModule.java new file mode 100644 index 0000000..668877d --- /dev/null +++ b/src/main/java/cc/fros/features/modules/hud/FpsHudModule.java @@ -0,0 +1,27 @@ +package cc.fros.features.modules.hud; + +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.features.modules.client.HudModule; +import cc.fros.features.settings.Setting; + +public class FpsHudModule extends HudModule { + public final Setting label = bool("Label", true); + + public FpsHudModule() { + super("FPS", "Display framerate", 100, 10); + } + + @Override + protected void render(Render2DEvent e) { + super.render(e); + + int fps = mc.getFps(); + String fpsStr = label.getValue() ? "FPS: " + fps : String.valueOf(fps); + + e.getContext().drawString(mc.font, fpsStr, + (int) getX(), (int) getY(), -1); + + setWidth(mc.font.width(fpsStr)); + setHeight(mc.font.lineHeight); + } +} diff --git a/src/main/java/cc/fros/features/modules/hud/PingHudModule.java b/src/main/java/cc/fros/features/modules/hud/PingHudModule.java new file mode 100644 index 0000000..a41a134 --- /dev/null +++ b/src/main/java/cc/fros/features/modules/hud/PingHudModule.java @@ -0,0 +1,51 @@ +package cc.fros.features.modules.hud; + +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.features.modules.client.HudModule; +import cc.fros.features.settings.Setting; +import net.minecraft.client.multiplayer.PlayerInfo; + +public class PingHudModule extends HudModule { + public final Setting label = bool("Label", true); + public final Setting colored = bool("Colored", true); + + public PingHudModule() { + super("Ping", "Display connection latency", 100, 10); + } + + @Override + protected void render(Render2DEvent e) { + super.render(e); + + if (nullCheck() || mc.getConnection() == null) { + draw(e, "Ping: --", -1); + return; + } + + PlayerInfo info = mc.getConnection().getPlayerInfo(mc.player.getUUID()); + if (info == null) { + draw(e, "Ping: --", -1); + return; + } + + int ping = info.getLatency(); + String pingStr = (label.getValue() ? "Ping: " : "") + ping + "ms"; + int color = colored.getValue() ? colorForPing(ping) : -1; + + draw(e, pingStr, color); + } + + private void draw(Render2DEvent e, String text, int color) { + e.getContext().drawString(mc.font, text, + (int) getX(), (int) getY(), color); + + setWidth(mc.font.width(text)); + setHeight(mc.font.lineHeight); + } + + private static int colorForPing(int ping) { + if (ping < 60) return 0xFF55FF55; + if (ping < 120) return 0xFFFFFF55; + return 0xFFFF5555; + } +} diff --git a/src/main/java/cc/fros/features/modules/hud/TimeHudModule.java b/src/main/java/cc/fros/features/modules/hud/TimeHudModule.java new file mode 100644 index 0000000..654737f --- /dev/null +++ b/src/main/java/cc/fros/features/modules/hud/TimeHudModule.java @@ -0,0 +1,33 @@ +package cc.fros.features.modules.hud; + +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.features.modules.client.HudModule; +import cc.fros.features.settings.Setting; + +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; + +public class TimeHudModule extends HudModule { + private static final DateTimeFormatter TWELVE_HOUR = DateTimeFormatter.ofPattern("hh:mm a"); + private static final DateTimeFormatter TWENTY_FOUR_HOUR = DateTimeFormatter.ofPattern("HH:mm"); + + public final Setting twentyFourHour = bool("24Hour", false); + + public TimeHudModule() { + super("Time", "Display the current time", 100, 10); + } + + @Override + protected void render(Render2DEvent e) { + super.render(e); + + DateTimeFormatter formatter = twentyFourHour.getValue() ? TWENTY_FOUR_HOUR : TWELVE_HOUR; + String timeStr = LocalTime.now().format(formatter); + + e.getContext().drawString(mc.font, timeStr, + (int) getX(), (int) getY(), -1); + + setWidth(mc.font.width(timeStr)); + setHeight(mc.font.lineHeight); + } +} diff --git a/src/main/java/me/alpha432/oyvey/features/modules/hud/WatermarkHudModule.java b/src/main/java/cc/fros/features/modules/hud/WatermarkHudModule.java similarity index 77% rename from src/main/java/me/alpha432/oyvey/features/modules/hud/WatermarkHudModule.java rename to src/main/java/cc/fros/features/modules/hud/WatermarkHudModule.java index 34841ab..fc18f66 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/hud/WatermarkHudModule.java +++ b/src/main/java/cc/fros/features/modules/hud/WatermarkHudModule.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.features.modules.hud; +package cc.fros.features.modules.hud; -import me.alpha432.oyvey.event.impl.render.Render2DEvent; -import me.alpha432.oyvey.features.modules.client.HudModule; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.BuildConfig; -import me.alpha432.oyvey.util.TextUtil; +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.features.modules.client.HudModule; +import cc.fros.features.settings.Setting; +import cc.fros.util.BuildConfig; +import cc.fros.util.TextUtil; import net.minecraft.network.chat.Component; public class WatermarkHudModule extends HudModule { diff --git a/src/main/java/cc/fros/features/modules/hud/WelcomerHudModule.java b/src/main/java/cc/fros/features/modules/hud/WelcomerHudModule.java new file mode 100644 index 0000000..de1e5f3 --- /dev/null +++ b/src/main/java/cc/fros/features/modules/hud/WelcomerHudModule.java @@ -0,0 +1,26 @@ +package cc.fros.features.modules.hud; + +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.features.modules.client.HudModule; +import cc.fros.features.settings.Setting; + +public class WelcomerHudModule extends HudModule { + public final Setting greeting = str("Greeting", "Hello"); + + public WelcomerHudModule() { + super("Welcomer", "Display a greeting with your username", 100, 10); + } + + @Override + protected void render(Render2DEvent e) { + super.render(e); + + String welcomeStr = greeting.getValue() + ", " + mc.getUser().getName(); + + e.getContext().drawString(mc.font, welcomeStr, + (int) getX(), (int) getY(), -1); + + setWidth(mc.font.width(welcomeStr)); + setHeight(mc.font.lineHeight); + } +} diff --git a/src/main/java/me/alpha432/oyvey/features/modules/misc/MCFModule.java b/src/main/java/cc/fros/features/modules/misc/MCFModule.java similarity index 72% rename from src/main/java/me/alpha432/oyvey/features/modules/misc/MCFModule.java rename to src/main/java/cc/fros/features/modules/misc/MCFModule.java index 5cdc6cf..9e1abaf 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/misc/MCFModule.java +++ b/src/main/java/cc/fros/features/modules/misc/MCFModule.java @@ -1,13 +1,13 @@ -package me.alpha432.oyvey.features.modules.misc; +package cc.fros.features.modules.misc; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.Fros; +import cc.fros.features.commands.Command; +import cc.fros.features.modules.Module; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import org.lwjgl.glfw.GLFW; -import static me.alpha432.oyvey.util.chat.SimpleSignature.from; +import static cc.fros.util.chat.SimpleSignature.from; public class MCFModule extends Module { private boolean pressed; @@ -36,12 +36,12 @@ public class MCFModule extends Module { if (!(targetedEntity instanceof Player)) return; String name = ((Player) targetedEntity).getGameProfile().name(); - if (OyVey.friendManager.isFriend(name)) { - OyVey.friendManager.removeFriend(name); + if (Fros.friendManager.isFriend(name)) { + Fros.friendManager.removeFriend(name); Command.sendMessage("{red} %s has been unfriended.", from(getName()), name); } else { - OyVey.friendManager.addFriend(name); + Fros.friendManager.addFriend(name); Command.sendMessage("{aqua} %s has been friended.", from(getName()), name); } } diff --git a/src/main/java/me/alpha432/oyvey/features/modules/movement/FastAccelModule.java b/src/main/java/cc/fros/features/modules/movement/FastAccelModule.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/features/modules/movement/FastAccelModule.java rename to src/main/java/cc/fros/features/modules/movement/FastAccelModule.java index 3d694ee..c1b8f84 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/movement/FastAccelModule.java +++ b/src/main/java/cc/fros/features/modules/movement/FastAccelModule.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.features.modules.movement; +package cc.fros.features.modules.movement; -import me.alpha432.oyvey.event.impl.entity.player.MoveEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.MovementUtil; +import cc.fros.event.impl.entity.player.MoveEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; +import cc.fros.util.MovementUtil; import net.minecraft.world.entity.MoverType; import org.joml.Vector2f; diff --git a/src/main/java/me/alpha432/oyvey/features/modules/movement/ReverseStepModule.java b/src/main/java/cc/fros/features/modules/movement/ReverseStepModule.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/features/modules/movement/ReverseStepModule.java rename to src/main/java/cc/fros/features/modules/movement/ReverseStepModule.java index c79c47d..ce78100 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/movement/ReverseStepModule.java +++ b/src/main/java/cc/fros/features/modules/movement/ReverseStepModule.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.features.modules.movement; +package cc.fros.features.modules.movement; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.features.modules.Module; public class ReverseStepModule extends Module { public ReverseStepModule() { diff --git a/src/main/java/me/alpha432/oyvey/features/modules/movement/StepModule.java b/src/main/java/cc/fros/features/modules/movement/StepModule.java similarity index 83% rename from src/main/java/me/alpha432/oyvey/features/modules/movement/StepModule.java rename to src/main/java/cc/fros/features/modules/movement/StepModule.java index bccb3ad..d9953ea 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/movement/StepModule.java +++ b/src/main/java/cc/fros/features/modules/movement/StepModule.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.features.modules.movement; +package cc.fros.features.modules.movement; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; import net.minecraft.world.entity.ai.attributes.Attributes; public class StepModule extends Module { diff --git a/src/main/java/me/alpha432/oyvey/features/modules/player/FastPlaceModule.java b/src/main/java/cc/fros/features/modules/player/FastPlaceModule.java similarity index 79% rename from src/main/java/me/alpha432/oyvey/features/modules/player/FastPlaceModule.java rename to src/main/java/cc/fros/features/modules/player/FastPlaceModule.java index 8bddd01..5be0947 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/player/FastPlaceModule.java +++ b/src/main/java/cc/fros/features/modules/player/FastPlaceModule.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.features.modules.player; +package cc.fros.features.modules.player; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.features.modules.Module; import net.minecraft.world.item.Items; public class FastPlaceModule extends Module { diff --git a/src/main/java/me/alpha432/oyvey/features/modules/player/NoFallModule.java b/src/main/java/cc/fros/features/modules/player/NoFallModule.java similarity index 73% rename from src/main/java/me/alpha432/oyvey/features/modules/player/NoFallModule.java rename to src/main/java/cc/fros/features/modules/player/NoFallModule.java index 889bfc7..f54b31b 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/player/NoFallModule.java +++ b/src/main/java/cc/fros/features/modules/player/NoFallModule.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.features.modules.player; +package cc.fros.features.modules.player; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.Fros; +import cc.fros.features.modules.Module; import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket; public class NoFallModule extends Module { @@ -11,7 +11,7 @@ public class NoFallModule extends Module { @Override public void onTick() { - if (!mc.player.onGround() && OyVey.positionManager.getFallDistance() > 3) { + if (!mc.player.onGround() && Fros.positionManager.getFallDistance() > 3) { boolean bl = mc.player.horizontalCollision; ServerboundMovePlayerPacket.PosRot packet = new ServerboundMovePlayerPacket.PosRot(mc.player.getX(), mc.player.getY() + 0.000000001, mc.player.getZ(), mc.player.getYRot(), mc.player.getXRot(), false, bl); diff --git a/src/main/java/me/alpha432/oyvey/features/modules/player/VelocityModule.java b/src/main/java/cc/fros/features/modules/player/VelocityModule.java similarity index 76% rename from src/main/java/me/alpha432/oyvey/features/modules/player/VelocityModule.java rename to src/main/java/cc/fros/features/modules/player/VelocityModule.java index 8901e92..37d328d 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/player/VelocityModule.java +++ b/src/main/java/cc/fros/features/modules/player/VelocityModule.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.features.modules.player; +package cc.fros.features.modules.player; -import me.alpha432.oyvey.event.impl.network.PacketEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.modules.Module; +import cc.fros.event.impl.network.PacketEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.modules.Module; import net.minecraft.network.protocol.game.ClientboundExplodePacket; import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; diff --git a/src/main/java/me/alpha432/oyvey/features/modules/render/BlockHighlightModule.java b/src/main/java/cc/fros/features/modules/render/BlockHighlightModule.java similarity index 76% rename from src/main/java/me/alpha432/oyvey/features/modules/render/BlockHighlightModule.java rename to src/main/java/cc/fros/features/modules/render/BlockHighlightModule.java index 9a25af8..89c707b 100644 --- a/src/main/java/me/alpha432/oyvey/features/modules/render/BlockHighlightModule.java +++ b/src/main/java/cc/fros/features/modules/render/BlockHighlightModule.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.features.modules.render; +package cc.fros.features.modules.render; -import me.alpha432.oyvey.event.impl.render.Render3DEvent; -import me.alpha432.oyvey.event.impl.render.RenderBlockOutlineEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.render.RenderUtil; +import cc.fros.event.impl.render.Render3DEvent; +import cc.fros.event.impl.render.RenderBlockOutlineEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.modules.Module; +import cc.fros.features.settings.Setting; +import cc.fros.util.render.RenderUtil; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; diff --git a/src/main/java/me/alpha432/oyvey/features/settings/Bind.java b/src/main/java/cc/fros/features/settings/Bind.java similarity index 94% rename from src/main/java/me/alpha432/oyvey/features/settings/Bind.java rename to src/main/java/cc/fros/features/settings/Bind.java index a6507b8..873a5b4 100644 --- a/src/main/java/me/alpha432/oyvey/features/settings/Bind.java +++ b/src/main/java/cc/fros/features/settings/Bind.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.features.settings; +package cc.fros.features.settings; import com.mojang.blaze3d.platform.InputConstants; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.util.traits.Util; import net.minecraft.client.input.KeyEvent; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/me/alpha432/oyvey/features/settings/EnumConverter.java b/src/main/java/cc/fros/features/settings/EnumConverter.java similarity index 97% rename from src/main/java/me/alpha432/oyvey/features/settings/EnumConverter.java rename to src/main/java/cc/fros/features/settings/EnumConverter.java index 2b05c8d..8aad645 100644 --- a/src/main/java/me/alpha432/oyvey/features/settings/EnumConverter.java +++ b/src/main/java/cc/fros/features/settings/EnumConverter.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.settings; +package cc.fros.features.settings; import com.google.common.base.Converter; import com.google.gson.JsonElement; diff --git a/src/main/java/me/alpha432/oyvey/features/settings/Setting.java b/src/main/java/cc/fros/features/settings/Setting.java similarity index 97% rename from src/main/java/me/alpha432/oyvey/features/settings/Setting.java rename to src/main/java/cc/fros/features/settings/Setting.java index 6ffef74..8a42a82 100644 --- a/src/main/java/me/alpha432/oyvey/features/settings/Setting.java +++ b/src/main/java/cc/fros/features/settings/Setting.java @@ -1,14 +1,14 @@ -package me.alpha432.oyvey.features.settings; +package cc.fros.features.settings; -import me.alpha432.oyvey.event.impl.ClientEvent; -import me.alpha432.oyvey.features.Feature; +import cc.fros.event.impl.ClientEvent; +import cc.fros.features.Feature; import org.joml.Vector2f; import java.awt.*; import java.util.Objects; import java.util.function.Predicate; -import static me.alpha432.oyvey.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.EVENT_BUS; public class Setting { private final String name; diff --git a/src/main/java/me/alpha432/oyvey/features/settings/SettingFactory.java b/src/main/java/cc/fros/features/settings/SettingFactory.java similarity index 96% rename from src/main/java/me/alpha432/oyvey/features/settings/SettingFactory.java rename to src/main/java/cc/fros/features/settings/SettingFactory.java index 8c612f6..ce4b704 100644 --- a/src/main/java/me/alpha432/oyvey/features/settings/SettingFactory.java +++ b/src/main/java/cc/fros/features/settings/SettingFactory.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.features.settings; +package cc.fros.features.settings; import org.joml.Vector2f; diff --git a/src/main/java/me/alpha432/oyvey/manager/ColorManager.java b/src/main/java/cc/fros/manager/ColorManager.java similarity index 88% rename from src/main/java/me/alpha432/oyvey/manager/ColorManager.java rename to src/main/java/cc/fros/manager/ColorManager.java index c85624c..7f0d7e7 100644 --- a/src/main/java/me/alpha432/oyvey/manager/ColorManager.java +++ b/src/main/java/cc/fros/manager/ColorManager.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.util.ColorUtil; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.util.ColorUtil; import java.awt.*; diff --git a/src/main/java/me/alpha432/oyvey/manager/CommandManager.java b/src/main/java/cc/fros/manager/CommandManager.java similarity index 85% rename from src/main/java/me/alpha432/oyvey/manager/CommandManager.java rename to src/main/java/cc/fros/manager/CommandManager.java index fa1727b..f376738 100644 --- a/src/main/java/me/alpha432/oyvey/manager/CommandManager.java +++ b/src/main/java/cc/fros/manager/CommandManager.java @@ -1,23 +1,23 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.features.commands.impl.*; -import me.alpha432.oyvey.util.traits.Jsonable; +import cc.fros.Fros; +import cc.fros.features.Feature; +import cc.fros.features.commands.Command; +import cc.fros.features.commands.impl.*; +import cc.fros.util.traits.Jsonable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.*; -import static me.alpha432.oyvey.features.commands.Command.SINGLE_FAILURE; -import static me.alpha432.oyvey.features.commands.MessageSignatures.GENERAL; -import static me.alpha432.oyvey.features.commands.MessageSignatures.SUCCESS; +import static cc.fros.features.commands.Command.SINGLE_FAILURE; +import static cc.fros.features.commands.MessageSignatures.GENERAL; +import static cc.fros.features.commands.MessageSignatures.SUCCESS; public class CommandManager extends Feature implements Jsonable { private static final Logger LOGGER = LogManager.getLogger("Commands"); @@ -41,7 +41,7 @@ public class CommandManager extends Feature implements Jsonable { register(new ToggleCommand()); LOGGER.info("Registered {} commands", commandList.size()); - OyVey.configManager.addConfig(this); + Fros.configManager.addConfig(this); } public void onChatSent(String message) { diff --git a/src/main/java/me/alpha432/oyvey/manager/ConfigManager.java b/src/main/java/cc/fros/manager/ConfigManager.java similarity index 87% rename from src/main/java/me/alpha432/oyvey/manager/ConfigManager.java rename to src/main/java/cc/fros/manager/ConfigManager.java index 5c291d5..5edf3fb 100644 --- a/src/main/java/me/alpha432/oyvey/manager/ConfigManager.java +++ b/src/main/java/cc/fros/manager/ConfigManager.java @@ -1,14 +1,14 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.settings.Bind; -import me.alpha432.oyvey.features.settings.EnumConverter; -import me.alpha432.oyvey.features.settings.Setting; -import me.alpha432.oyvey.util.traits.Jsonable; +import cc.fros.features.Feature; +import cc.fros.features.settings.Bind; +import cc.fros.features.settings.EnumConverter; +import cc.fros.features.settings.Setting; +import cc.fros.util.traits.Jsonable; import net.fabricmc.loader.api.FabricLoader; import org.joml.Vector2f; import org.slf4j.Logger; @@ -22,7 +22,7 @@ import java.util.List; public class ConfigManager { private static final Logger LOGGER = LoggerFactory.getLogger("ConfigManager"); - private static final Path OYVEY_PATH = FabricLoader.getInstance().getGameDir().resolve("oyvey"); + private static final Path FROS_PATH = FabricLoader.getInstance().getGameDir().resolve("fros"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private final List jsonables = new LinkedList<>(); @@ -34,7 +34,7 @@ public class ConfigManager { public void load() { mkdirs(); for (Jsonable jsonable : jsonables) { - Path path = OYVEY_PATH.resolve(jsonable.getFileName()); + Path path = FROS_PATH.resolve(jsonable.getFileName()); if (!Files.exists(path)) continue; try { String read = Files.readString(path); @@ -50,7 +50,7 @@ public class ConfigManager { for (Jsonable jsonable : jsonables) { try { JsonElement json = jsonable.toJson(); - Path path = OYVEY_PATH.resolve(jsonable.getFileName()); + Path path = FROS_PATH.resolve(jsonable.getFileName()); Files.writeString(path, GSON.toJson(json)); } catch (Throwable e) { LOGGER.error("Failed to write to file", e); @@ -59,8 +59,8 @@ public class ConfigManager { } private void mkdirs() { - if (!OYVEY_PATH.toFile().exists()) { - boolean success = OYVEY_PATH.toFile().mkdirs(); + if (!FROS_PATH.toFile().exists()) { + boolean success = FROS_PATH.toFile().mkdirs(); if (!success) { throw new RuntimeException("Failed to create needed directories!"); } diff --git a/src/main/java/me/alpha432/oyvey/manager/EventManager.java b/src/main/java/cc/fros/manager/EventManager.java similarity index 60% rename from src/main/java/me/alpha432/oyvey/manager/EventManager.java rename to src/main/java/cc/fros/manager/EventManager.java index 4421774..28ad213 100644 --- a/src/main/java/me/alpha432/oyvey/manager/EventManager.java +++ b/src/main/java/cc/fros/manager/EventManager.java @@ -1,18 +1,18 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.event.Stage; -import me.alpha432.oyvey.event.impl.entity.DeathEvent; -import me.alpha432.oyvey.event.impl.entity.player.TickEvent; -import me.alpha432.oyvey.event.impl.entity.player.UpdateWalkingPlayerEvent; -import me.alpha432.oyvey.event.impl.input.KeyInputEvent; -import me.alpha432.oyvey.event.impl.input.MouseInputEvent; -import me.alpha432.oyvey.event.impl.network.ChatEvent; -import me.alpha432.oyvey.event.impl.network.PacketEvent; -import me.alpha432.oyvey.event.impl.render.Render2DEvent; -import me.alpha432.oyvey.event.impl.render.Render3DEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.Feature; +import cc.fros.Fros; +import cc.fros.event.Stage; +import cc.fros.event.impl.entity.DeathEvent; +import cc.fros.event.impl.entity.player.TickEvent; +import cc.fros.event.impl.entity.player.UpdateWalkingPlayerEvent; +import cc.fros.event.impl.input.KeyInputEvent; +import cc.fros.event.impl.input.MouseInputEvent; +import cc.fros.event.impl.network.ChatEvent; +import cc.fros.event.impl.network.PacketEvent; +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.event.impl.render.Render3DEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.Feature; import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket; import net.minecraft.network.protocol.common.custom.BrandPayload; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; @@ -37,8 +37,8 @@ public class EventManager extends Feature { public void onTick(TickEvent.Post event) { if (nullCheck()) return; - OyVey.speedManager.update(); - OyVey.moduleManager.onTick(); + Fros.speedManager.update(); + Fros.moduleManager.onTick(); Set dead = new HashSet<>(); for (Player player : mc.level.players()) { if (player == null || player.getHealth() > 0.0F) @@ -53,44 +53,44 @@ public class EventManager extends Feature { @Subscribe public void onPacketReceive(PacketEvent.Receive event) { - OyVey.serverManager.onPacketReceived(); + Fros.serverManager.onPacketReceived(); if (event.getPacket() instanceof ClientboundSetTimePacket) - OyVey.serverManager.update(); + Fros.serverManager.update(); if (event.getPacket() instanceof ClientboundCustomPayloadPacket(CustomPacketPayload payload) && payload instanceof BrandPayload(String brand)) { - OyVey.serverManager.setServerBrand(brand); + Fros.serverManager.setServerBrand(brand); } } @Subscribe public void onWorldRender(Render3DEvent event) { - OyVey.moduleManager.onRender3D(event); + Fros.moduleManager.onRender3D(event); } @Subscribe public void onRenderGameOverlayEvent(Render2DEvent event) { - OyVey.moduleManager.onRender2D(event); + Fros.moduleManager.onRender2D(event); } @Subscribe public void onKeyInput(KeyInputEvent event) { - OyVey.moduleManager.onKeyPressed(event.getKey()); + Fros.moduleManager.onKeyPressed(event.getKey()); } @Subscribe public void onMouseInput(MouseInputEvent event) { if (event.getAction() == 1) { - OyVey.moduleManager.onMouseClicked(event.getButton()); + Fros.moduleManager.onMouseClicked(event.getButton()); } } @Subscribe public void onChatSent(ChatEvent event) { String message = event.getMessage(); - if (!message.startsWith(OyVey.commandManager.getCommandPrefix())) { + if (!message.startsWith(Fros.commandManager.getCommandPrefix())) { return; } event.cancel(); - OyVey.commandManager.onChatSent(message); + Fros.commandManager.onChatSent(message); } } \ No newline at end of file diff --git a/src/main/java/me/alpha432/oyvey/manager/FriendManager.java b/src/main/java/cc/fros/manager/FriendManager.java similarity index 91% rename from src/main/java/me/alpha432/oyvey/manager/FriendManager.java rename to src/main/java/cc/fros/manager/FriendManager.java index ed10435..05e11f3 100644 --- a/src/main/java/me/alpha432/oyvey/manager/FriendManager.java +++ b/src/main/java/cc/fros/manager/FriendManager.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.util.traits.Jsonable; +import cc.fros.Fros; +import cc.fros.util.traits.Jsonable; import net.minecraft.world.entity.player.Player; import java.util.ArrayList; @@ -14,7 +14,7 @@ public class FriendManager implements Jsonable { private final List friends = new ArrayList<>(); public void init() { - OyVey.configManager.addConfig(this); + Fros.configManager.addConfig(this); } public boolean isFriend(String name) { diff --git a/src/main/java/me/alpha432/oyvey/manager/HoleManager.java b/src/main/java/cc/fros/manager/HoleManager.java similarity index 91% rename from src/main/java/me/alpha432/oyvey/manager/HoleManager.java rename to src/main/java/cc/fros/manager/HoleManager.java index 5bbe0ca..0418c9e 100644 --- a/src/main/java/me/alpha432/oyvey/manager/HoleManager.java +++ b/src/main/java/cc/fros/manager/HoleManager.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; -import me.alpha432.oyvey.event.impl.entity.player.TickEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.Feature; +import cc.fros.event.impl.entity.player.TickEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.Feature; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/me/alpha432/oyvey/manager/ModuleManager.java b/src/main/java/cc/fros/manager/ModuleManager.java similarity index 70% rename from src/main/java/me/alpha432/oyvey/manager/ModuleManager.java rename to src/main/java/cc/fros/manager/ModuleManager.java index 28c1bf2..887a581 100644 --- a/src/main/java/me/alpha432/oyvey/manager/ModuleManager.java +++ b/src/main/java/cc/fros/manager/ModuleManager.java @@ -1,34 +1,38 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.event.impl.render.Render2DEvent; -import me.alpha432.oyvey.features.gui.OyVeyGui; +import cc.fros.Fros; +import cc.fros.event.impl.render.Render2DEvent; +import cc.fros.features.gui.FrosGui; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; -import me.alpha432.oyvey.event.impl.render.Render3DEvent; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.features.commands.ModuleCommand; -import me.alpha432.oyvey.features.modules.Module; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; -import me.alpha432.oyvey.features.modules.client.HudEditorModule; -import me.alpha432.oyvey.features.modules.client.NotificationsModule; -import me.alpha432.oyvey.features.modules.combat.KillAuraModule; -import me.alpha432.oyvey.features.modules.combat.CriticalsModule; -import me.alpha432.oyvey.features.modules.combat.KeyPearlModule; -import me.alpha432.oyvey.features.modules.hud.CoordinatesHudModule; -import me.alpha432.oyvey.features.modules.hud.WatermarkHudModule; -import me.alpha432.oyvey.features.modules.misc.MCFModule; -import me.alpha432.oyvey.features.modules.movement.FastAccelModule; -import me.alpha432.oyvey.features.modules.movement.ReverseStepModule; -import me.alpha432.oyvey.features.modules.movement.StepModule; -import me.alpha432.oyvey.features.modules.player.FastPlaceModule; -import me.alpha432.oyvey.features.modules.player.NoFallModule; -import me.alpha432.oyvey.features.modules.player.VelocityModule; -import me.alpha432.oyvey.features.modules.render.BlockHighlightModule; -import me.alpha432.oyvey.util.traits.Jsonable; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.event.impl.render.Render3DEvent; +import cc.fros.features.Feature; +import cc.fros.features.commands.ModuleCommand; +import cc.fros.features.modules.Module; +import cc.fros.features.modules.client.ClickGuiModule; +import cc.fros.features.modules.client.HudEditorModule; +import cc.fros.features.modules.client.NotificationsModule; +import cc.fros.features.modules.combat.KillAuraModule; +import cc.fros.features.modules.combat.CriticalsModule; +import cc.fros.features.modules.combat.KeyPearlModule; +import cc.fros.features.modules.hud.CoordinatesHudModule; +import cc.fros.features.modules.hud.FpsHudModule; +import cc.fros.features.modules.hud.PingHudModule; +import cc.fros.features.modules.hud.TimeHudModule; +import cc.fros.features.modules.hud.WelcomerHudModule; +import cc.fros.features.modules.hud.WatermarkHudModule; +import cc.fros.features.modules.misc.MCFModule; +import cc.fros.features.modules.movement.FastAccelModule; +import cc.fros.features.modules.movement.ReverseStepModule; +import cc.fros.features.modules.movement.StepModule; +import cc.fros.features.modules.player.FastPlaceModule; +import cc.fros.features.modules.player.NoFallModule; +import cc.fros.features.modules.player.VelocityModule; +import cc.fros.features.modules.render.BlockHighlightModule; +import cc.fros.util.traits.Jsonable; +import cc.fros.util.traits.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +48,10 @@ public class ModuleManager implements Jsonable, Util { public void init() { register(new WatermarkHudModule()); register(new CoordinatesHudModule()); + register(new FpsHudModule()); + register(new PingHudModule()); + register(new WelcomerHudModule()); + register(new TimeHudModule()); register(new HudEditorModule()); register(new ClickGuiModule()); register(new NotificationsModule()); @@ -63,10 +71,10 @@ public class ModuleManager implements Jsonable, Util { // Create a command for each module for modules to be configurable via command line for (Module module : modules) { - OyVey.commandManager.register(new ModuleCommand(module)); + Fros.commandManager.register(new ModuleCommand(module)); } - OyVey.configManager.addConfig(this); + Fros.configManager.addConfig(this); } public void register(Module module) { @@ -128,7 +136,7 @@ public class ModuleManager implements Jsonable, Util { if (key <= 0) return; if (mc.screen instanceof TitleScreen || mc.screen instanceof JoinMultiplayerScreen) { if (ClickGuiModule.getInstance().getBind().getKey() == key) { - OyVeyGui.open(mc.screen); + FrosGui.open(mc.screen); } return; } diff --git a/src/main/java/me/alpha432/oyvey/manager/PositionManager.java b/src/main/java/cc/fros/manager/PositionManager.java similarity index 89% rename from src/main/java/me/alpha432/oyvey/manager/PositionManager.java rename to src/main/java/cc/fros/manager/PositionManager.java index c041c4c..1c5947c 100644 --- a/src/main/java/me/alpha432/oyvey/manager/PositionManager.java +++ b/src/main/java/cc/fros/manager/PositionManager.java @@ -1,9 +1,9 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; -import me.alpha432.oyvey.event.Stage; -import me.alpha432.oyvey.event.impl.entity.player.UpdateWalkingPlayerEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.features.Feature; +import cc.fros.event.Stage; +import cc.fros.event.impl.entity.player.UpdateWalkingPlayerEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.features.Feature; import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket; public class PositionManager diff --git a/src/main/java/me/alpha432/oyvey/manager/RotationManager.java b/src/main/java/cc/fros/manager/RotationManager.java similarity index 92% rename from src/main/java/me/alpha432/oyvey/manager/RotationManager.java rename to src/main/java/cc/fros/manager/RotationManager.java index b9ab07a..37bada3 100644 --- a/src/main/java/me/alpha432/oyvey/manager/RotationManager.java +++ b/src/main/java/cc/fros/manager/RotationManager.java @@ -1,12 +1,12 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; -import me.alpha432.oyvey.event.Stage; -import me.alpha432.oyvey.event.impl.entity.player.TickEvent; -import me.alpha432.oyvey.event.impl.entity.player.TravelEvent; -import me.alpha432.oyvey.event.impl.entity.player.UpdateWalkingPlayerEvent; -import me.alpha432.oyvey.event.system.Subscribe; -import me.alpha432.oyvey.util.models.Angles; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.event.Stage; +import cc.fros.event.impl.entity.player.TickEvent; +import cc.fros.event.impl.entity.player.TravelEvent; +import cc.fros.event.impl.entity.player.UpdateWalkingPlayerEvent; +import cc.fros.event.system.Subscribe; +import cc.fros.util.models.Angles; +import cc.fros.util.traits.Util; import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket; import net.minecraft.util.Mth; diff --git a/src/main/java/me/alpha432/oyvey/manager/ServerManager.java b/src/main/java/cc/fros/manager/ServerManager.java similarity index 94% rename from src/main/java/me/alpha432/oyvey/manager/ServerManager.java rename to src/main/java/cc/fros/manager/ServerManager.java index 63a0a30..befe460 100644 --- a/src/main/java/me/alpha432/oyvey/manager/ServerManager.java +++ b/src/main/java/cc/fros/manager/ServerManager.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; -import me.alpha432.oyvey.features.Feature; -import me.alpha432.oyvey.util.models.Timer; +import cc.fros.features.Feature; +import cc.fros.util.models.Timer; import java.util.Arrays; diff --git a/src/main/java/me/alpha432/oyvey/manager/SpeedManager.java b/src/main/java/cc/fros/manager/SpeedManager.java similarity index 94% rename from src/main/java/me/alpha432/oyvey/manager/SpeedManager.java rename to src/main/java/cc/fros/manager/SpeedManager.java index de7094e..2f1ce43 100644 --- a/src/main/java/me/alpha432/oyvey/manager/SpeedManager.java +++ b/src/main/java/cc/fros/manager/SpeedManager.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.manager; +package cc.fros.manager; -import me.alpha432.oyvey.features.Feature; +import cc.fros.features.Feature; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/me/alpha432/oyvey/mixin/entity/MixinAbstractClientPlayer.java b/src/main/java/cc/fros/mixin/entity/MixinAbstractClientPlayer.java similarity index 76% rename from src/main/java/me/alpha432/oyvey/mixin/entity/MixinAbstractClientPlayer.java rename to src/main/java/cc/fros/mixin/entity/MixinAbstractClientPlayer.java index 9c9bc56..ba7c1bf 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/entity/MixinAbstractClientPlayer.java +++ b/src/main/java/cc/fros/mixin/entity/MixinAbstractClientPlayer.java @@ -1,14 +1,14 @@ -package me.alpha432.oyvey.mixin.entity; +package cc.fros.mixin.entity; -import me.alpha432.oyvey.event.impl.entity.player.TravelEvent; +import cc.fros.event.impl.entity.player.TravelEvent; import net.minecraft.client.player.AbstractClientPlayer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.alpha432.oyvey.util.traits.Util.EVENT_BUS; -import static me.alpha432.oyvey.util.traits.Util.isLocalPlayer; +import static cc.fros.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.isLocalPlayer; @Mixin(AbstractClientPlayer.class) public class MixinAbstractClientPlayer { diff --git a/src/main/java/me/alpha432/oyvey/mixin/entity/MixinClientPlayerEntity.java b/src/main/java/cc/fros/mixin/entity/MixinClientPlayerEntity.java similarity index 83% rename from src/main/java/me/alpha432/oyvey/mixin/entity/MixinClientPlayerEntity.java rename to src/main/java/cc/fros/mixin/entity/MixinClientPlayerEntity.java index 8a0cdcb..7d72e7e 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/entity/MixinClientPlayerEntity.java +++ b/src/main/java/cc/fros/mixin/entity/MixinClientPlayerEntity.java @@ -1,11 +1,11 @@ -package me.alpha432.oyvey.mixin.entity; +package cc.fros.mixin.entity; -import me.alpha432.oyvey.event.Stage; +import cc.fros.event.Stage; import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import me.alpha432.oyvey.event.impl.entity.player.MoveEvent; -import me.alpha432.oyvey.event.impl.entity.player.TickEvent; -import me.alpha432.oyvey.event.impl.entity.player.UpdateWalkingPlayerEvent; +import cc.fros.event.impl.entity.player.MoveEvent; +import cc.fros.event.impl.entity.player.TickEvent; +import cc.fros.event.impl.entity.player.UpdateWalkingPlayerEvent; import net.minecraft.client.player.LocalPlayer; import net.minecraft.world.entity.MoverType; import net.minecraft.world.phys.Vec3; @@ -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.alpha432.oyvey.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.EVENT_BUS; @Mixin(LocalPlayer.class) public class MixinClientPlayerEntity { diff --git a/src/main/java/me/alpha432/oyvey/mixin/input/MixinKeyboardHandler.java b/src/main/java/cc/fros/mixin/input/MixinKeyboardHandler.java similarity index 79% rename from src/main/java/me/alpha432/oyvey/mixin/input/MixinKeyboardHandler.java rename to src/main/java/cc/fros/mixin/input/MixinKeyboardHandler.java index 930e3a4..5ff55f3 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/input/MixinKeyboardHandler.java +++ b/src/main/java/cc/fros/mixin/input/MixinKeyboardHandler.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.mixin.input; +package cc.fros.mixin.input; -import me.alpha432.oyvey.event.impl.input.KeyInputEvent; +import cc.fros.event.impl.input.KeyInputEvent; import net.minecraft.client.KeyboardHandler; import net.minecraft.client.input.KeyEvent; 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.alpha432.oyvey.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.EVENT_BUS; @Mixin(KeyboardHandler.class) public class MixinKeyboardHandler { diff --git a/src/main/java/me/alpha432/oyvey/mixin/input/MixinMouseHandler.java b/src/main/java/cc/fros/mixin/input/MixinMouseHandler.java similarity index 80% rename from src/main/java/me/alpha432/oyvey/mixin/input/MixinMouseHandler.java rename to src/main/java/cc/fros/mixin/input/MixinMouseHandler.java index a92cc48..347c8d1 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/input/MixinMouseHandler.java +++ b/src/main/java/cc/fros/mixin/input/MixinMouseHandler.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.mixin.input; +package cc.fros.mixin.input; -import me.alpha432.oyvey.event.impl.input.MouseInputEvent; +import cc.fros.event.impl.input.MouseInputEvent; import net.minecraft.client.MouseHandler; import net.minecraft.client.input.MouseButtonInfo; 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.alpha432.oyvey.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.EVENT_BUS; @Mixin(MouseHandler.class) public class MixinMouseHandler { diff --git a/src/main/java/me/alpha432/oyvey/mixin/network/MixinClientPacketListener.java b/src/main/java/cc/fros/mixin/network/MixinClientPacketListener.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/mixin/network/MixinClientPacketListener.java rename to src/main/java/cc/fros/mixin/network/MixinClientPacketListener.java index 26b357a..d1ae5f2 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/network/MixinClientPacketListener.java +++ b/src/main/java/cc/fros/mixin/network/MixinClientPacketListener.java @@ -1,13 +1,13 @@ -package me.alpha432.oyvey.mixin.network; +package cc.fros.mixin.network; -import me.alpha432.oyvey.event.impl.network.ChatEvent; +import cc.fros.event.impl.network.ChatEvent; import net.minecraft.client.multiplayer.ClientPacketListener; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.alpha432.oyvey.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.EVENT_BUS; @Mixin(ClientPacketListener.class) public class MixinClientPacketListener { diff --git a/src/main/java/me/alpha432/oyvey/mixin/network/MixinConnection.java b/src/main/java/cc/fros/mixin/network/MixinConnection.java similarity index 92% rename from src/main/java/me/alpha432/oyvey/mixin/network/MixinConnection.java rename to src/main/java/cc/fros/mixin/network/MixinConnection.java index 68f0647..2191d47 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/network/MixinConnection.java +++ b/src/main/java/cc/fros/mixin/network/MixinConnection.java @@ -1,9 +1,9 @@ -package me.alpha432.oyvey.mixin.network; +package cc.fros.mixin.network; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; -import me.alpha432.oyvey.event.impl.network.PacketEvent; +import cc.fros.event.impl.network.PacketEvent; import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; @@ -17,7 +17,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.alpha432.oyvey.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.EVENT_BUS; @Mixin(Connection.class) public class MixinConnection { diff --git a/src/main/java/me/alpha432/oyvey/mixin/render/MixinAvatarRenderer.java b/src/main/java/cc/fros/mixin/render/MixinAvatarRenderer.java similarity index 79% rename from src/main/java/me/alpha432/oyvey/mixin/render/MixinAvatarRenderer.java rename to src/main/java/cc/fros/mixin/render/MixinAvatarRenderer.java index 59d2ee3..02dd16b 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/render/MixinAvatarRenderer.java +++ b/src/main/java/cc/fros/mixin/render/MixinAvatarRenderer.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.mixin.render; +package cc.fros.mixin.render; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.util.models.Angles; +import cc.fros.Fros; +import cc.fros.util.models.Angles; import net.minecraft.client.renderer.entity.player.AvatarRenderer; import net.minecraft.client.renderer.entity.state.AvatarRenderState; import net.minecraft.world.entity.Avatar; @@ -10,14 +10,14 @@ 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.alpha432.oyvey.util.traits.Util.mc; +import static cc.fros.util.traits.Util.mc; @Mixin(AvatarRenderer.class) public class MixinAvatarRenderer { @Inject(method = "extractRenderState(Lnet/minecraft/world/entity/Avatar;Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;F)V", at = @At("TAIL")) private void extractRenderStateHook(T avatar, AvatarRenderState state, float f, CallbackInfo ci) { if (mc.player != avatar) return; - Angles lerped = OyVey.rotationManager.getLerpRenderSnapshot(f); + Angles lerped = Fros.rotationManager.getLerpRenderSnapshot(f); if (lerped == null) return; state.xRot = lerped.xRot(); state.yRot = 0; diff --git a/src/main/java/me/alpha432/oyvey/mixin/render/MixinChatComponent.java b/src/main/java/cc/fros/mixin/render/MixinChatComponent.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/mixin/render/MixinChatComponent.java rename to src/main/java/cc/fros/mixin/render/MixinChatComponent.java index 5e1fcb8..d839eec 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/render/MixinChatComponent.java +++ b/src/main/java/cc/fros/mixin/render/MixinChatComponent.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.mixin.render; +package cc.fros.mixin.render; -import me.alpha432.oyvey.ducks.render.IChatComponent; +import cc.fros.ducks.render.IChatComponent; import net.minecraft.client.GuiMessage; import net.minecraft.client.gui.components.ChatComponent; import net.minecraft.network.chat.MessageSignature; @@ -19,13 +19,13 @@ public abstract class MixinChatComponent implements IChatComponent { private void refreshTrimmedMessages() {} @Override - public void oyvey$addMessage(GuiMessage message) { + public void fros$addMessage(GuiMessage message) { this.allMessages.addFirst(message); this.refreshTrimmedMessages(); } @Override - public void oyvey$removeMessage(MessageSignature signature) { + public void fros$removeMessage(MessageSignature signature) { this.allMessages.removeIf(message -> signature.equals(message.signature())); this.refreshTrimmedMessages(); } diff --git a/src/main/java/me/alpha432/oyvey/mixin/render/MixinDeltaTrackerTimer.java b/src/main/java/cc/fros/mixin/render/MixinDeltaTrackerTimer.java similarity index 86% rename from src/main/java/me/alpha432/oyvey/mixin/render/MixinDeltaTrackerTimer.java rename to src/main/java/cc/fros/mixin/render/MixinDeltaTrackerTimer.java index 92e85cd..dc98db9 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/render/MixinDeltaTrackerTimer.java +++ b/src/main/java/cc/fros/mixin/render/MixinDeltaTrackerTimer.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.mixin.render; +package cc.fros.mixin.render; -import me.alpha432.oyvey.OyVey; +import cc.fros.Fros; import net.minecraft.client.DeltaTracker; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; @@ -16,6 +16,6 @@ public class MixinDeltaTrackerTimer { @Inject(method = "advanceGameTime(J)I", at = @At(value = "FIELD", target = "Lnet/minecraft/client/DeltaTracker$Timer;lastMs:J", opcode = Opcodes.PUTFIELD)) public void advanceGameTime(long timeMillis, CallbackInfoReturnable cir) { - this.deltaTicks *= OyVey.TIMER; + this.deltaTicks *= Fros.TIMER; } } \ No newline at end of file diff --git a/src/main/java/me/alpha432/oyvey/mixin/render/MixinLevelRenderer.java b/src/main/java/cc/fros/mixin/render/MixinLevelRenderer.java similarity index 86% rename from src/main/java/me/alpha432/oyvey/mixin/render/MixinLevelRenderer.java rename to src/main/java/cc/fros/mixin/render/MixinLevelRenderer.java index 6558184..a504a35 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/render/MixinLevelRenderer.java +++ b/src/main/java/cc/fros/mixin/render/MixinLevelRenderer.java @@ -1,12 +1,12 @@ -package me.alpha432.oyvey.mixin.render; +package cc.fros.mixin.render; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.resource.GraphicsResourceAllocator; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import me.alpha432.oyvey.event.impl.render.Render3DEvent; -import me.alpha432.oyvey.event.impl.render.RenderBlockOutlineEvent; +import cc.fros.event.impl.render.Render3DEvent; +import cc.fros.event.impl.render.RenderBlockOutlineEvent; import net.minecraft.client.Camera; import net.minecraft.client.DeltaTracker; import net.minecraft.client.renderer.LevelRenderer; @@ -20,8 +20,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.alpha432.oyvey.util.traits.Util.EVENT_BUS; -import static me.alpha432.oyvey.util.traits.Util.mc; +import static cc.fros.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.mc; @Mixin(LevelRenderer.class) public class MixinLevelRenderer { @@ -42,7 +42,7 @@ public class MixinLevelRenderer { stack.mulPose(Axis.XP.rotationDegrees(mc.gameRenderer.getMainCamera().xRot())); stack.mulPose(Axis.YP.rotationDegrees(mc.gameRenderer.getMainCamera().yRot() + 180f)); - profiler.push("oyvey-render-3d"); + profiler.push("fros-render-3d"); Render3DEvent event = new Render3DEvent(stack, tickCounter.getGameTimeDeltaPartialTick(true)); EVENT_BUS.post(event); diff --git a/src/main/java/me/alpha432/oyvey/mixin/render/gui/MixinCommandSuggestions.java b/src/main/java/cc/fros/mixin/render/gui/MixinCommandSuggestions.java similarity index 86% rename from src/main/java/me/alpha432/oyvey/mixin/render/gui/MixinCommandSuggestions.java rename to src/main/java/cc/fros/mixin/render/gui/MixinCommandSuggestions.java index cace0c0..3b0ddd6 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/render/gui/MixinCommandSuggestions.java +++ b/src/main/java/cc/fros/mixin/render/gui/MixinCommandSuggestions.java @@ -1,12 +1,12 @@ -package me.alpha432.oyvey.mixin.render.gui; +package cc.fros.mixin.render.gui; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.suggestion.Suggestions; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.manager.CommandManager; +import cc.fros.Fros; +import cc.fros.manager.CommandManager; import net.minecraft.client.gui.components.CommandSuggestions; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.multiplayer.ClientSuggestionProvider; @@ -40,14 +40,14 @@ public abstract class MixinCommandSuggestions { @SuppressWarnings("unchecked") @Inject(method = "updateCommandInfo", at = @At("RETURN")) public void updateCommandInfo(CallbackInfo ci, @Local StringReader stringReader) { - String prefix = OyVey.commandManager.getCommandPrefix(); + String prefix = Fros.commandManager.getCommandPrefix(); if (!stringReader.canRead() || !stringReader.getString().startsWith(prefix)) { return; } stringReader.setCursor(prefix.length()); - CommandDispatcher dispatcher = OyVey.commandManager.getDispatcher(); - ParseResults parse = dispatcher.parse(stringReader, OyVey.commandManager); + CommandDispatcher dispatcher = Fros.commandManager.getDispatcher(); + ParseResults parse = dispatcher.parse(stringReader, Fros.commandManager); currentParse = (ParseResults) (Object) parse; if (suggestions == null || !keepSuggestions) { pendingSuggestions = dispatcher.getCompletionSuggestions(parse, input.getCursorPosition()); diff --git a/src/main/java/me/alpha432/oyvey/mixin/render/gui/MixinGui.java b/src/main/java/cc/fros/mixin/render/gui/MixinGui.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/mixin/render/gui/MixinGui.java rename to src/main/java/cc/fros/mixin/render/gui/MixinGui.java index 44aadc8..75cbb6b 100644 --- a/src/main/java/me/alpha432/oyvey/mixin/render/gui/MixinGui.java +++ b/src/main/java/cc/fros/mixin/render/gui/MixinGui.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.mixin.render.gui; +package cc.fros.mixin.render.gui; -import me.alpha432.oyvey.event.impl.render.Render2DEvent; +import cc.fros.event.impl.render.Render2DEvent; import net.minecraft.client.DeltaTracker; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; @@ -10,8 +10,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.alpha432.oyvey.util.traits.Util.EVENT_BUS; -import static me.alpha432.oyvey.util.traits.Util.mc; +import static cc.fros.util.traits.Util.EVENT_BUS; +import static cc.fros.util.traits.Util.mc; @Mixin(Gui.class) public class MixinGui { diff --git a/src/main/java/me/alpha432/oyvey/util/ColorUtil.java b/src/main/java/cc/fros/util/ColorUtil.java similarity index 80% rename from src/main/java/me/alpha432/oyvey/util/ColorUtil.java rename to src/main/java/cc/fros/util/ColorUtil.java index 29c4870..b236b4c 100644 --- a/src/main/java/me/alpha432/oyvey/util/ColorUtil.java +++ b/src/main/java/cc/fros/util/ColorUtil.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.util; +package cc.fros.util; -import me.alpha432.oyvey.features.modules.client.ClickGuiModule; +import cc.fros.features.modules.client.ClickGuiModule; import java.awt.*; diff --git a/src/main/java/me/alpha432/oyvey/util/EnchantmentUtil.java b/src/main/java/cc/fros/util/EnchantmentUtil.java similarity index 95% rename from src/main/java/me/alpha432/oyvey/util/EnchantmentUtil.java rename to src/main/java/cc/fros/util/EnchantmentUtil.java index d453332..1c3232b 100644 --- a/src/main/java/me/alpha432/oyvey/util/EnchantmentUtil.java +++ b/src/main/java/cc/fros/util/EnchantmentUtil.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.util; +package cc.fros.util; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.util.traits.Util; import net.minecraft.core.Holder; import net.minecraft.resources.ResourceKey; import net.minecraft.world.entity.EquipmentSlot; diff --git a/src/main/java/me/alpha432/oyvey/util/InteractionUtil.java b/src/main/java/cc/fros/util/InteractionUtil.java similarity index 98% rename from src/main/java/me/alpha432/oyvey/util/InteractionUtil.java rename to src/main/java/cc/fros/util/InteractionUtil.java index 2ab1cde..33cb298 100644 --- a/src/main/java/me/alpha432/oyvey/util/InteractionUtil.java +++ b/src/main/java/cc/fros/util/InteractionUtil.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.util; +package cc.fros.util; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.util.traits.Util; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket; diff --git a/src/main/java/me/alpha432/oyvey/util/KeyboardUtil.java b/src/main/java/cc/fros/util/KeyboardUtil.java similarity index 95% rename from src/main/java/me/alpha432/oyvey/util/KeyboardUtil.java rename to src/main/java/cc/fros/util/KeyboardUtil.java index 989abd9..41fc679 100644 --- a/src/main/java/me/alpha432/oyvey/util/KeyboardUtil.java +++ b/src/main/java/cc/fros/util/KeyboardUtil.java @@ -1,7 +1,7 @@ -package me.alpha432.oyvey.util; +package cc.fros.util; import com.mojang.blaze3d.platform.InputConstants; -import me.alpha432.oyvey.features.settings.Bind; +import cc.fros.features.settings.Bind; import net.minecraft.client.input.KeyEvent; import java.util.ArrayList; diff --git a/src/main/java/me/alpha432/oyvey/util/MathUtil.java b/src/main/java/cc/fros/util/MathUtil.java similarity index 98% rename from src/main/java/me/alpha432/oyvey/util/MathUtil.java rename to src/main/java/cc/fros/util/MathUtil.java index e267dbb..d959469 100644 --- a/src/main/java/me/alpha432/oyvey/util/MathUtil.java +++ b/src/main/java/cc/fros/util/MathUtil.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.util; +package cc.fros.util; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.util.traits.Util; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/me/alpha432/oyvey/util/MovementUtil.java b/src/main/java/cc/fros/util/MovementUtil.java similarity index 97% rename from src/main/java/me/alpha432/oyvey/util/MovementUtil.java rename to src/main/java/cc/fros/util/MovementUtil.java index a4e569d..d562fce 100644 --- a/src/main/java/me/alpha432/oyvey/util/MovementUtil.java +++ b/src/main/java/cc/fros/util/MovementUtil.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.util; +package cc.fros.util; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.util.traits.Util; import net.minecraft.client.player.ClientInput; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; diff --git a/src/main/java/me/alpha432/oyvey/util/TextUtil.java b/src/main/java/cc/fros/util/TextUtil.java similarity index 86% rename from src/main/java/me/alpha432/oyvey/util/TextUtil.java rename to src/main/java/cc/fros/util/TextUtil.java index 46796b0..bf2ecd0 100644 --- a/src/main/java/me/alpha432/oyvey/util/TextUtil.java +++ b/src/main/java/cc/fros/util/TextUtil.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.util; +package cc.fros.util; import dev.cattyn.catformat.CatFormat; import dev.cattyn.catformat.fabric.FabricCatFormat; -import me.alpha432.oyvey.OyVey; +import cc.fros.Fros; import net.minecraft.network.chat.MutableComponent; public final class TextUtil { @@ -30,6 +30,6 @@ public final class TextUtil { } private static void initColors() { - formatter.add("global", () -> OyVey.colorManager.getColorAsInt()); + formatter.add("global", () -> Fros.colorManager.getColorAsInt()); } } diff --git a/src/main/java/me/alpha432/oyvey/util/chat/ChatUtil.java b/src/main/java/cc/fros/util/chat/ChatUtil.java similarity index 73% rename from src/main/java/me/alpha432/oyvey/util/chat/ChatUtil.java rename to src/main/java/cc/fros/util/chat/ChatUtil.java index 3ee3730..34920c3 100644 --- a/src/main/java/me/alpha432/oyvey/util/chat/ChatUtil.java +++ b/src/main/java/cc/fros/util/chat/ChatUtil.java @@ -1,9 +1,9 @@ -package me.alpha432.oyvey.util.chat; +package cc.fros.util.chat; -import me.alpha432.oyvey.OyVey; -import me.alpha432.oyvey.ducks.render.IChatComponent; -import me.alpha432.oyvey.features.commands.Command; -import me.alpha432.oyvey.util.TextUtil; +import cc.fros.Fros; +import cc.fros.ducks.render.IChatComponent; +import cc.fros.features.commands.Command; +import cc.fros.util.TextUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.GuiMessage; import net.minecraft.client.GuiMessageTag; @@ -12,7 +12,7 @@ import net.minecraft.network.chat.MessageSignature; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.Style; -import static me.alpha432.oyvey.util.traits.Util.mc; +import static cc.fros.util.traits.Util.mc; public class ChatUtil { public static MutableComponent prefix() { @@ -46,15 +46,15 @@ public class ChatUtil { IChatComponent chat = (IChatComponent) mc.gui.getChat(); MessageSignature signature = new MessageSignature(sig.getByteSignature()); - chat.oyvey$removeMessage(signature); - chat.oyvey$addMessage(new GuiMessage(mc.gui.getGuiTicks(), message, signature, getMessageTag())); + chat.fros$removeMessage(signature); + chat.fros$addMessage(new GuiMessage(mc.gui.getGuiTicks(), message, signature, getMessageTag())); } public static Component getClientNameComponent() { - return Component.empty().withColor(OyVey.colorManager.getColorAsInt()).append("OyVey"); + return Component.empty().withColor(Fros.colorManager.getColorAsInt()).append("fros.cc"); } private static GuiMessageTag getMessageTag() { - return new GuiMessageTag(OyVey.colorManager.getColorAsInt(), null, null, null); + return new GuiMessageTag(Fros.colorManager.getColorAsInt(), null, null, null); } } \ No newline at end of file diff --git a/src/main/java/me/alpha432/oyvey/util/chat/Signature.java b/src/main/java/cc/fros/util/chat/Signature.java similarity index 63% rename from src/main/java/me/alpha432/oyvey/util/chat/Signature.java rename to src/main/java/cc/fros/util/chat/Signature.java index 3cf50d2..db6868a 100644 --- a/src/main/java/me/alpha432/oyvey/util/chat/Signature.java +++ b/src/main/java/cc/fros/util/chat/Signature.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.chat; +package cc.fros.util.chat; public interface Signature { byte[] getByteSignature(); diff --git a/src/main/java/me/alpha432/oyvey/util/chat/SimpleSignature.java b/src/main/java/cc/fros/util/chat/SimpleSignature.java similarity index 97% rename from src/main/java/me/alpha432/oyvey/util/chat/SimpleSignature.java rename to src/main/java/cc/fros/util/chat/SimpleSignature.java index da2b671..73f16ee 100644 --- a/src/main/java/me/alpha432/oyvey/util/chat/SimpleSignature.java +++ b/src/main/java/cc/fros/util/chat/SimpleSignature.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.chat; +package cc.fros.util.chat; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/me/alpha432/oyvey/util/inventory/InventoryUtil.java b/src/main/java/cc/fros/util/inventory/InventoryUtil.java similarity index 90% rename from src/main/java/me/alpha432/oyvey/util/inventory/InventoryUtil.java rename to src/main/java/cc/fros/util/inventory/InventoryUtil.java index 4e076a1..a5b8c8a 100644 --- a/src/main/java/me/alpha432/oyvey/util/inventory/InventoryUtil.java +++ b/src/main/java/cc/fros/util/inventory/InventoryUtil.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.util.inventory; +package cc.fros.util.inventory; -import me.alpha432.oyvey.util.inventory.strategy.HoldingStrategy; -import me.alpha432.oyvey.util.inventory.strategy.HotbarStrategy; -import me.alpha432.oyvey.util.inventory.strategy.InventoryStrategy; -import me.alpha432.oyvey.util.inventory.strategy.SwapStrategy; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.util.inventory.strategy.HoldingStrategy; +import cc.fros.util.inventory.strategy.HotbarStrategy; +import cc.fros.util.inventory.strategy.InventoryStrategy; +import cc.fros.util.inventory.strategy.SwapStrategy; +import cc.fros.util.traits.Util; import net.minecraft.world.inventory.ClickType; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/me/alpha432/oyvey/util/inventory/Result.java b/src/main/java/cc/fros/util/inventory/Result.java similarity index 95% rename from src/main/java/me/alpha432/oyvey/util/inventory/Result.java rename to src/main/java/cc/fros/util/inventory/Result.java index a16a159..5c195bb 100644 --- a/src/main/java/me/alpha432/oyvey/util/inventory/Result.java +++ b/src/main/java/cc/fros/util/inventory/Result.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.inventory; +package cc.fros.util.inventory; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/me/alpha432/oyvey/util/inventory/ResultType.java b/src/main/java/cc/fros/util/inventory/ResultType.java similarity index 64% rename from src/main/java/me/alpha432/oyvey/util/inventory/ResultType.java rename to src/main/java/cc/fros/util/inventory/ResultType.java index f73c447..b5cd72e 100644 --- a/src/main/java/me/alpha432/oyvey/util/inventory/ResultType.java +++ b/src/main/java/cc/fros/util/inventory/ResultType.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.inventory; +package cc.fros.util.inventory; public enum ResultType { HOTBAR, diff --git a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/HoldingStrategy.java b/src/main/java/cc/fros/util/inventory/strategy/HoldingStrategy.java similarity index 79% rename from src/main/java/me/alpha432/oyvey/util/inventory/strategy/HoldingStrategy.java rename to src/main/java/cc/fros/util/inventory/strategy/HoldingStrategy.java index 63ff6a0..2cbe7ac 100644 --- a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/HoldingStrategy.java +++ b/src/main/java/cc/fros/util/inventory/strategy/HoldingStrategy.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.util.inventory.strategy; +package cc.fros.util.inventory.strategy; -import me.alpha432.oyvey.util.inventory.Result; +import cc.fros.util.inventory.Result; public final class HoldingStrategy implements SwapStrategy{ public static final HoldingStrategy INSTANCE = new HoldingStrategy(); diff --git a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/HotbarStrategy.java b/src/main/java/cc/fros/util/inventory/strategy/HotbarStrategy.java similarity index 74% rename from src/main/java/me/alpha432/oyvey/util/inventory/strategy/HotbarStrategy.java rename to src/main/java/cc/fros/util/inventory/strategy/HotbarStrategy.java index ef29c0e..47c1a3a 100644 --- a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/HotbarStrategy.java +++ b/src/main/java/cc/fros/util/inventory/strategy/HotbarStrategy.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.util.inventory.strategy; +package cc.fros.util.inventory.strategy; -import me.alpha432.oyvey.util.inventory.InventoryUtil; -import me.alpha432.oyvey.util.inventory.Result; -import me.alpha432.oyvey.util.inventory.ResultType; +import cc.fros.util.inventory.InventoryUtil; +import cc.fros.util.inventory.Result; +import cc.fros.util.inventory.ResultType; public final class HotbarStrategy implements SwapStrategy { public static final HotbarStrategy INSTANCE = new HotbarStrategy(); diff --git a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/InventoryStrategy.java b/src/main/java/cc/fros/util/inventory/strategy/InventoryStrategy.java similarity index 79% rename from src/main/java/me/alpha432/oyvey/util/inventory/strategy/InventoryStrategy.java rename to src/main/java/cc/fros/util/inventory/strategy/InventoryStrategy.java index 431b155..975f1c0 100644 --- a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/InventoryStrategy.java +++ b/src/main/java/cc/fros/util/inventory/strategy/InventoryStrategy.java @@ -1,8 +1,8 @@ -package me.alpha432.oyvey.util.inventory.strategy; +package cc.fros.util.inventory.strategy; -import me.alpha432.oyvey.util.inventory.InventoryUtil; -import me.alpha432.oyvey.util.inventory.Result; -import me.alpha432.oyvey.util.inventory.ResultType; +import cc.fros.util.inventory.InventoryUtil; +import cc.fros.util.inventory.Result; +import cc.fros.util.inventory.ResultType; import net.minecraft.world.inventory.ClickType; public final class InventoryStrategy implements SwapStrategy { diff --git a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/SwapStrategy.java b/src/main/java/cc/fros/util/inventory/strategy/SwapStrategy.java similarity index 54% rename from src/main/java/me/alpha432/oyvey/util/inventory/strategy/SwapStrategy.java rename to src/main/java/cc/fros/util/inventory/strategy/SwapStrategy.java index 3f571c3..7dfaa2c 100644 --- a/src/main/java/me/alpha432/oyvey/util/inventory/strategy/SwapStrategy.java +++ b/src/main/java/cc/fros/util/inventory/strategy/SwapStrategy.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.util.inventory.strategy; +package cc.fros.util.inventory.strategy; -import me.alpha432.oyvey.util.inventory.Result; +import cc.fros.util.inventory.Result; public interface SwapStrategy { boolean swap(Result result); diff --git a/src/main/java/me/alpha432/oyvey/util/models/Angles.java b/src/main/java/cc/fros/util/models/Angles.java similarity index 78% rename from src/main/java/me/alpha432/oyvey/util/models/Angles.java rename to src/main/java/cc/fros/util/models/Angles.java index 67bf7a7..aaa74ae 100644 --- a/src/main/java/me/alpha432/oyvey/util/models/Angles.java +++ b/src/main/java/cc/fros/util/models/Angles.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.util.models; +package cc.fros.util.models; -import me.alpha432.oyvey.util.MathUtil; +import cc.fros.util.MathUtil; import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.Vec3; -import static me.alpha432.oyvey.util.traits.Util.mc; +import static cc.fros.util.traits.Util.mc; public record Angles(float yRot, float xRot) { public Angles(float[] rot) { diff --git a/src/main/java/me/alpha432/oyvey/util/models/Timer.java b/src/main/java/cc/fros/util/models/Timer.java similarity index 96% rename from src/main/java/me/alpha432/oyvey/util/models/Timer.java rename to src/main/java/cc/fros/util/models/Timer.java index 75276ac..7f96a0e 100644 --- a/src/main/java/me/alpha432/oyvey/util/models/Timer.java +++ b/src/main/java/cc/fros/util/models/Timer.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.models; +package cc.fros.util.models; public class Timer { private long time = -1L; diff --git a/src/main/java/me/alpha432/oyvey/util/render/Layers.java b/src/main/java/cc/fros/util/render/Layers.java similarity index 76% rename from src/main/java/me/alpha432/oyvey/util/render/Layers.java rename to src/main/java/cc/fros/util/render/Layers.java index 98a7628..00bd970 100644 --- a/src/main/java/me/alpha432/oyvey/util/render/Layers.java +++ b/src/main/java/cc/fros/util/render/Layers.java @@ -1,10 +1,10 @@ -package me.alpha432.oyvey.util.render; +package cc.fros.util.render; import net.minecraft.client.renderer.rendertype.RenderSetup; import net.minecraft.client.renderer.rendertype.RenderType; -import static me.alpha432.oyvey.util.render.Pipelines.GLOBAL_LINES_PIPELINE; -import static me.alpha432.oyvey.util.render.Pipelines.GLOBAL_QUADS_PIPELINE; +import static cc.fros.util.render.Pipelines.GLOBAL_LINES_PIPELINE; +import static cc.fros.util.render.Pipelines.GLOBAL_QUADS_PIPELINE; public class Layers { private static final RenderType GLOBAL_QUADS = RenderType.create("global_fill", diff --git a/src/main/java/me/alpha432/oyvey/util/render/Pipelines.java b/src/main/java/cc/fros/util/render/Pipelines.java similarity index 89% rename from src/main/java/me/alpha432/oyvey/util/render/Pipelines.java rename to src/main/java/cc/fros/util/render/Pipelines.java index d11911d..e2cfc53 100644 --- a/src/main/java/me/alpha432/oyvey/util/render/Pipelines.java +++ b/src/main/java/cc/fros/util/render/Pipelines.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.render; +package cc.fros.util.render; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; @@ -11,8 +11,8 @@ import static net.minecraft.client.renderer.RenderPipelines.*; class Pipelines { static final RenderPipeline.Snippet GLOBAL_LINES_SNIPPET = RenderPipeline.builder(MATRICES_FOG_SNIPPET, GLOBALS_SNIPPET) - .withVertexShader(Identifier.fromNamespaceAndPath("oyvey", "core/rendertype_lines_smooth")) - .withFragmentShader(Identifier.fromNamespaceAndPath("oyvey", "core/rendertype_lines_smooth")) + .withVertexShader(Identifier.fromNamespaceAndPath("fros", "core/rendertype_lines_smooth")) + .withFragmentShader(Identifier.fromNamespaceAndPath("fros", "core/rendertype_lines_smooth")) .withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL_LINE_WIDTH, VertexFormat.Mode.LINES) .withBlend(BlendFunction.TRANSLUCENT) .withCull(false) diff --git a/src/main/java/me/alpha432/oyvey/util/render/RenderUtil.java b/src/main/java/cc/fros/util/render/RenderUtil.java similarity index 98% rename from src/main/java/me/alpha432/oyvey/util/render/RenderUtil.java rename to src/main/java/cc/fros/util/render/RenderUtil.java index eaf5779..b62293c 100644 --- a/src/main/java/me/alpha432/oyvey/util/render/RenderUtil.java +++ b/src/main/java/cc/fros/util/render/RenderUtil.java @@ -1,9 +1,9 @@ -package me.alpha432.oyvey.util.render; +package cc.fros.util.render; import com.mojang.blaze3d.vertex.*; import com.mojang.math.Axis; -import me.alpha432.oyvey.util.render.state.RectRenderState; -import me.alpha432.oyvey.util.traits.Util; +import cc.fros.util.render.state.RectRenderState; +import cc.fros.util.traits.Util; import net.minecraft.client.Camera; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.render.TextureSetup; diff --git a/src/main/java/me/alpha432/oyvey/util/render/ScissorUtil.java b/src/main/java/cc/fros/util/render/ScissorUtil.java similarity index 93% rename from src/main/java/me/alpha432/oyvey/util/render/ScissorUtil.java rename to src/main/java/cc/fros/util/render/ScissorUtil.java index 0bd3a66..0d0b543 100644 --- a/src/main/java/me/alpha432/oyvey/util/render/ScissorUtil.java +++ b/src/main/java/cc/fros/util/render/ScissorUtil.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.render; +package cc.fros.util.render; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/me/alpha432/oyvey/util/render/state/RectRenderState.java b/src/main/java/cc/fros/util/render/state/RectRenderState.java similarity index 97% rename from src/main/java/me/alpha432/oyvey/util/render/state/RectRenderState.java rename to src/main/java/cc/fros/util/render/state/RectRenderState.java index 3b80927..262c8ab 100644 --- a/src/main/java/me/alpha432/oyvey/util/render/state/RectRenderState.java +++ b/src/main/java/cc/fros/util/render/state/RectRenderState.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.render.state; +package cc.fros.util.render.state; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/me/alpha432/oyvey/util/traits/Jsonable.java b/src/main/java/cc/fros/util/traits/Jsonable.java similarity index 83% rename from src/main/java/me/alpha432/oyvey/util/traits/Jsonable.java rename to src/main/java/cc/fros/util/traits/Jsonable.java index 209754a..01877d0 100644 --- a/src/main/java/me/alpha432/oyvey/util/traits/Jsonable.java +++ b/src/main/java/cc/fros/util/traits/Jsonable.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.traits; +package cc.fros.util.traits; import com.google.gson.JsonElement; diff --git a/src/main/java/me/alpha432/oyvey/util/traits/Toggleable.java b/src/main/java/cc/fros/util/traits/Toggleable.java similarity index 88% rename from src/main/java/me/alpha432/oyvey/util/traits/Toggleable.java rename to src/main/java/cc/fros/util/traits/Toggleable.java index 5be2bef..3ea3084 100644 --- a/src/main/java/me/alpha432/oyvey/util/traits/Toggleable.java +++ b/src/main/java/cc/fros/util/traits/Toggleable.java @@ -1,4 +1,4 @@ -package me.alpha432.oyvey.util.traits; +package cc.fros.util.traits; public interface Toggleable { boolean isToggled(); diff --git a/src/main/java/me/alpha432/oyvey/util/traits/Util.java b/src/main/java/cc/fros/util/traits/Util.java similarity index 72% rename from src/main/java/me/alpha432/oyvey/util/traits/Util.java rename to src/main/java/cc/fros/util/traits/Util.java index 59fb273..91c052a 100644 --- a/src/main/java/me/alpha432/oyvey/util/traits/Util.java +++ b/src/main/java/cc/fros/util/traits/Util.java @@ -1,6 +1,6 @@ -package me.alpha432.oyvey.util.traits; +package cc.fros.util.traits; -import me.alpha432.oyvey.event.system.EventBus; +import cc.fros.event.system.EventBus; import net.minecraft.client.Minecraft; public interface Util { diff --git a/src/main/java/me/alpha432/oyvey/ducks/render/IChatComponent.java b/src/main/java/me/alpha432/oyvey/ducks/render/IChatComponent.java deleted file mode 100644 index 282475e..0000000 --- a/src/main/java/me/alpha432/oyvey/ducks/render/IChatComponent.java +++ /dev/null @@ -1,9 +0,0 @@ -package me.alpha432.oyvey.ducks.render; - -import net.minecraft.client.GuiMessage; -import net.minecraft.network.chat.MessageSignature; - -public interface IChatComponent { - void oyvey$addMessage(GuiMessage message); - void oyvey$removeMessage(MessageSignature signature); -} \ No newline at end of file diff --git a/src/main/java/me/alpha432/oyvey/event/impl/render/RenderBlockOutlineEvent.java b/src/main/java/me/alpha432/oyvey/event/impl/render/RenderBlockOutlineEvent.java deleted file mode 100644 index e259b64..0000000 --- a/src/main/java/me/alpha432/oyvey/event/impl/render/RenderBlockOutlineEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package me.alpha432.oyvey.event.impl.render; - -import me.alpha432.oyvey.event.Event; - -public class RenderBlockOutlineEvent extends Event { -} diff --git a/src/main/resources/assets/oyvey/shaders/core/rendertype_lines_smooth.fsh b/src/main/resources/assets/fros/shaders/core/rendertype_lines_smooth.fsh similarity index 100% rename from src/main/resources/assets/oyvey/shaders/core/rendertype_lines_smooth.fsh rename to src/main/resources/assets/fros/shaders/core/rendertype_lines_smooth.fsh diff --git a/src/main/resources/assets/oyvey/shaders/core/rendertype_lines_smooth.vsh b/src/main/resources/assets/fros/shaders/core/rendertype_lines_smooth.vsh similarity index 100% rename from src/main/resources/assets/oyvey/shaders/core/rendertype_lines_smooth.vsh rename to src/main/resources/assets/fros/shaders/core/rendertype_lines_smooth.vsh diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8886a57..cd4330f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,17 +15,17 @@ }, "license": "MIT", "environment": "client", - "accessWidener": "oyvey.accesswidener", + "accessWidener": "fros.accesswidener", "entrypoints": { "client": [ - "me.alpha432.oyvey.OyVey" + "cc.fros.Fros" ], "main": [ - "me.alpha432.oyvey.OyVey" + "cc.fros.Fros" ] }, "mixins": [ - "oyvey.mixins.json" + "fros.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}", diff --git a/src/main/resources/oyvey.accesswidener b/src/main/resources/fros.accesswidener similarity index 100% rename from src/main/resources/oyvey.accesswidener rename to src/main/resources/fros.accesswidener diff --git a/src/main/resources/oyvey.mixins.json b/src/main/resources/fros.mixins.json similarity index 93% rename from src/main/resources/oyvey.mixins.json rename to src/main/resources/fros.mixins.json index 88a27b0..8aa3adb 100644 --- a/src/main/resources/oyvey.mixins.json +++ b/src/main/resources/fros.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "me.alpha432.oyvey.mixin", + "package": "cc.fros.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ "network.MixinConnection"