Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/genyo/addon/modules/GenyoSkinBlink.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
public class GenyoSkinBlink extends GenyoModule{

private final SettingGroup sgGeneral = settings.getDefaultGroup();

private final Setting<Integer> delay = sgGeneral.add(new IntSetting.Builder()
.name("Delay (mp)")
.description("hulkenberg????")
Expand Down Expand Up @@ -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
Expand All @@ -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<PlayerModelPart> currentParts = ((AccessorGameOptions) mc.options).getPlayerModelParts();
for (PlayerModelPart part : PlayerModelPart.values()) {
mc.options.setPlayerModelPart(part, !currentParts.contains(part));
}

mc.options.sendClientSettings();

timer = 0;
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/com/genyo/addon/modules/GenyoWelcome.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
10 changes: 3 additions & 7 deletions src/main/java/com/genyo/addon/screens/PlayerListScreen.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/genyo/addon/settings/PlayerListSetting.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
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;
import net.minecraft.nbt.NbtCompound;
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;
Expand Down
53 changes: 26 additions & 27 deletions src/main/java/com/genyo/addon/systems/enemies/Enemies.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/genyo/addon/systems/enemies/Enemy.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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
Expand Down
102 changes: 0 additions & 102 deletions src/main/java/com/genyo/addon/systems/timer/CacheTimer.java

This file was deleted.

34 changes: 0 additions & 34 deletions src/main/java/com/genyo/addon/systems/timer/ShorelineTimer.java

This file was deleted.

Loading