From 126b7ef4a72da1b9b80c0b8b585e91afec6f264d Mon Sep 17 00:00:00 2001 From: wuritz Date: Sun, 20 Jul 2025 11:25:06 +0200 Subject: [PATCH] elvileg minden fasza --- .../genyo/addon/modules/GenyoSkinBlink.java | 4 +- .../com/genyo/addon/modules/GenyoWelcome.java | 6 +- .../genyo/addon/screens/PlayerListScreen.java | 10 +- .../addon/settings/PlayerListSetting.java | 2 - .../genyo/addon/systems/enemies/Enemies.java | 53 +++++---- .../genyo/addon/systems/enemies/Enemy.java | 6 +- .../genyo/addon/systems/timer/CacheTimer.java | 102 ------------------ .../addon/systems/timer/ShorelineTimer.java | 34 ------ 8 files changed, 36 insertions(+), 181 deletions(-) delete mode 100644 src/main/java/com/genyo/addon/systems/timer/CacheTimer.java delete mode 100644 src/main/java/com/genyo/addon/systems/timer/ShorelineTimer.java diff --git a/src/main/java/com/genyo/addon/modules/GenyoSkinBlink.java b/src/main/java/com/genyo/addon/modules/GenyoSkinBlink.java index 814a66d..037fe54 100644 --- a/src/main/java/com/genyo/addon/modules/GenyoSkinBlink.java +++ b/src/main/java/com/genyo/addon/modules/GenyoSkinBlink.java @@ -15,7 +15,6 @@ public class GenyoSkinBlink extends GenyoModule{ private final SettingGroup sgGeneral = settings.getDefaultGroup(); - private final Setting delay = sgGeneral.add(new IntSetting.Builder() .name("Delay (mp)") .description("hulkenberg????") @@ -45,6 +44,7 @@ public void onDeactivate() { timer = 0; for (PlayerModelPart part : PlayerModelPart.values()) mc.options.setPlayerModelPart(part, enabledParts.contains(part)); + mc.options.sendClientSettings(); } @EventHandler @@ -53,12 +53,12 @@ public void onTick(TickEvent.Post event) { if (mc.player == null && mc.world == null) return; if (!(timer >= (delay.get() * 20))) return; - GenyoAddon.LOG.info("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); Set currentParts = ((AccessorGameOptions) mc.options).getPlayerModelParts(); for (PlayerModelPart part : PlayerModelPart.values()) { mc.options.setPlayerModelPart(part, !currentParts.contains(part)); } + mc.options.sendClientSettings(); timer = 0; diff --git a/src/main/java/com/genyo/addon/modules/GenyoWelcome.java b/src/main/java/com/genyo/addon/modules/GenyoWelcome.java index aca2bc0..689fa9a 100644 --- a/src/main/java/com/genyo/addon/modules/GenyoWelcome.java +++ b/src/main/java/com/genyo/addon/modules/GenyoWelcome.java @@ -14,19 +14,15 @@ import meteordevelopment.meteorclient.settings.StringSetting; import meteordevelopment.meteorclient.utils.misc.ISerializable; import meteordevelopment.meteorclient.utils.network.Http; -import meteordevelopment.meteorclient.utils.network.PacketUtils; import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.meteorclient.utils.render.PlayerHeadTexture; import meteordevelopment.meteorclient.utils.render.PlayerHeadUtils; import meteordevelopment.orbit.EventHandler; import meteordevelopment.orbit.EventPriority; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.PlayerListEntry; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; -import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket; -import net.minecraft.util.profiling.jfr.event.PacketReceivedEvent; import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; @@ -113,7 +109,7 @@ private void onReceivePacket(PacketEvent.Receive event) { String name = profile.getName(); if (!contains(name)) return; UUID playerUuid = profile.getId(); - GenyoAddon.LOG.info("asd"); + if (!pac.getActions().contains(PlayerListS2CPacket.Action.ADD_PLAYER) && playerUuid != null && !onlinePlayers.contains(playerUuid)) return; diff --git a/src/main/java/com/genyo/addon/screens/PlayerListScreen.java b/src/main/java/com/genyo/addon/screens/PlayerListScreen.java index 805f7a9..b578c77 100644 --- a/src/main/java/com/genyo/addon/screens/PlayerListScreen.java +++ b/src/main/java/com/genyo/addon/screens/PlayerListScreen.java @@ -1,6 +1,5 @@ package com.genyo.addon.screens; -import com.genyo.addon.GenyoAddon; import com.genyo.addon.modules.GenyoWelcome; import com.genyo.addon.settings.PlayerListSetting; import meteordevelopment.meteorclient.gui.GuiTheme; @@ -40,8 +39,7 @@ public void initWidgets() { add.action = () -> { String name = nameW.get().trim(); if (name.equalsIgnoreCase("")) return; - - if (setting.get(name) != null) { + if (setting.get(name) != null) { // it already exists nameW.set(""); return; } @@ -50,10 +48,8 @@ public void initWidgets() { nameW.set(""); setting.get().add(player); - MeteorExecutor.execute(() -> { - player.updateInfo(); - reload(); - }); + //player.updateInfo(); + MeteorExecutor.execute(this::reload); setting.onChanged(); //table.clear(); diff --git a/src/main/java/com/genyo/addon/settings/PlayerListSetting.java b/src/main/java/com/genyo/addon/settings/PlayerListSetting.java index 6867356..c3d6dc0 100644 --- a/src/main/java/com/genyo/addon/settings/PlayerListSetting.java +++ b/src/main/java/com/genyo/addon/settings/PlayerListSetting.java @@ -1,6 +1,5 @@ package com.genyo.addon.settings; -import com.genyo.addon.GenyoAddon; import com.genyo.addon.modules.GenyoWelcome; import meteordevelopment.meteorclient.settings.IVisible; import meteordevelopment.meteorclient.settings.Setting; @@ -8,7 +7,6 @@ import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.NbtList; import net.minecraft.nbt.NbtString; -import net.minecraft.util.Identifier; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/genyo/addon/systems/enemies/Enemies.java b/src/main/java/com/genyo/addon/systems/enemies/Enemies.java index be83199..044a4ff 100644 --- a/src/main/java/com/genyo/addon/systems/enemies/Enemies.java +++ b/src/main/java/com/genyo/addon/systems/enemies/Enemies.java @@ -161,37 +161,12 @@ public NbtCompound toTag() { return tag; } - private void genyo() { - if (mc.targetedEntity == null) return; - if (!(mc.targetedEntity instanceof PlayerEntity player)) return; - - if (!isEnemy(player)) { - add(new Enemy(player)); - info("Added %s to enemies", player.getName().getString()); - if (getMessageBool()) { - String message = getCustomMessage(); - - switch (getMessageMode()) { - case MessageMode.Whisper: - ChatUtils.sendPlayerMsg("/whisper " + player.getName().getString() + " " + message); - GenyoAddon.LOG.info("/whisper " + player.getName().getString() + " " + message); - case MessageMode.Msg: - ChatUtils.sendPlayerMsg("/msg " + player.getName().getString() + " " + message); - } - } - } else { - remove(get(player)); - info("Removed %s from opps.", player.getName().getString()); - } - } - @Override public Enemies fromTag(NbtCompound tag) { - if (tag.contains("settings")) settings.fromTag(tag.getCompound("settings")); - enemies.clear(); + if (tag.contains("settings")) settings.fromTag(tag.getCompound("settings")); - for (NbtElement itemTag : tag.getList("enemies", 8)) { + for (NbtElement itemTag : tag.getList("enemies", 10)) { NbtCompound enemyTag = (NbtCompound) itemTag; if (!enemyTag.contains("name")) continue; @@ -213,6 +188,30 @@ public Enemies fromTag(NbtCompound tag) { return this; } + private void genyo() { + if (mc.targetedEntity == null) return; + if (!(mc.targetedEntity instanceof PlayerEntity player)) return; + + if (!isEnemy(player)) { + add(new Enemy(player)); + info("Added %s to enemies", player.getName().getString()); + if (getMessageBool()) { + String message = getCustomMessage(); + + switch (getMessageMode()) { + case MessageMode.Whisper: + ChatUtils.sendPlayerMsg("/whisper " + player.getName().getString() + " " + message); + GenyoAddon.LOG.info("/whisper " + player.getName().getString() + " " + message); + case MessageMode.Msg: + ChatUtils.sendPlayerMsg("/msg " + player.getName().getString() + " " + message); + } + } + } else { + remove(get(player)); + info("Removed %s from opps.", player.getName().getString()); + } + } + public Color getEnemyColor() { return enemyColor.get(); } diff --git a/src/main/java/com/genyo/addon/systems/enemies/Enemy.java b/src/main/java/com/genyo/addon/systems/enemies/Enemy.java index c2be935..53ff3d8 100644 --- a/src/main/java/com/genyo/addon/systems/enemies/Enemy.java +++ b/src/main/java/com/genyo/addon/systems/enemies/Enemy.java @@ -1,6 +1,8 @@ package com.genyo.addon.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; @@ -81,8 +83,8 @@ public Enemy fromTag(NbtCompound tag) { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Enemy friend = (Enemy) o; - return Objects.equals(name, friend.name); + Enemy enemy = (Enemy) o; + return Objects.equals(name, enemy.name); } @Override diff --git a/src/main/java/com/genyo/addon/systems/timer/CacheTimer.java b/src/main/java/com/genyo/addon/systems/timer/CacheTimer.java deleted file mode 100644 index 35bd1e8..0000000 --- a/src/main/java/com/genyo/addon/systems/timer/CacheTimer.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.genyo.addon.systems.timer; - -import java.util.concurrent.TimeUnit; - -public class CacheTimer implements ShorelineTimer { - - // The cached time since last reset which indicates the time passed since - // the last timer reset - private long time; - - private long lastResetTime; - - /** - * Default constructor which will initialize the time to the current time - * which means {@link #passed(Number)} and {@link #passed(Number, TimeUnit)} - * will always return true initially - */ - public CacheTimer() { - this.time = System.nanoTime(); - } - - /** - * Returns true if the time since the last reset has exceeded - * the param time. - * - * @param time The param time in ms - * @return true if the time since the last reset has exceeded - * the param time - */ - @Override - public boolean passed(Number time) { - if (time.longValue() <= 0) { - return true; - } - return getElapsedTime() > time.longValue(); - } - - /** - * Returns true if the time since the last reset has exceeded - * the param time which is in the param units. - * - * @param time The param time - * @param unit The unit of the time - * @return true if the time since the last reset has exceeded - * the param time - * @see #passed(Number) - */ - public boolean passed(Number time, TimeUnit unit) { - return passed(unit.toMillis(time.longValue())); - } - - /** - * @return - */ - @Override - public long getElapsedTime() { - return toMillis(System.nanoTime() - time); - } - - /** - * @param time - */ - @Override - public void setElapsedTime(Number time) { - this.time = time.longValue() == MAX_TIME ? 0 : - System.nanoTime() - time.longValue(); - } - - public void setDelay(Number delay) { - this.time += delay.longValue(); - } - - /** - * @return - */ - public long getElapsedTime(TimeUnit unit) { - return unit.convert(getElapsedTime(), TimeUnit.MILLISECONDS); - } - - public long getLastResetTime() { - return lastResetTime; - } - - /** - * Sets the cached time since the last reset to the current time - */ - @Override - public void reset() { - long time = System.nanoTime(); - lastResetTime = time - this.time; - - this.time = time; - } - - /** - * @return - */ - private long toMillis(long nanos) { - return nanos / 1000000; - } - -} diff --git a/src/main/java/com/genyo/addon/systems/timer/ShorelineTimer.java b/src/main/java/com/genyo/addon/systems/timer/ShorelineTimer.java deleted file mode 100644 index 4a0f61c..0000000 --- a/src/main/java/com/genyo/addon/systems/timer/ShorelineTimer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.genyo.addon.systems.timer; - -public interface ShorelineTimer { - // - long MAX_TIME = -0xff; - - /** - * Returns true if the time since the last reset has exceeded - * the param time. - * - * @param time The param time - * @return true if the time since the last reset has exceeded - * the param time - */ - boolean passed(Number time); - - /** - * Resets the current elapsed time state of the timer and restarts the - * timer from 0. - */ - void reset(); - - /** - * Returns the elapsed time since the last reset of the timer. - * - * @return The elapsed time since the last reset - */ - long getElapsedTime(); - - /** - * @param time - */ - void setElapsedTime(Number time); -}