From 99886f9389b9b5f1163511e501c7f219a6d891c6 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 20:32:29 +0200 Subject: [PATCH 01/10] before renaming --- build.gradle | 1 + src/main/java/com/genyo/addon/GenyoAddon.java | 3 + .../genyo/addon/api/render/Interpolation.java | 97 +++++++ .../addon/{ => api}/render/RenderBuffers.java | 14 +- .../genyo/addon/api/render/ScissorStack.java | 48 ++++ .../events/render/RenderShaderEvent.java | 37 +++ .../mixin/game/MixinMinecraftClient.java | 3 +- .../MixinClientPlayNetworkHandler.java | 41 ++- .../mixin/render/MixinWorldRenderer.java | 10 + .../systems/hud/BetterPlayerRadarHud.java | 22 +- .../systems/modules/misc/CombatBrainrot.java | 2 +- .../addon/systems/modules/misc/Einstein.java | 232 +++++++++++++++ .../systems/modules/misc/GenyoTimer.java | 102 +++++++ .../addon/systems/modules/misc/Sigma.java | 103 +++++++ .../addon/systems/screens/MainMenuScreen.java | 19 +- .../com/genyo/addon/utils/GenyoChatUtils.java | 10 +- .../resources/assets/genyo/files/einstein.yml | 269 ++++++++++++++++++ src/main/resources/assets/genyo/sigma.txt | 50 ++++ src/main/resources/genyo.accesswidener | 1 - 19 files changed, 1039 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/genyo/addon/api/render/Interpolation.java rename src/main/java/com/genyo/addon/{ => api}/render/RenderBuffers.java (96%) create mode 100644 src/main/java/com/genyo/addon/api/render/ScissorStack.java create mode 100644 src/main/java/com/genyo/addon/events/render/RenderShaderEvent.java create mode 100644 src/main/java/com/genyo/addon/systems/modules/misc/Einstein.java create mode 100644 src/main/java/com/genyo/addon/systems/modules/misc/GenyoTimer.java create mode 100644 src/main/java/com/genyo/addon/systems/modules/misc/Sigma.java create mode 100644 src/main/resources/assets/genyo/files/einstein.yml create mode 100644 src/main/resources/assets/genyo/sigma.txt diff --git a/build.gradle b/build.gradle index 0f919d9..5b4a804 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,7 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation 'org.yaml:snakeyaml:2.2' // Use the latest version // Meteor modImplementation "meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT" diff --git a/src/main/java/com/genyo/addon/GenyoAddon.java b/src/main/java/com/genyo/addon/GenyoAddon.java index fb35455..d975e5d 100644 --- a/src/main/java/com/genyo/addon/GenyoAddon.java +++ b/src/main/java/com/genyo/addon/GenyoAddon.java @@ -128,6 +128,9 @@ private void initModules(Modules modules) { modules.add(new GenyoCapes()); modules.add(new GenyoPhase()); modules.add(new GenyoMainMenu()); + modules.add(new GenyoTimer()); + modules.add(new Sigma()); + modules.add(new Einstein()); } private void initHUD(Hud hud) { diff --git a/src/main/java/com/genyo/addon/api/render/Interpolation.java b/src/main/java/com/genyo/addon/api/render/Interpolation.java new file mode 100644 index 0000000..ecbc00a --- /dev/null +++ b/src/main/java/com/genyo/addon/api/render/Interpolation.java @@ -0,0 +1,97 @@ +package com.genyo.addon.api.render; + +import net.minecraft.entity.Entity; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; + +import static meteordevelopment.meteorclient.MeteorClient.mc; + +public class Interpolation { + + public static Vec3d getRenderPosition(Vec3d pos, Vec3d lastPos, float tickDelta) + { + return new Vec3d(pos.x - MathHelper.lerp(tickDelta, lastPos.x, pos.x), + pos.y - MathHelper.lerp(tickDelta, lastPos.y, pos.y), + pos.z - MathHelper.lerp(tickDelta, lastPos.z, pos.z)); + } + + /** + * Gets the interpolated {@link Vec3d} position of an entity (i.e. position + * based on render ticks) + * + * @param entity The entity to get the position for + * @param tickDelta The render time + * @return The interpolated vector of an entity + */ + public static Vec3d getRenderPosition(Entity entity, float tickDelta) + { + return new Vec3d(entity.getX() - MathHelper.lerp(tickDelta, entity.lastRenderX, entity.getX()), + entity.getY() - MathHelper.lerp(tickDelta, entity.lastRenderY, entity.getY()), + entity.getZ() - MathHelper.lerp(tickDelta, entity.lastRenderZ, entity.getZ())); + } + + /** + * @param entity + * @param tickDelta + * @return + */ + public static Vec3d getInterpolatedPosition(Entity entity, float tickDelta) + { + return new Vec3d(entity.prevX + ((entity.getX() - entity.prevX) * tickDelta), + entity.prevY + ((entity.getY() - entity.prevY) * tickDelta), + entity.prevZ + ((entity.getZ() - entity.prevZ) * tickDelta)); + } + + /** + * @param prev + * @param value + * @param factor + * @return + */ + public static float interpolateFloat(float prev, float value, float factor) + { + return prev + ((value - prev) * factor); + } + + /** + * @param prev + * @param value + * @param factor + * @return + */ + public static double interpolateDouble(double prev, double value, double factor) + { + return prev + ((value - prev) * factor); + } + + /** + * @param prevBox + * @param box + * @return + */ + public static Box getInterpolatedBox(Box prevBox, Box box) + { + + double delta = mc.isPaused() ? 1f : mc.getRenderTickCounter().getTickDelta(true); + + return new Box(interpolateDouble(prevBox.minX, box.minX, delta), + interpolateDouble(prevBox.minY, box.minY, delta), + interpolateDouble(prevBox.minZ, box.minZ, delta), + interpolateDouble(prevBox.maxX, box.maxX, delta), + interpolateDouble(prevBox.maxY, box.maxY, delta), + interpolateDouble(prevBox.maxZ, box.maxZ, delta)); + } + + /** + * @param entity + * @return + */ + public static Box getInterpolatedEntityBox(Entity entity) + { + Box box = entity.getBoundingBox(); + Box prevBox = entity.getBoundingBox().offset(entity.prevX - entity.getX(), entity.prevY - entity.getY(), entity.prevZ - entity.getZ()); + return getInterpolatedBox(prevBox, box); + } + +} diff --git a/src/main/java/com/genyo/addon/render/RenderBuffers.java b/src/main/java/com/genyo/addon/api/render/RenderBuffers.java similarity index 96% rename from src/main/java/com/genyo/addon/render/RenderBuffers.java rename to src/main/java/com/genyo/addon/api/render/RenderBuffers.java index 0d4e525..d1943c3 100644 --- a/src/main/java/com/genyo/addon/render/RenderBuffers.java +++ b/src/main/java/com/genyo/addon/api/render/RenderBuffers.java @@ -1,4 +1,4 @@ -package com.genyo.addon.render; +package com.genyo.addon.api.render; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; @@ -48,6 +48,18 @@ public static void postRender() postRenderCallbacks.clear(); } + public static void post(Runnable callback) + { + if (isSetup) + { + postRenderCallbacks.add(callback); + } + else + { + callback.run(); + } + } + private static Matrix4d toMatrix4d(Matrix4f matrix4f) { return new Matrix4d(matrix4f.m00(), matrix4f.m01(), matrix4f.m02(), matrix4f.m03(), diff --git a/src/main/java/com/genyo/addon/api/render/ScissorStack.java b/src/main/java/com/genyo/addon/api/render/ScissorStack.java new file mode 100644 index 0000000..50894e5 --- /dev/null +++ b/src/main/java/com/genyo/addon/api/render/ScissorStack.java @@ -0,0 +1,48 @@ +package com.genyo.addon.api.render; + +import net.minecraft.client.gui.ScreenRect; + +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.Objects; + +public class ScissorStack { + // + private final Deque stack = new ArrayDeque<>(); + + /** + * @param rect + * @return + */ + public ScreenRect push(ScreenRect rect) + { + ScreenRect screenRect = stack.peekLast(); + if (screenRect != null) + { + ScreenRect screenRect2 = Objects.requireNonNullElse(rect.intersection(screenRect), ScreenRect.empty()); + stack.addLast(screenRect2); + return screenRect2; + } + else + { + stack.addLast(rect); + return rect; + } + } + + /** + * @return + */ + public ScreenRect pop() + { + if (stack.isEmpty()) + { + throw new IllegalStateException("Scissor stack underflow"); + } + else + { + stack.removeLast(); + return stack.peekLast(); + } + } +} diff --git a/src/main/java/com/genyo/addon/events/render/RenderShaderEvent.java b/src/main/java/com/genyo/addon/events/render/RenderShaderEvent.java new file mode 100644 index 0000000..79edbdf --- /dev/null +++ b/src/main/java/com/genyo/addon/events/render/RenderShaderEvent.java @@ -0,0 +1,37 @@ +package com.genyo.addon.events.render; + +import meteordevelopment.meteorclient.events.Cancellable; +import net.minecraft.client.util.math.MatrixStack; + +public class RenderShaderEvent extends Cancellable { + + private static final RenderShaderEvent INSTANCE = new RenderShaderEvent(); + + public MatrixStack matrices; + public float tickDelta; + + /** + * @param matrices + * @param tickDelta + * @return + */ + public static RenderShaderEvent get(MatrixStack matrices, float tickDelta) { + INSTANCE.matrices = matrices; + INSTANCE.tickDelta = tickDelta; + + return INSTANCE; + } + + public static class BlockEntities extends RenderShaderEvent + { + /** + * @param matrices + * @param tickDelta + */ + public BlockEntities(MatrixStack matrices, float tickDelta) + { + get(matrices, tickDelta); + } + } + +} diff --git a/src/main/java/com/genyo/addon/mixin/game/MixinMinecraftClient.java b/src/main/java/com/genyo/addon/mixin/game/MixinMinecraftClient.java index 604b03e..384c67e 100644 --- a/src/main/java/com/genyo/addon/mixin/game/MixinMinecraftClient.java +++ b/src/main/java/com/genyo/addon/mixin/game/MixinMinecraftClient.java @@ -22,7 +22,7 @@ @Mixin(MinecraftClient.class) public abstract class MixinMinecraftClient { - @Unique + /*@Unique @Nullable public ClientPlayerEntity player; @@ -39,7 +39,6 @@ private void setScreen(Screen screen, CallbackInfo info) { if (screen instanceof TitleScreen) { //Sydney.checkForUpdates(); auto updater - //if (Sydney.MODULE_MANAGER.getModule(MenuModule.class).isToggled() && Sydney.MODULE_MANAGER.getModule(MenuModule.class).mainMenu.getValue()) { if (Modules.get().isActive(GenyoMainMenu.class)) { this.setScreen(new MainMenuScreen()); info.cancel(); diff --git a/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayNetworkHandler.java b/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayNetworkHandler.java index 113edca..0f6beb9 100644 --- a/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayNetworkHandler.java +++ b/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayNetworkHandler.java @@ -2,9 +2,20 @@ import com.genyo.addon.mixin.accessor.AccessorClientConnection; import com.genyo.addon.imixins.IClientPlayNetworkHandler; +import com.genyo.addon.systems.modules.misc.Einstein; import com.genyo.addon.systems.modules.movement.GenyoVelocity; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import meteordevelopment.meteorclient.MeteorClient; +import meteordevelopment.meteorclient.commands.Commands; +import meteordevelopment.meteorclient.events.game.SendMessageEvent; import meteordevelopment.meteorclient.mixininterface.IExplosionS2CPacket; +import meteordevelopment.meteorclient.pathing.BaritoneUtils; +import meteordevelopment.meteorclient.systems.config.Config; import meteordevelopment.meteorclient.systems.modules.Modules; +import meteordevelopment.meteorclient.utils.player.ChatUtils; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientCommonNetworkHandler; +import net.minecraft.client.network.ClientConnectionState; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.ClientConnection; import net.minecraft.network.packet.Packet; @@ -12,18 +23,29 @@ import net.minecraft.util.math.Vec3d; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ClientPlayNetworkHandler.class) -public class MixinClientPlayNetworkHandler implements IClientPlayNetworkHandler { +public abstract class MixinClientPlayNetworkHandler extends ClientCommonNetworkHandler implements IClientPlayNetworkHandler { + + @Unique + private boolean ignoreChatMessage; + + @Shadow + public abstract void sendChatMessage(String content); @Shadow public ClientConnection getConnection() { return null; } + protected MixinClientPlayNetworkHandler(MinecraftClient client, ClientConnection connection, ClientConnectionState connectionState) { + super(client, connection, connectionState); + } + @Inject(method = "onExplosion", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/util/thread/ThreadExecutor;)V", shift = At.Shift.AFTER)) private void onExplosionVelocity(ExplosionS2CPacket packet, CallbackInfo ci) { GenyoVelocity velocity = Modules.get().get(GenyoVelocity.class); @@ -41,4 +63,21 @@ public void sendQuietPacket(Packet packet) ((AccessorClientConnection) getConnection()).hookSendInternal(packet, null, true); } + @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true) + private void onSendChatMessage(String message, CallbackInfo ci) { + if (ignoreChatMessage) return; + + Einstein einstein = Modules.get().get(Einstein.class); + if (Modules.get().isActive(Einstein.class)) { + if (einstein.isInGame()) { + ci.cancel(); + + String correct = einstein.getCorrectChoice(); + + if (message.equals(correct)) einstein.correct(); + else einstein.incorrect(); + } + } + } + } diff --git a/src/main/java/com/genyo/addon/mixin/render/MixinWorldRenderer.java b/src/main/java/com/genyo/addon/mixin/render/MixinWorldRenderer.java index 6f4e9fe..4dc2abb 100644 --- a/src/main/java/com/genyo/addon/mixin/render/MixinWorldRenderer.java +++ b/src/main/java/com/genyo/addon/mixin/render/MixinWorldRenderer.java @@ -1,5 +1,6 @@ package com.genyo.addon.mixin.render; +import com.genyo.addon.events.render.RenderShaderEvent; import com.genyo.addon.events.render.RenderWorldEvent; import com.mojang.blaze3d.systems.RenderSystem; import meteordevelopment.meteorclient.MeteorClient; @@ -28,4 +29,13 @@ private void hookRender(ObjectAllocator allocator, RenderTickCounter tickCounter RenderSystem.getModelViewStack().popMatrix(); } + @Inject(method = "render", at = @At(value = "RETURN")) + private void hookRender$1(ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, Matrix4f positionMatrix, Matrix4f projectionMatrix, CallbackInfo ci) + { + MatrixStack matrixStack = new MatrixStack(); + matrixStack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(camera.getPitch())); + matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(camera.getYaw() + 180.0f)); + MeteorClient.EVENT_BUS.post(RenderShaderEvent.get(matrixStack, tickCounter.getTickDelta(true))); + } + } diff --git a/src/main/java/com/genyo/addon/systems/hud/BetterPlayerRadarHud.java b/src/main/java/com/genyo/addon/systems/hud/BetterPlayerRadarHud.java index 3410130..134297c 100644 --- a/src/main/java/com/genyo/addon/systems/hud/BetterPlayerRadarHud.java +++ b/src/main/java/com/genyo/addon/systems/hud/BetterPlayerRadarHud.java @@ -4,6 +4,7 @@ import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.friends.Friends; import meteordevelopment.meteorclient.systems.hud.*; +import meteordevelopment.meteorclient.systems.modules.render.Nametags; import meteordevelopment.meteorclient.utils.entity.EntityUtils; import meteordevelopment.meteorclient.utils.player.PlayerUtils; import meteordevelopment.meteorclient.utils.render.color.Color; @@ -93,7 +94,7 @@ public class BetterPlayerRadarHud extends HudElement { private final Setting distance = sgFeatures.add(new BoolSetting.Builder() .name("distance") .description("Shows the distance to the player next to their name.") - .defaultValue(false) + .defaultValue(true) .build() ); @@ -111,6 +112,14 @@ public class BetterPlayerRadarHud extends HudElement { .build() ); + /*private final Setting coloredPing = sgFeatures.add(new BoolSetting.Builder() + .name("Colored Ping") + .description("Dynamic color based on ping.") + .defaultValue(true) + .visible(ping::get) + .build() + );*/ + // Scale private final Setting customScale = sgScale.add(new BoolSetting.Builder() @@ -226,6 +235,7 @@ public void render(HudRenderer renderer) { // Strings String distanceText = null; String healthText = null; + String fullHealthText = null; String pingText = null; // Health @@ -272,8 +282,9 @@ public void render(HudRenderer renderer) { else healthColor = GREEN; width += spaceWidth; - healthText = String.format("| %s", healthInt); - width += renderer.textWidth(healthText, shadow.get(), getScale()); + healthText = String.format("%s", healthInt); + fullHealthText = "| " + healthText; + width += renderer.textWidth(fullHealthText, shadow.get(), getScale()); } x = renderer.text(text, x, y, color, shadow.get()); @@ -282,11 +293,14 @@ public void render(HudRenderer renderer) { x += spaceWidth + renderer.textWidth(distanceText, shadow.get(), getScale()); } if (ping.get()) { + //TODO: ping color renderer.text(pingText, x + spaceWidth, y, secondaryColor.get(), shadow.get(), getScale()); x += spaceWidth + renderer.textWidth(pingText, shadow.get(), getScale()); } if (health.get()) { - renderer.text(healthText, x + spaceWidth, y, healthColor, shadow.get(), getScale()); + renderer.text("|", x + spaceWidth, y, secondaryColor.get(), shadow.get(), getScale()); + x += spaceWidth; + renderer.text(healthText, x + spaceWidth + spaceWidth, y, healthColor, shadow.get(), getScale()); x += spaceWidth; } } diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/CombatBrainrot.java b/src/main/java/com/genyo/addon/systems/modules/misc/CombatBrainrot.java index bacb79d..c26f4a2 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/CombatBrainrot.java +++ b/src/main/java/com/genyo/addon/systems/modules/misc/CombatBrainrot.java @@ -23,7 +23,7 @@ public class CombatBrainrot extends GenyoModule { public CombatBrainrot() { - super(GenyoAddon.MISC, "combat-brainrot", "says something sigma when punching a crystal."); + super(GenyoAddon.MISC, "combat-brainrot", "says something sigma while in crystal pvp."); } private final SettingGroup sgGeneral = settings.getDefaultGroup(); diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/Einstein.java b/src/main/java/com/genyo/addon/systems/modules/misc/Einstein.java new file mode 100644 index 0000000..74165b2 --- /dev/null +++ b/src/main/java/com/genyo/addon/systems/modules/misc/Einstein.java @@ -0,0 +1,232 @@ +package com.genyo.addon.systems.modules.misc; + +import com.genyo.addon.GenyoAddon; +import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.addon.utils.GenyoChatUtils; +import com.genyo.addon.utils.math.timer.CacheTimer; +import com.genyo.addon.utils.math.timer.Timer; +import meteordevelopment.meteorclient.events.world.TickEvent; +import meteordevelopment.meteorclient.settings.BoolSetting; +import meteordevelopment.meteorclient.settings.Setting; +import meteordevelopment.meteorclient.settings.SettingGroup; +import meteordevelopment.meteorclient.utils.player.ChatUtils; +import meteordevelopment.orbit.EventHandler; +import net.minecraft.resource.Resource; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; +import org.yaml.snakeyaml.Yaml; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Random; + +public class Einstein extends GenyoModule { + + public Einstein() { + super(GenyoAddon.MISC, "einstein", "natural selection for society"); + readEinstein(); + } + + private final SettingGroup sgGeneral = settings.getDefaultGroup(); + + private final Setting goodbye = sgGeneral.add(new BoolSetting.Builder() + .name("Say goodbye") + .description("If you enter an incorrect answer you say something before you can't.") + .defaultValue(true) + .build() + ); + + // Things + private final Identifier file = Identifier.of(GenyoAddon.MOD_ID, "files/einstein.yml"); + private List entries = new ArrayList<>(); + private Random random = new Random(); + + // Cooldown + private int cooldown = 5; // default: 300 + private final Timer timer = new CacheTimer(); + + // Game things + private final Timer answerTimer = new CacheTimer(); + private Entry currentEntry; + private boolean inGame = false; + private int remainingTime = 14; + + @Override + public void onActivate() { + resetDefaults(); + } + + @Override + public void onDeactivate() { + resetDefaults(); + } + + @EventHandler + public void onTick(TickEvent.Pre event) { + if (mc.world == null && mc.player == null) return; + + if (timer.passed(cooldown * 1000) && !inGame) { + game(); + inGame = true; + resetGame(); + } + + if (inGame) { // In-game checks + if (answerTimer.passed(15000)) { + incorrect(); + } else if (answerTimer.getElapsedTime() - ((15 - remainingTime) * 1000L) >= 1000) { + remainingTime -= 1; + GenyoChatUtils.sendMessage(String.valueOf(remainingTime), "genyo-einstein-remaining"); + } + } + } + + private void game() { + currentEntry = entries.get(random.nextInt(entries.size())); + if (currentEntry == null) return; + + String question = currentEntry.question; + List answers = currentEntry.answers; + String output = ""; + + output += Formatting.GRAY + "Answer or crash :D" + Formatting.RESET + "\n\n"; + + output += "" + Formatting.GREEN + Formatting.BOLD + question + "\n"; + output += Formatting.DARK_GRAY + "(A) " + Formatting.GRAY + answers.get(0) + " "; + output += Formatting.DARK_GRAY + "(B) " + Formatting.GRAY + answers.get(1) + " "; + output += Formatting.DARK_GRAY + "(C) " + Formatting.GRAY + answers.get(2) + " "; + output += Formatting.DARK_GRAY + "(D) " + Formatting.GRAY + answers.get(3) + "\n\n"; + + output += Formatting.RESET + "" + Formatting.GRAY + "Answer with the correct letter in chat!\nYou have 15 seconds."; + + GenyoChatUtils.sendMessage(output); + answerTimer.reset(); + } + + public void correct() { + inGame = false; + String output = ""; + + output += Formatting.GREEN + " Correct :D"; + + GenyoChatUtils.sendMessage(output); + } + + public void incorrect() { + inGame = false; + resetDefaults(); + + if (goodbye.get()) ChatUtils.sendPlayerMsg("I feel like leaving."); + + mc.close(); + } + + public String getCorrectChoice() { + return currentEntry.correctChoice.toString(); + } + + private void readEinstein() { + Yaml yaml = new Yaml(); + + try { + Resource resource = mc.getResourceManager().getResource(file).orElseThrow(); + InputStream inputStream = resource.getInputStream(); + + HashMap yamlMap = yaml.load(inputStream); + + List keys = yamlMap.keySet().stream().toList(); + for (Object o : keys) { + Integer index = (int) o; + + // The things + String question; + List answers; + String correctAnswer; + + // The decoding + HashMap value = (HashMap) yamlMap.get(o); + + // question + question = value.get("question").toString(); + + // answers + HashMap entryAnswers = (HashMap) value.get("answers"); + String answerA = entryAnswers.get("A").toString(); + String answerB = entryAnswers.get("B").toString(); + String answerC = entryAnswers.get("C").toString(); + String answerD = entryAnswers.get("D").toString(); + answers = List.of(answerA, answerB, answerC, answerD); + + // correct answer + correctAnswer = value.get("correct").toString(); + + // Entry + entries.add(new Entry(question, answers, correctAnswer)); + } + } catch (Exception exception) { + GenyoAddon.LOG.info(exception.getMessage()); + } + } + + private static class Entry { + private final String question; + private final ArrayList answers; + private final Choices correctChoice; + private final String correctAnswer; + + public Entry(String question, List answers, String correctAnswer) { + this.question = question; + this.answers = new ArrayList<>(answers); + this.correctAnswer = correctAnswer; + + this.correctChoice = switch (answers.indexOf(correctAnswer)) { + case 0 -> Choices.A; + case 1 -> Choices.B; + case 2 -> Choices.C; + case 3 -> Choices.D; + default -> null; + }; + } + + public String getQuestion() { + return question; + } + + public List getAnswers() { + return answers; + } + + public Choices getCorrectChoice() { + return correctChoice; + } + + public String getCorrectAnswer() { + return correctAnswer; + } + + private enum Choices { + A, B, C, D + } + } + + public boolean isInGame() { + return inGame; + } + + private void resetGame() { + timer.reset(); + //cooldown = random.nextInt(120, 1800); + cooldown = random.nextInt(5, 10); + } + + private void resetDefaults() { + timer.reset(); + answerTimer.reset(); + cooldown = 5; // default: 300 + currentEntry = null; + inGame = false; + remainingTime = 15; + } +} diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoTimer.java b/src/main/java/com/genyo/addon/systems/modules/misc/GenyoTimer.java new file mode 100644 index 0000000..5babc81 --- /dev/null +++ b/src/main/java/com/genyo/addon/systems/modules/misc/GenyoTimer.java @@ -0,0 +1,102 @@ +package com.genyo.addon.systems.modules.misc; + +import com.genyo.addon.GenyoAddon; +import com.genyo.addon.events.render.TickCounterEvent; +import com.genyo.addon.managers.Managers; +import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.addon.systems.settings.FloatSetting; +import meteordevelopment.meteorclient.events.world.TickEvent; +import meteordevelopment.meteorclient.settings.BoolSetting; +import meteordevelopment.meteorclient.settings.Setting; +import meteordevelopment.meteorclient.settings.SettingGroup; +import meteordevelopment.orbit.EventHandler; + +public class GenyoTimer extends GenyoModule { + + public GenyoTimer() { + super(GenyoAddon.MISC, "genyo-timer", "Changes the change to the change and change."); + } + + private final SettingGroup sgGeneral = settings.getDefaultGroup(); + + private final Setting ticksConfig = sgGeneral.add(new FloatSetting.Builder() + .name("Ticks") + .description("The of the if the of if the.") + .min(0.1f) + .defaultValue(4.4f) + .max(50.0f) + .sliderRange(0.1f, 50.0f) + .build() + ); + + private final Setting tpsSyncConfig = sgGeneral.add(new BoolSetting.Builder() + .name("TPS Sync") + .description("Syncs game tick speed to server tick speed") + .defaultValue(false) + .build() + ); + + //TODO: fasz speed module + + // + private float prevTimer = -1.0f; + private float timer = 1.0f; + + @Override + public String getInfoString() { + return String.format("%s", timer); + } + + @Override + public void onDeactivate() + { + Managers.TICK.setClientTick(1.0f); + } + + @EventHandler + public void onTick(TickEvent.Pre event) { + if (tpsSyncConfig.get()) + { + timer = Math.max(Managers.TICK.getTpsCurrent() / 20.0f, 0.1f); + return; + } + timer = ticksConfig.get(); + } + + @EventHandler + public void onTickCounter(TickCounterEvent event) + { + if (timer != 1.0f) + { + event.cancel(); + event.ticks = timer; + } + } + + /** + * @return + */ + public float getTimer() + { + return timer; + } + + /** + * @param timer + */ + public void setTimer(float timer) + { + prevTimer = this.timer; + this.timer = timer; + } + + public void resetTimer() + { + if (prevTimer > 0.0f) + { + this.timer = prevTimer; + prevTimer = -1.0f; + } + } + +} diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/Sigma.java b/src/main/java/com/genyo/addon/systems/modules/misc/Sigma.java new file mode 100644 index 0000000..576aca4 --- /dev/null +++ b/src/main/java/com/genyo/addon/systems/modules/misc/Sigma.java @@ -0,0 +1,103 @@ +package com.genyo.addon.systems.modules.misc; + +import com.genyo.addon.GenyoAddon; +import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.addon.utils.math.MathUtil; +import com.genyo.addon.utils.math.timer.CacheTimer; +import com.genyo.addon.utils.math.timer.Timer; +import meteordevelopment.meteorclient.events.world.TickEvent; +import meteordevelopment.meteorclient.settings.BoolSetting; +import meteordevelopment.meteorclient.settings.EnumSetting; +import meteordevelopment.meteorclient.settings.Setting; +import meteordevelopment.meteorclient.settings.SettingGroup; +import meteordevelopment.meteorclient.utils.player.ChatUtils; +import meteordevelopment.orbit.EventHandler; +import net.minecraft.resource.Resource; +import net.minecraft.util.Identifier; + +import java.util.List; + +public class Sigma extends GenyoModule { + + public Sigma() { + super(GenyoAddon.MISC, "sigma", "and i heard em say, nothing's ever promised tomorrow today"); + } + + private final SettingGroup sgGeneral = settings.getDefaultGroup(); + + private final Setting the = sgGeneral.add(new BoolSetting.Builder() + .name("This doesn't do anything") + .description("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh") + .defaultValue(false) + .build() + ); + + private final Setting color = sgGeneral.add(new EnumSetting.Builder() + .name("9b9t Text Color") + .description("only works on 9b9t") + .defaultValue(NBColor.None) + .build() + ); + + private final Timer timer = new CacheTimer(); + + @Override + public void onDeactivate() { + timer.reset(); + } + + @Override + public void onActivate() { + timer.reset(); + } + + @EventHandler + public void onTick(TickEvent.Pre event) { + if (mc.player == null && mc.world == null) return; + + if (!timer.passed(300000)) return; + //if (!timer.passed(5000)) return; + + String output = ""; + String sigma = getSigma(); + + if (sigma == null) { + sigmaNotFound(); + return; + } + + if (color.get().equals(NBColor.Blue)) output += "`"; + else if (color.get().equals(NBColor.Green)) output += ">"; + + output += sigma; + + ChatUtils.sendPlayerMsg(output); + timer.reset(); + } + + private void sigmaNotFound() { + toggle(); + sendDisableMsg("Sigma text not found."); + } + + private String getSigma() { + String sigma = ""; + Identifier identifier = Identifier.of(GenyoAddon.MOD_ID, "sigma.txt"); + + try { + Resource resource = mc.getResourceManager().getResource(identifier).orElseThrow(); + List messages = resource.getReader().lines().toList(); + sigma = messages.get(MathUtil.pickRandom(messages)); + } catch (Exception ignored) { } + + if (sigma.isEmpty()) return null; + else return sigma; + } + + private enum NBColor { + None, + Green, + Blue + } + +} diff --git a/src/main/java/com/genyo/addon/systems/screens/MainMenuScreen.java b/src/main/java/com/genyo/addon/systems/screens/MainMenuScreen.java index d250562..d8a0f21 100644 --- a/src/main/java/com/genyo/addon/systems/screens/MainMenuScreen.java +++ b/src/main/java/com/genyo/addon/systems/screens/MainMenuScreen.java @@ -2,21 +2,17 @@ import com.genyo.addon.GenyoAddon; import com.genyo.addon.utils.math.MathUtil; -import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.renderer.GuiRenderer; import meteordevelopment.meteorclient.renderer.Renderer2D; import meteordevelopment.meteorclient.renderer.text.TextRenderer; import meteordevelopment.meteorclient.utils.render.color.Color; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.sound.SoundEngine; -import net.minecraft.client.sound.SoundSystem; +import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.resource.Resource; import net.minecraft.text.Text; -import net.minecraft.text.TextReorderingProcessor; import net.minecraft.util.Identifier; -import org.jetbrains.annotations.NotNull; import java.util.List; @@ -24,15 +20,13 @@ public class MainMenuScreen extends Screen { - private static final GuiRenderer RENDERER = new GuiRenderer(); - - private final String splashText = "a"; + private final String splashText; private final int buttonWidth = 80, buttonHeight = 16; public MainMenuScreen() { super(Text.literal(GenyoAddon.MOD_ID + "-menu")); - //splashText = getSplashText(); + splashText = getSplashText(); } @Override @@ -50,13 +44,10 @@ public void tick() { super.tick(); } - @Override - public void render(@NotNull DrawContext context, int mouseX, int mouseY, float delta) { - /*MatrixStack matrices = new MatrixStack(); - + public void render(DrawContext context, int mouseX, int mouseY, float delta) { Renderer2D.COLOR.quad(0, 0, width, height, new Color(25, 25, 25, 255)); TextRenderer.get().begin(); - TextRenderer.get().render("Fasz", 50, 50, Color.WHITE);*/ + TextRenderer.get().render("Fasz", 50, 50, Color.WHITE); } @Override diff --git a/src/main/java/com/genyo/addon/utils/GenyoChatUtils.java b/src/main/java/com/genyo/addon/utils/GenyoChatUtils.java index 7db0a85..3056596 100644 --- a/src/main/java/com/genyo/addon/utils/GenyoChatUtils.java +++ b/src/main/java/com/genyo/addon/utils/GenyoChatUtils.java @@ -25,10 +25,18 @@ public static void sendMessage(String text) { if (mc.world == null) return; ChatUtils.forceNextPrefixClass(GenyoChatUtils.class); - String msg = prefix + " " + text; + String msg = prefix + Formatting.RESET + " " + text; sendMessage(Text.of(msg), Objects.hash("genyo-msg")); } + public static void sendMessage(String text, String id) { + if (mc.world == null) return; + + ChatUtils.forceNextPrefixClass(GenyoChatUtils.class); + String msg = prefix + Formatting.RESET + " " + text; + sendMessage(Text.of(msg), Objects.hash(id)); + } + public static void sendError(String text) { if (mc.world == null) return; diff --git a/src/main/resources/assets/genyo/files/einstein.yml b/src/main/resources/assets/genyo/files/einstein.yml new file mode 100644 index 0000000..12c3456 --- /dev/null +++ b/src/main/resources/assets/genyo/files/einstein.yml @@ -0,0 +1,269 @@ +{0: {answers: {A: '279', B: '289', C: '299', D: '361'}, correct: '289', index: '0', + question: 'What is 17^2?'}, 1: {answers: {A: '1728', B: '1331', C: '2197', D: '2048'}, + correct: '2197', index: '1', question: 'What is 13^3?'}, 2: {answers: {A: '720', + B: '5040', C: '40320', D: '362880'}, correct: '5040', index: '2', question: 'What + is 7!?'}, 3: {answers: {A: '6', B: '9', C: '18', D: '36'}, correct: '18', index: '3', + question: 'What is gcd(252,198)?'}, 4: {answers: {A: '70', B: '140', C: '280', + D: '210'}, correct: '140', index: '4', question: 'What is lcm(14,20)?'}, 5: { + answers: {A: '1000', B: '1024', C: '2048', D: '512'}, correct: '1024', index: '5', + question: 'What is 2^10?'}, 6: {answers: {A: '12', B: '18', C: '24', D: '16'}, + correct: '12', index: '6', question: "What is \u03C6(36)?"}, 7: {answers: {A: '1', + B: '3', C: '7', D: '9'}, correct: '7', index: '7', question: 'What is the last + digit of 7^2025?'}, 8: {answers: {A: '364', B: '495', C: '792', D: '220'}, correct: '495', + index: '8', question: 'What is C(12,4)?'}, 9: {answers: {A: '1260', B: '1440', + C: '1620', D: '1800'}, correct: '1440', index: '9', question: 'What is the sum + of interior angles of a decagon?'}, 10: {answers: {A: '1', B: '11', C: '13', + D: '17'}, correct: '11', index: '10', question: 'What is det([[3,2],[5,7]])?'}, + 11: {answers: {A: '34', B: '55', C: '89', D: '144'}, correct: '55', index: '11', + question: 'What is F10 (F1=1,F2=1)?'}, 12: {answers: {A: '614', B: '604', C: '624', + D: '544'}, correct: '604', index: '12', question: "What is 9^3\u22125^3?"}, + 13: {answers: {A: '18', B: '24', C: '30', D: '36'}, correct: '24', index: '13', + question: 'What is the number of divisors of 360?'}, 14: {answers: {A: '0', B: '1', + C: '5', D: '12'}, correct: '0', index: '14', question: 'What is the remainder + when 1001 is divided by 13?'}, 15: {answers: {A: '12', B: '13', C: '14', D: '15'}, + correct: '13', index: '15', question: 'What is log2(8192)?'}, 16: {answers: { + A: '6561', B: '729', C: '2187', D: '8192'}, correct: '6561', index: '16', question: 'What + is 3^8?'}, 17: {answers: {A: '11', B: '13', C: '17', D: '19'}, correct: '13', + index: '17', question: 'What is the smallest prime factor of 221?'}, 18: {answers: { + A: '1', B: '9', C: '3', D: '0'}, correct: '1', index: '18', question: 'What + is 0.999... as a fraction?'}, 19: {answers: {A: '56', B: '64', C: '70', D: '84'}, + correct: '56', index: '19', question: 'What is C(8,3)?'}, 20: {answers: {A: '1', + B: '2', C: '3', D: '4'}, correct: '3', index: '20', question: 'What is 15 mod + 4?'}, 21: {answers: {A: '80', B: '40', C: '160', D: '320'}, correct: '80', index: '21', + question: 'What is (d/dx)x^5 at x=2?'}, 22: {answers: {A: '1', B: '3', C: '0', + D: '2'}, correct: '1', index: '22', question: "What is \u222B0^1 3x^2 dx?"}, + 23: {answers: {A: '1225', B: '1275', C: '1325', D: '1375'}, correct: '1275', index: '23', + question: 'What is the sum of the first 50 positive integers?'}, 24: {answers: { + A: '1048576', B: '524288', C: '2097152', D: '262144'}, correct: '1048576', index: '24', + question: 'What is 2^20?'}, 25: {answers: {A: '935', B: '1001', C: '1003', D: '1099'}, + correct: '1001', index: '25', question: "What is 11\xD713\xD77?"}, 26: {answers: { + A: '84', B: '96', C: '104', D: '112'}, correct: '96', index: '26', question: "What\ + \ is 14^2\u221210^2?"}, 27: {answers: {A: '48', B: '60', C: '72', D: '96'}, + correct: '72', index: '27', question: "What is 3\xD74!?"}, 28: {answers: {A: '120', + B: '360', C: '720', D: '840'}, correct: '720', index: '28', question: 'What + is the number of permutations of 6 distinct items?'}, 29: {answers: {A: Zero, + B: Infinity, C: Undefined, D: One}, correct: Undefined, index: '29', question: 'What + is 1/0?'}, 30: {answers: {A: '4', B: '8', C: '16', D: '36'}, correct: '16', + index: '30', question: "What is the discriminant of x^2\u221210x+21?"}, 31: { + answers: {A: '2', B: '3', C: '4', D: '6'}, correct: '3', index: '31', question: "What\ + \ is the larger root of x^2\u22125x+6=0?"}, 32: {answers: {A: '998001', B: '999000', + C: '1000001', D: '997002'}, correct: '998001', index: '32', question: "What\ + \ is 999\xD7999?"}, 33: {answers: {A: '1', B: '2', C: '3', D: '4'}, correct: '2', + index: '33', question: 'What is 23 mod 7?'}, 34: {answers: {A: '3', B: '5', C: '8', + D: '10'}, correct: '3', index: '34', question: "What is the smallest positive\ + \ solution to x\u22613 (mod 5)?"}, 35: {answers: {A: '78125', B: '16807', C: '59049', + D: '65536'}, correct: '78125', index: '35', question: 'What is 5^7?'}, 36: { + answers: {A: '0', B: '1', C: '2', D: '3'}, correct: '1', index: '36', question: 'What + is the remainder when 2^100 is divided by 3?'}, 37: {answers: {A: '22', B: '24', + C: '25', D: '26'}, correct: '24', index: '37', question: 'What is the number + of trailing zeros in 100!?'}, 38: {answers: {A: '23', B: '25', C: '26', D: '28'}, + correct: '26', index: '38', question: 'What is the sum of digits of 2^15?'}, 39: { + answers: {A: '10', B: '12', C: '14', D: '16'}, correct: '12', index: '39', question: "What\ + \ is the radius of a circle with area 144\u03C0?"}, 40: {answers: {A: '18', + B: '20', C: '22', D: '24'}, correct: '20', index: '40', question: 'What is the + arithmetic mean of 12 and 28?'}, 41: {answers: {A: '125', B: '145', C: '161', + D: '225'}, correct: '145', index: '41', question: 'What is 3^4+4^3?'}, 42: { + answers: {A: '768', B: '752', C: '1024', D: '640'}, correct: '768', index: '42', + question: 'What is 2^8+2^9?'}, 43: {answers: {A: '12', B: '7', C: '19', D: '5'}, + correct: '12', index: '43', question: "What is the product of roots of x^2\u2212\ + 7x+12=0?"}, 44: {answers: {A: '20', B: '30', C: '40', D: '50'}, correct: '40', + index: '44', question: 'What is the coefficient of x^3 in (x+2)^5?'}, 45: {answers: { + A: '511', B: '1023', C: '1025', D: '2047'}, correct: '1023', index: '45', question: 'What + is 1+2+4+8+...+2^9?'}, 46: {answers: {A: '32', B: '33', C: '34', D: '35'}, correct: '33', + index: '46', question: "What is \u230A100/3\u230B?"}, 47: {answers: {A: '97', + B: '99', C: '101', D: '103'}, correct: '101', index: '47', question: 'What is + the smallest prime greater than 100?'}, 48: {answers: {A: '169', B: '181', C: '193', + D: '205'}, correct: '169', index: '48', question: 'What is 12^2+5^2?'}, 49: { + answers: {A: '4', B: '7', C: '8', D: '9'}, correct: '4', index: '49', question: 'What + is the inverse of 3 modulo 11?'}, 50: {answers: {A: '331', B: '341', C: '361', + D: '371'}, correct: '361', index: '50', question: 'What is 19^2?'}, 51: {answers: { + A: '483', B: '503', C: '529', D: '543'}, correct: '529', index: '51', question: 'What + is 23^2?'}, 52: {answers: {A: '831', B: '841', C: '851', D: '861'}, correct: '841', + index: '52', question: 'What is 29^2?'}, 53: {answers: {A: '941', B: '951', C: '961', + D: '971'}, correct: '961', index: '53', question: 'What is 31^2?'}, 54: {answers: { + A: '1349', B: '1369', C: '1389', D: '1399'}, correct: '1369', index: '54', question: 'What + is 37^2?'}, 55: {answers: {A: '1641', B: '1681', C: '1701', D: '1721'}, correct: '1681', + index: '55', question: 'What is 41^2?'}, 56: {answers: {A: '2209', B: '2219', + C: '2229', D: '2249'}, correct: '2209', index: '56', question: 'What is 47^2?'}, + 57: {answers: {A: '2799', B: '2809', C: '2819', D: '2829'}, correct: '2809', index: '57', + question: 'What is 53^2?'}, 58: {answers: {A: '3409', B: '3481', C: '3499', D: '3509'}, + correct: '3481', index: '58', question: 'What is 59^2?'}, 59: {answers: {A: '3701', + B: '3721', C: '3741', D: '3761'}, correct: '3721', index: '59', question: 'What + is 61^2?'}, 60: {answers: {A: '4459', B: '4489', C: '4509', D: '4529'}, correct: '4489', + index: '60', question: 'What is 67^2?'}, 61: {answers: {A: '5009', B: '5041', + C: '5081', D: '5101'}, correct: '5041', index: '61', question: 'What is 71^2?'}, + 62: {answers: {A: '5329', B: '5349', C: '5369', D: '5389'}, correct: '5329', index: '62', + question: 'What is 73^2?'}, 63: {answers: {A: '6219', B: '6239', C: '6241', D: '6259'}, + correct: '6241', index: '63', question: 'What is 79^2?'}, 64: {answers: {A: '6869', + B: '6889', C: '6899', D: '6909'}, correct: '6889', index: '64', question: 'What + is 83^2?'}, 65: {answers: {A: '7901', B: '7921', C: '7939', D: '7951'}, correct: '7921', + index: '65', question: 'What is 89^2?'}, 66: {answers: {A: '9401', B: '9411', + C: '9439', D: '9409'}, correct: '9409', index: '66', question: 'What is 97^2?'}, + 67: {answers: {A: '10101', B: '10201', C: '10301', D: '10401'}, correct: '10201', + index: '67', question: 'What is 101^2?'}, 68: {answers: {A: '10409', B: '10501', + C: '10609', D: '10709'}, correct: '10609', index: '68', question: 'What is 103^2?'}, + 69: {answers: {A: '11309', B: '11409', C: '11449', D: '11509'}, correct: '11449', + index: '69', question: 'What is 107^2?'}, 70: {answers: {A: '12649', B: '12769', + C: '12809', D: '12849'}, correct: '12769', index: '70', question: 'What is 113^2?'}, + 71: {answers: {A: '16009', B: '16129', C: '16209', D: '16329'}, correct: '16129', + index: '71', question: 'What is 127^2?'}, 72: {answers: {A: '17001', B: '17161', + C: '17281', D: '17321'}, correct: '17161', index: '72', question: 'What is 131^2?'}, + 73: {answers: {A: '18769', B: '18869', C: '18969', D: '19069'}, correct: '18769', + index: '73', question: 'What is 137^2?'}, 74: {answers: {A: '19101', B: '19201', + C: '19321', D: '19441'}, correct: '19321', index: '74', question: 'What is 139^2?'}, + 75: {answers: {A: '22001', B: '22101', C: '22201', D: '22201'}, correct: '22201', + index: '75', question: 'What is 149^2?'}, 76: {answers: {A: '22701', B: '22781', + C: '22801', D: '22901'}, correct: '22801', index: '76', question: 'What is 151^2?'}, + 77: {answers: {A: '24501', B: '24601', C: '24649', D: '24701'}, correct: '24649', + index: '77', question: 'What is 157^2?'}, 78: {answers: {A: '26401', B: '26569', + C: '26601', D: '26701'}, correct: '26569', index: '78', question: 'What is 163^2?'}, + 79: {answers: {A: '27701', B: '27889', C: '27901', D: '28001'}, correct: '27889', + index: '79', question: 'What is 167^2?'}, 80: {answers: {A: '29701', B: '29809', + C: '29929', D: '30001'}, correct: '29929', index: '80', question: 'What is 173^2?'}, + 81: {answers: {A: '31801', B: '31901', C: '32041', D: '32101'}, correct: '32041', + index: '81', question: 'What is 179^2?'}, 82: {answers: {A: '32721', B: '32761', + C: '32801', D: '32841'}, correct: '32761', index: '82', question: 'What is 181^2?'}, + 83: {answers: {A: '36241', B: '36481', C: '36521', D: '36601'}, correct: '36481', + index: '83', question: 'What is 191^2?'}, 84: {answers: {A: '37129', B: '37249', + C: '37369', D: '37489'}, correct: '37249', index: '84', question: 'What is 193^2?'}, + 85: {answers: {A: '38569', B: '38701', C: '38809', D: '38929'}, correct: '38809', + index: '85', question: 'What is 197^2?'}, 86: {answers: {A: '39601', B: '39701', + C: '39801', D: '39901'}, correct: '39601', index: '86', question: 'What is 199^2?'}, + 87: {answers: {A: '479001600', B: '39916800', C: '6227020800', D: '362880'}, correct: '479001600', + index: '87', question: 'What is 12!?'}, 88: {answers: {A: '40320', B: '5040', + C: '720', D: '362880'}, correct: '40320', index: '88', question: 'What is 8!?'}, + 89: {answers: {A: '720', B: '5040', C: '362880', D: '3628800'}, correct: '362880', + index: '89', question: 'What is 9!?'}, 90: {answers: {A: '362880', B: '3628800', + C: '39916800', D: '479001600'}, correct: '3628800', index: '90', question: 'What + is 10!?'}, 91: {answers: {A: '3628800', B: '39916800', C: '479001600', D: '6227020800'}, + correct: '39916800', index: '91', question: 'What is 11!?'}, 92: {answers: {A: '6227020800', + B: '1307674368000', C: '87178291200', D: '2432902008176640000'}, correct: '1307674368000', + index: '92', question: 'What is 15!?'}, 93: {answers: {A: '15', B: '25', C: '45', + D: '75'}, correct: '45', index: '93', question: 'What is gcd(135,225)?'}, 94: { + answers: {A: '18', B: '36', C: '54', D: '72'}, correct: '36', index: '94', question: 'What + is gcd(180,324)?'}, 95: {answers: {A: '42', B: '63', C: '84', D: '126'}, correct: '42', + index: '95', question: 'What is gcd(420,378)?'}, 96: {answers: {A: '27', B: '54', + C: '81', D: '243'}, correct: '81', index: '96', question: 'What is gcd(729,972)?'}, + 97: {answers: {A: '60', B: '90', C: '120', D: '180'}, correct: '90', index: '97', + question: 'What is lcm(18,30)?'}, 98: {answers: {A: '42', B: '84', C: '126', D: '168'}, + correct: '84', index: '98', question: 'What is lcm(21,28)?'}, 99: {answers: { + A: '100', B: '200', C: '400', D: '800'}, correct: '200', index: '99', question: 'What + is lcm(25,40)?'}, 100: {answers: {A: '108', B: '144', C: '162', D: '216'}, correct: '108', + index: '100', question: 'What is lcm(27,36)?'}, 101: {answers: {A: '15625', B: '390625', + C: '78125', D: '1953125'}, correct: '390625', index: '101', question: 'What + is 5^8?'}, 102: {answers: {A: '7776', B: '46656', C: '279936', D: '1679616'}, + correct: '46656', index: '102', question: 'What is 6^6?'}, 103: {answers: {A: '16807', + B: '117649', C: '823543', D: '78125'}, correct: '16807', index: '103', question: 'What + is 7^5?'}, 104: {answers: {A: '4096', B: '8192', C: '16384', D: '32768'}, correct: '4096', + index: '104', question: 'What is 8^4?'}, 105: {answers: {A: '59049', B: '531441', + C: '4782969', D: '43046721'}, correct: '531441', index: '105', question: 'What + is 9^6?'}, 106: {answers: {A: '4', B: '8', C: '12', D: '16'}, correct: '8', + index: '106', question: "What is \u03C6(30)?"}, 107: {answers: {A: '12', B: '18', + C: '24', D: '36'}, correct: '24', index: '107', question: "What is \u03C6(72)?"}, + 108: {answers: {A: '30', B: '40', C: '50', D: '60'}, correct: '40', index: '108', + question: "What is \u03C6(100)?"}, 109: {answers: {A: '24', B: '32', C: '36', + D: '42'}, correct: '24', index: '109', question: "What is \u03C6(84)?"}, 110: { + answers: {A: '8', B: '9', C: '10', D: '11'}, correct: '10', index: '110', question: 'What + is log2(1024)?'}, 111: {answers: {A: '4', B: '5', C: '6', D: '7'}, correct: '6', + index: '111', question: 'What is log10(1000000)?'}, 112: {answers: {A: '5', B: '6', + C: '7', D: '8'}, correct: '6', index: '112', question: 'What is log3(729)?'}, + 113: {answers: {A: '4', B: '5', C: '6', D: '7'}, correct: '5', index: '113', question: 'What + is log5(3125)?'}, 114: {answers: {A: '200', B: '210', C: '220', D: '252'}, correct: '252', + index: '114', question: 'What is C(10,5)?'}, 115: {answers: {A: '91', B: '105', + C: '120', D: '136'}, correct: '105', index: '115', question: 'What is C(15,2)?'}, + 116: {answers: {A: '184756', B: '24310', C: '167960', D: '92378'}, correct: '184756', + index: '116', question: 'What is C(20,10)?'}, 117: {answers: {A: '816', B: '816', + C: '856', D: '918'}, correct: '816', index: '117', question: 'What is C(18,3)?'}, + 118: {answers: {A: '720', B: '840', C: '960', D: '1000'}, correct: '720', index: '118', + question: 'What is P(10,3)?'}, 119: {answers: {A: '1680', B: '1720', C: '1740', + D: '1760'}, correct: '1680', index: '119', question: 'What is P(8,4)?'}, 120: { + answers: {A: '132', B: '132', C: '142', D: '152'}, correct: '132', index: '120', + question: 'What is P(12,2)?'}, 121: {answers: {A: '2520', B: '2540', C: '2560', + D: '2580'}, correct: '2520', index: '121', question: 'What is P(7,5)?'}, 122: { + answers: {A: '4950', B: '5000', C: '5050', D: '5100'}, correct: '5050', index: '122', + question: 'What is the sum of first 100 natural numbers?'}, 123: {answers: {A: '19900', + B: '20000', C: '20100', D: '20100'}, correct: '20100', index: '123', question: 'What + is the sum of first 200 natural numbers?'}, 124: {answers: {A: '1250', B: '2450', + C: '2550', D: '2650'}, correct: '2550', index: '124', question: 'What is the + sum of first 50 even numbers?'}, 125: {answers: {A: '2400', B: '2500', C: '2600', + D: '2700'}, correct: '2500', index: '125', question: 'What is the sum of first + 50 odd numbers?'}, 126: {answers: {A: '1', B: '2', C: '3', D: '9'}, correct: "\u2212\ + 13", index: '126', question: 'What is det([[2,5],[7,11]])?'}, 127: {answers: { + A: "\u22122", B: "\u22121", C: '0', D: '1'}, correct: "\u22122", index: '127', + question: 'What is det([[4,3],[2,1]])?'}, 128: {answers: {A: '0', B: '6', C: '12', + D: '18'}, correct: '0', index: '128', question: 'What is det([[6,2],[9,3]])?'}, + 129: {answers: {A: '2', B: '14', C: '18', D: '36'}, correct: '18', index: '129', + question: 'What is det([[10,4],[7,5]])?'}, 130: {answers: {A: '89', B: '144', + C: '233', D: '377'}, correct: '144', index: '130', question: 'What is F12?'}, + 131: {answers: {A: '233', B: '377', C: '610', D: '987'}, correct: '610', index: '131', + question: 'What is F15?'}, 132: {answers: {A: '4181', B: '6765', C: '10946', D: '17711'}, + correct: '6765', index: '132', question: 'What is F20?'}, 133: {answers: {A: '121393', + B: '196418', C: '317811', D: '514229'}, correct: '75025', index: '133', question: 'What + is F25?'}, 134: {answers: {A: '0', B: '1', C: '2', D: '3'}, correct: '4', index: '134', + question: 'What is the remainder of 2^50 mod 7?'}, 135: {answers: {A: '1', B: '2', + C: '5', D: '8'}, correct: '5', index: '135', question: 'What is the remainder + of 5^25 mod 13?'}, 136: {answers: {A: '1', B: '3', C: '7', D: '9'}, correct: '1', + index: '136', question: 'What is the remainder of 3^40 mod 10?'}, 137: {answers: { + A: '0', B: '1', C: '3', D: '7'}, correct: '7', index: '137', question: 'What + is the remainder of 7^13 mod 12?'}, 138: {answers: {A: '12121', B: '12321', + C: '12421', D: '12521'}, correct: '12321', index: '138', question: "What is\ + \ 111\xD7111?"}, 139: {answers: {A: '15029', B: '15129', C: '15229', D: '15329'}, + correct: '15129', index: '139', question: "What is 123\xD7123?"}, 140: {answers: { + A: '102321', B: '102721', C: '103041', D: '103041'}, correct: '103041', index: '140', + question: "What is 321\xD7321?"}, 141: {answers: {A: '206116', B: '207936', C: '208936', + D: '209936'}, correct: '207936', index: '141', question: "What is 456\xD7456?"}, + 142: {answers: {A: '36', B: '37', C: '38', D: '39'}, correct: '38', index: '142', + question: "What is \u221A1444?"}, 143: {answers: {A: '47', B: '48', C: '49', D: '50'}, + correct: '47', index: '143', question: "What is \u221A2209?"}, 144: {answers: { + A: '52', B: '53', C: '54', D: '55'}, correct: '53', index: '144', question: "What\ + \ is \u221A2809?"}, 145: {answers: {A: '57', B: '58', C: '59', D: '60'}, correct: '59', + index: '145', question: "What is \u221A3481?"}, 146: {answers: {A: '311', B: '312', + C: '313', D: '314'}, correct: '314', index: '146', question: "What is \u230A\ + \u03C0\xD7100\u230B?"}, 147: {answers: {A: '2708', B: '2718', C: '2728', D: '2738'}, + correct: '2718', index: '147', question: "What is \u230Ae\xD71000\u230B?"}, 148: { + answers: {A: '1407', B: '1414', C: '1417', D: '1421'}, correct: '1414', index: '148', + question: "What is \u230A\u221A2\xD71000\u230B?"}, 149: {answers: {A: '1717', + B: '1720', C: '1732', D: '1740'}, correct: '1732', index: '149', question: "What\ + \ is \u230A\u221A3\xD71000\u230B?"}, 150: {answers: {A: '2048', B: '3072', C: '4096', + D: '8192'}, correct: '4096', index: '150', question: 'What is 2^12?'}, 151: { + answers: {A: '65536', B: '131072', C: '32768', D: '262144'}, correct: '65536', + index: '151', question: 'What is 2^16?'}, 152: {answers: {A: '65536', B: '131072', + C: '262144', D: '524288'}, correct: '262144', index: '152', question: 'What + is 2^18?'}, 153: {answers: {A: '1048576', B: '2097152', C: '4194304', D: '8388608'}, + correct: '16777216', index: '153', question: 'What is 2^24?'}, 154: {answers: { + A: '3', B: '4', C: '5', D: '6'}, correct: '6', index: '154', question: 'What + is the product of roots of x^2+5x+6=0?'}, 155: {answers: {A: '7', B: '8', C: '15', + D: "\u221215"}, correct: '15', index: '155', question: "What is the product\ + \ of roots of x^2\u22128x+15=0?"}, 156: {answers: {A: '9', B: '18', C: '20', + D: '25'}, correct: '20', index: '156', question: "What is the product of roots\ + \ of x^2\u22129x+20=0?"}, 157: {answers: {A: "\u221235", B: '35', C: "\u22127", + D: '7'}, correct: "\u221235", index: '157', question: "What is the product of\ + \ roots of x^2+2x\u221235=0?"}, 158: {answers: {A: '12', B: '13', C: '14', D: '15'}, + correct: '14', index: '158', question: "What is \u230A100/7\u230B?"}, 159: {answers: { + A: '21', B: '22', C: '23', D: '24'}, correct: '22', index: '159', question: "What\ + \ is \u230A200/9\u230B?"}, 160: {answers: {A: '26', B: '27', C: '28', D: '29'}, + correct: '27', index: '160', question: "What is \u230A300/11\u230B?"}, 161: { + answers: {A: '29', B: '30', C: '31', D: '32'}, correct: '30', index: '161', question: "What\ + \ is \u230A400/13\u230B?"}, 162: {answers: {A: '1651', B: '1717', C: '1729', + D: '1739'}, correct: '1729', index: '162', question: "What is 7\xD713\xD719?"}, + 163: {answers: {A: '4279', B: '4289', C: '4291', D: '4301'}, correct: '4291', index: '163', + question: "What is 11\xD717\xD723?"}, 164: {answers: {A: '7073', B: '7157', C: '7163', + D: '7177'}, correct: '7163', index: '164', question: "What is 13\xD719\xD729?"}, + 165: {answers: {A: '12071', B: '12121', C: '12121', D: '12167'}, correct: '12167', + index: '165', question: "What is 17\xD723\xD731?"}, 166: {answers: {A: '1', B: '2', + C: '3', D: '4'}, correct: '3', index: '166', question: 'What is the inverse + of 2 mod 5?'}, 167: {answers: {A: '1', B: '2', C: '3', D: '4'}, correct: '2', + index: '167', question: 'What is the inverse of 4 mod 7?'}, 168: {answers: {A: '5', + B: '7', C: '8', D: '5'}, correct: '5', index: '168', question: 'What is the + inverse of 5 mod 12?'}, 169: {answers: {A: '11', B: '13', C: '15', D: '23'}, + correct: '15', index: '169', question: 'What is the inverse of 7 mod 26?'}, 170: { + answers: {A: '0', B: '1', C: "\u22121", D: '0.5'}, correct: '1', index: '170', + question: "What is sin(90\xB0)?"}, 171: {answers: {A: "\u22121", B: '0', C: '1', + D: '0.5'}, correct: "\u22121", index: '171', question: "What is cos(180\xB0\ + )?"}, 172: {answers: {A: '0', B: '1', C: "\u221A2", D: "\u22121"}, correct: '1', + index: '172', question: "What is tan(45\xB0)?"}, 173: {answers: {A: '0.5', B: '0.707', + C: '0.866', D: '1'}, correct: '0.5', index: '173', question: "What is sin(30\xB0\ + )?"}, 174: {answers: {A: '0.5', B: '0.707', C: '0.866', D: '1'}, correct: '0.5', + index: '174', question: "What is cos(60\xB0)?"}, 175: {answers: {A: '0.5', B: '0.707', + C: '0.866', D: "\u221A3"}, correct: "\u221A3", index: '175', question: "What\ + \ is tan(60\xB0)?"}} diff --git a/src/main/resources/assets/genyo/sigma.txt b/src/main/resources/assets/genyo/sigma.txt new file mode 100644 index 0000000..56ab4f8 --- /dev/null +++ b/src/main/resources/assets/genyo/sigma.txt @@ -0,0 +1,50 @@ +Strength is found in solitude, and wisdom in reflection. +In a world of conformity, dare to be different. +The lone wolf may wander, but he’s never lost. +"Challenges bow to the sigma male’s resilience." – Emerso +Strength in vulnerability, power in authenticity. +A sigma male’s strength lies in his quiet determination. +In chaos, find your calm centre. +Your worth is not determined by others’ opinions. +True strength is measured by one’s ability to stand alone. +Silence is the ultimate form of strength. +A sigma male values his independence above all else. +Success is a personal journey, not a societal race. +I don’t need validation from others to feel good about my choices. +Your story is written with each step you take. +"In a world full of followers, be the leader of your destiny." – Lang Leav +Embrace the power of solitude and self-reflection. +"I am the architect of my destiny." – Walt Whitman +I don’t follow trends; I set my own path. +"Independence is my signature." – Nietzsche +"In solitude, strength is discovered." – Robert Frost +Success is not a destination; it’s a continuous journey. +Every day is an opportunity to redefine yourself. +Lead by example, inspire with action. +Success is not measured by popularity but by impact. +The best revenge is a life well-lived, guided by sigma principles. +"In the game of life, I am the rule maker, not the rule follower." – Rumi +"Success is my shadow; it never leaves my side." – Maya Angelou +Success is a mindset, not a destination. +"Champions aren’t born; they’re made in solitude." – Emerson +"Success is the best revenge for a sigma male. +"Not here for approval, here for authenticity. +"Live life authentically, unapologetically. +"Dare to dream, and have the courage to chase those dreams. +"The only validation you need is from yourself. +"I am not a threat; I am a promise of greatness." – Lang Leav +Quality over quantity, always. +Writing my own story, living by my own rules. +I don’t need a spotlight; I create my own shine. +Embrace your uniqueness; it’s your power. +Unapologetically myself, always. +In a world of followers, be a leader on your unique path. +Respect is earned, not demanded. +Don’t follow the path; blaze your trail. +Forge your path with the hammer of determination. +In the midst of chaos, find your calm. +Lead with integrity and inspire others through your authenticity. +In quiet moments, you find the loudest answers. +Lead by example, not by words, and show the world the sigma male’s strength. +A true sigma male roams through life as a lone wolf, thriving in solitude. +The sigma male is a force to be reckoned with. diff --git a/src/main/resources/genyo.accesswidener b/src/main/resources/genyo.accesswidener index ace9554..8fabc41 100644 --- a/src/main/resources/genyo.accesswidener +++ b/src/main/resources/genyo.accesswidener @@ -17,7 +17,6 @@ accessible field net/minecraft/client/Mouse cursorDeltaY D accessible field net/minecraft/client/Mouse cursorDeltaX D accessible field net/minecraft/entity/Entity hasVisualFire Z accessible field net/minecraft/network/packet/s2c/play/GameMessageS2CPacket content Lnet/minecraft/text/Text; -accessible field net/minecraft/block/spawner/MobSpawnerLogic spawnDelay I accessible class net/minecraft/client/gui/hud/InGameHud$HeartType accessible method net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket write (Lnet/minecraft/network/PacketByteBuf;)V accessible method net/minecraft/client/world/ClientWorld getPendingUpdateManager ()Lnet/minecraft/client/network/PendingUpdateManager; From ed4bd34114111b5f55f49b17173cb16cd759ccc9 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 20:40:15 +0200 Subject: [PATCH 02/10] renaming the main package --- proguard-rules.pro | 2 +- .../com/genyo/{addon => }/GenyoAddon.java | 40 ++++++++-------- .../com/genyo/addon/events/RunTickEvent.java | 4 -- .../addon/events/network/DisconnectEvent.java | 4 -- .../addon/events/network/PlayerTickEvent.java | 4 -- .../addon/events/world/LoadWorldEvent.java | 4 -- .../{addon => }/api/render/Interpolation.java | 2 +- .../{addon => }/api/render/RenderBuffers.java | 2 +- .../{addon => }/api/render/ScissorStack.java | 2 +- .../{addon => }/events/AttackBlockEvent.java | 2 +- .../java/com/genyo/events/RunTickEvent.java | 4 ++ .../genyo/{addon => }/events/StageEvent.java | 2 +- .../{addon => }/events/TotemPopEvent.java | 2 +- .../{addon => }/events/UnderCombatEvent.java | 2 +- .../events/entity/EntityDeathEvent.java | 2 +- .../events/entity/RenderPlayerEvent.java | 2 +- .../events/entity/player/PushEntityEvent.java | 2 +- .../events/entity/player/PushFluidsEvent.java | 2 +- .../events/keyboard/KeyboardTickEvent.java | 3 +- .../events/network/ConnectScreenEvent.java | 2 +- .../genyo/events/network/DisconnectEvent.java | 4 ++ .../events/network/ItemDesyncEvent.java | 2 +- .../events/network/MovementPacketsEvent.java | 2 +- .../events/network/PacketSneakingEvent.java | 2 +- .../genyo/events/network/PlayerTickEvent.java | 4 ++ .../events/network/PlayerUpdateEvent.java | 4 +- .../events/network/PushOutOfBlocksEvent.java | 2 +- .../events/network/SetCurrentHandEvent.java | 2 +- .../events/render/RenderShaderEvent.java | 2 +- .../events/render/RenderWorldEvent.java | 2 +- .../events/render/TickCounterEvent.java | 2 +- .../{addon => }/events/sync/SyncEvent.java | 2 +- .../events/world/AddEntityEvent.java | 2 +- .../events/world/BlockCollisionEvent.java | 2 +- .../genyo/events/world/LoadWorldEvent.java | 4 ++ .../events/world/RemoveEntityEvent.java | 2 +- .../imixins/IClientPlayNetworkHandler.java | 2 +- .../imixins/IClientPlayerEntity.java | 2 +- .../com/genyo/{addon => }/imixins/IMixin.java | 2 +- .../genyo/{addon => }/managers/Managers.java | 32 ++++++------- .../managers/anticheat/AntiCheatManager.java | 8 ++-- .../managers/anticheat/SetbackData.java | 2 +- .../managers/combat/CombatManager.java | 11 ++--- .../managers/combat/PearlManager.java | 7 ++- .../managers/combat/TotemManager.java | 6 +-- .../managers/network/GDTogglerManager.java | 6 +-- .../managers/network/NetworkManager.java | 12 ++--- .../managers/player/InteractionManager.java | 10 ++-- .../managers/player/InventoryManager.java | 16 +++---- .../managers/player/MovementManager.java | 6 +-- .../managers/player/PositionManager.java | 4 +- .../managers/player/RotationCallback.java | 2 +- .../managers/player/rotation/Rotation.java | 2 +- .../player/rotation/RotationManager.java | 18 ++++---- .../managers/world/BlockManager.java | 2 +- .../managers/world/SocialManager.java | 2 +- .../managers/world/tick/TickManager.java | 8 ++-- .../managers/world/tick/TickSync.java | 2 +- .../ClientPlayerInteractionManagerMixin.java | 8 ++-- .../DefaultSettingsWidgetFactoryMixin.java | 6 +-- .../{addon => }/mixin/FriendsInjector.java | 4 +- .../mixin/MixinClientConnection.java | 4 +- .../{addon => }/mixin/MixinConnectScreen.java | 4 +- .../mixin/MixinItemUsageContext.java | 4 +- .../{addon => }/mixin/MixinKeyboardInput.java | 4 +- .../{addon => }/mixin/PlayerUtilsMixin.java | 6 +-- .../mixin/accessor/AccessorBundlePacket.java | 2 +- .../accessor/AccessorClientConnection.java | 2 +- ...ccessorClientPlayerInteractionManager.java | 2 +- .../mixin/accessor/AccessorClientWorld.java | 2 +- ...AccessorEntityVelocityUpdateS2CPacket.java | 2 +- .../mixin/accessor/AccessorGameOptions.java | 2 +- .../{addon => }/mixin/entity/IEntity.java | 2 +- .../{addon => }/mixin/entity/MixinEntity.java | 4 +- .../entity/player/MixinPlayerEntity.java | 4 +- .../entity/player/MixinPlayerListEntry.java | 4 +- .../mixin/game/MixinMinecraftClient.java | 15 +----- .../MixinClientPlayNetworkHandler.java | 17 ++----- .../network/MixinClientPlayerEntity.java | 11 +++-- .../network/MixinServerPlayerEntity.java | 4 +- .../mixin/render/MixinRenderTickCounter.java | 4 +- .../mixin/render/MixinWorldRenderer.java | 6 +-- .../world/MixinBlockCollisionSpliterator.java | 4 +- .../mixin/world/MixinClientWorld.java | 6 +-- .../{addon => }/render/Render2DEngine.java | 2 +- .../{addon => }/render/Render3DEngine.java | 4 +- .../render/animation/Animation.java | 2 +- .../{addon => }/render/animation/Easing.java | 2 +- .../{addon => }/systems/enemies/Enemies.java | 4 +- .../systems/enemies/EnemiesTab.java | 2 +- .../{addon => }/systems/enemies/Enemy.java | 4 +- .../systems/hud/ActiveGenyoHud.java | 6 +-- .../systems/hud/BetterPlayerRadarHud.java | 5 +- .../{addon => }/systems/hud/InCombatHud.java | 8 ++-- .../{addon => }/systems/hud/PacketsHud.java | 6 +-- .../systems/hud/PvPNeccessaryHud.java | 6 +-- .../{addon => }/systems/hud/WatermarkHud.java | 4 +- .../systems/incombat/CombatPerson.java | 2 +- .../systems/incombat/InCombatSystem.java | 4 +- .../systems/incombat/InCombatTab.java | 2 +- .../systems/modules/GenyoModule.java | 6 +-- .../systems/modules/PlacerModule.java | 6 +-- .../modules/combat/GenyoAutoArmor.java | 12 ++--- .../modules/combat/GenyoAutoCrystal.java | 46 +++++++++---------- .../modules/combat/GenyoAutoTotem.java | 26 +++++------ .../systems/modules/combat/GenyoAutoTrap.java | 22 ++++----- .../systems/modules/combat/GenyoAutoXP.java | 12 ++--- .../modules/combat/GenyoCriticals.java | 28 +++++------ .../modules/combat/GenyoReplenish.java | 20 ++++---- .../systems/modules/combat/KFCSpawnKill.java | 36 +++++++-------- .../systems/modules/misc/CombatBrainrot.java | 16 +++---- .../systems/modules/misc/Einstein.java | 12 ++--- .../systems/modules/misc/GenyoAutoEZ.java | 12 ++--- .../systems/modules/misc/GenyoDiscord.java | 6 +-- .../systems/modules/misc/GenyoGoodbye.java | 10 ++-- .../systems/modules/misc/GenyoMainMenu.java | 6 +-- .../systems/modules/misc/GenyoSkinBlink.java | 12 ++--- .../systems/modules/misc/GenyoTimer.java | 12 ++--- .../systems/modules/misc/GenyoWelcome.java | 10 ++-- .../systems/modules/misc/PacketDebug.java | 6 +-- .../systems/modules/misc/Sigma.java | 12 ++--- .../systems/modules/movement/GenyoPhase.java | 27 +++++------ .../modules/movement/GenyoVelocity.java | 30 ++++++------ .../modules/visual/AngelSexHulkenberg.java | 20 ++++---- .../systems/modules/visual/GenyoCapes.java | 6 +-- .../systems/modules/visual/GenyoPenisESP.java | 10 ++-- .../systems/modules/world/GenyoAutoMine.java | 34 +++++++------- .../systems/modules/world/GenyoAutoTool.java | 10 ++-- .../modules/world/GenyoGhostBlocks.java | 8 ++-- .../systems/modules/world/GenyoScaffold.java | 20 ++++---- .../systems/modules/world/GenyoSelfTrap.java | 22 ++++----- .../systems/modules/world/GenyoSpeedmine.java | 26 +++++------ .../systems/modules/world/GenyoSurround.java | 8 ++-- .../modules/world/GenyoSurroundV2.java | 23 +++++----- .../systems/screens/ListGroupScreen.java | 10 ++-- .../systems/screens/MainMenuScreen.java | 9 ++-- .../systems/settings/FloatSetting.java | 2 +- .../settings/playerlist/ListGroupSetting.java | 8 ++-- .../settings/playerlist/ListPlayer.java | 2 +- .../systems/settings/playerlist/PLGroup.java | 2 +- .../genyo/{addon => }/utils/GEntityUtils.java | 2 +- .../genyo/{addon => }/utils/GInvUtils.java | 6 +-- .../{addon => }/utils/GenyoChatUtils.java | 2 +- .../com/genyo/{addon => }/utils/HudUtils.java | 2 +- .../utils/collection/EvictingQueue.java | 2 +- .../utils/collection/FirstOutQueue.java | 2 +- .../{addon => }/utils/entity/EntityUtil.java | 2 +- .../utils/math/GPositionUtils.java | 4 +- .../{addon => }/utils/math/MathUtil.java | 2 +- .../utils/math/PerSecondCounter.java | 2 +- .../utils/math/timer/CacheTimer.java | 2 +- .../utils/math/timer/TickTimer.java | 2 +- .../{addon => }/utils/math/timer/Timer.java | 2 +- .../utils/player/EnchantmentUtil.java | 2 +- .../utils/player/InteractionUtil.java | 8 ++-- .../utils/player/InventoryUtil.java | 2 +- .../utils/player/MovementUtil.java | 2 +- .../{addon => }/utils/player/PlayerUtil.java | 4 +- .../{addon => }/utils/player/RaycastUtil.java | 2 +- .../{addon => }/utils/player/Rotation.java | 3 +- .../utils/player/RotationUtil.java | 2 +- .../utils/player/SearchInvResult.java | 5 +- .../{addon => }/utils/render/ColorUtil.java | 2 +- .../utils/render/SInterpolation.java | 2 +- .../utils/string/EnumFormatter.java | 2 +- .../utils/world/BlastResistantBlocks.java | 2 +- .../utils/world/ExplosionUtil.java | 5 +- .../{addon => }/utils/world/HoleUtility.java | 2 +- .../{addon => }/utils/world/SneakBlocks.java | 2 +- src/main/resources/fabric.mod.json | 2 +- src/main/resources/genyo.mixins.json | 2 +- 171 files changed, 566 insertions(+), 609 deletions(-) rename src/main/java/com/genyo/{addon => }/GenyoAddon.java (85%) delete mode 100644 src/main/java/com/genyo/addon/events/RunTickEvent.java delete mode 100644 src/main/java/com/genyo/addon/events/network/DisconnectEvent.java delete mode 100644 src/main/java/com/genyo/addon/events/network/PlayerTickEvent.java delete mode 100644 src/main/java/com/genyo/addon/events/world/LoadWorldEvent.java rename src/main/java/com/genyo/{addon => }/api/render/Interpolation.java (98%) rename src/main/java/com/genyo/{addon => }/api/render/RenderBuffers.java (99%) rename src/main/java/com/genyo/{addon => }/api/render/ScissorStack.java (96%) rename src/main/java/com/genyo/{addon => }/events/AttackBlockEvent.java (95%) create mode 100644 src/main/java/com/genyo/events/RunTickEvent.java rename src/main/java/com/genyo/{addon => }/events/StageEvent.java (89%) rename src/main/java/com/genyo/{addon => }/events/TotemPopEvent.java (92%) rename src/main/java/com/genyo/{addon => }/events/UnderCombatEvent.java (91%) rename src/main/java/com/genyo/{addon => }/events/entity/EntityDeathEvent.java (88%) rename src/main/java/com/genyo/{addon => }/events/entity/RenderPlayerEvent.java (93%) rename src/main/java/com/genyo/{addon => }/events/entity/player/PushEntityEvent.java (90%) rename src/main/java/com/genyo/{addon => }/events/entity/player/PushFluidsEvent.java (71%) rename src/main/java/com/genyo/{addon => }/events/keyboard/KeyboardTickEvent.java (87%) rename src/main/java/com/genyo/{addon => }/events/network/ConnectScreenEvent.java (92%) create mode 100644 src/main/java/com/genyo/events/network/DisconnectEvent.java rename src/main/java/com/genyo/{addon => }/events/network/ItemDesyncEvent.java (92%) rename src/main/java/com/genyo/{addon => }/events/network/MovementPacketsEvent.java (93%) rename src/main/java/com/genyo/{addon => }/events/network/PacketSneakingEvent.java (74%) create mode 100644 src/main/java/com/genyo/events/network/PlayerTickEvent.java rename src/main/java/com/genyo/{addon => }/events/network/PlayerUpdateEvent.java (80%) rename src/main/java/com/genyo/{addon => }/events/network/PushOutOfBlocksEvent.java (74%) rename src/main/java/com/genyo/{addon => }/events/network/SetCurrentHandEvent.java (93%) rename src/main/java/com/genyo/{addon => }/events/render/RenderShaderEvent.java (95%) rename src/main/java/com/genyo/{addon => }/events/render/RenderWorldEvent.java (96%) rename src/main/java/com/genyo/{addon => }/events/render/TickCounterEvent.java (89%) rename src/main/java/com/genyo/{addon => }/events/sync/SyncEvent.java (94%) rename src/main/java/com/genyo/{addon => }/events/world/AddEntityEvent.java (88%) rename src/main/java/com/genyo/{addon => }/events/world/BlockCollisionEvent.java (95%) create mode 100644 src/main/java/com/genyo/events/world/LoadWorldEvent.java rename src/main/java/com/genyo/{addon => }/events/world/RemoveEntityEvent.java (91%) rename src/main/java/com/genyo/{addon => }/imixins/IClientPlayNetworkHandler.java (82%) rename src/main/java/com/genyo/{addon => }/imixins/IClientPlayerEntity.java (80%) rename src/main/java/com/genyo/{addon => }/imixins/IMixin.java (88%) rename src/main/java/com/genyo/{addon => }/managers/Managers.java (68%) rename src/main/java/com/genyo/{addon => }/managers/anticheat/AntiCheatManager.java (89%) rename src/main/java/com/genyo/{addon => }/managers/anticheat/SetbackData.java (82%) rename src/main/java/com/genyo/{addon => }/managers/combat/CombatManager.java (88%) rename src/main/java/com/genyo/{addon => }/managers/combat/PearlManager.java (90%) rename src/main/java/com/genyo/{addon => }/managers/combat/TotemManager.java (94%) rename src/main/java/com/genyo/{addon => }/managers/network/GDTogglerManager.java (76%) rename src/main/java/com/genyo/{addon => }/managers/network/NetworkManager.java (93%) rename src/main/java/com/genyo/{addon => }/managers/player/InteractionManager.java (98%) rename src/main/java/com/genyo/{addon => }/managers/player/InventoryManager.java (96%) rename src/main/java/com/genyo/{addon => }/managers/player/MovementManager.java (91%) rename src/main/java/com/genyo/{addon => }/managers/player/PositionManager.java (98%) rename src/main/java/com/genyo/{addon => }/managers/player/RotationCallback.java (86%) rename src/main/java/com/genyo/{addon => }/managers/player/rotation/Rotation.java (94%) rename src/main/java/com/genyo/{addon => }/managers/player/rotation/RotationManager.java (95%) rename src/main/java/com/genyo/{addon => }/managers/world/BlockManager.java (98%) rename src/main/java/com/genyo/{addon => }/managers/world/SocialManager.java (90%) rename src/main/java/com/genyo/{addon => }/managers/world/tick/TickManager.java (94%) rename src/main/java/com/genyo/{addon => }/managers/world/tick/TickSync.java (62%) rename src/main/java/com/genyo/{addon => }/mixin/ClientPlayerInteractionManagerMixin.java (93%) rename src/main/java/com/genyo/{addon => }/mixin/DefaultSettingsWidgetFactoryMixin.java (93%) rename src/main/java/com/genyo/{addon => }/mixin/FriendsInjector.java (89%) rename src/main/java/com/genyo/{addon => }/mixin/MixinClientConnection.java (88%) rename src/main/java/com/genyo/{addon => }/mixin/MixinConnectScreen.java (92%) rename src/main/java/com/genyo/{addon => }/mixin/MixinItemUsageContext.java (91%) rename src/main/java/com/genyo/{addon => }/mixin/MixinKeyboardInput.java (92%) rename src/main/java/com/genyo/{addon => }/mixin/PlayerUtilsMixin.java (90%) rename src/main/java/com/genyo/{addon => }/mixin/accessor/AccessorBundlePacket.java (90%) rename src/main/java/com/genyo/{addon => }/mixin/accessor/AccessorClientConnection.java (92%) rename src/main/java/com/genyo/{addon => }/mixin/accessor/AccessorClientPlayerInteractionManager.java (96%) rename src/main/java/com/genyo/{addon => }/mixin/accessor/AccessorClientWorld.java (95%) rename src/main/java/com/genyo/{addon => }/mixin/accessor/AccessorEntityVelocityUpdateS2CPacket.java (93%) rename src/main/java/com/genyo/{addon => }/mixin/accessor/AccessorGameOptions.java (92%) rename src/main/java/com/genyo/{addon => }/mixin/entity/IEntity.java (92%) rename src/main/java/com/genyo/{addon => }/mixin/entity/MixinEntity.java (88%) rename src/main/java/com/genyo/{addon => }/mixin/entity/player/MixinPlayerEntity.java (90%) rename src/main/java/com/genyo/{addon => }/mixin/entity/player/MixinPlayerListEntry.java (93%) rename src/main/java/com/genyo/{addon => }/mixin/game/MixinMinecraftClient.java (70%) rename src/main/java/com/genyo/{addon => }/mixin/network/MixinClientPlayNetworkHandler.java (83%) rename src/main/java/com/genyo/{addon => }/mixin/network/MixinClientPlayerEntity.java (94%) rename src/main/java/com/genyo/{addon => }/mixin/network/MixinServerPlayerEntity.java (87%) rename src/main/java/com/genyo/{addon => }/mixin/render/MixinRenderTickCounter.java (93%) rename src/main/java/com/genyo/{addon => }/mixin/render/MixinWorldRenderer.java (93%) rename src/main/java/com/genyo/{addon => }/mixin/world/MixinBlockCollisionSpliterator.java (94%) rename src/main/java/com/genyo/{addon => }/mixin/world/MixinClientWorld.java (90%) rename src/main/java/com/genyo/{addon => }/render/Render2DEngine.java (95%) rename src/main/java/com/genyo/{addon => }/render/Render3DEngine.java (99%) rename src/main/java/com/genyo/{addon => }/render/animation/Animation.java (97%) rename src/main/java/com/genyo/{addon => }/render/animation/Easing.java (99%) rename src/main/java/com/genyo/{addon => }/systems/enemies/Enemies.java (98%) rename src/main/java/com/genyo/{addon => }/systems/enemies/EnemiesTab.java (98%) rename src/main/java/com/genyo/{addon => }/systems/enemies/Enemy.java (94%) rename src/main/java/com/genyo/{addon => }/systems/hud/ActiveGenyoHud.java (99%) rename src/main/java/com/genyo/{addon => }/systems/hud/BetterPlayerRadarHud.java (98%) rename src/main/java/com/genyo/{addon => }/systems/hud/InCombatHud.java (97%) rename src/main/java/com/genyo/{addon => }/systems/hud/PacketsHud.java (97%) rename src/main/java/com/genyo/{addon => }/systems/hud/PvPNeccessaryHud.java (98%) rename src/main/java/com/genyo/{addon => }/systems/hud/WatermarkHud.java (97%) rename src/main/java/com/genyo/{addon => }/systems/incombat/CombatPerson.java (95%) rename src/main/java/com/genyo/{addon => }/systems/incombat/InCombatSystem.java (98%) rename src/main/java/com/genyo/{addon => }/systems/incombat/InCombatTab.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/GenyoModule.java (98%) rename src/main/java/com/genyo/{addon => }/systems/modules/PlacerModule.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/GenyoAutoArmor.java (97%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/GenyoAutoCrystal.java (98%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/GenyoAutoTotem.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/GenyoAutoTrap.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/GenyoAutoXP.java (94%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/GenyoCriticals.java (95%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/GenyoReplenish.java (92%) rename src/main/java/com/genyo/{addon => }/systems/modules/combat/KFCSpawnKill.java (97%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/CombatBrainrot.java (90%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/Einstein.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/GenyoAutoEZ.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/GenyoDiscord.java (98%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/GenyoGoodbye.java (93%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/GenyoMainMenu.java (55%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/GenyoSkinBlink.java (86%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/GenyoTimer.java (88%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/GenyoWelcome.java (94%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/PacketDebug.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/misc/Sigma.java (90%) rename src/main/java/com/genyo/{addon => }/systems/modules/movement/GenyoPhase.java (95%) rename src/main/java/com/genyo/{addon => }/systems/modules/movement/GenyoVelocity.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/visual/AngelSexHulkenberg.java (95%) rename src/main/java/com/genyo/{addon => }/systems/modules/visual/GenyoCapes.java (74%) rename src/main/java/com/genyo/{addon => }/systems/modules/visual/GenyoPenisESP.java (96%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoAutoMine.java (98%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoAutoTool.java (90%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoGhostBlocks.java (95%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoScaffold.java (97%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoSelfTrap.java (97%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoSpeedmine.java (97%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoSurround.java (98%) rename src/main/java/com/genyo/{addon => }/systems/modules/world/GenyoSurroundV2.java (97%) rename src/main/java/com/genyo/{addon => }/systems/screens/ListGroupScreen.java (95%) rename src/main/java/com/genyo/{addon => }/systems/screens/MainMenuScreen.java (91%) rename src/main/java/com/genyo/{addon => }/systems/settings/FloatSetting.java (98%) rename src/main/java/com/genyo/{addon => }/systems/settings/playerlist/ListGroupSetting.java (97%) rename src/main/java/com/genyo/{addon => }/systems/settings/playerlist/ListPlayer.java (98%) rename src/main/java/com/genyo/{addon => }/systems/settings/playerlist/PLGroup.java (96%) rename src/main/java/com/genyo/{addon => }/utils/GEntityUtils.java (96%) rename src/main/java/com/genyo/{addon => }/utils/GInvUtils.java (96%) rename src/main/java/com/genyo/{addon => }/utils/GenyoChatUtils.java (98%) rename src/main/java/com/genyo/{addon => }/utils/HudUtils.java (96%) rename src/main/java/com/genyo/{addon => }/utils/collection/EvictingQueue.java (95%) rename src/main/java/com/genyo/{addon => }/utils/collection/FirstOutQueue.java (98%) rename src/main/java/com/genyo/{addon => }/utils/entity/EntityUtil.java (97%) rename src/main/java/com/genyo/{addon => }/utils/math/GPositionUtils.java (95%) rename src/main/java/com/genyo/{addon => }/utils/math/MathUtil.java (95%) rename src/main/java/com/genyo/{addon => }/utils/math/PerSecondCounter.java (94%) rename src/main/java/com/genyo/{addon => }/utils/math/timer/CacheTimer.java (98%) rename src/main/java/com/genyo/{addon => }/utils/math/timer/TickTimer.java (96%) rename src/main/java/com/genyo/{addon => }/utils/math/timer/Timer.java (94%) rename src/main/java/com/genyo/{addon => }/utils/player/EnchantmentUtil.java (97%) rename src/main/java/com/genyo/{addon => }/utils/player/InteractionUtil.java (98%) rename src/main/java/com/genyo/{addon => }/utils/player/InventoryUtil.java (97%) rename src/main/java/com/genyo/{addon => }/utils/player/MovementUtil.java (98%) rename src/main/java/com/genyo/{addon => }/utils/player/PlayerUtil.java (96%) rename src/main/java/com/genyo/{addon => }/utils/player/RaycastUtil.java (96%) rename src/main/java/com/genyo/{addon => }/utils/player/Rotation.java (89%) rename src/main/java/com/genyo/{addon => }/utils/player/RotationUtil.java (96%) rename src/main/java/com/genyo/{addon => }/utils/player/SearchInvResult.java (88%) rename src/main/java/com/genyo/{addon => }/utils/render/ColorUtil.java (94%) rename src/main/java/com/genyo/{addon => }/utils/render/SInterpolation.java (97%) rename src/main/java/com/genyo/{addon => }/utils/string/EnumFormatter.java (96%) rename src/main/java/com/genyo/{addon => }/utils/world/BlastResistantBlocks.java (98%) rename src/main/java/com/genyo/{addon => }/utils/world/ExplosionUtil.java (99%) rename src/main/java/com/genyo/{addon => }/utils/world/HoleUtility.java (98%) rename src/main/java/com/genyo/{addon => }/utils/world/SneakBlocks.java (98%) diff --git a/proguard-rules.pro b/proguard-rules.pro index 9b73389..2c2fa18 100644 --- a/proguard-rules.pro +++ b/proguard-rules.pro @@ -15,7 +15,7 @@ -keep class com.genyo.addon.** { *; } # 4) Keep your addon’s main entrypoint (by name) --keep class com.genyo.addon.GenyoAddon { +-keep class com.genyo.GenyoAddon { public (); } diff --git a/src/main/java/com/genyo/addon/GenyoAddon.java b/src/main/java/com/genyo/GenyoAddon.java similarity index 85% rename from src/main/java/com/genyo/addon/GenyoAddon.java rename to src/main/java/com/genyo/GenyoAddon.java index d975e5d..3379664 100644 --- a/src/main/java/com/genyo/addon/GenyoAddon.java +++ b/src/main/java/com/genyo/GenyoAddon.java @@ -1,19 +1,23 @@ -package com.genyo.addon; - -import com.genyo.addon.systems.hud.*; -import com.genyo.addon.systems.modules.combat.*; -import com.genyo.addon.systems.modules.misc.*; -import com.genyo.addon.systems.modules.movement.GenyoPhase; -import com.genyo.addon.systems.modules.movement.GenyoVelocity; -import com.genyo.addon.systems.modules.visual.AngelSexHulkenberg; -import com.genyo.addon.systems.modules.visual.GenyoCapes; -import com.genyo.addon.systems.modules.visual.GenyoPenisESP; -import com.genyo.addon.systems.enemies.EnemiesTab; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.enemies.Enemies; -import com.genyo.addon.systems.incombat.InCombatSystem; -import com.genyo.addon.systems.incombat.InCombatTab; -import com.genyo.addon.systems.modules.world.*; +package com.genyo; + +import com.genyo.systems.hud.*; +import com.genyo.systems.modules.combat.*; +import com.genyo.systems.modules.misc.*; +import com.genyo.systems.hud.*; +import com.genyo.systems.modules.combat.*; +import com.genyo.systems.modules.misc.*; +import com.genyo.systems.modules.movement.GenyoPhase; +import com.genyo.systems.modules.movement.GenyoVelocity; +import com.genyo.systems.modules.visual.AngelSexHulkenberg; +import com.genyo.systems.modules.visual.GenyoCapes; +import com.genyo.systems.modules.visual.GenyoPenisESP; +import com.genyo.systems.enemies.EnemiesTab; +import com.genyo.managers.Managers; +import com.genyo.systems.enemies.Enemies; +import com.genyo.systems.incombat.InCombatSystem; +import com.genyo.systems.incombat.InCombatTab; +import com.genyo.systems.modules.world.*; +import com.genyo.systems.modules.world.*; import com.mojang.logging.LogUtils; import meteordevelopment.meteorclient.addons.GithubRepo; import meteordevelopment.meteorclient.addons.MeteorAddon; @@ -30,8 +34,6 @@ import net.minecraft.item.Items; import org.slf4j.Logger; -import java.lang.annotation.Target; - public class GenyoAddon extends MeteorAddon { public static final Logger LOG = LogUtils.getLogger(); @@ -153,7 +155,7 @@ public void onRegisterCategories() { @Override public String getPackage() { - return "com.genyo.addon"; + return "com.genyo"; } @Override diff --git a/src/main/java/com/genyo/addon/events/RunTickEvent.java b/src/main/java/com/genyo/addon/events/RunTickEvent.java deleted file mode 100644 index ad8cae5..0000000 --- a/src/main/java/com/genyo/addon/events/RunTickEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.genyo.addon.events; - -public class RunTickEvent { -} diff --git a/src/main/java/com/genyo/addon/events/network/DisconnectEvent.java b/src/main/java/com/genyo/addon/events/network/DisconnectEvent.java deleted file mode 100644 index aa9c99c..0000000 --- a/src/main/java/com/genyo/addon/events/network/DisconnectEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.genyo.addon.events.network; - -public class DisconnectEvent { -} diff --git a/src/main/java/com/genyo/addon/events/network/PlayerTickEvent.java b/src/main/java/com/genyo/addon/events/network/PlayerTickEvent.java deleted file mode 100644 index 149fa29..0000000 --- a/src/main/java/com/genyo/addon/events/network/PlayerTickEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.genyo.addon.events.network; - -public class PlayerTickEvent { -} diff --git a/src/main/java/com/genyo/addon/events/world/LoadWorldEvent.java b/src/main/java/com/genyo/addon/events/world/LoadWorldEvent.java deleted file mode 100644 index e0859c6..0000000 --- a/src/main/java/com/genyo/addon/events/world/LoadWorldEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.genyo.addon.events.world; - -public class LoadWorldEvent { -} diff --git a/src/main/java/com/genyo/addon/api/render/Interpolation.java b/src/main/java/com/genyo/api/render/Interpolation.java similarity index 98% rename from src/main/java/com/genyo/addon/api/render/Interpolation.java rename to src/main/java/com/genyo/api/render/Interpolation.java index ecbc00a..65c571b 100644 --- a/src/main/java/com/genyo/addon/api/render/Interpolation.java +++ b/src/main/java/com/genyo/api/render/Interpolation.java @@ -1,4 +1,4 @@ -package com.genyo.addon.api.render; +package com.genyo.api.render; import net.minecraft.entity.Entity; import net.minecraft.util.math.Box; diff --git a/src/main/java/com/genyo/addon/api/render/RenderBuffers.java b/src/main/java/com/genyo/api/render/RenderBuffers.java similarity index 99% rename from src/main/java/com/genyo/addon/api/render/RenderBuffers.java rename to src/main/java/com/genyo/api/render/RenderBuffers.java index d1943c3..c150e49 100644 --- a/src/main/java/com/genyo/addon/api/render/RenderBuffers.java +++ b/src/main/java/com/genyo/api/render/RenderBuffers.java @@ -1,4 +1,4 @@ -package com.genyo.addon.api.render; +package com.genyo.api.render; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/genyo/addon/api/render/ScissorStack.java b/src/main/java/com/genyo/api/render/ScissorStack.java similarity index 96% rename from src/main/java/com/genyo/addon/api/render/ScissorStack.java rename to src/main/java/com/genyo/api/render/ScissorStack.java index 50894e5..194a6bc 100644 --- a/src/main/java/com/genyo/addon/api/render/ScissorStack.java +++ b/src/main/java/com/genyo/api/render/ScissorStack.java @@ -1,4 +1,4 @@ -package com.genyo.addon.api.render; +package com.genyo.api.render; import net.minecraft.client.gui.ScreenRect; diff --git a/src/main/java/com/genyo/addon/events/AttackBlockEvent.java b/src/main/java/com/genyo/events/AttackBlockEvent.java similarity index 95% rename from src/main/java/com/genyo/addon/events/AttackBlockEvent.java rename to src/main/java/com/genyo/events/AttackBlockEvent.java index 27c5e5a..b9b65b1 100644 --- a/src/main/java/com/genyo/addon/events/AttackBlockEvent.java +++ b/src/main/java/com/genyo/events/AttackBlockEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events; +package com.genyo.events; import meteordevelopment.meteorclient.events.Cancellable; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/genyo/events/RunTickEvent.java b/src/main/java/com/genyo/events/RunTickEvent.java new file mode 100644 index 0000000..07dc9d6 --- /dev/null +++ b/src/main/java/com/genyo/events/RunTickEvent.java @@ -0,0 +1,4 @@ +package com.genyo.events; + +public class RunTickEvent { +} diff --git a/src/main/java/com/genyo/addon/events/StageEvent.java b/src/main/java/com/genyo/events/StageEvent.java similarity index 89% rename from src/main/java/com/genyo/addon/events/StageEvent.java rename to src/main/java/com/genyo/events/StageEvent.java index 9b2ed93..24d7e07 100644 --- a/src/main/java/com/genyo/addon/events/StageEvent.java +++ b/src/main/java/com/genyo/events/StageEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events; +package com.genyo.events; public class StageEvent { diff --git a/src/main/java/com/genyo/addon/events/TotemPopEvent.java b/src/main/java/com/genyo/events/TotemPopEvent.java similarity index 92% rename from src/main/java/com/genyo/addon/events/TotemPopEvent.java rename to src/main/java/com/genyo/events/TotemPopEvent.java index c004f21..862bc91 100644 --- a/src/main/java/com/genyo/addon/events/TotemPopEvent.java +++ b/src/main/java/com/genyo/events/TotemPopEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events; +package com.genyo.events; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/genyo/addon/events/UnderCombatEvent.java b/src/main/java/com/genyo/events/UnderCombatEvent.java similarity index 91% rename from src/main/java/com/genyo/addon/events/UnderCombatEvent.java rename to src/main/java/com/genyo/events/UnderCombatEvent.java index d47ed3c..c6b5264 100644 --- a/src/main/java/com/genyo/addon/events/UnderCombatEvent.java +++ b/src/main/java/com/genyo/events/UnderCombatEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events; +package com.genyo.events; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/genyo/addon/events/entity/EntityDeathEvent.java b/src/main/java/com/genyo/events/entity/EntityDeathEvent.java similarity index 88% rename from src/main/java/com/genyo/addon/events/entity/EntityDeathEvent.java rename to src/main/java/com/genyo/events/entity/EntityDeathEvent.java index b10cb02..2a1c0d0 100644 --- a/src/main/java/com/genyo/addon/events/entity/EntityDeathEvent.java +++ b/src/main/java/com/genyo/events/entity/EntityDeathEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.entity; +package com.genyo.events.entity; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/genyo/addon/events/entity/RenderPlayerEvent.java b/src/main/java/com/genyo/events/entity/RenderPlayerEvent.java similarity index 93% rename from src/main/java/com/genyo/addon/events/entity/RenderPlayerEvent.java rename to src/main/java/com/genyo/events/entity/RenderPlayerEvent.java index b67a464..987aca8 100644 --- a/src/main/java/com/genyo/addon/events/entity/RenderPlayerEvent.java +++ b/src/main/java/com/genyo/events/entity/RenderPlayerEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.entity; +package com.genyo.events.entity; import meteordevelopment.meteorclient.events.Cancellable; import net.minecraft.client.network.AbstractClientPlayerEntity; diff --git a/src/main/java/com/genyo/addon/events/entity/player/PushEntityEvent.java b/src/main/java/com/genyo/events/entity/player/PushEntityEvent.java similarity index 90% rename from src/main/java/com/genyo/addon/events/entity/player/PushEntityEvent.java rename to src/main/java/com/genyo/events/entity/player/PushEntityEvent.java index 835f28f..58584af 100644 --- a/src/main/java/com/genyo/addon/events/entity/player/PushEntityEvent.java +++ b/src/main/java/com/genyo/events/entity/player/PushEntityEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.entity.player; +package com.genyo.events.entity.player; import meteordevelopment.meteorclient.events.Cancellable; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/events/entity/player/PushFluidsEvent.java b/src/main/java/com/genyo/events/entity/player/PushFluidsEvent.java similarity index 71% rename from src/main/java/com/genyo/addon/events/entity/player/PushFluidsEvent.java rename to src/main/java/com/genyo/events/entity/player/PushFluidsEvent.java index 8ef6234..bd7a0a4 100644 --- a/src/main/java/com/genyo/addon/events/entity/player/PushFluidsEvent.java +++ b/src/main/java/com/genyo/events/entity/player/PushFluidsEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.entity.player; +package com.genyo.events.entity.player; import meteordevelopment.meteorclient.events.Cancellable; diff --git a/src/main/java/com/genyo/addon/events/keyboard/KeyboardTickEvent.java b/src/main/java/com/genyo/events/keyboard/KeyboardTickEvent.java similarity index 87% rename from src/main/java/com/genyo/addon/events/keyboard/KeyboardTickEvent.java rename to src/main/java/com/genyo/events/keyboard/KeyboardTickEvent.java index e4f0e74..84871b2 100644 --- a/src/main/java/com/genyo/addon/events/keyboard/KeyboardTickEvent.java +++ b/src/main/java/com/genyo/events/keyboard/KeyboardTickEvent.java @@ -1,7 +1,6 @@ -package com.genyo.addon.events.keyboard; +package com.genyo.events.keyboard; import meteordevelopment.meteorclient.events.Cancellable; -import meteordevelopment.meteorclient.events.world.TickEvent; import net.minecraft.client.input.Input; public class KeyboardTickEvent extends Cancellable { diff --git a/src/main/java/com/genyo/addon/events/network/ConnectScreenEvent.java b/src/main/java/com/genyo/events/network/ConnectScreenEvent.java similarity index 92% rename from src/main/java/com/genyo/addon/events/network/ConnectScreenEvent.java rename to src/main/java/com/genyo/events/network/ConnectScreenEvent.java index 892c0e4..2dfdda4 100644 --- a/src/main/java/com/genyo/addon/events/network/ConnectScreenEvent.java +++ b/src/main/java/com/genyo/events/network/ConnectScreenEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.network; +package com.genyo.events.network; import net.minecraft.client.network.ServerAddress; import net.minecraft.client.network.ServerInfo; diff --git a/src/main/java/com/genyo/events/network/DisconnectEvent.java b/src/main/java/com/genyo/events/network/DisconnectEvent.java new file mode 100644 index 0000000..825f79f --- /dev/null +++ b/src/main/java/com/genyo/events/network/DisconnectEvent.java @@ -0,0 +1,4 @@ +package com.genyo.events.network; + +public class DisconnectEvent { +} diff --git a/src/main/java/com/genyo/addon/events/network/ItemDesyncEvent.java b/src/main/java/com/genyo/events/network/ItemDesyncEvent.java similarity index 92% rename from src/main/java/com/genyo/addon/events/network/ItemDesyncEvent.java rename to src/main/java/com/genyo/events/network/ItemDesyncEvent.java index a2354f3..b38ffc3 100644 --- a/src/main/java/com/genyo/addon/events/network/ItemDesyncEvent.java +++ b/src/main/java/com/genyo/events/network/ItemDesyncEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.network; +package com.genyo.events.network; import meteordevelopment.meteorclient.events.Cancellable; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/genyo/addon/events/network/MovementPacketsEvent.java b/src/main/java/com/genyo/events/network/MovementPacketsEvent.java similarity index 93% rename from src/main/java/com/genyo/addon/events/network/MovementPacketsEvent.java rename to src/main/java/com/genyo/events/network/MovementPacketsEvent.java index 96ff31e..9317c45 100644 --- a/src/main/java/com/genyo/addon/events/network/MovementPacketsEvent.java +++ b/src/main/java/com/genyo/events/network/MovementPacketsEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.network; +package com.genyo.events.network; import meteordevelopment.meteorclient.events.Cancellable; diff --git a/src/main/java/com/genyo/addon/events/network/PacketSneakingEvent.java b/src/main/java/com/genyo/events/network/PacketSneakingEvent.java similarity index 74% rename from src/main/java/com/genyo/addon/events/network/PacketSneakingEvent.java rename to src/main/java/com/genyo/events/network/PacketSneakingEvent.java index 5ab558a..007cde9 100644 --- a/src/main/java/com/genyo/addon/events/network/PacketSneakingEvent.java +++ b/src/main/java/com/genyo/events/network/PacketSneakingEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.network; +package com.genyo.events.network; import meteordevelopment.meteorclient.events.Cancellable; diff --git a/src/main/java/com/genyo/events/network/PlayerTickEvent.java b/src/main/java/com/genyo/events/network/PlayerTickEvent.java new file mode 100644 index 0000000..0116432 --- /dev/null +++ b/src/main/java/com/genyo/events/network/PlayerTickEvent.java @@ -0,0 +1,4 @@ +package com.genyo.events.network; + +public class PlayerTickEvent { +} diff --git a/src/main/java/com/genyo/addon/events/network/PlayerUpdateEvent.java b/src/main/java/com/genyo/events/network/PlayerUpdateEvent.java similarity index 80% rename from src/main/java/com/genyo/addon/events/network/PlayerUpdateEvent.java rename to src/main/java/com/genyo/events/network/PlayerUpdateEvent.java index 5093f78..2941ffd 100644 --- a/src/main/java/com/genyo/addon/events/network/PlayerUpdateEvent.java +++ b/src/main/java/com/genyo/events/network/PlayerUpdateEvent.java @@ -1,6 +1,6 @@ -package com.genyo.addon.events.network; +package com.genyo.events.network; -import com.genyo.addon.events.StageEvent; +import com.genyo.events.StageEvent; public class PlayerUpdateEvent extends StageEvent { diff --git a/src/main/java/com/genyo/addon/events/network/PushOutOfBlocksEvent.java b/src/main/java/com/genyo/events/network/PushOutOfBlocksEvent.java similarity index 74% rename from src/main/java/com/genyo/addon/events/network/PushOutOfBlocksEvent.java rename to src/main/java/com/genyo/events/network/PushOutOfBlocksEvent.java index ec1e8d2..d448330 100644 --- a/src/main/java/com/genyo/addon/events/network/PushOutOfBlocksEvent.java +++ b/src/main/java/com/genyo/events/network/PushOutOfBlocksEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.network; +package com.genyo.events.network; import meteordevelopment.meteorclient.events.Cancellable; diff --git a/src/main/java/com/genyo/addon/events/network/SetCurrentHandEvent.java b/src/main/java/com/genyo/events/network/SetCurrentHandEvent.java similarity index 93% rename from src/main/java/com/genyo/addon/events/network/SetCurrentHandEvent.java rename to src/main/java/com/genyo/events/network/SetCurrentHandEvent.java index 0a457c4..b2d7f68 100644 --- a/src/main/java/com/genyo/addon/events/network/SetCurrentHandEvent.java +++ b/src/main/java/com/genyo/events/network/SetCurrentHandEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.network; +package com.genyo.events.network; import meteordevelopment.meteorclient.events.Cancellable; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/genyo/addon/events/render/RenderShaderEvent.java b/src/main/java/com/genyo/events/render/RenderShaderEvent.java similarity index 95% rename from src/main/java/com/genyo/addon/events/render/RenderShaderEvent.java rename to src/main/java/com/genyo/events/render/RenderShaderEvent.java index 79edbdf..c5d0f9a 100644 --- a/src/main/java/com/genyo/addon/events/render/RenderShaderEvent.java +++ b/src/main/java/com/genyo/events/render/RenderShaderEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.render; +package com.genyo.events.render; import meteordevelopment.meteorclient.events.Cancellable; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/com/genyo/addon/events/render/RenderWorldEvent.java b/src/main/java/com/genyo/events/render/RenderWorldEvent.java similarity index 96% rename from src/main/java/com/genyo/addon/events/render/RenderWorldEvent.java rename to src/main/java/com/genyo/events/render/RenderWorldEvent.java index f82c3fa..a0bd1b0 100644 --- a/src/main/java/com/genyo/addon/events/render/RenderWorldEvent.java +++ b/src/main/java/com/genyo/events/render/RenderWorldEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.render; +package com.genyo.events.render; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/com/genyo/addon/events/render/TickCounterEvent.java b/src/main/java/com/genyo/events/render/TickCounterEvent.java similarity index 89% rename from src/main/java/com/genyo/addon/events/render/TickCounterEvent.java rename to src/main/java/com/genyo/events/render/TickCounterEvent.java index ba7b563..5fba712 100644 --- a/src/main/java/com/genyo/addon/events/render/TickCounterEvent.java +++ b/src/main/java/com/genyo/events/render/TickCounterEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.render; +package com.genyo.events.render; import meteordevelopment.meteorclient.events.Cancellable; diff --git a/src/main/java/com/genyo/addon/events/sync/SyncEvent.java b/src/main/java/com/genyo/events/sync/SyncEvent.java similarity index 94% rename from src/main/java/com/genyo/addon/events/sync/SyncEvent.java rename to src/main/java/com/genyo/events/sync/SyncEvent.java index 24b13da..c37a63a 100644 --- a/src/main/java/com/genyo/addon/events/sync/SyncEvent.java +++ b/src/main/java/com/genyo/events/sync/SyncEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.sync; +package com.genyo.events.sync; import meteordevelopment.meteorclient.events.Cancellable; diff --git a/src/main/java/com/genyo/addon/events/world/AddEntityEvent.java b/src/main/java/com/genyo/events/world/AddEntityEvent.java similarity index 88% rename from src/main/java/com/genyo/addon/events/world/AddEntityEvent.java rename to src/main/java/com/genyo/events/world/AddEntityEvent.java index 891d5c9..4af41e1 100644 --- a/src/main/java/com/genyo/addon/events/world/AddEntityEvent.java +++ b/src/main/java/com/genyo/events/world/AddEntityEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.world; +package com.genyo.events.world; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/events/world/BlockCollisionEvent.java b/src/main/java/com/genyo/events/world/BlockCollisionEvent.java similarity index 95% rename from src/main/java/com/genyo/addon/events/world/BlockCollisionEvent.java rename to src/main/java/com/genyo/events/world/BlockCollisionEvent.java index 71103fb..e78bebb 100644 --- a/src/main/java/com/genyo/addon/events/world/BlockCollisionEvent.java +++ b/src/main/java/com/genyo/events/world/BlockCollisionEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.world; +package com.genyo.events.world; import meteordevelopment.meteorclient.events.Cancellable; import net.minecraft.block.Block; diff --git a/src/main/java/com/genyo/events/world/LoadWorldEvent.java b/src/main/java/com/genyo/events/world/LoadWorldEvent.java new file mode 100644 index 0000000..72d195f --- /dev/null +++ b/src/main/java/com/genyo/events/world/LoadWorldEvent.java @@ -0,0 +1,4 @@ +package com.genyo.events.world; + +public class LoadWorldEvent { +} diff --git a/src/main/java/com/genyo/addon/events/world/RemoveEntityEvent.java b/src/main/java/com/genyo/events/world/RemoveEntityEvent.java similarity index 91% rename from src/main/java/com/genyo/addon/events/world/RemoveEntityEvent.java rename to src/main/java/com/genyo/events/world/RemoveEntityEvent.java index 810487b..eb1bcc6 100644 --- a/src/main/java/com/genyo/addon/events/world/RemoveEntityEvent.java +++ b/src/main/java/com/genyo/events/world/RemoveEntityEvent.java @@ -1,4 +1,4 @@ -package com.genyo.addon.events.world; +package com.genyo.events.world; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/imixins/IClientPlayNetworkHandler.java b/src/main/java/com/genyo/imixins/IClientPlayNetworkHandler.java similarity index 82% rename from src/main/java/com/genyo/addon/imixins/IClientPlayNetworkHandler.java rename to src/main/java/com/genyo/imixins/IClientPlayNetworkHandler.java index 1d56b89..5062246 100644 --- a/src/main/java/com/genyo/addon/imixins/IClientPlayNetworkHandler.java +++ b/src/main/java/com/genyo/imixins/IClientPlayNetworkHandler.java @@ -1,4 +1,4 @@ -package com.genyo.addon.imixins; +package com.genyo.imixins; import net.minecraft.network.packet.Packet; diff --git a/src/main/java/com/genyo/addon/imixins/IClientPlayerEntity.java b/src/main/java/com/genyo/imixins/IClientPlayerEntity.java similarity index 80% rename from src/main/java/com/genyo/addon/imixins/IClientPlayerEntity.java rename to src/main/java/com/genyo/imixins/IClientPlayerEntity.java index 968d0d4..42c95e8 100644 --- a/src/main/java/com/genyo/addon/imixins/IClientPlayerEntity.java +++ b/src/main/java/com/genyo/imixins/IClientPlayerEntity.java @@ -1,4 +1,4 @@ -package com.genyo.addon.imixins; +package com.genyo.imixins; @IMixin public interface IClientPlayerEntity { diff --git a/src/main/java/com/genyo/addon/imixins/IMixin.java b/src/main/java/com/genyo/imixins/IMixin.java similarity index 88% rename from src/main/java/com/genyo/addon/imixins/IMixin.java rename to src/main/java/com/genyo/imixins/IMixin.java index b8d53bf..7602fbd 100644 --- a/src/main/java/com/genyo/addon/imixins/IMixin.java +++ b/src/main/java/com/genyo/imixins/IMixin.java @@ -1,4 +1,4 @@ -package com.genyo.addon.imixins; +package com.genyo.imixins; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/genyo/addon/managers/Managers.java b/src/main/java/com/genyo/managers/Managers.java similarity index 68% rename from src/main/java/com/genyo/addon/managers/Managers.java rename to src/main/java/com/genyo/managers/Managers.java index 9221b3e..1cb7343 100644 --- a/src/main/java/com/genyo/addon/managers/Managers.java +++ b/src/main/java/com/genyo/managers/Managers.java @@ -1,20 +1,20 @@ -package com.genyo.addon.managers; +package com.genyo.managers; -import com.genyo.addon.managers.anticheat.AntiCheatManager; -import com.genyo.addon.managers.combat.CombatManager; -import com.genyo.addon.managers.combat.PearlManager; -import com.genyo.addon.managers.combat.TotemManager; -import com.genyo.addon.managers.network.GDTogglerManager; -import com.genyo.addon.managers.network.NetworkManager; -import com.genyo.addon.managers.player.InteractionManager; -import com.genyo.addon.managers.player.InventoryManager; -import com.genyo.addon.managers.player.MovementManager; -import com.genyo.addon.managers.player.PositionManager; -import com.genyo.addon.managers.player.rotation.RotationManager; -import com.genyo.addon.managers.world.BlockManager; -import com.genyo.addon.managers.world.SocialManager; -import com.genyo.addon.managers.world.tick.TickManager; -import com.genyo.addon.render.Render3DEngine; +import com.genyo.managers.anticheat.AntiCheatManager; +import com.genyo.managers.combat.CombatManager; +import com.genyo.managers.combat.PearlManager; +import com.genyo.managers.combat.TotemManager; +import com.genyo.managers.network.GDTogglerManager; +import com.genyo.managers.network.NetworkManager; +import com.genyo.managers.player.InteractionManager; +import com.genyo.managers.player.InventoryManager; +import com.genyo.managers.player.MovementManager; +import com.genyo.managers.player.PositionManager; +import com.genyo.managers.player.rotation.RotationManager; +import com.genyo.managers.world.BlockManager; +import com.genyo.managers.world.SocialManager; +import com.genyo.managers.world.tick.TickManager; +import com.genyo.render.Render3DEngine; import meteordevelopment.meteorclient.MeteorClient; public class Managers { diff --git a/src/main/java/com/genyo/addon/managers/anticheat/AntiCheatManager.java b/src/main/java/com/genyo/managers/anticheat/AntiCheatManager.java similarity index 89% rename from src/main/java/com/genyo/addon/managers/anticheat/AntiCheatManager.java rename to src/main/java/com/genyo/managers/anticheat/AntiCheatManager.java index 6f72bad..f5649c0 100644 --- a/src/main/java/com/genyo/addon/managers/anticheat/AntiCheatManager.java +++ b/src/main/java/com/genyo/managers/anticheat/AntiCheatManager.java @@ -1,11 +1,9 @@ -package com.genyo.addon.managers.anticheat; +package com.genyo.managers.anticheat; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.DisconnectEvent; -import com.genyo.addon.utils.GenyoChatUtils; +import com.genyo.events.network.DisconnectEvent; +import com.genyo.utils.GenyoChatUtils; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.orbit.EventHandler; -import net.minecraft.entity.player.PlayerPosition; import net.minecraft.network.packet.s2c.common.CommonPingS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/genyo/addon/managers/anticheat/SetbackData.java b/src/main/java/com/genyo/managers/anticheat/SetbackData.java similarity index 82% rename from src/main/java/com/genyo/addon/managers/anticheat/SetbackData.java rename to src/main/java/com/genyo/managers/anticheat/SetbackData.java index 3ec2488..4cd5aba 100644 --- a/src/main/java/com/genyo/addon/managers/anticheat/SetbackData.java +++ b/src/main/java/com/genyo/managers/anticheat/SetbackData.java @@ -1,4 +1,4 @@ -package com.genyo.addon.managers.anticheat; +package com.genyo.managers.anticheat; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/genyo/addon/managers/combat/CombatManager.java b/src/main/java/com/genyo/managers/combat/CombatManager.java similarity index 88% rename from src/main/java/com/genyo/addon/managers/combat/CombatManager.java rename to src/main/java/com/genyo/managers/combat/CombatManager.java index 56d0447..9eab275 100644 --- a/src/main/java/com/genyo/addon/managers/combat/CombatManager.java +++ b/src/main/java/com/genyo/managers/combat/CombatManager.java @@ -1,19 +1,16 @@ -package com.genyo.addon.managers.combat; +package com.genyo.managers.combat; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.TotemPopEvent; -import com.genyo.addon.events.UnderCombatEvent; -import com.genyo.addon.utils.GenyoChatUtils; +import com.genyo.events.TotemPopEvent; +import com.genyo.events.UnderCombatEvent; +import com.genyo.utils.GenyoChatUtils; import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.events.entity.player.AttackEntityEvent; import meteordevelopment.meteorclient.events.packets.PacketEvent; -import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.orbit.EventHandler; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityStatuses; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket; -import net.minecraft.text.Text; import net.minecraft.util.Formatting; import java.util.HashMap; diff --git a/src/main/java/com/genyo/addon/managers/combat/PearlManager.java b/src/main/java/com/genyo/managers/combat/PearlManager.java similarity index 90% rename from src/main/java/com/genyo/addon/managers/combat/PearlManager.java rename to src/main/java/com/genyo/managers/combat/PearlManager.java index 9dedda2..c6a2c6f 100644 --- a/src/main/java/com/genyo/addon/managers/combat/PearlManager.java +++ b/src/main/java/com/genyo/managers/combat/PearlManager.java @@ -1,8 +1,7 @@ -package com.genyo.addon.managers.combat; +package com.genyo.managers.combat; -import com.genyo.addon.systems.modules.movement.GenyoPhase; -import com.genyo.addon.systems.modules.movement.GenyoVelocity; -import com.genyo.addon.utils.player.RaycastUtil; +import com.genyo.systems.modules.movement.GenyoPhase; +import com.genyo.utils.player.RaycastUtil; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.systems.modules.Modules; import meteordevelopment.orbit.EventHandler; diff --git a/src/main/java/com/genyo/addon/managers/combat/TotemManager.java b/src/main/java/com/genyo/managers/combat/TotemManager.java similarity index 94% rename from src/main/java/com/genyo/addon/managers/combat/TotemManager.java rename to src/main/java/com/genyo/managers/combat/TotemManager.java index 0de24d5..35c31d9 100644 --- a/src/main/java/com/genyo/addon/managers/combat/TotemManager.java +++ b/src/main/java/com/genyo/managers/combat/TotemManager.java @@ -1,7 +1,7 @@ -package com.genyo.addon.managers.combat; +package com.genyo.managers.combat; -import com.genyo.addon.events.network.DisconnectEvent; -import com.genyo.addon.events.entity.EntityDeathEvent; +import com.genyo.events.network.DisconnectEvent; +import com.genyo.events.entity.EntityDeathEvent; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.orbit.EventHandler; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/managers/network/GDTogglerManager.java b/src/main/java/com/genyo/managers/network/GDTogglerManager.java similarity index 76% rename from src/main/java/com/genyo/addon/managers/network/GDTogglerManager.java rename to src/main/java/com/genyo/managers/network/GDTogglerManager.java index eef494c..7addef0 100644 --- a/src/main/java/com/genyo/addon/managers/network/GDTogglerManager.java +++ b/src/main/java/com/genyo/managers/network/GDTogglerManager.java @@ -1,7 +1,7 @@ -package com.genyo.addon.managers.network; +package com.genyo.managers.network; -import com.genyo.addon.systems.modules.misc.GenyoDiscord; -import com.genyo.addon.utils.GenyoChatUtils; +import com.genyo.systems.modules.misc.GenyoDiscord; +import com.genyo.utils.GenyoChatUtils; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.systems.modules.Modules; import meteordevelopment.orbit.EventHandler; diff --git a/src/main/java/com/genyo/addon/managers/network/NetworkManager.java b/src/main/java/com/genyo/managers/network/NetworkManager.java similarity index 93% rename from src/main/java/com/genyo/addon/managers/network/NetworkManager.java rename to src/main/java/com/genyo/managers/network/NetworkManager.java index d441c48..cb906d3 100644 --- a/src/main/java/com/genyo/addon/managers/network/NetworkManager.java +++ b/src/main/java/com/genyo/managers/network/NetworkManager.java @@ -1,10 +1,10 @@ -package com.genyo.addon.managers.network; +package com.genyo.managers.network; -import com.genyo.addon.events.network.ConnectScreenEvent; -import com.genyo.addon.events.network.DisconnectEvent; -import com.genyo.addon.mixin.accessor.AccessorClientWorld; -import com.genyo.addon.imixins.IClientPlayNetworkHandler; -import com.genyo.addon.utils.math.PerSecondCounter; +import com.genyo.events.network.ConnectScreenEvent; +import com.genyo.events.network.DisconnectEvent; +import com.genyo.mixin.accessor.AccessorClientWorld; +import com.genyo.imixins.IClientPlayNetworkHandler; +import com.genyo.utils.math.PerSecondCounter; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.orbit.EventHandler; import net.minecraft.client.network.*; diff --git a/src/main/java/com/genyo/addon/managers/player/InteractionManager.java b/src/main/java/com/genyo/managers/player/InteractionManager.java similarity index 98% rename from src/main/java/com/genyo/addon/managers/player/InteractionManager.java rename to src/main/java/com/genyo/managers/player/InteractionManager.java index bcdf854..00c35c3 100644 --- a/src/main/java/com/genyo/addon/managers/player/InteractionManager.java +++ b/src/main/java/com/genyo/managers/player/InteractionManager.java @@ -1,9 +1,9 @@ -package com.genyo.addon.managers.player; +package com.genyo.managers.player; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.utils.player.MovementUtil; -import com.genyo.addon.utils.player.RotationUtil; -import com.genyo.addon.utils.world.SneakBlocks; +import com.genyo.managers.Managers; +import com.genyo.utils.player.MovementUtil; +import com.genyo.utils.player.RotationUtil; +import com.genyo.utils.world.SneakBlocks; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket; diff --git a/src/main/java/com/genyo/addon/managers/player/InventoryManager.java b/src/main/java/com/genyo/managers/player/InventoryManager.java similarity index 96% rename from src/main/java/com/genyo/addon/managers/player/InventoryManager.java rename to src/main/java/com/genyo/managers/player/InventoryManager.java index 04f9701..ff5a294 100644 --- a/src/main/java/com/genyo/addon/managers/player/InventoryManager.java +++ b/src/main/java/com/genyo/managers/player/InventoryManager.java @@ -1,11 +1,11 @@ -package com.genyo.addon.managers.player; - -import com.genyo.addon.events.entity.EntityDeathEvent; -import com.genyo.addon.events.network.ItemDesyncEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.mixin.accessor.AccessorBundlePacket; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; +package com.genyo.managers.player; + +import com.genyo.events.entity.EntityDeathEvent; +import com.genyo.events.network.ItemDesyncEvent; +import com.genyo.managers.Managers; +import com.genyo.mixin.accessor.AccessorBundlePacket; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import meteordevelopment.meteorclient.events.packets.PacketEvent; diff --git a/src/main/java/com/genyo/addon/managers/player/MovementManager.java b/src/main/java/com/genyo/managers/player/MovementManager.java similarity index 91% rename from src/main/java/com/genyo/addon/managers/player/MovementManager.java rename to src/main/java/com/genyo/managers/player/MovementManager.java index 6d9effd..77a2339 100644 --- a/src/main/java/com/genyo/addon/managers/player/MovementManager.java +++ b/src/main/java/com/genyo/managers/player/MovementManager.java @@ -1,7 +1,7 @@ -package com.genyo.addon.managers.player; +package com.genyo.managers.player; -import com.genyo.addon.events.network.PacketSneakingEvent; -import com.genyo.addon.managers.Managers; +import com.genyo.events.network.PacketSneakingEvent; +import com.genyo.managers.Managers; import meteordevelopment.orbit.EventHandler; import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; diff --git a/src/main/java/com/genyo/addon/managers/player/PositionManager.java b/src/main/java/com/genyo/managers/player/PositionManager.java similarity index 98% rename from src/main/java/com/genyo/addon/managers/player/PositionManager.java rename to src/main/java/com/genyo/managers/player/PositionManager.java index 94a235c..b89a511 100644 --- a/src/main/java/com/genyo/addon/managers/player/PositionManager.java +++ b/src/main/java/com/genyo/managers/player/PositionManager.java @@ -1,6 +1,6 @@ -package com.genyo.addon.managers.player; +package com.genyo.managers.player; -import com.genyo.addon.managers.Managers; +import com.genyo.managers.Managers; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.orbit.EventHandler; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/managers/player/RotationCallback.java b/src/main/java/com/genyo/managers/player/RotationCallback.java similarity index 86% rename from src/main/java/com/genyo/addon/managers/player/RotationCallback.java rename to src/main/java/com/genyo/managers/player/RotationCallback.java index 3c685d3..0b8b277 100644 --- a/src/main/java/com/genyo/addon/managers/player/RotationCallback.java +++ b/src/main/java/com/genyo/managers/player/RotationCallback.java @@ -1,4 +1,4 @@ -package com.genyo.addon.managers.player; +package com.genyo.managers.player; public interface RotationCallback { diff --git a/src/main/java/com/genyo/addon/managers/player/rotation/Rotation.java b/src/main/java/com/genyo/managers/player/rotation/Rotation.java similarity index 94% rename from src/main/java/com/genyo/addon/managers/player/rotation/Rotation.java rename to src/main/java/com/genyo/managers/player/rotation/Rotation.java index 25d43fb..27826ba 100644 --- a/src/main/java/com/genyo/addon/managers/player/rotation/Rotation.java +++ b/src/main/java/com/genyo/managers/player/rotation/Rotation.java @@ -1,4 +1,4 @@ -package com.genyo.addon.managers.player.rotation; +package com.genyo.managers.player.rotation; public class Rotation { diff --git a/src/main/java/com/genyo/addon/managers/player/rotation/RotationManager.java b/src/main/java/com/genyo/managers/player/rotation/RotationManager.java similarity index 95% rename from src/main/java/com/genyo/addon/managers/player/rotation/RotationManager.java rename to src/main/java/com/genyo/managers/player/rotation/RotationManager.java index 185d9fa..ed6b7ca 100644 --- a/src/main/java/com/genyo/addon/managers/player/rotation/RotationManager.java +++ b/src/main/java/com/genyo/managers/player/rotation/RotationManager.java @@ -1,12 +1,12 @@ -package com.genyo.addon.managers.player.rotation; - -import com.genyo.addon.events.StageEvent; -import com.genyo.addon.events.network.MovementPacketsEvent; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.events.network.PlayerUpdateEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.imixins.IClientPlayerEntity; -import com.genyo.addon.utils.player.PlayerUtil; +package com.genyo.managers.player.rotation; + +import com.genyo.events.StageEvent; +import com.genyo.events.network.MovementPacketsEvent; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.events.network.PlayerUpdateEvent; +import com.genyo.managers.Managers; +import com.genyo.imixins.IClientPlayerEntity; +import com.genyo.utils.player.PlayerUtil; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.orbit.EventHandler; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; diff --git a/src/main/java/com/genyo/addon/managers/world/BlockManager.java b/src/main/java/com/genyo/managers/world/BlockManager.java similarity index 98% rename from src/main/java/com/genyo/addon/managers/world/BlockManager.java rename to src/main/java/com/genyo/managers/world/BlockManager.java index 3a2e6de..dad3bf1 100644 --- a/src/main/java/com/genyo/addon/managers/world/BlockManager.java +++ b/src/main/java/com/genyo/managers/world/BlockManager.java @@ -1,4 +1,4 @@ -package com.genyo.addon.managers.world; +package com.genyo.managers.world; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.world.TickEvent; diff --git a/src/main/java/com/genyo/addon/managers/world/SocialManager.java b/src/main/java/com/genyo/managers/world/SocialManager.java similarity index 90% rename from src/main/java/com/genyo/addon/managers/world/SocialManager.java rename to src/main/java/com/genyo/managers/world/SocialManager.java index b344a3a..02615d2 100644 --- a/src/main/java/com/genyo/addon/managers/world/SocialManager.java +++ b/src/main/java/com/genyo/managers/world/SocialManager.java @@ -1,4 +1,4 @@ -package com.genyo.addon.managers.world; +package com.genyo.managers.world; import meteordevelopment.meteorclient.systems.friends.Friends; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/genyo/addon/managers/world/tick/TickManager.java b/src/main/java/com/genyo/managers/world/tick/TickManager.java similarity index 94% rename from src/main/java/com/genyo/addon/managers/world/tick/TickManager.java rename to src/main/java/com/genyo/managers/world/tick/TickManager.java index 0912fe4..434d2ab 100644 --- a/src/main/java/com/genyo/addon/managers/world/tick/TickManager.java +++ b/src/main/java/com/genyo/managers/world/tick/TickManager.java @@ -1,8 +1,8 @@ -package com.genyo.addon.managers.world.tick; +package com.genyo.managers.world.tick; -import com.genyo.addon.events.network.DisconnectEvent; -import com.genyo.addon.events.render.TickCounterEvent; -import com.genyo.addon.utils.collection.EvictingQueue; +import com.genyo.events.network.DisconnectEvent; +import com.genyo.events.render.TickCounterEvent; +import com.genyo.utils.collection.EvictingQueue; import com.google.common.collect.Lists; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.orbit.EventHandler; diff --git a/src/main/java/com/genyo/addon/managers/world/tick/TickSync.java b/src/main/java/com/genyo/managers/world/tick/TickSync.java similarity index 62% rename from src/main/java/com/genyo/addon/managers/world/tick/TickSync.java rename to src/main/java/com/genyo/managers/world/tick/TickSync.java index 797840b..9ad2ec8 100644 --- a/src/main/java/com/genyo/addon/managers/world/tick/TickSync.java +++ b/src/main/java/com/genyo/managers/world/tick/TickSync.java @@ -1,4 +1,4 @@ -package com.genyo.addon.managers.world.tick; +package com.genyo.managers.world.tick; public enum TickSync { CURRENT, diff --git a/src/main/java/com/genyo/addon/mixin/ClientPlayerInteractionManagerMixin.java b/src/main/java/com/genyo/mixin/ClientPlayerInteractionManagerMixin.java similarity index 93% rename from src/main/java/com/genyo/addon/mixin/ClientPlayerInteractionManagerMixin.java rename to src/main/java/com/genyo/mixin/ClientPlayerInteractionManagerMixin.java index c7dc3ce..726ad17 100644 --- a/src/main/java/com/genyo/addon/mixin/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/com/genyo/mixin/ClientPlayerInteractionManagerMixin.java @@ -1,8 +1,8 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.events.AttackBlockEvent; -import com.genyo.addon.events.network.ItemDesyncEvent; -import com.genyo.addon.events.network.PacketSneakingEvent; +import com.genyo.events.AttackBlockEvent; +import com.genyo.events.network.ItemDesyncEvent; +import com.genyo.events.network.PacketSneakingEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.block.BlockState; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/main/java/com/genyo/addon/mixin/DefaultSettingsWidgetFactoryMixin.java b/src/main/java/com/genyo/mixin/DefaultSettingsWidgetFactoryMixin.java similarity index 93% rename from src/main/java/com/genyo/addon/mixin/DefaultSettingsWidgetFactoryMixin.java rename to src/main/java/com/genyo/mixin/DefaultSettingsWidgetFactoryMixin.java index 483a487..aa6519f 100644 --- a/src/main/java/com/genyo/addon/mixin/DefaultSettingsWidgetFactoryMixin.java +++ b/src/main/java/com/genyo/mixin/DefaultSettingsWidgetFactoryMixin.java @@ -1,7 +1,7 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.systems.settings.playerlist.ListGroupSetting; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.systems.settings.playerlist.ListGroupSetting; import meteordevelopment.meteorclient.gui.DefaultSettingsWidgetFactory; import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.utils.SettingsWidgetFactory; diff --git a/src/main/java/com/genyo/addon/mixin/FriendsInjector.java b/src/main/java/com/genyo/mixin/FriendsInjector.java similarity index 89% rename from src/main/java/com/genyo/addon/mixin/FriendsInjector.java rename to src/main/java/com/genyo/mixin/FriendsInjector.java index d52fe82..595ef73 100644 --- a/src/main/java/com/genyo/addon/mixin/FriendsInjector.java +++ b/src/main/java/com/genyo/mixin/FriendsInjector.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.systems.enemies.Enemies; +import com.genyo.systems.enemies.Enemies; import meteordevelopment.meteorclient.systems.friends.Friend; import meteordevelopment.meteorclient.systems.friends.Friends; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/genyo/addon/mixin/MixinClientConnection.java b/src/main/java/com/genyo/mixin/MixinClientConnection.java similarity index 88% rename from src/main/java/com/genyo/addon/mixin/MixinClientConnection.java rename to src/main/java/com/genyo/mixin/MixinClientConnection.java index ea0f136..6f06be6 100644 --- a/src/main/java/com/genyo/addon/mixin/MixinClientConnection.java +++ b/src/main/java/com/genyo/mixin/MixinClientConnection.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.events.network.DisconnectEvent; +import com.genyo.events.network.DisconnectEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.network.ClientConnection; import net.minecraft.text.Text; diff --git a/src/main/java/com/genyo/addon/mixin/MixinConnectScreen.java b/src/main/java/com/genyo/mixin/MixinConnectScreen.java similarity index 92% rename from src/main/java/com/genyo/addon/mixin/MixinConnectScreen.java rename to src/main/java/com/genyo/mixin/MixinConnectScreen.java index 7b5f8d4..7127b28 100644 --- a/src/main/java/com/genyo/addon/mixin/MixinConnectScreen.java +++ b/src/main/java/com/genyo/mixin/MixinConnectScreen.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.events.network.ConnectScreenEvent; +import com.genyo.events.network.ConnectScreenEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.multiplayer.ConnectScreen; diff --git a/src/main/java/com/genyo/addon/mixin/MixinItemUsageContext.java b/src/main/java/com/genyo/mixin/MixinItemUsageContext.java similarity index 91% rename from src/main/java/com/genyo/addon/mixin/MixinItemUsageContext.java rename to src/main/java/com/genyo/mixin/MixinItemUsageContext.java index c9d2d59..86054d1 100644 --- a/src/main/java/com/genyo/addon/mixin/MixinItemUsageContext.java +++ b/src/main/java/com/genyo/mixin/MixinItemUsageContext.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.events.network.ItemDesyncEvent; +import com.genyo.events.network.ItemDesyncEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; diff --git a/src/main/java/com/genyo/addon/mixin/MixinKeyboardInput.java b/src/main/java/com/genyo/mixin/MixinKeyboardInput.java similarity index 92% rename from src/main/java/com/genyo/addon/mixin/MixinKeyboardInput.java rename to src/main/java/com/genyo/mixin/MixinKeyboardInput.java index c212ea2..31e9d49 100644 --- a/src/main/java/com/genyo/addon/mixin/MixinKeyboardInput.java +++ b/src/main/java/com/genyo/mixin/MixinKeyboardInput.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.events.keyboard.KeyboardTickEvent; +import com.genyo.events.keyboard.KeyboardTickEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.client.input.Input; import net.minecraft.client.input.KeyboardInput; diff --git a/src/main/java/com/genyo/addon/mixin/PlayerUtilsMixin.java b/src/main/java/com/genyo/mixin/PlayerUtilsMixin.java similarity index 90% rename from src/main/java/com/genyo/addon/mixin/PlayerUtilsMixin.java rename to src/main/java/com/genyo/mixin/PlayerUtilsMixin.java index 136780b..0bb8a95 100644 --- a/src/main/java/com/genyo/addon/mixin/PlayerUtilsMixin.java +++ b/src/main/java/com/genyo/mixin/PlayerUtilsMixin.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin; +package com.genyo.mixin; -import com.genyo.addon.systems.enemies.Enemies; +import com.genyo.systems.enemies.Enemies; import meteordevelopment.meteorclient.utils.player.PlayerUtils; import meteordevelopment.meteorclient.utils.render.color.Color; import net.minecraft.entity.player.PlayerEntity; @@ -18,5 +18,5 @@ private static void injectGetPlayerColor(PlayerEntity entity, Color defaultColor cir.setReturnValue(Enemies.get().getEnemyColor()); } } - + } diff --git a/src/main/java/com/genyo/addon/mixin/accessor/AccessorBundlePacket.java b/src/main/java/com/genyo/mixin/accessor/AccessorBundlePacket.java similarity index 90% rename from src/main/java/com/genyo/addon/mixin/accessor/AccessorBundlePacket.java rename to src/main/java/com/genyo/mixin/accessor/AccessorBundlePacket.java index 36cdf1d..2a25fa8 100644 --- a/src/main/java/com/genyo/addon/mixin/accessor/AccessorBundlePacket.java +++ b/src/main/java/com/genyo/mixin/accessor/AccessorBundlePacket.java @@ -1,4 +1,4 @@ -package com.genyo.addon.mixin.accessor; +package com.genyo.mixin.accessor; import net.minecraft.network.packet.BundlePacket; import net.minecraft.network.packet.Packet; diff --git a/src/main/java/com/genyo/addon/mixin/accessor/AccessorClientConnection.java b/src/main/java/com/genyo/mixin/accessor/AccessorClientConnection.java similarity index 92% rename from src/main/java/com/genyo/addon/mixin/accessor/AccessorClientConnection.java rename to src/main/java/com/genyo/mixin/accessor/AccessorClientConnection.java index 7a36802..a3e9be2 100644 --- a/src/main/java/com/genyo/addon/mixin/accessor/AccessorClientConnection.java +++ b/src/main/java/com/genyo/mixin/accessor/AccessorClientConnection.java @@ -1,4 +1,4 @@ -package com.genyo.addon.mixin.accessor; +package com.genyo.mixin.accessor; import net.minecraft.network.ClientConnection; import net.minecraft.network.PacketCallbacks; diff --git a/src/main/java/com/genyo/addon/mixin/accessor/AccessorClientPlayerInteractionManager.java b/src/main/java/com/genyo/mixin/accessor/AccessorClientPlayerInteractionManager.java similarity index 96% rename from src/main/java/com/genyo/addon/mixin/accessor/AccessorClientPlayerInteractionManager.java rename to src/main/java/com/genyo/mixin/accessor/AccessorClientPlayerInteractionManager.java index 3a91b7f..1395d86 100644 --- a/src/main/java/com/genyo/addon/mixin/accessor/AccessorClientPlayerInteractionManager.java +++ b/src/main/java/com/genyo/mixin/accessor/AccessorClientPlayerInteractionManager.java @@ -1,4 +1,4 @@ -package com.genyo.addon.mixin.accessor; +package com.genyo.mixin.accessor; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.ClientPlayerInteractionManager; diff --git a/src/main/java/com/genyo/addon/mixin/accessor/AccessorClientWorld.java b/src/main/java/com/genyo/mixin/accessor/AccessorClientWorld.java similarity index 95% rename from src/main/java/com/genyo/addon/mixin/accessor/AccessorClientWorld.java rename to src/main/java/com/genyo/mixin/accessor/AccessorClientWorld.java index b089191..85f74bd 100644 --- a/src/main/java/com/genyo/addon/mixin/accessor/AccessorClientWorld.java +++ b/src/main/java/com/genyo/mixin/accessor/AccessorClientWorld.java @@ -1,4 +1,4 @@ -package com.genyo.addon.mixin.accessor; +package com.genyo.mixin.accessor; import net.minecraft.client.network.PendingUpdateManager; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/com/genyo/addon/mixin/accessor/AccessorEntityVelocityUpdateS2CPacket.java b/src/main/java/com/genyo/mixin/accessor/AccessorEntityVelocityUpdateS2CPacket.java similarity index 93% rename from src/main/java/com/genyo/addon/mixin/accessor/AccessorEntityVelocityUpdateS2CPacket.java rename to src/main/java/com/genyo/mixin/accessor/AccessorEntityVelocityUpdateS2CPacket.java index 16b6c71..240d66d 100644 --- a/src/main/java/com/genyo/addon/mixin/accessor/AccessorEntityVelocityUpdateS2CPacket.java +++ b/src/main/java/com/genyo/mixin/accessor/AccessorEntityVelocityUpdateS2CPacket.java @@ -1,4 +1,4 @@ -package com.genyo.addon.mixin.accessor; +package com.genyo.mixin.accessor; import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/genyo/addon/mixin/accessor/AccessorGameOptions.java b/src/main/java/com/genyo/mixin/accessor/AccessorGameOptions.java similarity index 92% rename from src/main/java/com/genyo/addon/mixin/accessor/AccessorGameOptions.java rename to src/main/java/com/genyo/mixin/accessor/AccessorGameOptions.java index 67eed56..70b5177 100644 --- a/src/main/java/com/genyo/addon/mixin/accessor/AccessorGameOptions.java +++ b/src/main/java/com/genyo/mixin/accessor/AccessorGameOptions.java @@ -1,4 +1,4 @@ -package com.genyo.addon.mixin.accessor; +package com.genyo.mixin.accessor; import net.minecraft.client.option.GameOptions; import net.minecraft.entity.player.PlayerModelPart; diff --git a/src/main/java/com/genyo/addon/mixin/entity/IEntity.java b/src/main/java/com/genyo/mixin/entity/IEntity.java similarity index 92% rename from src/main/java/com/genyo/addon/mixin/entity/IEntity.java rename to src/main/java/com/genyo/mixin/entity/IEntity.java index 6786b38..5eee616 100644 --- a/src/main/java/com/genyo/addon/mixin/entity/IEntity.java +++ b/src/main/java/com/genyo/mixin/entity/IEntity.java @@ -1,4 +1,4 @@ -package com.genyo.addon.mixin.entity; +package com.genyo.mixin.entity; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/genyo/addon/mixin/entity/MixinEntity.java b/src/main/java/com/genyo/mixin/entity/MixinEntity.java similarity index 88% rename from src/main/java/com/genyo/addon/mixin/entity/MixinEntity.java rename to src/main/java/com/genyo/mixin/entity/MixinEntity.java index 3a59fe3..3dbfc0f 100644 --- a/src/main/java/com/genyo/addon/mixin/entity/MixinEntity.java +++ b/src/main/java/com/genyo/mixin/entity/MixinEntity.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin.entity; +package com.genyo.mixin.entity; -import com.genyo.addon.events.entity.player.PushEntityEvent; +import com.genyo.events.entity.player.PushEntityEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.entity.Entity; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/genyo/addon/mixin/entity/player/MixinPlayerEntity.java b/src/main/java/com/genyo/mixin/entity/player/MixinPlayerEntity.java similarity index 90% rename from src/main/java/com/genyo/addon/mixin/entity/player/MixinPlayerEntity.java rename to src/main/java/com/genyo/mixin/entity/player/MixinPlayerEntity.java index 96d989e..1704aa0 100644 --- a/src/main/java/com/genyo/addon/mixin/entity/player/MixinPlayerEntity.java +++ b/src/main/java/com/genyo/mixin/entity/player/MixinPlayerEntity.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin.entity.player; +package com.genyo.mixin.entity.player; -import com.genyo.addon.events.entity.player.PushFluidsEvent; +import com.genyo.events.entity.player.PushFluidsEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.entity.player.PlayerEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/genyo/addon/mixin/entity/player/MixinPlayerListEntry.java b/src/main/java/com/genyo/mixin/entity/player/MixinPlayerListEntry.java similarity index 93% rename from src/main/java/com/genyo/addon/mixin/entity/player/MixinPlayerListEntry.java rename to src/main/java/com/genyo/mixin/entity/player/MixinPlayerListEntry.java index c0fa2c1..f037eda 100644 --- a/src/main/java/com/genyo/addon/mixin/entity/player/MixinPlayerListEntry.java +++ b/src/main/java/com/genyo/mixin/entity/player/MixinPlayerListEntry.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin.entity.player; +package com.genyo.mixin.entity.player; -import com.genyo.addon.systems.modules.visual.GenyoCapes; +import com.genyo.systems.modules.visual.GenyoCapes; import com.mojang.authlib.GameProfile; import meteordevelopment.meteorclient.systems.modules.Modules; import net.minecraft.client.network.PlayerListEntry; diff --git a/src/main/java/com/genyo/addon/mixin/game/MixinMinecraftClient.java b/src/main/java/com/genyo/mixin/game/MixinMinecraftClient.java similarity index 70% rename from src/main/java/com/genyo/addon/mixin/game/MixinMinecraftClient.java rename to src/main/java/com/genyo/mixin/game/MixinMinecraftClient.java index 384c67e..e450cd4 100644 --- a/src/main/java/com/genyo/addon/mixin/game/MixinMinecraftClient.java +++ b/src/main/java/com/genyo/mixin/game/MixinMinecraftClient.java @@ -1,24 +1,13 @@ -package com.genyo.addon.mixin.game; +package com.genyo.mixin.game; -import com.genyo.addon.events.RunTickEvent; -import com.genyo.addon.systems.modules.misc.GenyoMainMenu; -import com.genyo.addon.systems.screens.MainMenuScreen; +import com.genyo.events.RunTickEvent; import meteordevelopment.meteorclient.MeteorClient; -import meteordevelopment.meteorclient.systems.modules.Modules; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.DeathScreen; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.client.network.ClientPlayerEntity; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import javax.annotation.Nullable; - @Mixin(MinecraftClient.class) public abstract class MixinMinecraftClient { diff --git a/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayNetworkHandler.java b/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java similarity index 83% rename from src/main/java/com/genyo/addon/mixin/network/MixinClientPlayNetworkHandler.java rename to src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java index 0f6beb9..057f806 100644 --- a/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayNetworkHandler.java +++ b/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java @@ -1,18 +1,11 @@ -package com.genyo.addon.mixin.network; +package com.genyo.mixin.network; -import com.genyo.addon.mixin.accessor.AccessorClientConnection; -import com.genyo.addon.imixins.IClientPlayNetworkHandler; -import com.genyo.addon.systems.modules.misc.Einstein; -import com.genyo.addon.systems.modules.movement.GenyoVelocity; -import com.mojang.brigadier.exceptions.CommandSyntaxException; -import meteordevelopment.meteorclient.MeteorClient; -import meteordevelopment.meteorclient.commands.Commands; -import meteordevelopment.meteorclient.events.game.SendMessageEvent; +import com.genyo.mixin.accessor.AccessorClientConnection; +import com.genyo.imixins.IClientPlayNetworkHandler; +import com.genyo.systems.modules.misc.Einstein; +import com.genyo.systems.modules.movement.GenyoVelocity; import meteordevelopment.meteorclient.mixininterface.IExplosionS2CPacket; -import meteordevelopment.meteorclient.pathing.BaritoneUtils; -import meteordevelopment.meteorclient.systems.config.Config; import meteordevelopment.meteorclient.systems.modules.Modules; -import meteordevelopment.meteorclient.utils.player.ChatUtils; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientCommonNetworkHandler; import net.minecraft.client.network.ClientConnectionState; diff --git a/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayerEntity.java b/src/main/java/com/genyo/mixin/network/MixinClientPlayerEntity.java similarity index 94% rename from src/main/java/com/genyo/addon/mixin/network/MixinClientPlayerEntity.java rename to src/main/java/com/genyo/mixin/network/MixinClientPlayerEntity.java index c70f979..0baa187 100644 --- a/src/main/java/com/genyo/addon/mixin/network/MixinClientPlayerEntity.java +++ b/src/main/java/com/genyo/mixin/network/MixinClientPlayerEntity.java @@ -1,9 +1,10 @@ -package com.genyo.addon.mixin.network; +package com.genyo.mixin.network; -import com.genyo.addon.events.StageEvent; -import com.genyo.addon.events.sync.SyncEvent; -import com.genyo.addon.events.network.*; -import com.genyo.addon.imixins.IClientPlayerEntity; +import com.genyo.events.StageEvent; +import com.genyo.events.network.*; +import com.genyo.events.sync.SyncEvent; +import com.genyo.events.network.*; +import com.genyo.imixins.IClientPlayerEntity; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.util.Hand; diff --git a/src/main/java/com/genyo/addon/mixin/network/MixinServerPlayerEntity.java b/src/main/java/com/genyo/mixin/network/MixinServerPlayerEntity.java similarity index 87% rename from src/main/java/com/genyo/addon/mixin/network/MixinServerPlayerEntity.java rename to src/main/java/com/genyo/mixin/network/MixinServerPlayerEntity.java index 9f5ba41..9064ca2 100644 --- a/src/main/java/com/genyo/addon/mixin/network/MixinServerPlayerEntity.java +++ b/src/main/java/com/genyo/mixin/network/MixinServerPlayerEntity.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin.network; +package com.genyo.mixin.network; -import com.genyo.addon.events.world.LoadWorldEvent; +import com.genyo.events.world.LoadWorldEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; diff --git a/src/main/java/com/genyo/addon/mixin/render/MixinRenderTickCounter.java b/src/main/java/com/genyo/mixin/render/MixinRenderTickCounter.java similarity index 93% rename from src/main/java/com/genyo/addon/mixin/render/MixinRenderTickCounter.java rename to src/main/java/com/genyo/mixin/render/MixinRenderTickCounter.java index 2bebdfd..885a36a 100644 --- a/src/main/java/com/genyo/addon/mixin/render/MixinRenderTickCounter.java +++ b/src/main/java/com/genyo/mixin/render/MixinRenderTickCounter.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin.render; +package com.genyo.mixin.render; -import com.genyo.addon.events.render.TickCounterEvent; +import com.genyo.events.render.TickCounterEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.client.render.RenderTickCounter; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/com/genyo/addon/mixin/render/MixinWorldRenderer.java b/src/main/java/com/genyo/mixin/render/MixinWorldRenderer.java similarity index 93% rename from src/main/java/com/genyo/addon/mixin/render/MixinWorldRenderer.java rename to src/main/java/com/genyo/mixin/render/MixinWorldRenderer.java index 4dc2abb..63c30ff 100644 --- a/src/main/java/com/genyo/addon/mixin/render/MixinWorldRenderer.java +++ b/src/main/java/com/genyo/mixin/render/MixinWorldRenderer.java @@ -1,7 +1,7 @@ -package com.genyo.addon.mixin.render; +package com.genyo.mixin.render; -import com.genyo.addon.events.render.RenderShaderEvent; -import com.genyo.addon.events.render.RenderWorldEvent; +import com.genyo.events.render.RenderShaderEvent; +import com.genyo.events.render.RenderWorldEvent; import com.mojang.blaze3d.systems.RenderSystem; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.client.render.*; diff --git a/src/main/java/com/genyo/addon/mixin/world/MixinBlockCollisionSpliterator.java b/src/main/java/com/genyo/mixin/world/MixinBlockCollisionSpliterator.java similarity index 94% rename from src/main/java/com/genyo/addon/mixin/world/MixinBlockCollisionSpliterator.java rename to src/main/java/com/genyo/mixin/world/MixinBlockCollisionSpliterator.java index b8a773a..c10b09d 100644 --- a/src/main/java/com/genyo/addon/mixin/world/MixinBlockCollisionSpliterator.java +++ b/src/main/java/com/genyo/mixin/world/MixinBlockCollisionSpliterator.java @@ -1,6 +1,6 @@ -package com.genyo.addon.mixin.world; +package com.genyo.mixin.world; -import com.genyo.addon.events.world.BlockCollisionEvent; +import com.genyo.events.world.BlockCollisionEvent; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import meteordevelopment.meteorclient.MeteorClient; diff --git a/src/main/java/com/genyo/addon/mixin/world/MixinClientWorld.java b/src/main/java/com/genyo/mixin/world/MixinClientWorld.java similarity index 90% rename from src/main/java/com/genyo/addon/mixin/world/MixinClientWorld.java rename to src/main/java/com/genyo/mixin/world/MixinClientWorld.java index f6ac961..1df7a19 100644 --- a/src/main/java/com/genyo/addon/mixin/world/MixinClientWorld.java +++ b/src/main/java/com/genyo/mixin/world/MixinClientWorld.java @@ -1,7 +1,7 @@ -package com.genyo.addon.mixin.world; +package com.genyo.mixin.world; -import com.genyo.addon.events.world.AddEntityEvent; -import com.genyo.addon.events.world.RemoveEntityEvent; +import com.genyo.events.world.AddEntityEvent; +import com.genyo.events.world.RemoveEntityEvent; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/render/Render2DEngine.java b/src/main/java/com/genyo/render/Render2DEngine.java similarity index 95% rename from src/main/java/com/genyo/addon/render/Render2DEngine.java rename to src/main/java/com/genyo/render/Render2DEngine.java index 4216967..54e6a67 100644 --- a/src/main/java/com/genyo/addon/render/Render2DEngine.java +++ b/src/main/java/com/genyo/render/Render2DEngine.java @@ -1,4 +1,4 @@ -package com.genyo.addon.render; +package com.genyo.render; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.BufferRenderer; diff --git a/src/main/java/com/genyo/addon/render/Render3DEngine.java b/src/main/java/com/genyo/render/Render3DEngine.java similarity index 99% rename from src/main/java/com/genyo/addon/render/Render3DEngine.java rename to src/main/java/com/genyo/render/Render3DEngine.java index 7427e93..415e595 100644 --- a/src/main/java/com/genyo/addon/render/Render3DEngine.java +++ b/src/main/java/com/genyo/render/Render3DEngine.java @@ -1,6 +1,5 @@ -package com.genyo.addon.render; +package com.genyo.render; -import com.genyo.addon.GenyoAddon; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import meteordevelopment.meteorclient.events.render.Render3DEvent; @@ -8,7 +7,6 @@ import meteordevelopment.meteorclient.utils.render.color.Color; import meteordevelopment.orbit.EventHandler; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gl.ShaderProgramKey; import net.minecraft.client.gl.ShaderProgramKeys; import net.minecraft.client.render.*; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/com/genyo/addon/render/animation/Animation.java b/src/main/java/com/genyo/render/animation/Animation.java similarity index 97% rename from src/main/java/com/genyo/addon/render/animation/Animation.java rename to src/main/java/com/genyo/render/animation/Animation.java index 3c0751c..c5fcc8d 100644 --- a/src/main/java/com/genyo/addon/render/animation/Animation.java +++ b/src/main/java/com/genyo/render/animation/Animation.java @@ -1,4 +1,4 @@ -package com.genyo.addon.render.animation; +package com.genyo.render.animation; public class Animation { diff --git a/src/main/java/com/genyo/addon/render/animation/Easing.java b/src/main/java/com/genyo/render/animation/Easing.java similarity index 99% rename from src/main/java/com/genyo/addon/render/animation/Easing.java rename to src/main/java/com/genyo/render/animation/Easing.java index 9ea55e3..ed5d0db 100644 --- a/src/main/java/com/genyo/addon/render/animation/Easing.java +++ b/src/main/java/com/genyo/render/animation/Easing.java @@ -1,4 +1,4 @@ -package com.genyo.addon.render.animation; +package com.genyo.render.animation; public enum Easing { diff --git a/src/main/java/com/genyo/addon/systems/enemies/Enemies.java b/src/main/java/com/genyo/systems/enemies/Enemies.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/enemies/Enemies.java rename to src/main/java/com/genyo/systems/enemies/Enemies.java index 044a4ff..ec641e3 100644 --- a/src/main/java/com/genyo/addon/systems/enemies/Enemies.java +++ b/src/main/java/com/genyo/systems/enemies/Enemies.java @@ -1,6 +1,6 @@ -package com.genyo.addon.systems.enemies; +package com.genyo.systems.enemies; -import com.genyo.addon.GenyoAddon; +import com.genyo.GenyoAddon; import com.mojang.util.UndashedUuid; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.System; diff --git a/src/main/java/com/genyo/addon/systems/enemies/EnemiesTab.java b/src/main/java/com/genyo/systems/enemies/EnemiesTab.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/enemies/EnemiesTab.java rename to src/main/java/com/genyo/systems/enemies/EnemiesTab.java index c694bc2..b27992d 100644 --- a/src/main/java/com/genyo/addon/systems/enemies/EnemiesTab.java +++ b/src/main/java/com/genyo/systems/enemies/EnemiesTab.java @@ -1,4 +1,4 @@ -package com.genyo.addon.systems.enemies; +package com.genyo.systems.enemies; import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.tabs.Tab; diff --git a/src/main/java/com/genyo/addon/systems/enemies/Enemy.java b/src/main/java/com/genyo/systems/enemies/Enemy.java similarity index 94% rename from src/main/java/com/genyo/addon/systems/enemies/Enemy.java rename to src/main/java/com/genyo/systems/enemies/Enemy.java index 53ff3d8..16ebedc 100644 --- a/src/main/java/com/genyo/addon/systems/enemies/Enemy.java +++ b/src/main/java/com/genyo/systems/enemies/Enemy.java @@ -1,8 +1,6 @@ -package com.genyo.addon.systems.enemies; +package com.genyo.systems.enemies; import com.mojang.util.UndashedUuid; -import meteordevelopment.meteorclient.systems.friends.Friend; -import meteordevelopment.meteorclient.systems.friends.Friends; import meteordevelopment.meteorclient.utils.misc.ISerializable; import meteordevelopment.meteorclient.utils.network.Http; import meteordevelopment.meteorclient.utils.render.PlayerHeadTexture; diff --git a/src/main/java/com/genyo/addon/systems/hud/ActiveGenyoHud.java b/src/main/java/com/genyo/systems/hud/ActiveGenyoHud.java similarity index 99% rename from src/main/java/com/genyo/addon/systems/hud/ActiveGenyoHud.java rename to src/main/java/com/genyo/systems/hud/ActiveGenyoHud.java index f70c198..c40a4f8 100644 --- a/src/main/java/com/genyo/addon/systems/hud/ActiveGenyoHud.java +++ b/src/main/java/com/genyo/systems/hud/ActiveGenyoHud.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.hud; +package com.genyo.systems.hud; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.hud.*; import meteordevelopment.meteorclient.systems.modules.Module; diff --git a/src/main/java/com/genyo/addon/systems/hud/BetterPlayerRadarHud.java b/src/main/java/com/genyo/systems/hud/BetterPlayerRadarHud.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/hud/BetterPlayerRadarHud.java rename to src/main/java/com/genyo/systems/hud/BetterPlayerRadarHud.java index 134297c..dc31512 100644 --- a/src/main/java/com/genyo/addon/systems/hud/BetterPlayerRadarHud.java +++ b/src/main/java/com/genyo/systems/hud/BetterPlayerRadarHud.java @@ -1,10 +1,9 @@ -package com.genyo.addon.systems.hud; +package com.genyo.systems.hud; -import com.genyo.addon.GenyoAddon; +import com.genyo.GenyoAddon; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.friends.Friends; import meteordevelopment.meteorclient.systems.hud.*; -import meteordevelopment.meteorclient.systems.modules.render.Nametags; import meteordevelopment.meteorclient.utils.entity.EntityUtils; import meteordevelopment.meteorclient.utils.player.PlayerUtils; import meteordevelopment.meteorclient.utils.render.color.Color; diff --git a/src/main/java/com/genyo/addon/systems/hud/InCombatHud.java b/src/main/java/com/genyo/systems/hud/InCombatHud.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/hud/InCombatHud.java rename to src/main/java/com/genyo/systems/hud/InCombatHud.java index d0c4f7a..aefbbf8 100644 --- a/src/main/java/com/genyo/addon/systems/hud/InCombatHud.java +++ b/src/main/java/com/genyo/systems/hud/InCombatHud.java @@ -1,8 +1,8 @@ -package com.genyo.addon.systems.hud; +package com.genyo.systems.hud; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.incombat.CombatPerson; -import com.genyo.addon.systems.incombat.InCombatSystem; +import com.genyo.GenyoAddon; +import com.genyo.systems.incombat.CombatPerson; +import com.genyo.systems.incombat.InCombatSystem; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.hud.*; import meteordevelopment.meteorclient.utils.render.color.Color; diff --git a/src/main/java/com/genyo/addon/systems/hud/PacketsHud.java b/src/main/java/com/genyo/systems/hud/PacketsHud.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/hud/PacketsHud.java rename to src/main/java/com/genyo/systems/hud/PacketsHud.java index 4fbea63..c811a54 100644 --- a/src/main/java/com/genyo/addon/systems/hud/PacketsHud.java +++ b/src/main/java/com/genyo/systems/hud/PacketsHud.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.hud; +package com.genyo.systems.hud; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.managers.Managers; +import com.genyo.GenyoAddon; +import com.genyo.managers.Managers; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.hud.Hud; import meteordevelopment.meteorclient.systems.hud.HudElement; diff --git a/src/main/java/com/genyo/addon/systems/hud/PvPNeccessaryHud.java b/src/main/java/com/genyo/systems/hud/PvPNeccessaryHud.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/hud/PvPNeccessaryHud.java rename to src/main/java/com/genyo/systems/hud/PvPNeccessaryHud.java index 7c1167a..6077ba5 100644 --- a/src/main/java/com/genyo/addon/systems/hud/PvPNeccessaryHud.java +++ b/src/main/java/com/genyo/systems/hud/PvPNeccessaryHud.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.hud; +package com.genyo.systems.hud; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.utils.HudUtils; +import com.genyo.GenyoAddon; +import com.genyo.utils.HudUtils; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.hud.HudElement; import meteordevelopment.meteorclient.systems.hud.HudElementInfo; diff --git a/src/main/java/com/genyo/addon/systems/hud/WatermarkHud.java b/src/main/java/com/genyo/systems/hud/WatermarkHud.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/hud/WatermarkHud.java rename to src/main/java/com/genyo/systems/hud/WatermarkHud.java index f9c675b..455eed6 100644 --- a/src/main/java/com/genyo/addon/systems/hud/WatermarkHud.java +++ b/src/main/java/com/genyo/systems/hud/WatermarkHud.java @@ -1,6 +1,6 @@ -package com.genyo.addon.systems.hud; +package com.genyo.systems.hud; -import com.genyo.addon.GenyoAddon; +import com.genyo.GenyoAddon; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.hud.Hud; import meteordevelopment.meteorclient.systems.hud.HudElement; diff --git a/src/main/java/com/genyo/addon/systems/incombat/CombatPerson.java b/src/main/java/com/genyo/systems/incombat/CombatPerson.java similarity index 95% rename from src/main/java/com/genyo/addon/systems/incombat/CombatPerson.java rename to src/main/java/com/genyo/systems/incombat/CombatPerson.java index 869d063..c345034 100644 --- a/src/main/java/com/genyo/addon/systems/incombat/CombatPerson.java +++ b/src/main/java/com/genyo/systems/incombat/CombatPerson.java @@ -1,4 +1,4 @@ -package com.genyo.addon.systems.incombat; +package com.genyo.systems.incombat; import meteordevelopment.meteorclient.systems.friends.Friend; import meteordevelopment.meteorclient.systems.friends.Friends; diff --git a/src/main/java/com/genyo/addon/systems/incombat/InCombatSystem.java b/src/main/java/com/genyo/systems/incombat/InCombatSystem.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/incombat/InCombatSystem.java rename to src/main/java/com/genyo/systems/incombat/InCombatSystem.java index 9147ab4..edc9280 100644 --- a/src/main/java/com/genyo/addon/systems/incombat/InCombatSystem.java +++ b/src/main/java/com/genyo/systems/incombat/InCombatSystem.java @@ -1,6 +1,6 @@ -package com.genyo.addon.systems.incombat; +package com.genyo.systems.incombat; -import com.genyo.addon.events.UnderCombatEvent; +import com.genyo.events.UnderCombatEvent; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.System; import meteordevelopment.meteorclient.systems.friends.Friends; diff --git a/src/main/java/com/genyo/addon/systems/incombat/InCombatTab.java b/src/main/java/com/genyo/systems/incombat/InCombatTab.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/incombat/InCombatTab.java rename to src/main/java/com/genyo/systems/incombat/InCombatTab.java index da2d033..0265266 100644 --- a/src/main/java/com/genyo/addon/systems/incombat/InCombatTab.java +++ b/src/main/java/com/genyo/systems/incombat/InCombatTab.java @@ -1,4 +1,4 @@ -package com.genyo.addon.systems.incombat; +package com.genyo.systems.incombat; import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.tabs.Tab; diff --git a/src/main/java/com/genyo/addon/systems/modules/GenyoModule.java b/src/main/java/com/genyo/systems/modules/GenyoModule.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/modules/GenyoModule.java rename to src/main/java/com/genyo/systems/modules/GenyoModule.java index c1d263d..22fd031 100644 --- a/src/main/java/com/genyo/addon/systems/modules/GenyoModule.java +++ b/src/main/java/com/genyo/systems/modules/GenyoModule.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.modules; +package com.genyo.systems.modules; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.managers.player.rotation.Rotation; +import com.genyo.managers.Managers; +import com.genyo.managers.player.rotation.Rotation; import meteordevelopment.meteorclient.mixininterface.IChatHud; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/modules/PlacerModule.java b/src/main/java/com/genyo/systems/modules/PlacerModule.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/PlacerModule.java rename to src/main/java/com/genyo/systems/modules/PlacerModule.java index 1b8d652..e2969db 100644 --- a/src/main/java/com/genyo/addon/systems/modules/PlacerModule.java +++ b/src/main/java/com/genyo/systems/modules/PlacerModule.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.modules; +package com.genyo.systems.modules; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.managers.player.rotation.Rotation; +import com.genyo.managers.Managers; +import com.genyo.managers.player.rotation.Rotation; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.systems.modules.Category; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoArmor.java b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoArmor.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoArmor.java rename to src/main/java/com/genyo/systems/modules/combat/GenyoAutoArmor.java index b092920..5c6dca8 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoArmor.java +++ b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoArmor.java @@ -1,10 +1,10 @@ -package com.genyo.addon.systems.modules.combat; +package com.genyo.systems.modules.combat; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.settings.FloatSetting; +import com.genyo.GenyoAddon; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.settings.FloatSetting; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.EnumSetting; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoCrystal.java b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoCrystal.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoCrystal.java rename to src/main/java/com/genyo/systems/modules/combat/GenyoAutoCrystal.java index c1b48cf..73bdab7 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoCrystal.java +++ b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoCrystal.java @@ -1,29 +1,29 @@ -package com.genyo.addon.systems.modules.combat; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.DisconnectEvent; -import com.genyo.addon.events.world.AddEntityEvent; -import com.genyo.addon.systems.modules.PlacerModule; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.player.RotationUtil; +package com.genyo.systems.modules.combat; + +import com.genyo.GenyoAddon; +import com.genyo.events.network.DisconnectEvent; +import com.genyo.events.world.AddEntityEvent; +import com.genyo.systems.modules.PlacerModule; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.player.RotationUtil; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.utils.render.color.Color; import meteordevelopment.meteorclient.utils.render.color.SettingColor; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.events.RunTickEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.world.GenyoAutoMine; -import com.genyo.addon.systems.modules.world.GenyoSurroundV2; -import com.genyo.addon.render.animation.Animation; -import com.genyo.addon.utils.collection.EvictingQueue; -import com.genyo.addon.utils.entity.EntityUtil; -import com.genyo.addon.utils.math.PerSecondCounter; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; -import com.genyo.addon.utils.player.InventoryUtil; -import com.genyo.addon.utils.player.PlayerUtil; -import com.genyo.addon.utils.world.BlastResistantBlocks; -import com.genyo.addon.utils.world.ExplosionUtil; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.events.RunTickEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.world.GenyoAutoMine; +import com.genyo.systems.modules.world.GenyoSurroundV2; +import com.genyo.render.animation.Animation; +import com.genyo.utils.collection.EvictingQueue; +import com.genyo.utils.entity.EntityUtil; +import com.genyo.utils.math.PerSecondCounter; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; +import com.genyo.utils.player.InventoryUtil; +import com.genyo.utils.player.PlayerUtil; +import com.genyo.utils.world.BlastResistantBlocks; +import com.genyo.utils.world.ExplosionUtil; import com.google.common.collect.Lists; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.render.Render2DEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoTotem.java b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoTotem.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoTotem.java rename to src/main/java/com/genyo/systems/modules/combat/GenyoAutoTotem.java index 81cfc0a..8c71aaf 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoTotem.java +++ b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoTotem.java @@ -1,16 +1,16 @@ -package com.genyo.addon.systems.modules.combat; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.world.LoadWorldEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; -import com.genyo.addon.utils.player.InventoryUtil; -import com.genyo.addon.utils.player.PlayerUtil; -import com.genyo.addon.utils.world.ExplosionUtil; -import com.genyo.addon.utils.world.SneakBlocks; +package com.genyo.systems.modules.combat; + +import com.genyo.GenyoAddon; +import com.genyo.events.world.LoadWorldEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; +import com.genyo.utils.player.InventoryUtil; +import com.genyo.utils.player.PlayerUtil; +import com.genyo.utils.world.ExplosionUtil; +import com.genyo.utils.world.SneakBlocks; import com.google.common.collect.Lists; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.world.TickEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoTrap.java b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoTrap.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoTrap.java rename to src/main/java/com/genyo/systems/modules/combat/GenyoAutoTrap.java index 34b0122..ae30be9 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoTrap.java +++ b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoTrap.java @@ -1,14 +1,14 @@ -package com.genyo.addon.systems.modules.combat; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.PlacerModule; -import com.genyo.addon.render.animation.Animation; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.math.GPositionUtils; -import com.genyo.addon.utils.math.MathUtil; -import com.genyo.addon.utils.world.BlastResistantBlocks; +package com.genyo.systems.modules.combat; + +import com.genyo.GenyoAddon; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.PlacerModule; +import com.genyo.render.animation.Animation; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.math.GPositionUtils; +import com.genyo.utils.math.MathUtil; +import com.genyo.utils.world.BlastResistantBlocks; import com.google.common.collect.Lists; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.render.Render3DEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoXP.java b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoXP.java similarity index 94% rename from src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoXP.java rename to src/main/java/com/genyo/systems/modules/combat/GenyoAutoXP.java index be437be..8eb561d 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoAutoXP.java +++ b/src/main/java/com/genyo/systems/modules/combat/GenyoAutoXP.java @@ -1,10 +1,10 @@ -package com.genyo.addon.systems.modules.combat; +package com.genyo.systems.modules.combat; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.utils.math.timer.TickTimer; +import com.genyo.GenyoAddon; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.utils.math.timer.TickTimer; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.IntSetting; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoCriticals.java b/src/main/java/com/genyo/systems/modules/combat/GenyoCriticals.java similarity index 95% rename from src/main/java/com/genyo/addon/systems/modules/combat/GenyoCriticals.java rename to src/main/java/com/genyo/systems/modules/combat/GenyoCriticals.java index 0dcc0e7..31fe4c8 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoCriticals.java +++ b/src/main/java/com/genyo/systems/modules/combat/GenyoCriticals.java @@ -1,17 +1,17 @@ -package com.genyo.addon.systems.modules.combat; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.modules.world.GenyoAutoMine; -import com.genyo.addon.systems.modules.world.GenyoSelfTrap; -import com.genyo.addon.systems.modules.world.GenyoSurroundV2; -import com.genyo.addon.utils.GEntityUtils; -import com.genyo.addon.utils.math.GPositionUtils; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; -import com.genyo.addon.utils.player.InventoryUtil; -import com.genyo.addon.utils.player.MovementUtil; +package com.genyo.systems.modules.combat; + +import com.genyo.GenyoAddon; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.modules.world.GenyoAutoMine; +import com.genyo.systems.modules.world.GenyoSelfTrap; +import com.genyo.systems.modules.world.GenyoSurroundV2; +import com.genyo.utils.GEntityUtils; +import com.genyo.utils.math.GPositionUtils; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; +import com.genyo.utils.player.InventoryUtil; +import com.genyo.utils.player.MovementUtil; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.mixininterface.IPlayerInteractEntityC2SPacket; import meteordevelopment.meteorclient.settings.BoolSetting; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoReplenish.java b/src/main/java/com/genyo/systems/modules/combat/GenyoReplenish.java similarity index 92% rename from src/main/java/com/genyo/addon/systems/modules/combat/GenyoReplenish.java rename to src/main/java/com/genyo/systems/modules/combat/GenyoReplenish.java index 0138c76..8225816 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/GenyoReplenish.java +++ b/src/main/java/com/genyo/systems/modules/combat/GenyoReplenish.java @@ -1,13 +1,13 @@ -package com.genyo.addon.systems.modules.combat; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.entity.EntityDeathEvent; -import com.genyo.addon.events.network.DisconnectEvent; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; -import com.genyo.addon.utils.player.InventoryUtil; +package com.genyo.systems.modules.combat; + +import com.genyo.GenyoAddon; +import com.genyo.events.entity.EntityDeathEvent; +import com.genyo.events.network.DisconnectEvent; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; +import com.genyo.utils.player.InventoryUtil; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.IntSetting; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/modules/combat/KFCSpawnKill.java b/src/main/java/com/genyo/systems/modules/combat/KFCSpawnKill.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/modules/combat/KFCSpawnKill.java rename to src/main/java/com/genyo/systems/modules/combat/KFCSpawnKill.java index 4c2174f..64a1c18 100644 --- a/src/main/java/com/genyo/addon/systems/modules/combat/KFCSpawnKill.java +++ b/src/main/java/com/genyo/systems/modules/combat/KFCSpawnKill.java @@ -1,21 +1,21 @@ -package com.genyo.addon.systems.modules.combat; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.DisconnectEvent; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.events.world.RemoveEntityEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.managers.world.tick.TickSync; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.modules.world.GenyoAutoMine; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.entity.EntityUtil; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; -import com.genyo.addon.utils.player.EnchantmentUtil; -import com.genyo.addon.utils.player.PlayerUtil; -import com.genyo.addon.utils.player.RotationUtil; -import com.genyo.addon.utils.render.SInterpolation; +package com.genyo.systems.modules.combat; + +import com.genyo.GenyoAddon; +import com.genyo.events.network.DisconnectEvent; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.events.world.RemoveEntityEvent; +import com.genyo.managers.Managers; +import com.genyo.managers.world.tick.TickSync; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.modules.world.GenyoAutoMine; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.entity.EntityUtil; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; +import com.genyo.utils.player.EnchantmentUtil; +import com.genyo.utils.player.PlayerUtil; +import com.genyo.utils.player.RotationUtil; +import com.genyo.utils.render.SInterpolation; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.renderer.ShapeMode; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/CombatBrainrot.java b/src/main/java/com/genyo/systems/modules/misc/CombatBrainrot.java similarity index 90% rename from src/main/java/com/genyo/addon/systems/modules/misc/CombatBrainrot.java rename to src/main/java/com/genyo/systems/modules/misc/CombatBrainrot.java index c26f4a2..2fbe5d5 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/CombatBrainrot.java +++ b/src/main/java/com/genyo/systems/modules/misc/CombatBrainrot.java @@ -1,11 +1,11 @@ -package com.genyo.addon.systems.modules.misc; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.math.MathUtil; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; +package com.genyo.systems.modules.misc; + +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.math.MathUtil; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/Einstein.java b/src/main/java/com/genyo/systems/modules/misc/Einstein.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/misc/Einstein.java rename to src/main/java/com/genyo/systems/modules/misc/Einstein.java index 74165b2..142865d 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/Einstein.java +++ b/src/main/java/com/genyo/systems/modules/misc/Einstein.java @@ -1,10 +1,10 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.utils.GenyoChatUtils; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.utils.GenyoChatUtils; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoAutoEZ.java b/src/main/java/com/genyo/systems/modules/misc/GenyoAutoEZ.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/misc/GenyoAutoEZ.java rename to src/main/java/com/genyo/systems/modules/misc/GenyoAutoEZ.java index dd7499c..f50c5a2 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoAutoEZ.java +++ b/src/main/java/com/genyo/systems/modules/misc/GenyoAutoEZ.java @@ -1,10 +1,10 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.incombat.CombatPerson; -import com.genyo.addon.systems.incombat.InCombatSystem; -import com.genyo.addon.utils.math.MathUtil; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.incombat.CombatPerson; +import com.genyo.systems.incombat.InCombatSystem; +import com.genyo.utils.math.MathUtil; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.*; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoDiscord.java b/src/main/java/com/genyo/systems/modules/misc/GenyoDiscord.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/modules/misc/GenyoDiscord.java rename to src/main/java/com/genyo/systems/modules/misc/GenyoDiscord.java index cea6c64..2ceb3f7 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoDiscord.java +++ b/src/main/java/com/genyo/systems/modules/misc/GenyoDiscord.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; import meteordevelopment.discordipc.DiscordIPC; import meteordevelopment.discordipc.RichPresence; import meteordevelopment.meteorclient.events.game.OpenScreenEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoGoodbye.java b/src/main/java/com/genyo/systems/modules/misc/GenyoGoodbye.java similarity index 93% rename from src/main/java/com/genyo/addon/systems/modules/misc/GenyoGoodbye.java rename to src/main/java/com/genyo/systems/modules/misc/GenyoGoodbye.java index 6289a35..949be64 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoGoodbye.java +++ b/src/main/java/com/genyo/systems/modules/misc/GenyoGoodbye.java @@ -1,9 +1,9 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.settings.playerlist.ListGroupSetting; -import com.genyo.addon.systems.settings.playerlist.PLGroup; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.settings.playerlist.ListGroupSetting; +import com.genyo.systems.settings.playerlist.PLGroup; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.IntSetting; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoMainMenu.java b/src/main/java/com/genyo/systems/modules/misc/GenyoMainMenu.java similarity index 55% rename from src/main/java/com/genyo/addon/systems/modules/misc/GenyoMainMenu.java rename to src/main/java/com/genyo/systems/modules/misc/GenyoMainMenu.java index dc64f20..f2a3aa4 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoMainMenu.java +++ b/src/main/java/com/genyo/systems/modules/misc/GenyoMainMenu.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; public class GenyoMainMenu extends GenyoModule { diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoSkinBlink.java b/src/main/java/com/genyo/systems/modules/misc/GenyoSkinBlink.java similarity index 86% rename from src/main/java/com/genyo/addon/systems/modules/misc/GenyoSkinBlink.java rename to src/main/java/com/genyo/systems/modules/misc/GenyoSkinBlink.java index b68b6e4..84d8fe6 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoSkinBlink.java +++ b/src/main/java/com/genyo/systems/modules/misc/GenyoSkinBlink.java @@ -1,20 +1,16 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.mixin.accessor.AccessorGameOptions; -import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.GenyoAddon; +import com.genyo.mixin.accessor.AccessorGameOptions; +import com.genyo.systems.modules.GenyoModule; import meteordevelopment.meteorclient.events.world.TickEvent; -import meteordevelopment.meteorclient.gui.screens.settings.RegistryListSettingScreen; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.IntSetting; import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.SettingGroup; import meteordevelopment.orbit.EventHandler; import net.minecraft.entity.player.PlayerModelPart; -import net.minecraft.registry.Registries; -import net.minecraft.registry.RegistryKeys; -import java.rmi.registry.Registry; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoTimer.java b/src/main/java/com/genyo/systems/modules/misc/GenyoTimer.java similarity index 88% rename from src/main/java/com/genyo/addon/systems/modules/misc/GenyoTimer.java rename to src/main/java/com/genyo/systems/modules/misc/GenyoTimer.java index 5babc81..5c07774 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoTimer.java +++ b/src/main/java/com/genyo/systems/modules/misc/GenyoTimer.java @@ -1,10 +1,10 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.render.TickCounterEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.settings.FloatSetting; +import com.genyo.GenyoAddon; +import com.genyo.events.render.TickCounterEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.settings.FloatSetting; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoWelcome.java b/src/main/java/com/genyo/systems/modules/misc/GenyoWelcome.java similarity index 94% rename from src/main/java/com/genyo/addon/systems/modules/misc/GenyoWelcome.java rename to src/main/java/com/genyo/systems/modules/misc/GenyoWelcome.java index b827708..6d00c6b 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/GenyoWelcome.java +++ b/src/main/java/com/genyo/systems/modules/misc/GenyoWelcome.java @@ -1,9 +1,9 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.settings.playerlist.ListGroupSetting; -import com.genyo.addon.systems.settings.playerlist.PLGroup; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.settings.playerlist.ListGroupSetting; +import com.genyo.systems.settings.playerlist.PLGroup; import com.mojang.authlib.GameProfile; import meteordevelopment.meteorclient.events.game.GameJoinedEvent; import meteordevelopment.meteorclient.events.game.GameLeftEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/PacketDebug.java b/src/main/java/com/genyo/systems/modules/misc/PacketDebug.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/misc/PacketDebug.java rename to src/main/java/com/genyo/systems/modules/misc/PacketDebug.java index c48756f..9785d7c 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/PacketDebug.java +++ b/src/main/java/com/genyo/systems/modules/misc/PacketDebug.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.*; diff --git a/src/main/java/com/genyo/addon/systems/modules/misc/Sigma.java b/src/main/java/com/genyo/systems/modules/misc/Sigma.java similarity index 90% rename from src/main/java/com/genyo/addon/systems/modules/misc/Sigma.java rename to src/main/java/com/genyo/systems/modules/misc/Sigma.java index 576aca4..59f808b 100644 --- a/src/main/java/com/genyo/addon/systems/modules/misc/Sigma.java +++ b/src/main/java/com/genyo/systems/modules/misc/Sigma.java @@ -1,10 +1,10 @@ -package com.genyo.addon.systems.modules.misc; +package com.genyo.systems.modules.misc; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.utils.math.MathUtil; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.utils.math.MathUtil; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.EnumSetting; diff --git a/src/main/java/com/genyo/addon/systems/modules/movement/GenyoPhase.java b/src/main/java/com/genyo/systems/modules/movement/GenyoPhase.java similarity index 95% rename from src/main/java/com/genyo/addon/systems/modules/movement/GenyoPhase.java rename to src/main/java/com/genyo/systems/modules/movement/GenyoPhase.java index 36a1e23..43d8c7d 100644 --- a/src/main/java/com/genyo/addon/systems/modules/movement/GenyoPhase.java +++ b/src/main/java/com/genyo/systems/modules/movement/GenyoPhase.java @@ -1,16 +1,14 @@ -package com.genyo.addon.systems.modules.movement; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.PlayerUpdateEvent; -import com.genyo.addon.events.network.PushOutOfBlocksEvent; -import com.genyo.addon.events.world.BlockCollisionEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.modules.PlacerModule; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.player.RaycastUtil; -import com.genyo.addon.utils.player.RotationUtil; -import com.genyo.addon.utils.string.EnumFormatter; +package com.genyo.systems.modules.movement; + +import com.genyo.GenyoAddon; +import com.genyo.events.network.PlayerUpdateEvent; +import com.genyo.events.network.PushOutOfBlocksEvent; +import com.genyo.events.world.BlockCollisionEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.PlacerModule; +import com.genyo.utils.player.RaycastUtil; +import com.genyo.utils.player.RotationUtil; +import com.genyo.utils.string.EnumFormatter; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.orbit.EventHandler; @@ -20,7 +18,6 @@ import net.minecraft.block.ScaffoldingBlock; import net.minecraft.entity.Entity; import net.minecraft.entity.decoration.ItemFrameEntity; -import net.minecraft.item.BlockItem; import net.minecraft.item.EnderPearlItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -34,10 +31,8 @@ import net.minecraft.util.math.*; import net.minecraft.util.shape.VoxelShapes; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.Set; public class GenyoPhase extends PlacerModule { diff --git a/src/main/java/com/genyo/addon/systems/modules/movement/GenyoVelocity.java b/src/main/java/com/genyo/systems/modules/movement/GenyoVelocity.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/movement/GenyoVelocity.java rename to src/main/java/com/genyo/systems/modules/movement/GenyoVelocity.java index 256074d..081b575 100644 --- a/src/main/java/com/genyo/addon/systems/modules/movement/GenyoVelocity.java +++ b/src/main/java/com/genyo/systems/modules/movement/GenyoVelocity.java @@ -1,18 +1,18 @@ -package com.genyo.addon.systems.modules.movement; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.entity.player.PushEntityEvent; -import com.genyo.addon.events.entity.player.PushFluidsEvent; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.events.network.PushOutOfBlocksEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.mixin.accessor.AccessorBundlePacket; -import com.genyo.addon.mixin.accessor.AccessorClientWorld; -import com.genyo.addon.mixin.accessor.AccessorEntityVelocityUpdateS2CPacket; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.modules.world.GenyoSurroundV2; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.math.GPositionUtils; +package com.genyo.systems.modules.movement; + +import com.genyo.GenyoAddon; +import com.genyo.events.entity.player.PushEntityEvent; +import com.genyo.events.entity.player.PushFluidsEvent; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.events.network.PushOutOfBlocksEvent; +import com.genyo.managers.Managers; +import com.genyo.mixin.accessor.AccessorBundlePacket; +import com.genyo.mixin.accessor.AccessorClientWorld; +import com.genyo.mixin.accessor.AccessorEntityVelocityUpdateS2CPacket; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.modules.world.GenyoSurroundV2; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.math.GPositionUtils; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.modules.Modules; diff --git a/src/main/java/com/genyo/addon/systems/modules/visual/AngelSexHulkenberg.java b/src/main/java/com/genyo/systems/modules/visual/AngelSexHulkenberg.java similarity index 95% rename from src/main/java/com/genyo/addon/systems/modules/visual/AngelSexHulkenberg.java rename to src/main/java/com/genyo/systems/modules/visual/AngelSexHulkenberg.java index febb2e3..8b124d1 100644 --- a/src/main/java/com/genyo/addon/systems/modules/visual/AngelSexHulkenberg.java +++ b/src/main/java/com/genyo/systems/modules/visual/AngelSexHulkenberg.java @@ -1,13 +1,13 @@ -package com.genyo.addon.systems.modules.visual; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.TotemPopEvent; -import com.genyo.addon.mixin.entity.IEntity; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.render.Render2DEngine; -import com.genyo.addon.render.Render3DEngine; -import com.genyo.addon.systems.enemies.Enemies; -import com.genyo.addon.utils.math.MathUtil; +package com.genyo.systems.modules.visual; + +import com.genyo.GenyoAddon; +import com.genyo.events.TotemPopEvent; +import com.genyo.mixin.entity.IEntity; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.render.Render2DEngine; +import com.genyo.render.Render3DEngine; +import com.genyo.systems.enemies.Enemies; +import com.genyo.utils.math.MathUtil; import com.mojang.authlib.GameProfile; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/genyo/addon/systems/modules/visual/GenyoCapes.java b/src/main/java/com/genyo/systems/modules/visual/GenyoCapes.java similarity index 74% rename from src/main/java/com/genyo/addon/systems/modules/visual/GenyoCapes.java rename to src/main/java/com/genyo/systems/modules/visual/GenyoCapes.java index be43334..8423d4d 100644 --- a/src/main/java/com/genyo/addon/systems/modules/visual/GenyoCapes.java +++ b/src/main/java/com/genyo/systems/modules/visual/GenyoCapes.java @@ -1,7 +1,7 @@ -package com.genyo.addon.systems.modules.visual; +package com.genyo.systems.modules.visual; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; import net.minecraft.util.Identifier; public class GenyoCapes extends GenyoModule { diff --git a/src/main/java/com/genyo/addon/systems/modules/visual/GenyoPenisESP.java b/src/main/java/com/genyo/systems/modules/visual/GenyoPenisESP.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/modules/visual/GenyoPenisESP.java rename to src/main/java/com/genyo/systems/modules/visual/GenyoPenisESP.java index 556c04c..7be7924 100644 --- a/src/main/java/com/genyo/addon/systems/modules/visual/GenyoPenisESP.java +++ b/src/main/java/com/genyo/systems/modules/visual/GenyoPenisESP.java @@ -1,9 +1,9 @@ -package com.genyo.addon.systems.modules.visual; +package com.genyo.systems.modules.visual; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.render.Render3DEngine; -import com.genyo.addon.systems.settings.FloatSetting; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.render.Render3DEngine; +import com.genyo.systems.settings.FloatSetting; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.friends.Friends; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoAutoMine.java b/src/main/java/com/genyo/systems/modules/world/GenyoAutoMine.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoAutoMine.java rename to src/main/java/com/genyo/systems/modules/world/GenyoAutoMine.java index 1422b8d..6e04267 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoAutoMine.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoAutoMine.java @@ -1,20 +1,20 @@ -package com.genyo.addon.systems.modules.world; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.AttackBlockEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.modules.combat.GenyoAutoCrystal; -import com.genyo.addon.render.animation.Animation; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.GEntityUtils; -import com.genyo.addon.utils.math.GPositionUtils; -import com.genyo.addon.utils.math.MathUtil; -import com.genyo.addon.utils.math.timer.CacheTimer; -import com.genyo.addon.utils.math.timer.Timer; -import com.genyo.addon.utils.player.RotationUtil; -import com.genyo.addon.utils.render.ColorUtil; -import com.genyo.addon.utils.world.BlastResistantBlocks; +package com.genyo.systems.modules.world; + +import com.genyo.GenyoAddon; +import com.genyo.events.AttackBlockEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.modules.combat.GenyoAutoCrystal; +import com.genyo.render.animation.Animation; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.GEntityUtils; +import com.genyo.utils.math.GPositionUtils; +import com.genyo.utils.math.MathUtil; +import com.genyo.utils.math.timer.CacheTimer; +import com.genyo.utils.math.timer.Timer; +import com.genyo.utils.player.RotationUtil; +import com.genyo.utils.render.ColorUtil; +import com.genyo.utils.world.BlastResistantBlocks; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoAutoTool.java b/src/main/java/com/genyo/systems/modules/world/GenyoAutoTool.java similarity index 90% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoAutoTool.java rename to src/main/java/com/genyo/systems/modules/world/GenyoAutoTool.java index 8c7fc96..85aa259 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoAutoTool.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoAutoTool.java @@ -1,9 +1,9 @@ -package com.genyo.addon.systems.modules.world; +package com.genyo.systems.modules.world; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.AttackBlockEvent; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.utils.player.EnchantmentUtil; +import com.genyo.GenyoAddon; +import com.genyo.events.AttackBlockEvent; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.utils.player.EnchantmentUtil; import meteordevelopment.orbit.EventHandler; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoGhostBlocks.java b/src/main/java/com/genyo/systems/modules/world/GenyoGhostBlocks.java similarity index 95% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoGhostBlocks.java rename to src/main/java/com/genyo/systems/modules/world/GenyoGhostBlocks.java index 051d702..8c91bf2 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoGhostBlocks.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoGhostBlocks.java @@ -1,8 +1,8 @@ -package com.genyo.addon.systems.modules.world; +package com.genyo.systems.modules.world; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.GenyoModule; +import com.genyo.GenyoAddon; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.GenyoModule; import meteordevelopment.meteorclient.events.entity.player.BreakBlockEvent; import meteordevelopment.meteorclient.events.entity.player.InteractBlockEvent; import meteordevelopment.meteorclient.settings.*; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoScaffold.java b/src/main/java/com/genyo/systems/modules/world/GenyoScaffold.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoScaffold.java rename to src/main/java/com/genyo/systems/modules/world/GenyoScaffold.java index b0442a0..0b7e98b 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoScaffold.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoScaffold.java @@ -1,13 +1,13 @@ -package com.genyo.addon.systems.modules.world; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.events.network.PlayerTickEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.PlacerModule; -import com.genyo.addon.render.animation.Animation; -import com.genyo.addon.utils.math.GPositionUtils; -import com.genyo.addon.utils.player.MovementUtil; -import com.genyo.addon.utils.player.RotationUtil; +package com.genyo.systems.modules.world; + +import com.genyo.GenyoAddon; +import com.genyo.events.network.PlayerTickEvent; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.PlacerModule; +import com.genyo.render.animation.Animation; +import com.genyo.utils.math.GPositionUtils; +import com.genyo.utils.player.MovementUtil; +import com.genyo.utils.player.RotationUtil; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.renderer.ShapeMode; import meteordevelopment.meteorclient.settings.*; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSelfTrap.java b/src/main/java/com/genyo/systems/modules/world/GenyoSelfTrap.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoSelfTrap.java rename to src/main/java/com/genyo/systems/modules/world/GenyoSelfTrap.java index a1095e9..396a6b8 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSelfTrap.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoSelfTrap.java @@ -1,14 +1,14 @@ -package com.genyo.addon.systems.modules.world; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.PlacerModule; -import com.genyo.addon.render.animation.Animation; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.math.GPositionUtils; -import com.genyo.addon.utils.math.MathUtil; -import com.genyo.addon.utils.player.Rotation; -import com.genyo.addon.utils.world.BlastResistantBlocks; +package com.genyo.systems.modules.world; + +import com.genyo.GenyoAddon; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.PlacerModule; +import com.genyo.render.animation.Animation; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.math.GPositionUtils; +import com.genyo.utils.math.MathUtil; +import com.genyo.utils.player.Rotation; +import com.genyo.utils.world.BlastResistantBlocks; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSpeedmine.java b/src/main/java/com/genyo/systems/modules/world/GenyoSpeedmine.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoSpeedmine.java rename to src/main/java/com/genyo/systems/modules/world/GenyoSpeedmine.java index e5546f7..c629201 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSpeedmine.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoSpeedmine.java @@ -1,20 +1,20 @@ -package com.genyo.addon.systems.modules.world; +package com.genyo.systems.modules.world; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.systems.settings.FloatSetting; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.systems.settings.FloatSetting; import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.utils.render.color.Color; import meteordevelopment.meteorclient.utils.render.color.SettingColor; -import com.genyo.addon.events.AttackBlockEvent; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.mixin.accessor.AccessorClientPlayerInteractionManager; -import com.genyo.addon.render.animation.Animation; -import com.genyo.addon.utils.collection.FirstOutQueue; -import com.genyo.addon.utils.math.MathUtil; -import com.genyo.addon.utils.player.EnchantmentUtil; -import com.genyo.addon.utils.player.RotationUtil; -import com.genyo.addon.utils.render.ColorUtil; +import com.genyo.events.AttackBlockEvent; +import com.genyo.managers.Managers; +import com.genyo.mixin.accessor.AccessorClientPlayerInteractionManager; +import com.genyo.render.animation.Animation; +import com.genyo.utils.collection.FirstOutQueue; +import com.genyo.utils.math.MathUtil; +import com.genyo.utils.player.EnchantmentUtil; +import com.genyo.utils.player.RotationUtil; +import com.genyo.utils.render.ColorUtil; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSurround.java b/src/main/java/com/genyo/systems/modules/world/GenyoSurround.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoSurround.java rename to src/main/java/com/genyo/systems/modules/world/GenyoSurround.java index e01e460..aafb8ac 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSurround.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoSurround.java @@ -1,8 +1,8 @@ -package com.genyo.addon.systems.modules.world; +package com.genyo.systems.modules.world; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.modules.GenyoModule; -import com.genyo.addon.utils.math.GPositionUtils; +import com.genyo.GenyoAddon; +import com.genyo.systems.modules.GenyoModule; +import com.genyo.utils.math.GPositionUtils; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.renderer.ShapeMode; diff --git a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSurroundV2.java b/src/main/java/com/genyo/systems/modules/world/GenyoSurroundV2.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/modules/world/GenyoSurroundV2.java rename to src/main/java/com/genyo/systems/modules/world/GenyoSurroundV2.java index 83d25a0..7f11b44 100644 --- a/src/main/java/com/genyo/addon/systems/modules/world/GenyoSurroundV2.java +++ b/src/main/java/com/genyo/systems/modules/world/GenyoSurroundV2.java @@ -1,14 +1,14 @@ -package com.genyo.addon.systems.modules.world; - -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.systems.modules.PlacerModule; -import com.genyo.addon.render.animation.Animation; -import com.genyo.addon.systems.settings.FloatSetting; -import com.genyo.addon.utils.math.GPositionUtils; -import com.genyo.addon.utils.math.MathUtil; -import com.genyo.addon.utils.player.Rotation; -import com.genyo.addon.utils.world.BlastResistantBlocks; +package com.genyo.systems.modules.world; + +import com.genyo.GenyoAddon; +import com.genyo.managers.Managers; +import com.genyo.systems.modules.PlacerModule; +import com.genyo.render.animation.Animation; +import com.genyo.systems.settings.FloatSetting; +import com.genyo.utils.math.GPositionUtils; +import com.genyo.utils.math.MathUtil; +import com.genyo.utils.player.Rotation; +import com.genyo.utils.world.BlastResistantBlocks; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; @@ -20,7 +20,6 @@ import meteordevelopment.meteorclient.utils.render.color.SettingColor; import meteordevelopment.meteorclient.utils.world.BlockUtils; import meteordevelopment.orbit.EventHandler; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/systems/screens/ListGroupScreen.java b/src/main/java/com/genyo/systems/screens/ListGroupScreen.java similarity index 95% rename from src/main/java/com/genyo/addon/systems/screens/ListGroupScreen.java rename to src/main/java/com/genyo/systems/screens/ListGroupScreen.java index 08d1beb..d386102 100644 --- a/src/main/java/com/genyo/addon/systems/screens/ListGroupScreen.java +++ b/src/main/java/com/genyo/systems/screens/ListGroupScreen.java @@ -1,9 +1,9 @@ -package com.genyo.addon.systems.screens; +package com.genyo.systems.screens; -import com.genyo.addon.systems.settings.playerlist.ListGroupSetting; -import com.genyo.addon.systems.settings.playerlist.ListPlayer; -import com.genyo.addon.systems.settings.playerlist.PLGroup; -import com.genyo.addon.utils.GenyoChatUtils; +import com.genyo.systems.settings.playerlist.ListGroupSetting; +import com.genyo.systems.settings.playerlist.ListPlayer; +import com.genyo.systems.settings.playerlist.PLGroup; +import com.genyo.utils.GenyoChatUtils; import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.WindowScreen; import meteordevelopment.meteorclient.gui.widgets.WWidget; diff --git a/src/main/java/com/genyo/addon/systems/screens/MainMenuScreen.java b/src/main/java/com/genyo/systems/screens/MainMenuScreen.java similarity index 91% rename from src/main/java/com/genyo/addon/systems/screens/MainMenuScreen.java rename to src/main/java/com/genyo/systems/screens/MainMenuScreen.java index d8a0f21..31f4234 100644 --- a/src/main/java/com/genyo/addon/systems/screens/MainMenuScreen.java +++ b/src/main/java/com/genyo/systems/screens/MainMenuScreen.java @@ -1,15 +1,12 @@ -package com.genyo.addon.systems.screens; +package com.genyo.systems.screens; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.utils.math.MathUtil; -import meteordevelopment.meteorclient.gui.renderer.GuiRenderer; +import com.genyo.GenyoAddon; +import com.genyo.utils.math.MathUtil; import meteordevelopment.meteorclient.renderer.Renderer2D; import meteordevelopment.meteorclient.renderer.text.TextRenderer; import meteordevelopment.meteorclient.utils.render.color.Color; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.resource.Resource; import net.minecraft.text.Text; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/genyo/addon/systems/settings/FloatSetting.java b/src/main/java/com/genyo/systems/settings/FloatSetting.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/settings/FloatSetting.java rename to src/main/java/com/genyo/systems/settings/FloatSetting.java index acbb73e..c0152ef 100644 --- a/src/main/java/com/genyo/addon/systems/settings/FloatSetting.java +++ b/src/main/java/com/genyo/systems/settings/FloatSetting.java @@ -1,4 +1,4 @@ -package com.genyo.addon.systems.settings; +package com.genyo.systems.settings; import meteordevelopment.meteorclient.settings.IVisible; import meteordevelopment.meteorclient.settings.Setting; diff --git a/src/main/java/com/genyo/addon/systems/settings/playerlist/ListGroupSetting.java b/src/main/java/com/genyo/systems/settings/playerlist/ListGroupSetting.java similarity index 97% rename from src/main/java/com/genyo/addon/systems/settings/playerlist/ListGroupSetting.java rename to src/main/java/com/genyo/systems/settings/playerlist/ListGroupSetting.java index cfcadf0..e34e147 100644 --- a/src/main/java/com/genyo/addon/systems/settings/playerlist/ListGroupSetting.java +++ b/src/main/java/com/genyo/systems/settings/playerlist/ListGroupSetting.java @@ -1,8 +1,8 @@ -package com.genyo.addon.systems.settings.playerlist; +package com.genyo.systems.settings.playerlist; -import com.genyo.addon.GenyoAddon; -import com.genyo.addon.systems.screens.ListGroupScreen; -import com.genyo.addon.utils.GenyoChatUtils; +import com.genyo.GenyoAddon; +import com.genyo.systems.screens.ListGroupScreen; +import com.genyo.utils.GenyoChatUtils; import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.renderer.GuiRenderer; import meteordevelopment.meteorclient.gui.widgets.containers.WTable; diff --git a/src/main/java/com/genyo/addon/systems/settings/playerlist/ListPlayer.java b/src/main/java/com/genyo/systems/settings/playerlist/ListPlayer.java similarity index 98% rename from src/main/java/com/genyo/addon/systems/settings/playerlist/ListPlayer.java rename to src/main/java/com/genyo/systems/settings/playerlist/ListPlayer.java index 69569f2..26ed6e0 100644 --- a/src/main/java/com/genyo/addon/systems/settings/playerlist/ListPlayer.java +++ b/src/main/java/com/genyo/systems/settings/playerlist/ListPlayer.java @@ -1,4 +1,4 @@ -package com.genyo.addon.systems.settings.playerlist; +package com.genyo.systems.settings.playerlist; import com.mojang.util.UndashedUuid; import meteordevelopment.meteorclient.utils.misc.ISerializable; diff --git a/src/main/java/com/genyo/addon/systems/settings/playerlist/PLGroup.java b/src/main/java/com/genyo/systems/settings/playerlist/PLGroup.java similarity index 96% rename from src/main/java/com/genyo/addon/systems/settings/playerlist/PLGroup.java rename to src/main/java/com/genyo/systems/settings/playerlist/PLGroup.java index feebb1a..18dd1e5 100644 --- a/src/main/java/com/genyo/addon/systems/settings/playerlist/PLGroup.java +++ b/src/main/java/com/genyo/systems/settings/playerlist/PLGroup.java @@ -1,4 +1,4 @@ -package com.genyo.addon.systems.settings.playerlist; +package com.genyo.systems.settings.playerlist; import java.util.List; diff --git a/src/main/java/com/genyo/addon/utils/GEntityUtils.java b/src/main/java/com/genyo/utils/GEntityUtils.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/GEntityUtils.java rename to src/main/java/com/genyo/utils/GEntityUtils.java index 1987a9e..fc6d816 100644 --- a/src/main/java/com/genyo/addon/utils/GEntityUtils.java +++ b/src/main/java/com/genyo/utils/GEntityUtils.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils; +package com.genyo.utils; import net.minecraft.entity.Entity; import net.minecraft.entity.vehicle.BoatEntity; diff --git a/src/main/java/com/genyo/addon/utils/GInvUtils.java b/src/main/java/com/genyo/utils/GInvUtils.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/GInvUtils.java rename to src/main/java/com/genyo/utils/GInvUtils.java index d11e31e..491ac57 100644 --- a/src/main/java/com/genyo/addon/utils/GInvUtils.java +++ b/src/main/java/com/genyo/utils/GInvUtils.java @@ -1,7 +1,7 @@ -package com.genyo.addon.utils; +package com.genyo.utils; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.utils.player.SearchInvResult; +import com.genyo.managers.Managers; +import com.genyo.utils.player.SearchInvResult; import meteordevelopment.meteorclient.utils.player.FindItemResult; import net.minecraft.block.Block; import net.minecraft.item.*; diff --git a/src/main/java/com/genyo/addon/utils/GenyoChatUtils.java b/src/main/java/com/genyo/utils/GenyoChatUtils.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/GenyoChatUtils.java rename to src/main/java/com/genyo/utils/GenyoChatUtils.java index 3056596..e8d17e5 100644 --- a/src/main/java/com/genyo/addon/utils/GenyoChatUtils.java +++ b/src/main/java/com/genyo/utils/GenyoChatUtils.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils; +package com.genyo.utils; import meteordevelopment.meteorclient.mixininterface.IChatHud; import meteordevelopment.meteorclient.utils.player.ChatUtils; diff --git a/src/main/java/com/genyo/addon/utils/HudUtils.java b/src/main/java/com/genyo/utils/HudUtils.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/HudUtils.java rename to src/main/java/com/genyo/utils/HudUtils.java index 9f616de..ebcbb68 100644 --- a/src/main/java/com/genyo/addon/utils/HudUtils.java +++ b/src/main/java/com/genyo/utils/HudUtils.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils; +package com.genyo.utils; import meteordevelopment.meteorclient.systems.hud.HudRenderer; import meteordevelopment.meteorclient.utils.render.color.Color; diff --git a/src/main/java/com/genyo/addon/utils/collection/EvictingQueue.java b/src/main/java/com/genyo/utils/collection/EvictingQueue.java similarity index 95% rename from src/main/java/com/genyo/addon/utils/collection/EvictingQueue.java rename to src/main/java/com/genyo/utils/collection/EvictingQueue.java index e824a5e..399eded 100644 --- a/src/main/java/com/genyo/addon/utils/collection/EvictingQueue.java +++ b/src/main/java/com/genyo/utils/collection/EvictingQueue.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.collection; +package com.genyo.utils.collection; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/genyo/addon/utils/collection/FirstOutQueue.java b/src/main/java/com/genyo/utils/collection/FirstOutQueue.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/collection/FirstOutQueue.java rename to src/main/java/com/genyo/utils/collection/FirstOutQueue.java index 91117b2..2b4d6f0 100644 --- a/src/main/java/com/genyo/addon/utils/collection/FirstOutQueue.java +++ b/src/main/java/com/genyo/utils/collection/FirstOutQueue.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.collection; +package com.genyo.utils.collection; import com.google.common.collect.ForwardingQueue; diff --git a/src/main/java/com/genyo/addon/utils/entity/EntityUtil.java b/src/main/java/com/genyo/utils/entity/EntityUtil.java similarity index 97% rename from src/main/java/com/genyo/addon/utils/entity/EntityUtil.java rename to src/main/java/com/genyo/utils/entity/EntityUtil.java index c515e7b..16dd425 100644 --- a/src/main/java/com/genyo/addon/utils/entity/EntityUtil.java +++ b/src/main/java/com/genyo/utils/entity/EntityUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.entity; +package com.genyo.utils.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/genyo/addon/utils/math/GPositionUtils.java b/src/main/java/com/genyo/utils/math/GPositionUtils.java similarity index 95% rename from src/main/java/com/genyo/addon/utils/math/GPositionUtils.java rename to src/main/java/com/genyo/utils/math/GPositionUtils.java index 71a906d..03cb8b5 100644 --- a/src/main/java/com/genyo/addon/utils/math/GPositionUtils.java +++ b/src/main/java/com/genyo/utils/math/GPositionUtils.java @@ -1,6 +1,6 @@ -package com.genyo.addon.utils.math; +package com.genyo.utils.math; -import com.genyo.addon.utils.world.BlastResistantBlocks; +import com.genyo.utils.world.BlastResistantBlocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/genyo/addon/utils/math/MathUtil.java b/src/main/java/com/genyo/utils/math/MathUtil.java similarity index 95% rename from src/main/java/com/genyo/addon/utils/math/MathUtil.java rename to src/main/java/com/genyo/utils/math/MathUtil.java index fc201cf..b6c035a 100644 --- a/src/main/java/com/genyo/addon/utils/math/MathUtil.java +++ b/src/main/java/com/genyo/utils/math/MathUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.math; +package com.genyo.utils.math; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/genyo/addon/utils/math/PerSecondCounter.java b/src/main/java/com/genyo/utils/math/PerSecondCounter.java similarity index 94% rename from src/main/java/com/genyo/addon/utils/math/PerSecondCounter.java rename to src/main/java/com/genyo/utils/math/PerSecondCounter.java index d62a3bb..e838d08 100644 --- a/src/main/java/com/genyo/addon/utils/math/PerSecondCounter.java +++ b/src/main/java/com/genyo/utils/math/PerSecondCounter.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.math; +package com.genyo.utils.math; import java.util.LinkedList; diff --git a/src/main/java/com/genyo/addon/utils/math/timer/CacheTimer.java b/src/main/java/com/genyo/utils/math/timer/CacheTimer.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/math/timer/CacheTimer.java rename to src/main/java/com/genyo/utils/math/timer/CacheTimer.java index 8f98c5b..d2d5cdd 100644 --- a/src/main/java/com/genyo/addon/utils/math/timer/CacheTimer.java +++ b/src/main/java/com/genyo/utils/math/timer/CacheTimer.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.math.timer; +package com.genyo.utils.math.timer; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/genyo/addon/utils/math/timer/TickTimer.java b/src/main/java/com/genyo/utils/math/timer/TickTimer.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/math/timer/TickTimer.java rename to src/main/java/com/genyo/utils/math/timer/TickTimer.java index 0960f9b..621db6d 100644 --- a/src/main/java/com/genyo/addon/utils/math/timer/TickTimer.java +++ b/src/main/java/com/genyo/utils/math/timer/TickTimer.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.math.timer; +package com.genyo.utils.math.timer; import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.events.world.TickEvent; diff --git a/src/main/java/com/genyo/addon/utils/math/timer/Timer.java b/src/main/java/com/genyo/utils/math/timer/Timer.java similarity index 94% rename from src/main/java/com/genyo/addon/utils/math/timer/Timer.java rename to src/main/java/com/genyo/utils/math/timer/Timer.java index 2fe533f..16b8bd7 100644 --- a/src/main/java/com/genyo/addon/utils/math/timer/Timer.java +++ b/src/main/java/com/genyo/utils/math/timer/Timer.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.math.timer; +package com.genyo.utils.math.timer; public interface Timer { diff --git a/src/main/java/com/genyo/addon/utils/player/EnchantmentUtil.java b/src/main/java/com/genyo/utils/player/EnchantmentUtil.java similarity index 97% rename from src/main/java/com/genyo/addon/utils/player/EnchantmentUtil.java rename to src/main/java/com/genyo/utils/player/EnchantmentUtil.java index bcdc41e..a341244 100644 --- a/src/main/java/com/genyo/addon/utils/player/EnchantmentUtil.java +++ b/src/main/java/com/genyo/utils/player/EnchantmentUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.component.DataComponentTypes; diff --git a/src/main/java/com/genyo/addon/utils/player/InteractionUtil.java b/src/main/java/com/genyo/utils/player/InteractionUtil.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/player/InteractionUtil.java rename to src/main/java/com/genyo/utils/player/InteractionUtil.java index 03607c0..33f33de 100644 --- a/src/main/java/com/genyo/addon/utils/player/InteractionUtil.java +++ b/src/main/java/com/genyo/utils/player/InteractionUtil.java @@ -1,8 +1,8 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; -import com.genyo.addon.managers.Managers; -import com.genyo.addon.utils.GInvUtils; -import com.genyo.addon.utils.world.ExplosionUtil; +import com.genyo.managers.Managers; +import com.genyo.utils.GInvUtils; +import com.genyo.utils.world.ExplosionUtil; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/genyo/addon/utils/player/InventoryUtil.java b/src/main/java/com/genyo/utils/player/InventoryUtil.java similarity index 97% rename from src/main/java/com/genyo/addon/utils/player/InventoryUtil.java rename to src/main/java/com/genyo/utils/player/InventoryUtil.java index 504f62e..23df236 100644 --- a/src/main/java/com/genyo/addon/utils/player/InventoryUtil.java +++ b/src/main/java/com/genyo/utils/player/InventoryUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.Item; diff --git a/src/main/java/com/genyo/addon/utils/player/MovementUtil.java b/src/main/java/com/genyo/utils/player/MovementUtil.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/player/MovementUtil.java rename to src/main/java/com/genyo/utils/player/MovementUtil.java index 574058d..c304578 100644 --- a/src/main/java/com/genyo/addon/utils/player/MovementUtil.java +++ b/src/main/java/com/genyo/utils/player/MovementUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.EquipmentSlot; diff --git a/src/main/java/com/genyo/addon/utils/player/PlayerUtil.java b/src/main/java/com/genyo/utils/player/PlayerUtil.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/player/PlayerUtil.java rename to src/main/java/com/genyo/utils/player/PlayerUtil.java index 4039854..9db297c 100644 --- a/src/main/java/com/genyo/addon/utils/player/PlayerUtil.java +++ b/src/main/java/com/genyo/utils/player/PlayerUtil.java @@ -1,6 +1,6 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; -import com.genyo.addon.utils.math.GPositionUtils; +import com.genyo.utils.math.GPositionUtils; import net.minecraft.block.BlockState; import net.minecraft.block.CobwebBlock; import net.minecraft.client.option.KeyBinding; diff --git a/src/main/java/com/genyo/addon/utils/player/RaycastUtil.java b/src/main/java/com/genyo/utils/player/RaycastUtil.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/player/RaycastUtil.java rename to src/main/java/com/genyo/utils/player/RaycastUtil.java index d2c8423..1997151 100644 --- a/src/main/java/com/genyo/addon/utils/player/RaycastUtil.java +++ b/src/main/java/com/genyo/utils/player/RaycastUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/genyo/addon/utils/player/Rotation.java b/src/main/java/com/genyo/utils/player/Rotation.java similarity index 89% rename from src/main/java/com/genyo/addon/utils/player/Rotation.java rename to src/main/java/com/genyo/utils/player/Rotation.java index 2b4f94e..c1bc333 100644 --- a/src/main/java/com/genyo/addon/utils/player/Rotation.java +++ b/src/main/java/com/genyo/utils/player/Rotation.java @@ -1,6 +1,5 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; -import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import static meteordevelopment.meteorclient.MeteorClient.mc; diff --git a/src/main/java/com/genyo/addon/utils/player/RotationUtil.java b/src/main/java/com/genyo/utils/player/RotationUtil.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/player/RotationUtil.java rename to src/main/java/com/genyo/utils/player/RotationUtil.java index c58132b..0d17331 100644 --- a/src/main/java/com/genyo/addon/utils/player/RotationUtil.java +++ b/src/main/java/com/genyo/utils/player/RotationUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/genyo/addon/utils/player/SearchInvResult.java b/src/main/java/com/genyo/utils/player/SearchInvResult.java similarity index 88% rename from src/main/java/com/genyo/addon/utils/player/SearchInvResult.java rename to src/main/java/com/genyo/utils/player/SearchInvResult.java index c9b9df3..434fa4f 100644 --- a/src/main/java/com/genyo/addon/utils/player/SearchInvResult.java +++ b/src/main/java/com/genyo/utils/player/SearchInvResult.java @@ -1,7 +1,6 @@ -package com.genyo.addon.utils.player; +package com.genyo.utils.player; -import com.genyo.addon.utils.GInvUtils; -import meteordevelopment.meteorclient.utils.player.InvUtils; +import com.genyo.utils.GInvUtils; import net.minecraft.item.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/genyo/addon/utils/render/ColorUtil.java b/src/main/java/com/genyo/utils/render/ColorUtil.java similarity index 94% rename from src/main/java/com/genyo/addon/utils/render/ColorUtil.java rename to src/main/java/com/genyo/utils/render/ColorUtil.java index bb10b2c..e2bd390 100644 --- a/src/main/java/com/genyo/addon/utils/render/ColorUtil.java +++ b/src/main/java/com/genyo/utils/render/ColorUtil.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.render; +package com.genyo.utils.render; import meteordevelopment.meteorclient.utils.render.color.Color; diff --git a/src/main/java/com/genyo/addon/utils/render/SInterpolation.java b/src/main/java/com/genyo/utils/render/SInterpolation.java similarity index 97% rename from src/main/java/com/genyo/addon/utils/render/SInterpolation.java rename to src/main/java/com/genyo/utils/render/SInterpolation.java index 2e258c3..4c9a87b 100644 --- a/src/main/java/com/genyo/addon/utils/render/SInterpolation.java +++ b/src/main/java/com/genyo/utils/render/SInterpolation.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.render; +package com.genyo.utils.render; import net.minecraft.entity.Entity; import net.minecraft.util.math.Box; diff --git a/src/main/java/com/genyo/addon/utils/string/EnumFormatter.java b/src/main/java/com/genyo/utils/string/EnumFormatter.java similarity index 96% rename from src/main/java/com/genyo/addon/utils/string/EnumFormatter.java rename to src/main/java/com/genyo/utils/string/EnumFormatter.java index 2bfb333..4af4506 100644 --- a/src/main/java/com/genyo/addon/utils/string/EnumFormatter.java +++ b/src/main/java/com/genyo/utils/string/EnumFormatter.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.string; +package com.genyo.utils.string; public class EnumFormatter { diff --git a/src/main/java/com/genyo/addon/utils/world/BlastResistantBlocks.java b/src/main/java/com/genyo/utils/world/BlastResistantBlocks.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/world/BlastResistantBlocks.java rename to src/main/java/com/genyo/utils/world/BlastResistantBlocks.java index dd2c8b2..1197d99 100644 --- a/src/main/java/com/genyo/addon/utils/world/BlastResistantBlocks.java +++ b/src/main/java/com/genyo/utils/world/BlastResistantBlocks.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.world; +package com.genyo.utils.world; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import net.minecraft.block.Block; diff --git a/src/main/java/com/genyo/addon/utils/world/ExplosionUtil.java b/src/main/java/com/genyo/utils/world/ExplosionUtil.java similarity index 99% rename from src/main/java/com/genyo/addon/utils/world/ExplosionUtil.java rename to src/main/java/com/genyo/utils/world/ExplosionUtil.java index 4d00cac..51c496f 100644 --- a/src/main/java/com/genyo/addon/utils/world/ExplosionUtil.java +++ b/src/main/java/com/genyo/utils/world/ExplosionUtil.java @@ -1,6 +1,6 @@ -package com.genyo.addon.utils.world; +package com.genyo.utils.world; -import com.genyo.addon.utils.player.EnchantmentUtil; +import com.genyo.utils.player.EnchantmentUtil; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.enchantment.EnchantmentHelper; @@ -15,7 +15,6 @@ import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/genyo/addon/utils/world/HoleUtility.java b/src/main/java/com/genyo/utils/world/HoleUtility.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/world/HoleUtility.java rename to src/main/java/com/genyo/utils/world/HoleUtility.java index 153a3cc..b56e5d6 100644 --- a/src/main/java/com/genyo/addon/utils/world/HoleUtility.java +++ b/src/main/java/com/genyo/utils/world/HoleUtility.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.world; +package com.genyo.utils.world; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/genyo/addon/utils/world/SneakBlocks.java b/src/main/java/com/genyo/utils/world/SneakBlocks.java similarity index 98% rename from src/main/java/com/genyo/addon/utils/world/SneakBlocks.java rename to src/main/java/com/genyo/utils/world/SneakBlocks.java index a6e0ae1..ccf7f5e 100644 --- a/src/main/java/com/genyo/addon/utils/world/SneakBlocks.java +++ b/src/main/java/com/genyo/utils/world/SneakBlocks.java @@ -1,4 +1,4 @@ -package com.genyo.addon.utils.world; +package com.genyo.utils.world; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8fd3b4f..39f307f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "environment": "client", "entrypoints": { "meteor": [ - "com.genyo.addon.GenyoAddon" + "com.genyo.GenyoAddon" ] }, "mixins": [ diff --git a/src/main/resources/genyo.mixins.json b/src/main/resources/genyo.mixins.json index 98d375e..f982e54 100644 --- a/src/main/resources/genyo.mixins.json +++ b/src/main/resources/genyo.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.genyo.addon.mixin", + "package": "com.genyo.mixin", "compatibilityLevel": "JAVA_21", "client": [ "ClientPlayerInteractionManagerMixin", From 83c291d0c9cb57eba850a821fad39ebb0ce54f16 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 21:00:02 +0200 Subject: [PATCH 03/10] finalize Einstein --- .../genyo/systems/modules/misc/Einstein.java | 8 +- .../assets/genyo/einstein/einstein.yml | 269 ++++++++++++++++++ .../resources/assets/genyo/einstein/maker.py | 38 +++ .../assets/genyo/einstein/questions.txt | 176 ++++++++++++ .../resources/assets/genyo/files/einstein.yml | 269 ------------------ 5 files changed, 486 insertions(+), 274 deletions(-) create mode 100644 src/main/resources/assets/genyo/einstein/einstein.yml create mode 100644 src/main/resources/assets/genyo/einstein/maker.py create mode 100644 src/main/resources/assets/genyo/einstein/questions.txt delete mode 100644 src/main/resources/assets/genyo/files/einstein.yml diff --git a/src/main/java/com/genyo/systems/modules/misc/Einstein.java b/src/main/java/com/genyo/systems/modules/misc/Einstein.java index 142865d..94ea466 100644 --- a/src/main/java/com/genyo/systems/modules/misc/Einstein.java +++ b/src/main/java/com/genyo/systems/modules/misc/Einstein.java @@ -39,9 +39,9 @@ public Einstein() { ); // Things - private final Identifier file = Identifier.of(GenyoAddon.MOD_ID, "files/einstein.yml"); - private List entries = new ArrayList<>(); - private Random random = new Random(); + private final Identifier file = Identifier.of(GenyoAddon.MOD_ID, "einstein/einstein.yml"); + private final List entries = new ArrayList<>(); + private final Random random = new Random(); // Cooldown private int cooldown = 5; // default: 300 @@ -138,8 +138,6 @@ private void readEinstein() { List keys = yamlMap.keySet().stream().toList(); for (Object o : keys) { - Integer index = (int) o; - // The things String question; List answers; diff --git a/src/main/resources/assets/genyo/einstein/einstein.yml b/src/main/resources/assets/genyo/einstein/einstein.yml new file mode 100644 index 0000000..1c60f2f --- /dev/null +++ b/src/main/resources/assets/genyo/einstein/einstein.yml @@ -0,0 +1,269 @@ +{0: {answers: {A: '279', B: '289', C: '299', D: '361'}, correct: '289', index: '0', + question: 'What is 17^2?'}, 1: {answers: {A: '1728', B: '1331', C: '2197', D: '2048'}, + correct: '2197', index: '1', question: 'What is 13^3?'}, 2: {answers: {A: '720', + B: '5040', C: '40320', D: '362880'}, correct: '5040', index: '2', question: 'What + is 7!?'}, 3: {answers: {A: '6', B: '9', C: '18', D: '36'}, correct: '18', index: '3', + question: 'What is gcd(252,198)?'}, 4: {answers: {A: '70', B: '140', C: '280', + D: '210'}, correct: '140', index: '4', question: 'What is lcm(14,20)?'}, 5: { + answers: {A: '1000', B: '1024', C: '2048', D: '512'}, correct: '1024', index: '5', + question: 'What is 2^10?'}, 6: {answers: {A: '12', B: '18', C: '24', D: '16'}, + correct: '12', index: '6', question: "What is \u03C6(36)?"}, 7: {answers: {A: '1', + B: '3', C: '7', D: '9'}, correct: '7', index: '7', question: 'What is the last + digit of 7^2025?'}, 8: {answers: {A: '364', B: '495', C: '792', D: '220'}, correct: '495', + index: '8', question: 'What is C(12,4)?'}, 9: {answers: {A: '1260', B: '1440', + C: '1620', D: '1800'}, correct: '1440', index: '9', question: 'What is the sum + of interior angles of a decagon?'}, 10: {answers: {A: '1', B: '11', C: '13', + D: '17'}, correct: '11', index: '10', question: 'What is det([[3,2],[5,7]])?'}, + 11: {answers: {A: '34', B: '55', C: '89', D: '144'}, correct: '55', index: '11', + question: 'What is F10 (F1=1,F2=1)?'}, 12: {answers: {A: '614', B: '604', C: '624', + D: '544'}, correct: '604', index: '12', question: "What is 9^3\u22125^3?"}, + 13: {answers: {A: '18', B: '24', C: '30', D: '36'}, correct: '24', index: '13', + question: 'What is the number of divisors of 360?'}, 14: {answers: {A: '0', B: '1', + C: '5', D: '12'}, correct: '0', index: '14', question: 'What is the remainder + when 1001 is divided by 13?'}, 15: {answers: {A: '12', B: '13', C: '14', D: '15'}, + correct: '13', index: '15', question: 'What is log2(8192)?'}, 16: {answers: { + A: '6561', B: '729', C: '2187', D: '8192'}, correct: '6561', index: '16', question: 'What + is 3^8?'}, 17: {answers: {A: '11', B: '13', C: '17', D: '19'}, correct: '13', + index: '17', question: 'What is the smallest prime factor of 221?'}, 18: {answers: { + A: '1', B: '9', C: '3', D: '0'}, correct: '1', index: '18', question: 'What + is 0.999... as a fraction?'}, 19: {answers: {A: '56', B: '64', C: '70', D: '84'}, + correct: '56', index: '19', question: 'What is C(8,3)?'}, 20: {answers: {A: '1', + B: '2', C: '3', D: '4'}, correct: '3', index: '20', question: 'What is 15 mod + 4?'}, 21: {answers: {A: '80', B: '40', C: '160', D: '320'}, correct: '80', index: '21', + question: 'What is (d/dx)x^5 at x=2?'}, 22: {answers: {A: '1', B: '3', C: '0', + D: '2'}, correct: '1', index: '22', question: "What is \u222B0^1 3x^2 dx?"}, + 23: {answers: {A: '1225', B: '1275', C: '1325', D: '1375'}, correct: '1275', index: '23', + question: 'What is the sum of the first 50 positive integers?'}, 24: {answers: { + A: '1048576', B: '524288', C: '2097152', D: '262144'}, correct: '1048576', index: '24', + question: 'What is 2^20?'}, 25: {answers: {A: '935', B: '1001', C: '1003', D: '1099'}, + correct: '1001', index: '25', question: "What is 11\xD713\xD77?"}, 26: {answers: { + A: '84', B: '96', C: '104', D: '112'}, correct: '96', index: '26', question: "What\ + \ is 14^2\u221210^2?"}, 27: {answers: {A: '48', B: '60', C: '72', D: '96'}, + correct: '72', index: '27', question: "What is 3\xD74!?"}, 28: {answers: {A: '120', + B: '360', C: '720', D: '840'}, correct: '720', index: '28', question: 'What + is the number of permutations of 6 distinct items?'}, 29: {answers: {A: Zero, + B: Infinity, C: Undefined, D: One}, correct: Undefined, index: '29', question: 'What + is 1/0?'}, 30: {answers: {A: '4', B: '8', C: '16', D: '36'}, correct: '16', + index: '30', question: "What is the discriminant of x^2\u221210x+21?"}, 31: { + answers: {A: '2', B: '3', C: '4', D: '6'}, correct: '3', index: '31', question: "What\ + \ is the larger root of x^2\u22125x+6=0?"}, 32: {answers: {A: '998001', B: '999000', + C: '1000001', D: '997002'}, correct: '998001', index: '32', question: "What\ + \ is 999\xD7999?"}, 33: {answers: {A: '1', B: '2', C: '3', D: '4'}, correct: '2', + index: '33', question: 'What is 23 mod 7?'}, 34: {answers: {A: '3', B: '5', C: '8', + D: '10'}, correct: '3', index: '34', question: "What is the smallest positive\ + \ solution to x\u22613 (mod 5)?"}, 35: {answers: {A: '78125', B: '16807', C: '59049', + D: '65536'}, correct: '78125', index: '35', question: 'What is 5^7?'}, 36: { + answers: {A: '0', B: '1', C: '2', D: '3'}, correct: '1', index: '36', question: 'What + is the remainder when 2^100 is divided by 3?'}, 37: {answers: {A: '22', B: '24', + C: '25', D: '26'}, correct: '24', index: '37', question: 'What is the number + of trailing zeros in 100!?'}, 38: {answers: {A: '23', B: '25', C: '26', D: '28'}, + correct: '26', index: '38', question: 'What is the sum of digits of 2^15?'}, 39: { + answers: {A: '10', B: '12', C: '14', D: '16'}, correct: '12', index: '39', question: "What\ + \ is the radius of a circle with area 144\u03C0?"}, 40: {answers: {A: '18', + B: '20', C: '22', D: '24'}, correct: '20', index: '40', question: 'What is the + arithmetic mean of 12 and 28?'}, 41: {answers: {A: '125', B: '145', C: '161', + D: '225'}, correct: '145', index: '41', question: 'What is 3^4+4^3?'}, 42: { + answers: {A: '768', B: '752', C: '1024', D: '640'}, correct: '768', index: '42', + question: 'What is 2^8+2^9?'}, 43: {answers: {A: '12', B: '7', C: '19', D: '5'}, + correct: '12', index: '43', question: "What is the product of roots of x^2\u2212\ + 7x+12=0?"}, 44: {answers: {A: '20', B: '30', C: '40', D: '50'}, correct: '40', + index: '44', question: 'What is the coefficient of x^3 in (x+2)^5?'}, 45: {answers: { + A: '511', B: '1023', C: '1025', D: '2047'}, correct: '1023', index: '45', question: 'What + is 1+2+4+8+...+2^9?'}, 46: {answers: {A: '32', B: '33', C: '34', D: '35'}, correct: '33', + index: '46', question: "What is \u230A100/3\u230B?"}, 47: {answers: {A: '97', + B: '99', C: '101', D: '103'}, correct: '101', index: '47', question: 'What is + the smallest prime greater than 100?'}, 48: {answers: {A: '169', B: '181', C: '193', + D: '205'}, correct: '169', index: '48', question: 'What is 12^2+5^2?'}, 49: { + answers: {A: '4', B: '7', C: '8', D: '9'}, correct: '4', index: '49', question: 'What + is the inverse of 3 modulo 11?'}, 50: {answers: {A: '331', B: '341', C: '361', + D: '371'}, correct: '361', index: '50', question: 'What is 19^2?'}, 51: {answers: { + A: '483', B: '503', C: '529', D: '543'}, correct: '529', index: '51', question: 'What + is 23^2?'}, 52: {answers: {A: '831', B: '841', C: '851', D: '861'}, correct: '841', + index: '52', question: 'What is 29^2?'}, 53: {answers: {A: '941', B: '951', C: '961', + D: '971'}, correct: '961', index: '53', question: 'What is 31^2?'}, 54: {answers: { + A: '1349', B: '1369', C: '1389', D: '1399'}, correct: '1369', index: '54', question: 'What + is 37^2?'}, 55: {answers: {A: '1641', B: '1681', C: '1701', D: '1721'}, correct: '1681', + index: '55', question: 'What is 41^2?'}, 56: {answers: {A: '2209', B: '2219', + C: '2229', D: '2249'}, correct: '2209', index: '56', question: 'What is 47^2?'}, + 57: {answers: {A: '2799', B: '2809', C: '2819', D: '2829'}, correct: '2809', index: '57', + question: 'What is 53^2?'}, 58: {answers: {A: '3409', B: '3481', C: '3499', D: '3509'}, + correct: '3481', index: '58', question: 'What is 59^2?'}, 59: {answers: {A: '3701', + B: '3721', C: '3741', D: '3761'}, correct: '3721', index: '59', question: 'What + is 61^2?'}, 60: {answers: {A: '4459', B: '4489', C: '4509', D: '4529'}, correct: '4489', + index: '60', question: 'What is 67^2?'}, 61: {answers: {A: '5009', B: '5041', + C: '5081', D: '5101'}, correct: '5041', index: '61', question: 'What is 71^2?'}, + 62: {answers: {A: '5329', B: '5349', C: '5369', D: '5389'}, correct: '5329', index: '62', + question: 'What is 73^2?'}, 63: {answers: {A: '6219', B: '6239', C: '6241', D: '6259'}, + correct: '6241', index: '63', question: 'What is 79^2?'}, 64: {answers: {A: '6869', + B: '6889', C: '6899', D: '6909'}, correct: '6889', index: '64', question: 'What + is 83^2?'}, 65: {answers: {A: '7901', B: '7921', C: '7939', D: '7951'}, correct: '7921', + index: '65', question: 'What is 89^2?'}, 66: {answers: {A: '9401', B: '9411', + C: '9439', D: '9409'}, correct: '9409', index: '66', question: 'What is 97^2?'}, + 67: {answers: {A: '10101', B: '10201', C: '10301', D: '10401'}, correct: '10201', + index: '67', question: 'What is 101^2?'}, 68: {answers: {A: '10409', B: '10501', + C: '10609', D: '10709'}, correct: '10609', index: '68', question: 'What is 103^2?'}, + 69: {answers: {A: '11309', B: '11409', C: '11449', D: '11509'}, correct: '11449', + index: '69', question: 'What is 107^2?'}, 70: {answers: {A: '12649', B: '12769', + C: '12809', D: '12849'}, correct: '12769', index: '70', question: 'What is 113^2?'}, + 71: {answers: {A: '16009', B: '16129', C: '16209', D: '16329'}, correct: '16129', + index: '71', question: 'What is 127^2?'}, 72: {answers: {A: '17001', B: '17161', + C: '17281', D: '17321'}, correct: '17161', index: '72', question: 'What is 131^2?'}, + 73: {answers: {A: '18769', B: '18869', C: '18969', D: '19069'}, correct: '18769', + index: '73', question: 'What is 137^2?'}, 74: {answers: {A: '19101', B: '19201', + C: '19321', D: '19441'}, correct: '19321', index: '74', question: 'What is 139^2?'}, + 75: {answers: {A: '22001', B: '22101', C: '22201', D: '22201'}, correct: '22201', + index: '75', question: 'What is 149^2?'}, 76: {answers: {A: '22701', B: '22781', + C: '22801', D: '22901'}, correct: '22801', index: '76', question: 'What is 151^2?'}, + 77: {answers: {A: '24501', B: '24601', C: '24649', D: '24701'}, correct: '24649', + index: '77', question: 'What is 157^2?'}, 78: {answers: {A: '26401', B: '26569', + C: '26601', D: '26701'}, correct: '26569', index: '78', question: 'What is 163^2?'}, + 79: {answers: {A: '27701', B: '27889', C: '27901', D: '28001'}, correct: '27889', + index: '79', question: 'What is 167^2?'}, 80: {answers: {A: '29701', B: '29809', + C: '29929', D: '30001'}, correct: '29929', index: '80', question: 'What is 173^2?'}, + 81: {answers: {A: '31801', B: '31901', C: '32041', D: '32101'}, correct: '32041', + index: '81', question: 'What is 179^2?'}, 82: {answers: {A: '32721', B: '32761', + C: '32801', D: '32841'}, correct: '32761', index: '82', question: 'What is 181^2?'}, + 83: {answers: {A: '36241', B: '36481', C: '36521', D: '36601'}, correct: '36481', + index: '83', question: 'What is 191^2?'}, 84: {answers: {A: '37129', B: '37249', + C: '37369', D: '37489'}, correct: '37249', index: '84', question: 'What is 193^2?'}, + 85: {answers: {A: '38569', B: '38701', C: '38809', D: '38929'}, correct: '38809', + index: '85', question: 'What is 197^2?'}, 86: {answers: {A: '39601', B: '39701', + C: '39801', D: '39901'}, correct: '39601', index: '86', question: 'What is 199^2?'}, + 87: {answers: {A: '479001600', B: '39916800', C: '6227020800', D: '362880'}, correct: '479001600', + index: '87', question: 'What is 12!?'}, 88: {answers: {A: '40320', B: '5040', + C: '720', D: '362880'}, correct: '40320', index: '88', question: 'What is 8!?'}, + 89: {answers: {A: '720', B: '5040', C: '362880', D: '3628800'}, correct: '362880', + index: '89', question: 'What is 9!?'}, 90: {answers: {A: '362880', B: '3628800', + C: '39916800', D: '479001600'}, correct: '3628800', index: '90', question: 'What + is 10!?'}, 91: {answers: {A: '3628800', B: '39916800', C: '479001600', D: '6227020800'}, + correct: '39916800', index: '91', question: 'What is 11!?'}, 92: {answers: {A: '6227020800', + B: '1307674368000', C: '87178291200', D: '2432902008176640000'}, correct: '1307674368000', + index: '92', question: 'What is 15!?'}, 93: {answers: {A: '15', B: '25', C: '45', + D: '75'}, correct: '45', index: '93', question: 'What is gcd(135,225)?'}, 94: { + answers: {A: '18', B: '36', C: '54', D: '72'}, correct: '36', index: '94', question: 'What + is gcd(180,324)?'}, 95: {answers: {A: '42', B: '63', C: '84', D: '126'}, correct: '42', + index: '95', question: 'What is gcd(420,378)?'}, 96: {answers: {A: '27', B: '54', + C: '81', D: '243'}, correct: '81', index: '96', question: 'What is gcd(729,972)?'}, + 97: {answers: {A: '60', B: '90', C: '120', D: '180'}, correct: '90', index: '97', + question: 'What is lcm(18,30)?'}, 98: {answers: {A: '42', B: '84', C: '126', D: '168'}, + correct: '84', index: '98', question: 'What is lcm(21,28)?'}, 99: {answers: { + A: '100', B: '200', C: '400', D: '800'}, correct: '200', index: '99', question: 'What + is lcm(25,40)?'}, 100: {answers: {A: '108', B: '144', C: '162', D: '216'}, correct: '108', + index: '100', question: 'What is lcm(27,36)?'}, 101: {answers: {A: '15625', B: '390625', + C: '78125', D: '1953125'}, correct: '390625', index: '101', question: 'What + is 5^8?'}, 102: {answers: {A: '7776', B: '46656', C: '279936', D: '1679616'}, + correct: '46656', index: '102', question: 'What is 6^6?'}, 103: {answers: {A: '16807', + B: '117649', C: '823543', D: '78125'}, correct: '16807', index: '103', question: 'What + is 7^5?'}, 104: {answers: {A: '4096', B: '8192', C: '16384', D: '32768'}, correct: '4096', + index: '104', question: 'What is 8^4?'}, 105: {answers: {A: '59049', B: '531441', + C: '4782969', D: '43046721'}, correct: '531441', index: '105', question: 'What + is 9^6?'}, 106: {answers: {A: '4', B: '8', C: '12', D: '16'}, correct: '8', + index: '106', question: "What is \u03C6(30)?"}, 107: {answers: {A: '12', B: '18', + C: '24', D: '36'}, correct: '24', index: '107', question: "What is \u03C6(72)?"}, + 108: {answers: {A: '30', B: '40', C: '50', D: '60'}, correct: '40', index: '108', + question: "What is \u03C6(100)?"}, 109: {answers: {A: '24', B: '32', C: '36', + D: '42'}, correct: '24', index: '109', question: "What is \u03C6(84)?"}, 110: { + answers: {A: '8', B: '9', C: '10', D: '11'}, correct: '10', index: '110', question: 'What + is log2(1024)?'}, 111: {answers: {A: '4', B: '5', C: '6', D: '7'}, correct: '6', + index: '111', question: 'What is log10(1000000)?'}, 112: {answers: {A: '5', B: '6', + C: '7', D: '8'}, correct: '6', index: '112', question: 'What is log3(729)?'}, + 113: {answers: {A: '4', B: '5', C: '6', D: '7'}, correct: '5', index: '113', question: 'What + is log5(3125)?'}, 114: {answers: {A: '200', B: '210', C: '220', D: '252'}, correct: '252', + index: '114', question: 'What is C(10,5)?'}, 115: {answers: {A: '91', B: '105', + C: '120', D: '136'}, correct: '105', index: '115', question: 'What is C(15,2)?'}, + 116: {answers: {A: '184756', B: '24310', C: '167960', D: '92378'}, correct: '184756', + index: '116', question: 'What is C(20,10)?'}, 117: {answers: {A: '816', B: '816', + C: '856', D: '918'}, correct: '816', index: '117', question: 'What is C(18,3)?'}, + 118: {answers: {A: '720', B: '840', C: '960', D: '1000'}, correct: '720', index: '118', + question: 'What is P(10,3)?'}, 119: {answers: {A: '1680', B: '1720', C: '1740', + D: '1760'}, correct: '1680', index: '119', question: 'What is P(8,4)?'}, 120: { + answers: {A: '132', B: '132', C: '142', D: '152'}, correct: '132', index: '120', + question: 'What is P(12,2)?'}, 121: {answers: {A: '2520', B: '2540', C: '2560', + D: '2580'}, correct: '2520', index: '121', question: 'What is P(7,5)?'}, 122: { + answers: {A: '4950', B: '5000', C: '5050', D: '5100'}, correct: '5050', index: '122', + question: 'What is the sum of first 100 natural numbers?'}, 123: {answers: {A: '19900', + B: '20000', C: '20100', D: '20100'}, correct: '20100', index: '123', question: 'What + is the sum of first 200 natural numbers?'}, 124: {answers: {A: '1250', B: '2450', + C: '2550', D: '2650'}, correct: '2550', index: '124', question: 'What is the + sum of first 50 even numbers?'}, 125: {answers: {A: '2400', B: '2500', C: '2600', + D: '2700'}, correct: '2500', index: '125', question: 'What is the sum of first + 50 odd numbers?'}, 126: {answers: {A: '1', B: '2', C: '3', D: '9'}, correct: "\u2212\ + 13", index: '126', question: 'What is det([[2,5],[7,11]])?'}, 127: {answers: { + A: "\u22122", B: "\u22121", C: '0', D: '1'}, correct: "\u22122", index: '127', + question: 'What is det([[4,3],[2,1]])?'}, 128: {answers: {A: '0', B: '6', C: '12', + D: '18'}, correct: '0', index: '128', question: 'What is det([[6,2],[9,3]])?'}, + 129: {answers: {A: '2', B: '14', C: '18', D: '36'}, correct: '18', index: '129', + question: 'What is det([[10,4],[7,5]])?'}, 130: {answers: {A: '89', B: '144', + C: '233', D: '377'}, correct: '144', index: '130', question: 'What is F12?'}, + 131: {answers: {A: '233', B: '377', C: '610', D: '987'}, correct: '610', index: '131', + question: 'What is F15?'}, 132: {answers: {A: '4181', B: '6765', C: '10946', D: '17711'}, + correct: '6765', index: '132', question: 'What is F20?'}, 133: {answers: {A: '121393', + B: '196418', C: '317811', D: '514229'}, correct: '75025', index: '133', question: 'What + is F25?'}, 134: {answers: {A: '0', B: '1', C: '2', D: '3'}, correct: '4', index: '134', + question: 'What is the remainder of 2^50 mod 7?'}, 135: {answers: {A: '1', B: '2', + C: '5', D: '8'}, correct: '5', index: '135', question: 'What is the remainder + of 5^25 mod 13?'}, 136: {answers: {A: '1', B: '3', C: '7', D: '9'}, correct: '1', + index: '136', question: 'What is the remainder of 3^40 mod 10?'}, 137: {answers: { + A: '0', B: '1', C: '3', D: '7'}, correct: '7', index: '137', question: 'What + is the remainder of 7^13 mod 12?'}, 138: {answers: {A: '12121', B: '12321', + C: '12421', D: '12521'}, correct: '12321', index: '138', question: "What is\ + \ 111\xD7111?"}, 139: {answers: {A: '15029', B: '15129', C: '15229', D: '15329'}, + correct: '15129', index: '139', question: "What is 123\xD7123?"}, 140: {answers: { + A: '102321', B: '102721', C: '103041', D: '103041'}, correct: '103041', index: '140', + question: "What is 321\xD7321?"}, 141: {answers: {A: '206116', B: '207936', C: '208936', + D: '209936'}, correct: '207936', index: '141', question: "What is 456\xD7456?"}, + 142: {answers: {A: '36', B: '37', C: '38', D: '39'}, correct: '38', index: '142', + question: "What is \u221A1444?"}, 143: {answers: {A: '47', B: '48', C: '49', D: '50'}, + correct: '47', index: '143', question: "What is \u221A2209?"}, 144: {answers: { + A: '52', B: '53', C: '54', D: '55'}, correct: '53', index: '144', question: "What\ + \ is \u221A2809?"}, 145: {answers: {A: '57', B: '58', C: '59', D: '60'}, correct: '59', + index: '145', question: "What is \u221A3481?"}, 146: {answers: {A: '311', B: '312', + C: '313', D: '314'}, correct: '314', index: '146', question: "What is \u230A\ + \u03C0\xD7100\u230B?"}, 147: {answers: {A: '2708', B: '2718', C: '2728', D: '2738'}, + correct: '2718', index: '147', question: "What is \u230Ae\xD71000\u230B?"}, 148: { + answers: {A: '1407', B: '1414', C: '1417', D: '1421'}, correct: '1414', index: '148', + question: "What is \u230A\u221A2\xD71000\u230B?"}, 149: {answers: {A: '1717', + B: '1720', C: '1732', D: '1740'}, correct: '1732', index: '149', question: "What\ + \ is \u230A\u221A3\xD71000\u230B?"}, 150: {answers: {A: '2048', B: '3072', C: '4096', + D: '8192'}, correct: '4096', index: '150', question: 'What is 2^12?'}, 151: { + answers: {A: '65536', B: '131072', C: '32768', D: '262144'}, correct: '65536', + index: '151', question: 'What is 2^16?'}, 152: {answers: {A: '65536', B: '131072', + C: '262144', D: '524288'}, correct: '262144', index: '152', question: 'What + is 2^18?'}, 153: {answers: {A: '1048576', B: '2097152', C: '4194304', D: '8388608'}, + correct: '16777216', index: '153', question: 'What is 2^24?'}, 154: {answers: { + A: '3', B: '4', C: '5', D: '6'}, correct: '6', index: '154', question: 'What + is the product of roots of x^2+5x+6=0?'}, 155: {answers: {A: '7', B: '8', C: '15', + D: "\u221215"}, correct: '15', index: '155', question: "What is the product\ + \ of roots of x^2\u22128x+15=0?"}, 156: {answers: {A: '9', B: '18', C: '20', + D: '25'}, correct: '20', index: '156', question: "What is the product of roots\ + \ of x^2\u22129x+20=0?"}, 157: {answers: {A: "\u221235", B: '35', C: "\u22127", + D: '7'}, correct: "\u221235", index: '157', question: "What is the product of\ + \ roots of x^2+2x\u221235=0?"}, 158: {answers: {A: '12', B: '13', C: '14', D: '15'}, + correct: '14', index: '158', question: "What is \u230A100/7\u230B?"}, 159: {answers: { + A: '21', B: '22', C: '23', D: '24'}, correct: '22', index: '159', question: "What\ + \ is \u230A200/9\u230B?"}, 160: {answers: {A: '26', B: '27', C: '28', D: '29'}, + correct: '27', index: '160', question: "What is \u230A300/11\u230B?"}, 161: { + answers: {A: '29', B: '30', C: '31', D: '32'}, correct: '30', index: '161', question: "What\ + \ is \u230A400/13\u230B?"}, 162: {answers: {A: '1651', B: '1717', C: '1729', + D: '1739'}, correct: '1729', index: '162', question: "What is 7\xD713\xD719?"}, + 163: {answers: {A: '4279', B: '4289', C: '4291', D: '4301'}, correct: '4291', index: '163', + question: "What is 11\xD717\xD723?"}, 164: {answers: {A: '7073', B: '7157', C: '7163', + D: '7177'}, correct: '7163', index: '164', question: "What is 13\xD719\xD729?"}, + 165: {answers: {A: '12071', B: '12121', C: '12121', D: '12167'}, correct: '12167', + index: '165', question: "What is 17\xD723\xD731?"}, 166: {answers: {A: '1', B: '2', + C: '3', D: '4'}, correct: '3', index: '166', question: 'What is the inverse + of 2 mod 5?'}, 167: {answers: {A: '1', B: '2', C: '3', D: '4'}, correct: '2', + index: '167', question: 'What is the inverse of 4 mod 7?'}, 168: {answers: {A: '5', + B: '7', C: '8', D: '5'}, correct: '5', index: '168', question: 'What is the + inverse of 5 mod 12?'}, 169: {answers: {A: '11', B: '13', C: '15', D: '23'}, + correct: '15', index: '169', question: 'What is the inverse of 7 mod 26?'}, 170: { + answers: {A: '0', B: '1', C: "\u22121", D: '0.5'}, correct: '1', index: '170', + question: "What is sin(90\xB0)?"}, 171: {answers: {A: "\u22121", B: '0', C: '1', + D: '0.5'}, correct: "\u22121", index: '171', question: "What is cos(180\xB0\ + )?"}, 172: {answers: {A: '0', B: '1', C: "\u221A2", D: "\u22121"}, correct: '1', + index: '172', question: "What is tan(45\xB0)?"}, 173: {answers: {A: '0.5', B: '0.707', + C: '0.866', D: '1'}, correct: '0.5', index: '173', question: "What is sin(30\xB0\ + )?"}, 174: {answers: {A: '0.5', B: '0.707', C: '0.866', D: '1'}, correct: '0.5', + index: '174', question: "What is cos(60\xB0)?"}, 175: {answers: {A: '0.5', B: '0.707', + C: '0.866', D: "\u221A3"}, correct: "\u221A3", index: '175', question: "What\ + \ is tan(60\xB0)?"}} diff --git a/src/main/resources/assets/genyo/einstein/maker.py b/src/main/resources/assets/genyo/einstein/maker.py new file mode 100644 index 0000000..ad4976b --- /dev/null +++ b/src/main/resources/assets/genyo/einstein/maker.py @@ -0,0 +1,38 @@ +import yaml # type: ignore + +path = "src/main/resources/assets/genyo/einstein/" +questions = dict() + +with open(path + "questions.txt", "r", encoding="UTF-8") as file: + index = 0 + + for line in file: + current = line.strip().split("|") + + #question, answers, correct + + question = current[0] + answers = [current[1], current[2], current[3], current[4]] + correct = current[5] + + if correct == None: + break + + data = dict( + index = str(index), + question = question, + answers = dict( + A = answers[0], + B = answers[1], + C = answers[2], + D = answers[3] + ), + correct = correct + ) + + questions[index] = data + + index += 1 + +with open(path + "einstein.yml", "w") as outfile: + yaml.dump(questions, outfile, default_flow_style=True) \ No newline at end of file diff --git a/src/main/resources/assets/genyo/einstein/questions.txt b/src/main/resources/assets/genyo/einstein/questions.txt new file mode 100644 index 0000000..5cfb5b3 --- /dev/null +++ b/src/main/resources/assets/genyo/einstein/questions.txt @@ -0,0 +1,176 @@ +What is 17^2?|279|289|299|361|289 +What is 13^3?|1728|1331|2197|2048|2197 +What is 7!?|720|5040|40320|362880|5040 +What is gcd(252,198)?|6|9|18|36|18 +What is lcm(14,20)?|70|140|280|210|140 +What is 2^10?|1000|1024|2048|512|1024 +What is φ(36)?|12|18|24|16|12 +What is the last digit of 7^2025?|1|3|7|9|7 +What is C(12,4)?|364|495|792|220|495 +What is the sum of interior angles of a decagon?|1260|1440|1620|1800|1440 +What is det([[3,2],[5,7]])?|1|11|13|17|11 +What is F10 (F1=1,F2=1)?|34|55|89|144|55 +What is 9^3−5^3?|614|604|624|544|604 +What is the number of divisors of 360?|18|24|30|36|24 +What is the remainder when 1001 is divided by 13?|0|1|5|12|0 +What is log2(8192)?|12|13|14|15|13 +What is 3^8?|6561|729|2187|8192|6561 +What is the smallest prime factor of 221?|11|13|17|19|13 +What is 0.999... as a fraction?|1|9|3|0|1 +What is C(8,3)?|56|64|70|84|56 +What is 15 mod 4?|1|2|3|4|3 +What is (d/dx)x^5 at x=2?|80|40|160|320|80 +What is ∫0^1 3x^2 dx?|1|3|0|2|1 +What is the sum of the first 50 positive integers?|1225|1275|1325|1375|1275 +What is 2^20?|1048576|524288|2097152|262144|1048576 +What is 11×13×7?|935|1001|1003|1099|1001 +What is 14^2−10^2?|84|96|104|112|96 +What is 3×4!?|48|60|72|96|72 +What is the number of permutations of 6 distinct items?|120|360|720|840|720 +What is 1/0?|Zero|Infinity|Undefined|One|Undefined +What is the discriminant of x^2−10x+21?|4|8|16|36|16 +What is the larger root of x^2−5x+6=0?|2|3|4|6|3 +What is 999×999?|998001|999000|1000001|997002|998001 +What is 23 mod 7?|1|2|3|4|2 +What is the smallest positive solution to x≡3 (mod 5)?|3|5|8|10|3 +What is 5^7?|78125|16807|59049|65536|78125 +What is the remainder when 2^100 is divided by 3?|0|1|2|3|1 +What is the number of trailing zeros in 100!?|22|24|25|26|24 +What is the sum of digits of 2^15?|23|25|26|28|26 +What is the radius of a circle with area 144π?|10|12|14|16|12 +What is the arithmetic mean of 12 and 28?|18|20|22|24|20 +What is 3^4+4^3?|125|145|161|225|145 +What is 2^8+2^9?|768|752|1024|640|768 +What is the product of roots of x^2−7x+12=0?|12|7|19|5|12 +What is the coefficient of x^3 in (x+2)^5?|20|30|40|50|40 +What is 1+2+4+8+...+2^9?|511|1023|1025|2047|1023 +What is ⌊100/3⌋?|32|33|34|35|33 +What is the smallest prime greater than 100?|97|99|101|103|101 +What is 12^2+5^2?|169|181|193|205|169 +What is the inverse of 3 modulo 11?|4|7|8|9|4 +What is 19^2?|331|341|361|371|361 +What is 23^2?|483|503|529|543|529 +What is 29^2?|831|841|851|861|841 +What is 31^2?|941|951|961|971|961 +What is 37^2?|1349|1369|1389|1399|1369 +What is 41^2?|1641|1681|1701|1721|1681 +What is 47^2?|2209|2219|2229|2249|2209 +What is 53^2?|2799|2809|2819|2829|2809 +What is 59^2?|3409|3481|3499|3509|3481 +What is 61^2?|3701|3721|3741|3761|3721 +What is 67^2?|4459|4489|4509|4529|4489 +What is 71^2?|5009|5041|5081|5101|5041 +What is 73^2?|5329|5349|5369|5389|5329 +What is 79^2?|6219|6239|6241|6259|6241 +What is 83^2?|6869|6889|6899|6909|6889 +What is 89^2?|7901|7921|7939|7951|7921 +What is 97^2?|9401|9411|9439|9409|9409 +What is 101^2?|10101|10201|10301|10401|10201 +What is 103^2?|10409|10501|10609|10709|10609 +What is 107^2?|11309|11409|11449|11509|11449 +What is 113^2?|12649|12769|12809|12849|12769 +What is 127^2?|16009|16129|16209|16329|16129 +What is 131^2?|17001|17161|17281|17321|17161 +What is 137^2?|18769|18869|18969|19069|18769 +What is 139^2?|19101|19201|19321|19441|19321 +What is 149^2?|22001|22101|22201|22201|22201 +What is 151^2?|22701|22781|22801|22901|22801 +What is 157^2?|24501|24601|24649|24701|24649 +What is 163^2?|26401|26569|26601|26701|26569 +What is 167^2?|27701|27889|27901|28001|27889 +What is 173^2?|29701|29809|29929|30001|29929 +What is 179^2?|31801|31901|32041|32101|32041 +What is 181^2?|32721|32761|32801|32841|32761 +What is 191^2?|36241|36481|36521|36601|36481 +What is 193^2?|37129|37249|37369|37489|37249 +What is 197^2?|38569|38701|38809|38929|38809 +What is 199^2?|39601|39701|39801|39901|39601 +What is 12!?|479001600|39916800|6227020800|362880|479001600 +What is 8!?|40320|5040|720|362880|40320 +What is 9!?|720|5040|362880|3628800|362880 +What is 10!?|362880|3628800|39916800|479001600|3628800 +What is 11!?|3628800|39916800|479001600|6227020800|39916800 +What is 15!?|6227020800|1307674368000|87178291200|2432902008176640000|1307674368000 +What is gcd(135,225)?|15|25|45|75|45 +What is gcd(180,324)?|18|36|54|72|36 +What is gcd(420,378)?|42|63|84|126|42 +What is gcd(729,972)?|27|54|81|243|81 +What is lcm(18,30)?|60|90|120|180|90 +What is lcm(21,28)?|42|84|126|168|84 +What is lcm(25,40)?|100|200|400|800|200 +What is lcm(27,36)?|108|144|162|216|108 +What is 5^8?|15625|390625|78125|1953125|390625 +What is 6^6?|7776|46656|279936|1679616|46656 +What is 7^5?|16807|117649|823543|78125|16807 +What is 8^4?|4096|8192|16384|32768|4096 +What is 9^6?|59049|531441|4782969|43046721|531441 +What is φ(30)?|4|8|12|16|8 +What is φ(72)?|12|18|24|36|24 +What is φ(100)?|30|40|50|60|40 +What is φ(84)?|24|32|36|42|24 +What is log2(1024)?|8|9|10|11|10 +What is log10(1000000)?|4|5|6|7|6 +What is log3(729)?|5|6|7|8|6 +What is log5(3125)?|4|5|6|7|5 +What is C(10,5)?|200|210|220|252|252 +What is C(15,2)?|91|105|120|136|105 +What is C(20,10)?|184756|24310|167960|92378|184756 +What is C(18,3)?|816|816|856|918|816 +What is P(10,3)?|720|840|960|1000|720 +What is P(8,4)?|1680|1720|1740|1760|1680 +What is P(12,2)?|132|132|142|152|132 +What is P(7,5)?|2520|2540|2560|2580|2520 +What is the sum of first 100 natural numbers?|4950|5000|5050|5100|5050 +What is the sum of first 200 natural numbers?|19900|20000|20100|20100|20100 +What is the sum of first 50 even numbers?|1250|2450|2550|2650|2550 +What is the sum of first 50 odd numbers?|2400|2500|2600|2700|2500 +What is det([[2,5],[7,11]])?|1|2|3|9|−13 +What is det([[4,3],[2,1]])?|−2|−1|0|1|−2 +What is det([[6,2],[9,3]])?|0|6|12|18|0 +What is det([[10,4],[7,5]])?|2|14|18|36|18 +What is F12?|89|144|233|377|144 +What is F15?|233|377|610|987|610 +What is F20?|4181|6765|10946|17711|6765 +What is F25?|121393|196418|317811|514229|75025 +What is the remainder of 2^50 mod 7?|0|1|2|3|4|2 +What is the remainder of 5^25 mod 13?|1|2|5|8|5 +What is the remainder of 3^40 mod 10?|1|3|7|9|1 +What is the remainder of 7^13 mod 12?|0|1|3|7|7 +What is 111×111?|12121|12321|12421|12521|12321 +What is 123×123?|15029|15129|15229|15329|15129 +What is 321×321?|102321|102721|103041|103041|103041 +What is 456×456?|206116|207936|208936|209936|207936 +What is √1444?|36|37|38|39|38 +What is √2209?|47|48|49|50|47 +What is √2809?|52|53|54|55|53 +What is √3481?|57|58|59|60|59 +What is ⌊π×100⌋?|311|312|313|314|314 +What is ⌊e×1000⌋?|2708|2718|2728|2738|2718 +What is ⌊√2×1000⌋?|1407|1414|1417|1421|1414 +What is ⌊√3×1000⌋?|1717|1720|1732|1740|1732 +What is 2^12?|2048|3072|4096|8192|4096 +What is 2^16?|65536|131072|32768|262144|65536 +What is 2^18?|65536|131072|262144|524288|262144 +What is 2^24?|1048576|2097152|4194304|8388608|16777216|16777216 +What is the product of roots of x^2+5x+6=0?|3|4|5|6|6 +What is the product of roots of x^2−8x+15=0?|7|8|15|−15|15 +What is the product of roots of x^2−9x+20=0?|9|18|20|25|20 +What is the product of roots of x^2+2x−35=0?|−35|35|−7|7|−35 +What is ⌊100/7⌋?|12|13|14|15|14 +What is ⌊200/9⌋?|21|22|23|24|22 +What is ⌊300/11⌋?|26|27|28|29|27 +What is ⌊400/13⌋?|29|30|31|32|30 +What is 7×13×19?|1651|1717|1729|1739|1729 +What is 11×17×23?|4279|4289|4291|4301|4291 +What is 13×19×29?|7073|7157|7163|7177|7163 +What is 17×23×31?|12071|12121|12121|12167|12167 +What is the inverse of 2 mod 5?|1|2|3|4|3 +What is the inverse of 4 mod 7?|1|2|3|4|2 +What is the inverse of 5 mod 12?|5|7|8|5|5 +What is the inverse of 7 mod 26?|11|13|15|23|15 +What is sin(90°)?|0|1|−1|0.5|1 +What is cos(180°)?|−1|0|1|0.5|−1 +What is tan(45°)?|0|1|√2|−1|1 +What is sin(30°)?|0.5|0.707|0.866|1|0.5 +What is cos(60°)?|0.5|0.707|0.866|1|0.5 +What is tan(60°)?|0.5|0.707|0.866|√3|√3 \ No newline at end of file diff --git a/src/main/resources/assets/genyo/files/einstein.yml b/src/main/resources/assets/genyo/files/einstein.yml deleted file mode 100644 index 12c3456..0000000 --- a/src/main/resources/assets/genyo/files/einstein.yml +++ /dev/null @@ -1,269 +0,0 @@ -{0: {answers: {A: '279', B: '289', C: '299', D: '361'}, correct: '289', index: '0', - question: 'What is 17^2?'}, 1: {answers: {A: '1728', B: '1331', C: '2197', D: '2048'}, - correct: '2197', index: '1', question: 'What is 13^3?'}, 2: {answers: {A: '720', - B: '5040', C: '40320', D: '362880'}, correct: '5040', index: '2', question: 'What - is 7!?'}, 3: {answers: {A: '6', B: '9', C: '18', D: '36'}, correct: '18', index: '3', - question: 'What is gcd(252,198)?'}, 4: {answers: {A: '70', B: '140', C: '280', - D: '210'}, correct: '140', index: '4', question: 'What is lcm(14,20)?'}, 5: { - answers: {A: '1000', B: '1024', C: '2048', D: '512'}, correct: '1024', index: '5', - question: 'What is 2^10?'}, 6: {answers: {A: '12', B: '18', C: '24', D: '16'}, - correct: '12', index: '6', question: "What is \u03C6(36)?"}, 7: {answers: {A: '1', - B: '3', C: '7', D: '9'}, correct: '7', index: '7', question: 'What is the last - digit of 7^2025?'}, 8: {answers: {A: '364', B: '495', C: '792', D: '220'}, correct: '495', - index: '8', question: 'What is C(12,4)?'}, 9: {answers: {A: '1260', B: '1440', - C: '1620', D: '1800'}, correct: '1440', index: '9', question: 'What is the sum - of interior angles of a decagon?'}, 10: {answers: {A: '1', B: '11', C: '13', - D: '17'}, correct: '11', index: '10', question: 'What is det([[3,2],[5,7]])?'}, - 11: {answers: {A: '34', B: '55', C: '89', D: '144'}, correct: '55', index: '11', - question: 'What is F10 (F1=1,F2=1)?'}, 12: {answers: {A: '614', B: '604', C: '624', - D: '544'}, correct: '604', index: '12', question: "What is 9^3\u22125^3?"}, - 13: {answers: {A: '18', B: '24', C: '30', D: '36'}, correct: '24', index: '13', - question: 'What is the number of divisors of 360?'}, 14: {answers: {A: '0', B: '1', - C: '5', D: '12'}, correct: '0', index: '14', question: 'What is the remainder - when 1001 is divided by 13?'}, 15: {answers: {A: '12', B: '13', C: '14', D: '15'}, - correct: '13', index: '15', question: 'What is log2(8192)?'}, 16: {answers: { - A: '6561', B: '729', C: '2187', D: '8192'}, correct: '6561', index: '16', question: 'What - is 3^8?'}, 17: {answers: {A: '11', B: '13', C: '17', D: '19'}, correct: '13', - index: '17', question: 'What is the smallest prime factor of 221?'}, 18: {answers: { - A: '1', B: '9', C: '3', D: '0'}, correct: '1', index: '18', question: 'What - is 0.999... as a fraction?'}, 19: {answers: {A: '56', B: '64', C: '70', D: '84'}, - correct: '56', index: '19', question: 'What is C(8,3)?'}, 20: {answers: {A: '1', - B: '2', C: '3', D: '4'}, correct: '3', index: '20', question: 'What is 15 mod - 4?'}, 21: {answers: {A: '80', B: '40', C: '160', D: '320'}, correct: '80', index: '21', - question: 'What is (d/dx)x^5 at x=2?'}, 22: {answers: {A: '1', B: '3', C: '0', - D: '2'}, correct: '1', index: '22', question: "What is \u222B0^1 3x^2 dx?"}, - 23: {answers: {A: '1225', B: '1275', C: '1325', D: '1375'}, correct: '1275', index: '23', - question: 'What is the sum of the first 50 positive integers?'}, 24: {answers: { - A: '1048576', B: '524288', C: '2097152', D: '262144'}, correct: '1048576', index: '24', - question: 'What is 2^20?'}, 25: {answers: {A: '935', B: '1001', C: '1003', D: '1099'}, - correct: '1001', index: '25', question: "What is 11\xD713\xD77?"}, 26: {answers: { - A: '84', B: '96', C: '104', D: '112'}, correct: '96', index: '26', question: "What\ - \ is 14^2\u221210^2?"}, 27: {answers: {A: '48', B: '60', C: '72', D: '96'}, - correct: '72', index: '27', question: "What is 3\xD74!?"}, 28: {answers: {A: '120', - B: '360', C: '720', D: '840'}, correct: '720', index: '28', question: 'What - is the number of permutations of 6 distinct items?'}, 29: {answers: {A: Zero, - B: Infinity, C: Undefined, D: One}, correct: Undefined, index: '29', question: 'What - is 1/0?'}, 30: {answers: {A: '4', B: '8', C: '16', D: '36'}, correct: '16', - index: '30', question: "What is the discriminant of x^2\u221210x+21?"}, 31: { - answers: {A: '2', B: '3', C: '4', D: '6'}, correct: '3', index: '31', question: "What\ - \ is the larger root of x^2\u22125x+6=0?"}, 32: {answers: {A: '998001', B: '999000', - C: '1000001', D: '997002'}, correct: '998001', index: '32', question: "What\ - \ is 999\xD7999?"}, 33: {answers: {A: '1', B: '2', C: '3', D: '4'}, correct: '2', - index: '33', question: 'What is 23 mod 7?'}, 34: {answers: {A: '3', B: '5', C: '8', - D: '10'}, correct: '3', index: '34', question: "What is the smallest positive\ - \ solution to x\u22613 (mod 5)?"}, 35: {answers: {A: '78125', B: '16807', C: '59049', - D: '65536'}, correct: '78125', index: '35', question: 'What is 5^7?'}, 36: { - answers: {A: '0', B: '1', C: '2', D: '3'}, correct: '1', index: '36', question: 'What - is the remainder when 2^100 is divided by 3?'}, 37: {answers: {A: '22', B: '24', - C: '25', D: '26'}, correct: '24', index: '37', question: 'What is the number - of trailing zeros in 100!?'}, 38: {answers: {A: '23', B: '25', C: '26', D: '28'}, - correct: '26', index: '38', question: 'What is the sum of digits of 2^15?'}, 39: { - answers: {A: '10', B: '12', C: '14', D: '16'}, correct: '12', index: '39', question: "What\ - \ is the radius of a circle with area 144\u03C0?"}, 40: {answers: {A: '18', - B: '20', C: '22', D: '24'}, correct: '20', index: '40', question: 'What is the - arithmetic mean of 12 and 28?'}, 41: {answers: {A: '125', B: '145', C: '161', - D: '225'}, correct: '145', index: '41', question: 'What is 3^4+4^3?'}, 42: { - answers: {A: '768', B: '752', C: '1024', D: '640'}, correct: '768', index: '42', - question: 'What is 2^8+2^9?'}, 43: {answers: {A: '12', B: '7', C: '19', D: '5'}, - correct: '12', index: '43', question: "What is the product of roots of x^2\u2212\ - 7x+12=0?"}, 44: {answers: {A: '20', B: '30', C: '40', D: '50'}, correct: '40', - index: '44', question: 'What is the coefficient of x^3 in (x+2)^5?'}, 45: {answers: { - A: '511', B: '1023', C: '1025', D: '2047'}, correct: '1023', index: '45', question: 'What - is 1+2+4+8+...+2^9?'}, 46: {answers: {A: '32', B: '33', C: '34', D: '35'}, correct: '33', - index: '46', question: "What is \u230A100/3\u230B?"}, 47: {answers: {A: '97', - B: '99', C: '101', D: '103'}, correct: '101', index: '47', question: 'What is - the smallest prime greater than 100?'}, 48: {answers: {A: '169', B: '181', C: '193', - D: '205'}, correct: '169', index: '48', question: 'What is 12^2+5^2?'}, 49: { - answers: {A: '4', B: '7', C: '8', D: '9'}, correct: '4', index: '49', question: 'What - is the inverse of 3 modulo 11?'}, 50: {answers: {A: '331', B: '341', C: '361', - D: '371'}, correct: '361', index: '50', question: 'What is 19^2?'}, 51: {answers: { - A: '483', B: '503', C: '529', D: '543'}, correct: '529', index: '51', question: 'What - is 23^2?'}, 52: {answers: {A: '831', B: '841', C: '851', D: '861'}, correct: '841', - index: '52', question: 'What is 29^2?'}, 53: {answers: {A: '941', B: '951', C: '961', - D: '971'}, correct: '961', index: '53', question: 'What is 31^2?'}, 54: {answers: { - A: '1349', B: '1369', C: '1389', D: '1399'}, correct: '1369', index: '54', question: 'What - is 37^2?'}, 55: {answers: {A: '1641', B: '1681', C: '1701', D: '1721'}, correct: '1681', - index: '55', question: 'What is 41^2?'}, 56: {answers: {A: '2209', B: '2219', - C: '2229', D: '2249'}, correct: '2209', index: '56', question: 'What is 47^2?'}, - 57: {answers: {A: '2799', B: '2809', C: '2819', D: '2829'}, correct: '2809', index: '57', - question: 'What is 53^2?'}, 58: {answers: {A: '3409', B: '3481', C: '3499', D: '3509'}, - correct: '3481', index: '58', question: 'What is 59^2?'}, 59: {answers: {A: '3701', - B: '3721', C: '3741', D: '3761'}, correct: '3721', index: '59', question: 'What - is 61^2?'}, 60: {answers: {A: '4459', B: '4489', C: '4509', D: '4529'}, correct: '4489', - index: '60', question: 'What is 67^2?'}, 61: {answers: {A: '5009', B: '5041', - C: '5081', D: '5101'}, correct: '5041', index: '61', question: 'What is 71^2?'}, - 62: {answers: {A: '5329', B: '5349', C: '5369', D: '5389'}, correct: '5329', index: '62', - question: 'What is 73^2?'}, 63: {answers: {A: '6219', B: '6239', C: '6241', D: '6259'}, - correct: '6241', index: '63', question: 'What is 79^2?'}, 64: {answers: {A: '6869', - B: '6889', C: '6899', D: '6909'}, correct: '6889', index: '64', question: 'What - is 83^2?'}, 65: {answers: {A: '7901', B: '7921', C: '7939', D: '7951'}, correct: '7921', - index: '65', question: 'What is 89^2?'}, 66: {answers: {A: '9401', B: '9411', - C: '9439', D: '9409'}, correct: '9409', index: '66', question: 'What is 97^2?'}, - 67: {answers: {A: '10101', B: '10201', C: '10301', D: '10401'}, correct: '10201', - index: '67', question: 'What is 101^2?'}, 68: {answers: {A: '10409', B: '10501', - C: '10609', D: '10709'}, correct: '10609', index: '68', question: 'What is 103^2?'}, - 69: {answers: {A: '11309', B: '11409', C: '11449', D: '11509'}, correct: '11449', - index: '69', question: 'What is 107^2?'}, 70: {answers: {A: '12649', B: '12769', - C: '12809', D: '12849'}, correct: '12769', index: '70', question: 'What is 113^2?'}, - 71: {answers: {A: '16009', B: '16129', C: '16209', D: '16329'}, correct: '16129', - index: '71', question: 'What is 127^2?'}, 72: {answers: {A: '17001', B: '17161', - C: '17281', D: '17321'}, correct: '17161', index: '72', question: 'What is 131^2?'}, - 73: {answers: {A: '18769', B: '18869', C: '18969', D: '19069'}, correct: '18769', - index: '73', question: 'What is 137^2?'}, 74: {answers: {A: '19101', B: '19201', - C: '19321', D: '19441'}, correct: '19321', index: '74', question: 'What is 139^2?'}, - 75: {answers: {A: '22001', B: '22101', C: '22201', D: '22201'}, correct: '22201', - index: '75', question: 'What is 149^2?'}, 76: {answers: {A: '22701', B: '22781', - C: '22801', D: '22901'}, correct: '22801', index: '76', question: 'What is 151^2?'}, - 77: {answers: {A: '24501', B: '24601', C: '24649', D: '24701'}, correct: '24649', - index: '77', question: 'What is 157^2?'}, 78: {answers: {A: '26401', B: '26569', - C: '26601', D: '26701'}, correct: '26569', index: '78', question: 'What is 163^2?'}, - 79: {answers: {A: '27701', B: '27889', C: '27901', D: '28001'}, correct: '27889', - index: '79', question: 'What is 167^2?'}, 80: {answers: {A: '29701', B: '29809', - C: '29929', D: '30001'}, correct: '29929', index: '80', question: 'What is 173^2?'}, - 81: {answers: {A: '31801', B: '31901', C: '32041', D: '32101'}, correct: '32041', - index: '81', question: 'What is 179^2?'}, 82: {answers: {A: '32721', B: '32761', - C: '32801', D: '32841'}, correct: '32761', index: '82', question: 'What is 181^2?'}, - 83: {answers: {A: '36241', B: '36481', C: '36521', D: '36601'}, correct: '36481', - index: '83', question: 'What is 191^2?'}, 84: {answers: {A: '37129', B: '37249', - C: '37369', D: '37489'}, correct: '37249', index: '84', question: 'What is 193^2?'}, - 85: {answers: {A: '38569', B: '38701', C: '38809', D: '38929'}, correct: '38809', - index: '85', question: 'What is 197^2?'}, 86: {answers: {A: '39601', B: '39701', - C: '39801', D: '39901'}, correct: '39601', index: '86', question: 'What is 199^2?'}, - 87: {answers: {A: '479001600', B: '39916800', C: '6227020800', D: '362880'}, correct: '479001600', - index: '87', question: 'What is 12!?'}, 88: {answers: {A: '40320', B: '5040', - C: '720', D: '362880'}, correct: '40320', index: '88', question: 'What is 8!?'}, - 89: {answers: {A: '720', B: '5040', C: '362880', D: '3628800'}, correct: '362880', - index: '89', question: 'What is 9!?'}, 90: {answers: {A: '362880', B: '3628800', - C: '39916800', D: '479001600'}, correct: '3628800', index: '90', question: 'What - is 10!?'}, 91: {answers: {A: '3628800', B: '39916800', C: '479001600', D: '6227020800'}, - correct: '39916800', index: '91', question: 'What is 11!?'}, 92: {answers: {A: '6227020800', - B: '1307674368000', C: '87178291200', D: '2432902008176640000'}, correct: '1307674368000', - index: '92', question: 'What is 15!?'}, 93: {answers: {A: '15', B: '25', C: '45', - D: '75'}, correct: '45', index: '93', question: 'What is gcd(135,225)?'}, 94: { - answers: {A: '18', B: '36', C: '54', D: '72'}, correct: '36', index: '94', question: 'What - is gcd(180,324)?'}, 95: {answers: {A: '42', B: '63', C: '84', D: '126'}, correct: '42', - index: '95', question: 'What is gcd(420,378)?'}, 96: {answers: {A: '27', B: '54', - C: '81', D: '243'}, correct: '81', index: '96', question: 'What is gcd(729,972)?'}, - 97: {answers: {A: '60', B: '90', C: '120', D: '180'}, correct: '90', index: '97', - question: 'What is lcm(18,30)?'}, 98: {answers: {A: '42', B: '84', C: '126', D: '168'}, - correct: '84', index: '98', question: 'What is lcm(21,28)?'}, 99: {answers: { - A: '100', B: '200', C: '400', D: '800'}, correct: '200', index: '99', question: 'What - is lcm(25,40)?'}, 100: {answers: {A: '108', B: '144', C: '162', D: '216'}, correct: '108', - index: '100', question: 'What is lcm(27,36)?'}, 101: {answers: {A: '15625', B: '390625', - C: '78125', D: '1953125'}, correct: '390625', index: '101', question: 'What - is 5^8?'}, 102: {answers: {A: '7776', B: '46656', C: '279936', D: '1679616'}, - correct: '46656', index: '102', question: 'What is 6^6?'}, 103: {answers: {A: '16807', - B: '117649', C: '823543', D: '78125'}, correct: '16807', index: '103', question: 'What - is 7^5?'}, 104: {answers: {A: '4096', B: '8192', C: '16384', D: '32768'}, correct: '4096', - index: '104', question: 'What is 8^4?'}, 105: {answers: {A: '59049', B: '531441', - C: '4782969', D: '43046721'}, correct: '531441', index: '105', question: 'What - is 9^6?'}, 106: {answers: {A: '4', B: '8', C: '12', D: '16'}, correct: '8', - index: '106', question: "What is \u03C6(30)?"}, 107: {answers: {A: '12', B: '18', - C: '24', D: '36'}, correct: '24', index: '107', question: "What is \u03C6(72)?"}, - 108: {answers: {A: '30', B: '40', C: '50', D: '60'}, correct: '40', index: '108', - question: "What is \u03C6(100)?"}, 109: {answers: {A: '24', B: '32', C: '36', - D: '42'}, correct: '24', index: '109', question: "What is \u03C6(84)?"}, 110: { - answers: {A: '8', B: '9', C: '10', D: '11'}, correct: '10', index: '110', question: 'What - is log2(1024)?'}, 111: {answers: {A: '4', B: '5', C: '6', D: '7'}, correct: '6', - index: '111', question: 'What is log10(1000000)?'}, 112: {answers: {A: '5', B: '6', - C: '7', D: '8'}, correct: '6', index: '112', question: 'What is log3(729)?'}, - 113: {answers: {A: '4', B: '5', C: '6', D: '7'}, correct: '5', index: '113', question: 'What - is log5(3125)?'}, 114: {answers: {A: '200', B: '210', C: '220', D: '252'}, correct: '252', - index: '114', question: 'What is C(10,5)?'}, 115: {answers: {A: '91', B: '105', - C: '120', D: '136'}, correct: '105', index: '115', question: 'What is C(15,2)?'}, - 116: {answers: {A: '184756', B: '24310', C: '167960', D: '92378'}, correct: '184756', - index: '116', question: 'What is C(20,10)?'}, 117: {answers: {A: '816', B: '816', - C: '856', D: '918'}, correct: '816', index: '117', question: 'What is C(18,3)?'}, - 118: {answers: {A: '720', B: '840', C: '960', D: '1000'}, correct: '720', index: '118', - question: 'What is P(10,3)?'}, 119: {answers: {A: '1680', B: '1720', C: '1740', - D: '1760'}, correct: '1680', index: '119', question: 'What is P(8,4)?'}, 120: { - answers: {A: '132', B: '132', C: '142', D: '152'}, correct: '132', index: '120', - question: 'What is P(12,2)?'}, 121: {answers: {A: '2520', B: '2540', C: '2560', - D: '2580'}, correct: '2520', index: '121', question: 'What is P(7,5)?'}, 122: { - answers: {A: '4950', B: '5000', C: '5050', D: '5100'}, correct: '5050', index: '122', - question: 'What is the sum of first 100 natural numbers?'}, 123: {answers: {A: '19900', - B: '20000', C: '20100', D: '20100'}, correct: '20100', index: '123', question: 'What - is the sum of first 200 natural numbers?'}, 124: {answers: {A: '1250', B: '2450', - C: '2550', D: '2650'}, correct: '2550', index: '124', question: 'What is the - sum of first 50 even numbers?'}, 125: {answers: {A: '2400', B: '2500', C: '2600', - D: '2700'}, correct: '2500', index: '125', question: 'What is the sum of first - 50 odd numbers?'}, 126: {answers: {A: '1', B: '2', C: '3', D: '9'}, correct: "\u2212\ - 13", index: '126', question: 'What is det([[2,5],[7,11]])?'}, 127: {answers: { - A: "\u22122", B: "\u22121", C: '0', D: '1'}, correct: "\u22122", index: '127', - question: 'What is det([[4,3],[2,1]])?'}, 128: {answers: {A: '0', B: '6', C: '12', - D: '18'}, correct: '0', index: '128', question: 'What is det([[6,2],[9,3]])?'}, - 129: {answers: {A: '2', B: '14', C: '18', D: '36'}, correct: '18', index: '129', - question: 'What is det([[10,4],[7,5]])?'}, 130: {answers: {A: '89', B: '144', - C: '233', D: '377'}, correct: '144', index: '130', question: 'What is F12?'}, - 131: {answers: {A: '233', B: '377', C: '610', D: '987'}, correct: '610', index: '131', - question: 'What is F15?'}, 132: {answers: {A: '4181', B: '6765', C: '10946', D: '17711'}, - correct: '6765', index: '132', question: 'What is F20?'}, 133: {answers: {A: '121393', - B: '196418', C: '317811', D: '514229'}, correct: '75025', index: '133', question: 'What - is F25?'}, 134: {answers: {A: '0', B: '1', C: '2', D: '3'}, correct: '4', index: '134', - question: 'What is the remainder of 2^50 mod 7?'}, 135: {answers: {A: '1', B: '2', - C: '5', D: '8'}, correct: '5', index: '135', question: 'What is the remainder - of 5^25 mod 13?'}, 136: {answers: {A: '1', B: '3', C: '7', D: '9'}, correct: '1', - index: '136', question: 'What is the remainder of 3^40 mod 10?'}, 137: {answers: { - A: '0', B: '1', C: '3', D: '7'}, correct: '7', index: '137', question: 'What - is the remainder of 7^13 mod 12?'}, 138: {answers: {A: '12121', B: '12321', - C: '12421', D: '12521'}, correct: '12321', index: '138', question: "What is\ - \ 111\xD7111?"}, 139: {answers: {A: '15029', B: '15129', C: '15229', D: '15329'}, - correct: '15129', index: '139', question: "What is 123\xD7123?"}, 140: {answers: { - A: '102321', B: '102721', C: '103041', D: '103041'}, correct: '103041', index: '140', - question: "What is 321\xD7321?"}, 141: {answers: {A: '206116', B: '207936', C: '208936', - D: '209936'}, correct: '207936', index: '141', question: "What is 456\xD7456?"}, - 142: {answers: {A: '36', B: '37', C: '38', D: '39'}, correct: '38', index: '142', - question: "What is \u221A1444?"}, 143: {answers: {A: '47', B: '48', C: '49', D: '50'}, - correct: '47', index: '143', question: "What is \u221A2209?"}, 144: {answers: { - A: '52', B: '53', C: '54', D: '55'}, correct: '53', index: '144', question: "What\ - \ is \u221A2809?"}, 145: {answers: {A: '57', B: '58', C: '59', D: '60'}, correct: '59', - index: '145', question: "What is \u221A3481?"}, 146: {answers: {A: '311', B: '312', - C: '313', D: '314'}, correct: '314', index: '146', question: "What is \u230A\ - \u03C0\xD7100\u230B?"}, 147: {answers: {A: '2708', B: '2718', C: '2728', D: '2738'}, - correct: '2718', index: '147', question: "What is \u230Ae\xD71000\u230B?"}, 148: { - answers: {A: '1407', B: '1414', C: '1417', D: '1421'}, correct: '1414', index: '148', - question: "What is \u230A\u221A2\xD71000\u230B?"}, 149: {answers: {A: '1717', - B: '1720', C: '1732', D: '1740'}, correct: '1732', index: '149', question: "What\ - \ is \u230A\u221A3\xD71000\u230B?"}, 150: {answers: {A: '2048', B: '3072', C: '4096', - D: '8192'}, correct: '4096', index: '150', question: 'What is 2^12?'}, 151: { - answers: {A: '65536', B: '131072', C: '32768', D: '262144'}, correct: '65536', - index: '151', question: 'What is 2^16?'}, 152: {answers: {A: '65536', B: '131072', - C: '262144', D: '524288'}, correct: '262144', index: '152', question: 'What - is 2^18?'}, 153: {answers: {A: '1048576', B: '2097152', C: '4194304', D: '8388608'}, - correct: '16777216', index: '153', question: 'What is 2^24?'}, 154: {answers: { - A: '3', B: '4', C: '5', D: '6'}, correct: '6', index: '154', question: 'What - is the product of roots of x^2+5x+6=0?'}, 155: {answers: {A: '7', B: '8', C: '15', - D: "\u221215"}, correct: '15', index: '155', question: "What is the product\ - \ of roots of x^2\u22128x+15=0?"}, 156: {answers: {A: '9', B: '18', C: '20', - D: '25'}, correct: '20', index: '156', question: "What is the product of roots\ - \ of x^2\u22129x+20=0?"}, 157: {answers: {A: "\u221235", B: '35', C: "\u22127", - D: '7'}, correct: "\u221235", index: '157', question: "What is the product of\ - \ roots of x^2+2x\u221235=0?"}, 158: {answers: {A: '12', B: '13', C: '14', D: '15'}, - correct: '14', index: '158', question: "What is \u230A100/7\u230B?"}, 159: {answers: { - A: '21', B: '22', C: '23', D: '24'}, correct: '22', index: '159', question: "What\ - \ is \u230A200/9\u230B?"}, 160: {answers: {A: '26', B: '27', C: '28', D: '29'}, - correct: '27', index: '160', question: "What is \u230A300/11\u230B?"}, 161: { - answers: {A: '29', B: '30', C: '31', D: '32'}, correct: '30', index: '161', question: "What\ - \ is \u230A400/13\u230B?"}, 162: {answers: {A: '1651', B: '1717', C: '1729', - D: '1739'}, correct: '1729', index: '162', question: "What is 7\xD713\xD719?"}, - 163: {answers: {A: '4279', B: '4289', C: '4291', D: '4301'}, correct: '4291', index: '163', - question: "What is 11\xD717\xD723?"}, 164: {answers: {A: '7073', B: '7157', C: '7163', - D: '7177'}, correct: '7163', index: '164', question: "What is 13\xD719\xD729?"}, - 165: {answers: {A: '12071', B: '12121', C: '12121', D: '12167'}, correct: '12167', - index: '165', question: "What is 17\xD723\xD731?"}, 166: {answers: {A: '1', B: '2', - C: '3', D: '4'}, correct: '3', index: '166', question: 'What is the inverse - of 2 mod 5?'}, 167: {answers: {A: '1', B: '2', C: '3', D: '4'}, correct: '2', - index: '167', question: 'What is the inverse of 4 mod 7?'}, 168: {answers: {A: '5', - B: '7', C: '8', D: '5'}, correct: '5', index: '168', question: 'What is the - inverse of 5 mod 12?'}, 169: {answers: {A: '11', B: '13', C: '15', D: '23'}, - correct: '15', index: '169', question: 'What is the inverse of 7 mod 26?'}, 170: { - answers: {A: '0', B: '1', C: "\u22121", D: '0.5'}, correct: '1', index: '170', - question: "What is sin(90\xB0)?"}, 171: {answers: {A: "\u22121", B: '0', C: '1', - D: '0.5'}, correct: "\u22121", index: '171', question: "What is cos(180\xB0\ - )?"}, 172: {answers: {A: '0', B: '1', C: "\u221A2", D: "\u22121"}, correct: '1', - index: '172', question: "What is tan(45\xB0)?"}, 173: {answers: {A: '0.5', B: '0.707', - C: '0.866', D: '1'}, correct: '0.5', index: '173', question: "What is sin(30\xB0\ - )?"}, 174: {answers: {A: '0.5', B: '0.707', C: '0.866', D: '1'}, correct: '0.5', - index: '174', question: "What is cos(60\xB0)?"}, 175: {answers: {A: '0.5', B: '0.707', - C: '0.866', D: "\u221A3"}, correct: "\u221A3", index: '175', question: "What\ - \ is tan(60\xB0)?"}} From 66e3f3ce180af1934888f3775dfa5d2ce33152c0 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 21:01:21 +0200 Subject: [PATCH 04/10] For real --- .../java/com/genyo/systems/modules/misc/Einstein.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genyo/systems/modules/misc/Einstein.java b/src/main/java/com/genyo/systems/modules/misc/Einstein.java index 94ea466..26389b0 100644 --- a/src/main/java/com/genyo/systems/modules/misc/Einstein.java +++ b/src/main/java/com/genyo/systems/modules/misc/Einstein.java @@ -44,7 +44,7 @@ public Einstein() { private final Random random = new Random(); // Cooldown - private int cooldown = 5; // default: 300 + private int cooldown = 300; // default: 300, testing: 5 private final Timer timer = new CacheTimer(); // Game things @@ -215,14 +215,14 @@ public boolean isInGame() { private void resetGame() { timer.reset(); - //cooldown = random.nextInt(120, 1800); - cooldown = random.nextInt(5, 10); + cooldown = random.nextInt(120, 1800); // for real use + //cooldown = random.nextInt(5, 10); // for testing } private void resetDefaults() { timer.reset(); answerTimer.reset(); - cooldown = 5; // default: 300 + cooldown = 300; // default: 300, testing: 5 currentEntry = null; inGame = false; remainingTime = 15; From 08b6980aed237f03a761cac2fbaae688e3a95c7b Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 21:06:52 +0200 Subject: [PATCH 05/10] frfr on god --- src/main/java/com/genyo/systems/modules/misc/Einstein.java | 2 +- src/main/resources/assets/genyo/einstein/maker.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genyo/systems/modules/misc/Einstein.java b/src/main/java/com/genyo/systems/modules/misc/Einstein.java index 26389b0..6f07892 100644 --- a/src/main/java/com/genyo/systems/modules/misc/Einstein.java +++ b/src/main/java/com/genyo/systems/modules/misc/Einstein.java @@ -25,7 +25,7 @@ public class Einstein extends GenyoModule { public Einstein() { - super(GenyoAddon.MISC, "einstein", "natural selection for society"); + super(GenyoAddon.MISC, "einstein", "natural selection of society"); readEinstein(); } diff --git a/src/main/resources/assets/genyo/einstein/maker.py b/src/main/resources/assets/genyo/einstein/maker.py index ad4976b..4efb1d0 100644 --- a/src/main/resources/assets/genyo/einstein/maker.py +++ b/src/main/resources/assets/genyo/einstein/maker.py @@ -1,6 +1,7 @@ import yaml # type: ignore +import os -path = "src/main/resources/assets/genyo/einstein/" +path = os.path.dirname(os.path.abspath(__file__)) + "/" questions = dict() with open(path + "questions.txt", "r", encoding="UTF-8") as file: From a8cf672ddc3fd86670ee331db16107e46348d199 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 21:10:57 +0200 Subject: [PATCH 06/10] get ready for 0.8.2 --- build.gradle | 32 -------------------------------- gradle.properties | 2 +- proguard-rules.pro | 32 -------------------------------- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 proguard-rules.pro diff --git a/build.gradle b/build.gradle index 5b4a804..e133501 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,3 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath "com.guardsquare:proguard-gradle:7.4.2" - } -} - plugins { id 'base' id "fabric-loom" version "1.10-SNAPSHOT" @@ -65,10 +56,6 @@ tasks { } } - remapJar { - archiveClassifier.set('reobf') // my-mod-1.0.0-reobf.jar - } - java { sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 @@ -79,22 +66,3 @@ tasks { it.options.release = 21 } } - -import net.fabricmc.loom.task.RemapJarTask -import proguard.gradle.ProGuardTask - -tasks.register("proguardObf", ProGuardTask) { ProGuardTask t -> - description = "Obfuscate and shrink the reobf JAR" - - dependsOn "remapJar" - def reobfJar = file("$buildDir/libs/${archivesBaseName}-${version}-reobf.jar") - inputs.file reobfJar - injars reobfJar - outjars file("$buildDir/libs/${archivesBaseName}-${version}-obf.jar") - libraryjars files(configurations.modImplementation) // only your Meteor Client + other libs - configuration "proguard-rules.pro" -} - -tasks.build { - dependsOn "proguardObf" -} diff --git a/gradle.properties b/gradle.properties index 4b908ea..130c32a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.8 loader_version=0.16.14 # Mod Properties -mod_version=0.8.1 +mod_version=0.8.2 maven_group=com.genyo archives_base_name=genyo-addon diff --git a/proguard-rules.pro b/proguard-rules.pro deleted file mode 100644 index 2c2fa18..0000000 --- a/proguard-rules.pro +++ /dev/null @@ -1,32 +0,0 @@ -# 0) Don’t fail on missing library classes --ignorewarnings --dontwarn net.minecraft.** --dontwarn net.fabricmc.** --dontwarn meteordevelopment.** - -# 1) Preserve ALL annotation metadata --keepattributes *Annotation*,InnerClasses,EnclosingMethod,Signature - -# 2) Keep Mixin annotation & your mixins --keep @interface org.spongepowered.asm.mixin.Mixin --keep class com.genyo.addon.mixin.** { *; } - -# 3) Keep **all** of your addon’s code (so Meteor’s reflection can see your Settings, Commands, etc.) --keep class com.genyo.addon.** { *; } - -# 4) Keep your addon’s main entrypoint (by name) --keep class com.genyo.GenyoAddon { - public (); -} - -# 5) Keep Fabric & Meteor APIs you use reflectively --dontwarn net.fabricmc.** --keep class net.fabricmc.** { *; } - --dontwarn meteordevelopment.** --keep class meteordevelopment.** { *; } - -# 6) Shrink/optimize flags --dontshrink --dontoptimize --allowaccessmodification From 0788115e3059a5a9341a8e9f08a203231db87092 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 21:13:01 +0200 Subject: [PATCH 07/10] maybe --- untitled/build.gradle.kts | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 untitled/build.gradle.kts diff --git a/untitled/build.gradle.kts b/untitled/build.gradle.kts deleted file mode 100644 index 1e69985..0000000 --- a/untitled/build.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id("java") -} - -group = "com.genyo" -version = "0.8.0" - -repositories { - mavenCentral() -} - -dependencies { - testImplementation(platform("org.junit:junit-bom:5.10.0")) - testImplementation("org.junit.jupiter:junit-jupiter") -} - -tasks.test { - useJUnitPlatform() -} \ No newline at end of file From fa3655e5a234718eef4deac62698e781fe75f1d7 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 21:37:26 +0200 Subject: [PATCH 08/10] i forgot --- .../MixinClientPlayNetworkHandler.java | 3 +- .../genyo/systems/modules/misc/Einstein.java | 51 +++++++++++-------- .../com/genyo/systems/modules/misc/Sigma.java | 24 ++++++--- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java b/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java index 057f806..e9c7738 100644 --- a/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java +++ b/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java @@ -67,8 +67,7 @@ private void onSendChatMessage(String message, CallbackInfo ci) { String correct = einstein.getCorrectChoice(); - if (message.equals(correct)) einstein.correct(); - else einstein.incorrect(); + einstein.endGame(message.equals(correct)); } } } diff --git a/src/main/java/com/genyo/systems/modules/misc/Einstein.java b/src/main/java/com/genyo/systems/modules/misc/Einstein.java index 6f07892..6686a56 100644 --- a/src/main/java/com/genyo/systems/modules/misc/Einstein.java +++ b/src/main/java/com/genyo/systems/modules/misc/Einstein.java @@ -7,6 +7,7 @@ import com.genyo.utils.math.timer.Timer; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.settings.BoolSetting; +import meteordevelopment.meteorclient.settings.IntSetting; import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.SettingGroup; import meteordevelopment.meteorclient.utils.player.ChatUtils; @@ -31,6 +32,16 @@ public Einstein() { private final SettingGroup sgGeneral = settings.getDefaultGroup(); + private final Setting interval = sgGeneral.add(new IntSetting.Builder() + .name("Time Interval") + .description("The time between the executions of the Final Solution (in minutes)") + .min(1) + .defaultValue(5) + .max(20) + .sliderRange(1, 20) + .build() + ); + private final Setting goodbye = sgGeneral.add(new BoolSetting.Builder() .name("Say goodbye") .description("If you enter an incorrect answer you say something before you can't.") @@ -44,7 +55,7 @@ public Einstein() { private final Random random = new Random(); // Cooldown - private int cooldown = 300; // default: 300, testing: 5 + private int cooldown = interval.get() * 60000; // default: 300, testing: 5 private final Timer timer = new CacheTimer(); // Game things @@ -67,15 +78,15 @@ public void onDeactivate() { public void onTick(TickEvent.Pre event) { if (mc.world == null && mc.player == null) return; - if (timer.passed(cooldown * 1000) && !inGame) { - game(); + if (timer.passed(cooldown) && !inGame) { + startGame(); inGame = true; resetGame(); } if (inGame) { // In-game checks if (answerTimer.passed(15000)) { - incorrect(); + endGame(false); } else if (answerTimer.getElapsedTime() - ((15 - remainingTime) * 1000L) >= 1000) { remainingTime -= 1; GenyoChatUtils.sendMessage(String.valueOf(remainingTime), "genyo-einstein-remaining"); @@ -83,7 +94,7 @@ public void onTick(TickEvent.Pre event) { } } - private void game() { + private void startGame() { currentEntry = entries.get(random.nextInt(entries.size())); if (currentEntry == null) return; @@ -105,22 +116,22 @@ private void game() { answerTimer.reset(); } - public void correct() { - inGame = false; - String output = ""; + public void endGame(boolean correct) { + if (correct) { + inGame = false; + String output = ""; - output += Formatting.GREEN + " Correct :D"; + output += Formatting.GREEN + " Correct :D"; - GenyoChatUtils.sendMessage(output); - } + GenyoChatUtils.sendMessage(output); + } else { + inGame = false; + resetDefaults(); - public void incorrect() { - inGame = false; - resetDefaults(); + if (goodbye.get()) ChatUtils.sendPlayerMsg("I feel like leaving."); - if (goodbye.get()) ChatUtils.sendPlayerMsg("I feel like leaving."); - - mc.close(); + mc.close(); + } } public String getCorrectChoice() { @@ -165,6 +176,7 @@ private void readEinstein() { } } catch (Exception exception) { GenyoAddon.LOG.info(exception.getMessage()); + sendError("Couldn't read file. Send logs to wuritz pls."); } } @@ -215,14 +227,13 @@ public boolean isInGame() { private void resetGame() { timer.reset(); - cooldown = random.nextInt(120, 1800); // for real use - //cooldown = random.nextInt(5, 10); // for testing + cooldown = interval.get() * 60000; } private void resetDefaults() { timer.reset(); answerTimer.reset(); - cooldown = 300; // default: 300, testing: 5 + cooldown = interval.get() * 60000; currentEntry = null; inGame = false; remainingTime = 15; diff --git a/src/main/java/com/genyo/systems/modules/misc/Sigma.java b/src/main/java/com/genyo/systems/modules/misc/Sigma.java index 59f808b..512f814 100644 --- a/src/main/java/com/genyo/systems/modules/misc/Sigma.java +++ b/src/main/java/com/genyo/systems/modules/misc/Sigma.java @@ -6,10 +6,7 @@ import com.genyo.utils.math.timer.CacheTimer; import com.genyo.utils.math.timer.Timer; import meteordevelopment.meteorclient.events.world.TickEvent; -import meteordevelopment.meteorclient.settings.BoolSetting; -import meteordevelopment.meteorclient.settings.EnumSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; +import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.orbit.EventHandler; import net.minecraft.resource.Resource; @@ -25,6 +22,16 @@ public Sigma() { private final SettingGroup sgGeneral = settings.getDefaultGroup(); + private final Setting interval = sgGeneral.add(new IntSetting.Builder() + .name("Time Interval") + .description("The time between the comings of Christ (in minutes)") + .min(1) + .defaultValue(5) + .max(20) + .sliderRange(1, 20) + .build() + ); + private final Setting the = sgGeneral.add(new BoolSetting.Builder() .name("This doesn't do anything") .description("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh") @@ -55,8 +62,8 @@ public void onActivate() { public void onTick(TickEvent.Pre event) { if (mc.player == null && mc.world == null) return; - if (!timer.passed(300000)) return; - //if (!timer.passed(5000)) return; + if (!timer.passed(interval.get() * 60000)) return; + //if (!timer.passed(5000)) return; // for testing String output = ""; String sigma = getSigma(); @@ -88,7 +95,10 @@ private String getSigma() { Resource resource = mc.getResourceManager().getResource(identifier).orElseThrow(); List messages = resource.getReader().lines().toList(); sigma = messages.get(MathUtil.pickRandom(messages)); - } catch (Exception ignored) { } + } catch (Exception e) { + GenyoAddon.LOG.info(e.getMessage()); + sendError("Couldn't read file. Send logs to wuritz pls."); + } if (sigma.isEmpty()) return null; else return sigma; From 56f7e15b2b8cadedb77a9156bbbdd366156a88bc Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 22:58:22 +0200 Subject: [PATCH 09/10] again finalize --- build.gradle | 5 ++++- gradle.properties | 2 -- .../mixin/network/MixinClientPlayNetworkHandler.java | 11 ++++++++++- .../com/genyo/systems/modules/misc/Einstein.java | 12 ++++++++---- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index e133501..326dc4e 100644 --- a/build.gradle +++ b/build.gradle @@ -31,10 +31,13 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - implementation 'org.yaml:snakeyaml:2.2' // Use the latest version // Meteor modImplementation "meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT" + + // SnakeYaml + implementation 'org.yaml:snakeyaml:2.2' + include 'org.yaml:snakeyaml:2.2' } tasks { diff --git a/gradle.properties b/gradle.properties index 130c32a..b0a91ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,4 @@ maven_group=com.genyo archives_base_name=genyo-addon # Dependencies - -# DiscordRPC (https://github.com/MeteorDevelopment/java-discord-rpc) discordipc_version=1.1 diff --git a/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java b/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java index e9c7738..b5850d9 100644 --- a/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java +++ b/src/main/java/com/genyo/mixin/network/MixinClientPlayNetworkHandler.java @@ -21,6 +21,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.Arrays; +import java.util.List; + @Mixin(ClientPlayNetworkHandler.class) public abstract class MixinClientPlayNetworkHandler extends ClientCommonNetworkHandler implements IClientPlayNetworkHandler { @@ -62,7 +65,7 @@ private void onSendChatMessage(String message, CallbackInfo ci) { Einstein einstein = Modules.get().get(Einstein.class); if (Modules.get().isActive(Einstein.class)) { - if (einstein.isInGame()) { + if (einstein.isInGame() && isChoice(message)) { ci.cancel(); String correct = einstein.getCorrectChoice(); @@ -72,4 +75,10 @@ private void onSendChatMessage(String message, CallbackInfo ci) { } } + private boolean isChoice(String message) { + final List choices = Arrays.asList("A", "B", "C", "D"); + + return choices.contains(message.toUpperCase()); + } + } diff --git a/src/main/java/com/genyo/systems/modules/misc/Einstein.java b/src/main/java/com/genyo/systems/modules/misc/Einstein.java index 6686a56..fa5b348 100644 --- a/src/main/java/com/genyo/systems/modules/misc/Einstein.java +++ b/src/main/java/com/genyo/systems/modules/misc/Einstein.java @@ -39,6 +39,7 @@ public Einstein() { .defaultValue(5) .max(20) .sliderRange(1, 20) + .onChanged(this::changeCooldown) .build() ); @@ -62,7 +63,7 @@ public Einstein() { private final Timer answerTimer = new CacheTimer(); private Entry currentEntry; private boolean inGame = false; - private int remainingTime = 14; + private int remainingTime = 15; @Override public void onActivate() { @@ -80,7 +81,6 @@ public void onTick(TickEvent.Pre event) { if (timer.passed(cooldown) && !inGame) { startGame(); - inGame = true; resetGame(); } @@ -95,6 +95,8 @@ public void onTick(TickEvent.Pre event) { } private void startGame() { + inGame = true; + currentEntry = entries.get(random.nextInt(entries.size())); if (currentEntry == null) return; @@ -227,15 +229,17 @@ public boolean isInGame() { private void resetGame() { timer.reset(); - cooldown = interval.get() * 60000; } private void resetDefaults() { timer.reset(); answerTimer.reset(); - cooldown = interval.get() * 60000; currentEntry = null; inGame = false; remainingTime = 15; } + + private void changeCooldown(int newValue) { + cooldown = newValue * 60000; + } } From eb35715ccd62ab31a8591907fb4a13327728d716 Mon Sep 17 00:00:00 2001 From: wuritz Date: Mon, 18 Aug 2025 23:23:52 +0200 Subject: [PATCH 10/10] watermark version toggle --- .../com/genyo/systems/hud/WatermarkHud.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genyo/systems/hud/WatermarkHud.java b/src/main/java/com/genyo/systems/hud/WatermarkHud.java index 455eed6..8c319b3 100644 --- a/src/main/java/com/genyo/systems/hud/WatermarkHud.java +++ b/src/main/java/com/genyo/systems/hud/WatermarkHud.java @@ -12,10 +12,21 @@ public class WatermarkHud extends HudElement { public static final HudElementInfo INFO = new HudElementInfo<>(GenyoAddon.HUD_GROUP, "watermark", "The best thing in the entire addon.", WatermarkHud::new); + public WatermarkHud() { + super(INFO); + } private final SettingGroup sgGeneral = settings.getDefaultGroup(); private final SettingGroup sgScale = settings.createGroup("Scale"); + private final Setting version = sgGeneral.add(new BoolSetting.Builder() + .name("Version") + .description("Render the current Genyo version") + .defaultValue(false) + .onChanged(this::updateRenderText) + .build() + ); + private final Setting shadow = sgGeneral.add(new BoolSetting.Builder() .name("shadow") .description("Renders shadow behind text.") @@ -49,8 +60,11 @@ public class WatermarkHud extends HudElement { .build() ); - public WatermarkHud() { - super(INFO); + private String renderText = "Genyo"; + + private void updateRenderText(boolean version) { + if (version) renderText = "Genyo " + GenyoAddon.VERSION; + else renderText = "Genyo"; } private double getScale() { @@ -59,13 +73,12 @@ private double getScale() { @Override public void tick(HudRenderer renderer) { - setSize(renderer.textWidth("Genyo " + GenyoAddon.VERSION, shadow.get(), getScale()), renderer.textHeight(shadow.get(), getScale())); + setSize(renderer.textWidth(renderText, shadow.get(), getScale()), renderer.textHeight(shadow.get(), getScale())); } @Override public void render(HudRenderer renderer) { - renderer.text("Genyo ", x, y, color.get(), shadow.get(), getScale()); - renderer.text(GenyoAddon.VERSION.toString(), x + renderer.textWidth("Genyo ", shadow.get(), getScale()), y, color.get(), shadow.get(), getScale()); + renderer.text(renderText, x, y, color.get(), shadow.get(), getScale()); } }