diff --git a/src/main/java/thunder/hack/ThunderHack.java b/src/main/java/thunder/hack/ThunderHack.java index 52d2e977..f5db3d1e 100644 --- a/src/main/java/thunder/hack/ThunderHack.java +++ b/src/main/java/thunder/hack/ThunderHack.java @@ -20,7 +20,6 @@ import java.awt.*; import java.lang.invoke.MethodHandles; - public class ThunderHack implements ModInitializer { public static final ModMetadata MOD_META; diff --git a/src/main/java/thunder/hack/core/Core.java b/src/main/java/thunder/hack/core/Core.java index 4e789a1c..45988eab 100644 --- a/src/main/java/thunder/hack/core/Core.java +++ b/src/main/java/thunder/hack/core/Core.java @@ -25,7 +25,6 @@ import thunder.hack.features.cmd.Command; import thunder.hack.core.manager.client.MacroManager; import thunder.hack.core.manager.client.ModuleManager; -import thunder.hack.core.manager.client.ServerManager; import thunder.hack.events.impl.*; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.notification.Notification; @@ -75,7 +74,7 @@ public void onTick(PlayerUpdateEvent event) { ThunderHack.EVENT_BUS.post(new EventDeath(p)); } - if (!Objects.equals(Managers.COMMAND.getPrefix(), ClientSettings.prefix.getValue().toString())) + if (!Objects.equals(Managers.COMMAND.getPrefix(), ClientSettings.prefix.getValue())) Managers.COMMAND.setPrefix(ClientSettings.prefix.getValue()); new HashMap<>(InteractionUtility.awaiting).forEach((bp, time) -> { @@ -154,8 +153,7 @@ public void onEntitySpawn(EventEntitySpawn e) { if (e.getEntity() != null && bp.getSquaredDistance(e.getEntity().getPos()) < 4.) InteractionUtility.awaiting.remove(bp); }); - } - */ + }*/ public void drawSkull(DrawContext e) { if (showSkull && !skullTimer.passedMs(3000) && ClientSettings.skullEmoji.getValue()) { diff --git a/src/main/java/thunder/hack/core/Managers.java b/src/main/java/thunder/hack/core/Managers.java index 56f749ca..8ceb1a32 100644 --- a/src/main/java/thunder/hack/core/Managers.java +++ b/src/main/java/thunder/hack/core/Managers.java @@ -27,7 +27,7 @@ public class Managers { public static final PlayerManager PLAYER = new PlayerManager(); // World - public static final HoleManager HOLE = new HoleManager(); + public static final HoleManager HOLE = new HoleManager(); //todo ??? public static final WayPointManager WAYPOINT = new WayPointManager(); // Client diff --git a/src/main/java/thunder/hack/core/manager/client/ConfigManager.java b/src/main/java/thunder/hack/core/manager/client/ConfigManager.java index 85e5f122..9769d760 100644 --- a/src/main/java/thunder/hack/core/manager/client/ConfigManager.java +++ b/src/main/java/thunder/hack/core/manager/client/ConfigManager.java @@ -238,7 +238,7 @@ private void parseModule(JsonObject object, String category) throws NullPointerE if (module == null) return; - if (!Objects.equals(category, "none") && !module.getCategory().getName().toLowerCase().equals(category.toLowerCase())) + if (!Objects.equals(category, "none") && !module.getCategory().getName().equalsIgnoreCase(category)) return; JsonObject mobject = object.getAsJsonObject(module.getName()); @@ -246,7 +246,6 @@ private void parseModule(JsonObject object, String category) throws NullPointerE for (Setting setting : module.getSettings()) { try { if (setting.getValue() instanceof SettingGroup) { - } else if (setting.getValue() instanceof Boolean) { setting.setValue(mobject.getAsJsonPrimitive(setting.getName()).getAsBoolean()); } else if (setting.getValue() instanceof Float) { @@ -353,7 +352,7 @@ public JsonObject getModuleObject(@NotNull Module m) { } else if (setting.getValue() instanceof String str) { try { attribs.add(setting.getName(), jp.parse(str.replace(" ", "%%").replace("/", "++"))); - } catch (Exception exception) { + } catch (Exception ignored) { } } else if (setting.getValue() instanceof ItemSelectSetting iSelect) { JsonArray array = new JsonArray(); @@ -393,7 +392,7 @@ public List getConfigList() { List list = new ArrayList<>(); if (CONFIGS_FOLDER.listFiles() != null) { - for (File file : Arrays.stream(Objects.requireNonNull(CONFIGS_FOLDER.listFiles())).filter(f -> f.getName().endsWith(".th")).collect(Collectors.toList())) { + for (File file : Arrays.stream(Objects.requireNonNull(CONFIGS_FOLDER.listFiles())).filter(f -> f.getName().endsWith(".th")).toList()) { list.add(file.getName().replace(".th", "")); } } diff --git a/src/main/java/thunder/hack/core/manager/client/ModuleManager.java b/src/main/java/thunder/hack/core/manager/client/ModuleManager.java index c76f6341..06f60039 100644 --- a/src/main/java/thunder/hack/core/manager/client/ModuleManager.java +++ b/src/main/java/thunder/hack/core/manager/client/ModuleManager.java @@ -315,7 +315,7 @@ public void onLoad(String category) { modules.sort(Comparator.comparing(Module::getName)); modules.forEach(m -> { - if (m.isEnabled() && (m.getCategory().getName().toLowerCase().equals(category.toLowerCase()) || category.equals("none"))) + if (m.isEnabled() && (m.getCategory().getName().equalsIgnoreCase(category) || category.equals("none"))) ThunderHack.EVENT_BUS.subscribe(m); }); @@ -360,7 +360,7 @@ public void onLogin() { public void onUnload(String category) { modules.forEach(module -> { - if (module.isEnabled() && (module.getCategory().getName().toLowerCase().equals(category.toLowerCase()) || category.equals("none"))) { + if (module.isEnabled() && (module.getCategory().getName().equalsIgnoreCase(category) || category.equals("none"))) { ThunderHack.EVENT_BUS.unsubscribe(module); module.setEnabled(false); } diff --git a/src/main/java/thunder/hack/core/manager/client/ProxyManager.java b/src/main/java/thunder/hack/core/manager/client/ProxyManager.java index 5d239a23..b547b351 100644 --- a/src/main/java/thunder/hack/core/manager/client/ProxyManager.java +++ b/src/main/java/thunder/hack/core/manager/client/ProxyManager.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Objects; - public class ProxyManager implements IManager { private final List proxies = new ArrayList<>(); private ThProxy activeProxy; diff --git a/src/main/java/thunder/hack/core/manager/client/ServerManager.java b/src/main/java/thunder/hack/core/manager/client/ServerManager.java index 9681079a..1e8cfba0 100644 --- a/src/main/java/thunder/hack/core/manager/client/ServerManager.java +++ b/src/main/java/thunder/hack/core/manager/client/ServerManager.java @@ -57,7 +57,6 @@ public void onPacketReceive(PacketEvent.@NotNull Receive event) { } } - public int getPing() { if (mc.getNetworkHandler() == null || mc.player == null) return 0; diff --git a/src/main/java/thunder/hack/core/manager/client/ShaderManager.java b/src/main/java/thunder/hack/core/manager/client/ShaderManager.java index 0f19f601..99cbce96 100644 --- a/src/main/java/thunder/hack/core/manager/client/ShaderManager.java +++ b/src/main/java/thunder/hack/core/manager/client/ShaderManager.java @@ -157,7 +157,7 @@ public void setupShader(Shader shader, ManagedShaderEffect effect) { effect.setUniformValue("outlinecolor", shaders.outlineColor.getValue().getGlRed(), shaders.outlineColor.getValue().getGlGreen(), shaders.outlineColor.getValue().getGlBlue(), shaders.outlineColor.getValue().getGlAlpha()); effect.setUniformValue("primaryColor", shaders.fillColor1.getValue().getGlRed(), shaders.fillColor1.getValue().getGlGreen(), shaders.fillColor1.getValue().getGlBlue(), shaders.fillColor1.getValue().getAlpha()); effect.setUniformValue("secondaryColor", shaders.fillColor2.getValue().getGlRed(), shaders.fillColor2.getValue().getGlGreen(), shaders.fillColor2.getValue().getGlBlue(), shaders.fillColor1.getValue().getAlpha()); - effect.setUniformValue("time", (float) ((System.currentTimeMillis() % 100000) / 1000f)); + effect.setUniformValue("time", (System.currentTimeMillis() % 100000) / 1000f); effect.render(Render3DEngine.getTickDelta()); } } diff --git a/src/main/java/thunder/hack/core/manager/client/TelemetryManager.java b/src/main/java/thunder/hack/core/manager/client/TelemetryManager.java index 965b5f6c..415072bc 100644 --- a/src/main/java/thunder/hack/core/manager/client/TelemetryManager.java +++ b/src/main/java/thunder/hack/core/manager/client/TelemetryManager.java @@ -3,7 +3,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonParser; import org.apache.commons.compress.utils.Lists; -import thunder.hack.core.Managers; import thunder.hack.core.manager.IManager; import thunder.hack.features.modules.client.ClientSettings; import thunder.hack.utility.Timer; @@ -62,7 +61,7 @@ public List getOnlinePlayers() { return Lists.newArrayList(onlinePlayers.iterator()); } - public List getAllPlayers() { + public List getAllPlayers() { // Method 'getAllPlayers()' is never used return Lists.newArrayList(allPlayers.iterator()); } } diff --git a/src/main/java/thunder/hack/core/manager/player/PlayerManager.java b/src/main/java/thunder/hack/core/manager/player/PlayerManager.java index 43eafe58..d90ca365 100644 --- a/src/main/java/thunder/hack/core/manager/player/PlayerManager.java +++ b/src/main/java/thunder/hack/core/manager/player/PlayerManager.java @@ -49,7 +49,6 @@ public class PlayerManager implements IManager { public boolean inInventory; - @EventHandler(priority = EventPriority.HIGHEST) public void onSync(EventSync event) { if (Module.fullNullCheck()) return; diff --git a/src/main/java/thunder/hack/events/impl/EventClickSlot.java b/src/main/java/thunder/hack/events/impl/EventClickSlot.java index bb07280c..98db8651 100644 --- a/src/main/java/thunder/hack/events/impl/EventClickSlot.java +++ b/src/main/java/thunder/hack/events/impl/EventClickSlot.java @@ -4,7 +4,6 @@ import thunder.hack.events.Event; public class EventClickSlot extends Event { - private final SlotActionType slotActionType; private final int slot, button, id; diff --git a/src/main/java/thunder/hack/events/impl/EventMouse.java b/src/main/java/thunder/hack/events/impl/EventMouse.java index 095c1dc8..56819e80 100644 --- a/src/main/java/thunder/hack/events/impl/EventMouse.java +++ b/src/main/java/thunder/hack/events/impl/EventMouse.java @@ -15,7 +15,7 @@ public int getAction() { int action; - public EventMouse(int b,int action){ + public EventMouse(int b,int action) { button = b; this.action = action; } diff --git a/src/main/java/thunder/hack/events/impl/EventPlayerTravel.java b/src/main/java/thunder/hack/events/impl/EventPlayerTravel.java index 15739df1..31f911bf 100644 --- a/src/main/java/thunder/hack/events/impl/EventPlayerTravel.java +++ b/src/main/java/thunder/hack/events/impl/EventPlayerTravel.java @@ -7,7 +7,7 @@ public class EventPlayerTravel extends Event { private Vec3d mVec; private boolean pre; - public EventPlayerTravel(Vec3d mVec,boolean pre) { + public EventPlayerTravel(Vec3d mVec, boolean pre) { this.mVec = mVec; this.pre = pre; } diff --git a/src/main/java/thunder/hack/features/cmd/args/CategoryArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/CategoryArgumentType.java index a3b13f19..3f779dd7 100644 --- a/src/main/java/thunder/hack/features/cmd/args/CategoryArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/CategoryArgumentType.java @@ -11,12 +11,13 @@ import net.minecraft.text.Text; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.client.ClientSettings; import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class CategoryArgumentType implements ArgumentType { private static final List EXAMPLES = Managers.MODULE.getCategories().stream() .map(Module.Category::getName) @@ -30,7 +31,7 @@ public static CategoryArgumentType create() { public String parse(StringReader reader) throws CommandSyntaxException { String cat = reader.readString(); if (!EXAMPLES.contains(cat)) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Категории " + name.toString() + " не существует(" : "Category " + name.toString() + " does not exists(") + name -> Text.literal(isRu() ? "Категории " + name.toString() + " не существует(" : "Category " + name.toString() + " does not exist :(") ).create(cat); return cat; } diff --git a/src/main/java/thunder/hack/features/cmd/args/CfgArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/CfgArgumentType.java index cade3a95..0544aa1e 100644 --- a/src/main/java/thunder/hack/features/cmd/args/CfgArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/CfgArgumentType.java @@ -9,13 +9,13 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.features.modules.client.ClientSettings; import java.util.Collection; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class CfgArgumentType implements ArgumentType { private static final Collection EXAMPLES = Managers.CONFIG.getConfigList().stream() .limit(5) @@ -29,7 +29,7 @@ public static CfgArgumentType create() { public String parse(StringReader reader) throws CommandSyntaxException { String config = reader.readString(); if (!Managers.CONFIG.getConfigList().contains(config)) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Конфига " + name.toString() + " не существует(" : "Config " + name.toString() + " does not exists(") + name -> Text.literal(isRu() ? "Конфига " + name.toString() + " не существует(" : "Config " + name.toString() + " does not exist :(") ).create(config); return config; diff --git a/src/main/java/thunder/hack/features/cmd/args/CfgModeType.java b/src/main/java/thunder/hack/features/cmd/args/CfgModeType.java index a7756bd8..a6594090 100644 --- a/src/main/java/thunder/hack/features/cmd/args/CfgModeType.java +++ b/src/main/java/thunder/hack/features/cmd/args/CfgModeType.java @@ -9,14 +9,14 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.features.modules.client.ClientSettings; import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class CfgModeType implements ArgumentType { private static final Collection EXAMPLES = List.of("combat", "render", "player", "misc", "client", "hud", "movement"); @@ -28,7 +28,7 @@ public static CfgModeType create() { public String parse(StringReader reader) throws CommandSyntaxException { String cat = reader.readString(); if (!getExamples().contains(cat)) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Вкладки " + name.toString() + " не существует(" : "Category " + name.toString() + " does not exists(") + name -> Text.literal(isRu() ? "Вкладки " + name.toString() + " не существует(" : "Category " + name.toString() + " does not exist :(") ).create(cat); return cat; diff --git a/src/main/java/thunder/hack/features/cmd/args/ChestStealerArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/ChestStealerArgumentType.java index 380bfe02..865d2ceb 100644 --- a/src/main/java/thunder/hack/features/cmd/args/ChestStealerArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/ChestStealerArgumentType.java @@ -13,13 +13,14 @@ import net.minecraft.registry.Registries; import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; -import thunder.hack.features.modules.client.ClientSettings; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class ChestStealerArgumentType implements ArgumentType { private static final List EXAMPLES = getRegistered().stream().limit(5).toList(); @@ -31,7 +32,7 @@ public static ChestStealerArgumentType create() { public String parse(@NotNull StringReader reader) throws CommandSyntaxException { String blockName = reader.readString(); if (!getRegistered().contains(blockName)) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Такого предмета нет!" : "There is no such item!") + name -> Text.literal(isRu() ? "Такого предмета нет!" : "There is no such item!") ).create(blockName); return blockName; } @@ -46,7 +47,6 @@ public Collection getExamples() { return EXAMPLES; } - private static @NotNull List getRegistered() { List result = new ArrayList<>(); diff --git a/src/main/java/thunder/hack/features/cmd/args/FriendArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/FriendArgumentType.java index b215feef..2617193d 100644 --- a/src/main/java/thunder/hack/features/cmd/args/FriendArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/FriendArgumentType.java @@ -10,12 +10,13 @@ import net.minecraft.command.CommandSource; import net.minecraft.text.Text; import thunder.hack.core.Managers; -import thunder.hack.features.modules.client.ClientSettings; import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class FriendArgumentType implements ArgumentType { private static final List EXAMPLES = Managers.FRIEND.getFriends().stream().limit(5).toList(); @@ -27,7 +28,7 @@ public static FriendArgumentType create() { public String parse(StringReader reader) throws CommandSyntaxException { String friend = reader.readString(); if (!Managers.FRIEND.isFriend(friend)) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Друга с именем " + name.toString() + " не существует(" : "Friend with name " + name.toString() + " does not exists(") + name -> Text.literal(isRu() ? "Друга с именем " + name.toString() + " не существует(" : "Friend with name " + name.toString() + " does not exist :(") ).create(friend); return friend; diff --git a/src/main/java/thunder/hack/features/cmd/args/ModuleArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/ModuleArgumentType.java index c08e0eca..bbbb157e 100644 --- a/src/main/java/thunder/hack/features/cmd/args/ModuleArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/ModuleArgumentType.java @@ -9,14 +9,14 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.client.ClientSettings; import java.util.Collection; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class ModuleArgumentType implements ArgumentType { private static final Collection EXAMPLES = Managers.MODULE.modules.stream() .map(Module::getName) @@ -31,7 +31,7 @@ public static ModuleArgumentType create() { public Module parse(StringReader reader) throws CommandSyntaxException { Module module = Managers.MODULE.get(reader.readString()); if (module == null) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Модуля " + name.toString() + " не существует(" : "Module " + name.toString() + " does not exists(") + name -> Text.literal(isRu() ? "Модуля " + name.toString() + " не существует(" : "Module " + name.toString() + " does not exist :(") ).create(reader.readString()); return module; diff --git a/src/main/java/thunder/hack/features/cmd/args/SearchArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/SearchArgumentType.java index 32c75360..1f44e46c 100644 --- a/src/main/java/thunder/hack/features/cmd/args/SearchArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/SearchArgumentType.java @@ -11,13 +11,14 @@ import net.minecraft.command.CommandSource; import net.minecraft.registry.Registries; import net.minecraft.text.Text; -import thunder.hack.features.modules.client.ClientSettings; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class SearchArgumentType implements ArgumentType { private static final List EXAMPLES = getRegisteredBlocks().stream().limit(5).toList(); @@ -29,7 +30,7 @@ public static SearchArgumentType create() { public String parse(StringReader reader) throws CommandSyntaxException { String blockName = reader.readString(); if (!getRegisteredBlocks().contains(blockName)) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Такого блока нет!" : "There is no such block!") + name -> Text.literal(isRu() ? "Такого блока нет!" : "There is no such block!") ).create(blockName); return blockName; } @@ -51,5 +52,4 @@ public static List getRegisteredBlocks() { } return result; } - -} +} \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/cmd/args/SettingArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/SettingArgumentType.java index b6e8dbb6..0f18e4eb 100644 --- a/src/main/java/thunder/hack/features/cmd/args/SettingArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/SettingArgumentType.java @@ -36,5 +36,4 @@ public static List getSettings(Module module) { } return result; } - } \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/cmd/args/WayPointArgumentType.java b/src/main/java/thunder/hack/features/cmd/args/WayPointArgumentType.java index dac97c3f..4e28348e 100644 --- a/src/main/java/thunder/hack/features/cmd/args/WayPointArgumentType.java +++ b/src/main/java/thunder/hack/features/cmd/args/WayPointArgumentType.java @@ -9,14 +9,14 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.command.CommandSource; import net.minecraft.text.Text; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.world.WayPointManager; -import thunder.hack.features.modules.client.ClientSettings; import java.util.Collection; import java.util.concurrent.CompletableFuture; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class WayPointArgumentType implements ArgumentType { private static final Collection EXAMPLES = Managers.WAYPOINT.getWayPoints().stream() .map(WayPointManager.WayPoint::getName) @@ -32,7 +32,7 @@ public WayPointManager.WayPoint parse(StringReader reader) throws CommandSyntaxE WayPointManager.WayPoint wp = Managers.WAYPOINT.getWayPointByName(reader.readString()); if (wp == null) throw new DynamicCommandExceptionType( - name -> Text.literal(ClientSettings.language.getValue().equals(ClientSettings.Language.RU) ? "Вейпоинта " + name.toString() + " не существует(" : "Waypoint " + name.toString() + " does not exists(") + name -> Text.literal(isRu() ? "Вейпоинта " + name.toString() + " не существует(" : "Waypoint " + name.toString() + " does not exist :(") ).create(reader.readString()); return wp; diff --git a/src/main/java/thunder/hack/features/cmd/impl/BindCommand.java b/src/main/java/thunder/hack/features/cmd/impl/BindCommand.java index 95d62ec7..35ad9e6b 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/BindCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/BindCommand.java @@ -48,7 +48,6 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) } } - if (key == 0) { sendMessage("Unknown key '" + stringKey + "'!"); return SINGLE_SUCCESS; diff --git a/src/main/java/thunder/hack/features/cmd/impl/CalcCommand.java b/src/main/java/thunder/hack/features/cmd/impl/CalcCommand.java index c78dcecd..086a974f 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/CalcCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/CalcCommand.java @@ -5,13 +5,9 @@ import net.minecraft.command.CommandSource; import org.jetbrains.annotations.NotNull; import thunder.hack.features.cmd.Command; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; - public class CalcCommand extends Command { public CalcCommand() { super("calc"); diff --git a/src/main/java/thunder/hack/features/cmd/impl/GamemodeCommand.java b/src/main/java/thunder/hack/features/cmd/impl/GamemodeCommand.java index 85aa5732..60f92b9e 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/GamemodeCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/GamemodeCommand.java @@ -15,7 +15,6 @@ public GamemodeCommand() { @Override public void executeBuild(LiteralArgumentBuilder builder) { - builder.then(arg("mode", StringArgumentType.greedyString()).executes(context -> { final String mode = context.getArgument("mode", String.class); diff --git a/src/main/java/thunder/hack/features/cmd/impl/GetNbtCommand.java b/src/main/java/thunder/hack/features/cmd/impl/GetNbtCommand.java index 6cca8181..19311409 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/GetNbtCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/GetNbtCommand.java @@ -16,7 +16,6 @@ public GetNbtCommand() { @Override public void executeBuild(@NotNull LiteralArgumentBuilder builder) { builder.executes(context -> { - sendMessage(mc.player.getMainHandStack().getComponents() != null ? mc.player.getMainHandStack().getComponents().toString() : isRu() ? "У этого предмета нет nbt тегов!" : "This item don't contains nbt tags!"); return SINGLE_SUCCESS; }); diff --git a/src/main/java/thunder/hack/features/cmd/impl/GotoWaypointCommand.java b/src/main/java/thunder/hack/features/cmd/impl/GotoWaypointCommand.java index 55da902e..af053f7b 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/GotoWaypointCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/GotoWaypointCommand.java @@ -19,13 +19,13 @@ public GotoWaypointCommand(){ @Override public void executeBuild(LiteralArgumentBuilder builder) { builder.then(arg("name", WayPointArgumentType.create()).executes(context -> { - if(!ThunderHack.baritone) { - sendMessage(isRu() ? "Баритон не найден (можешь скачать на https://meteorclient.com)" : "Baritone not found (you can download it on https://meteorclient.com)"); + if (!ThunderHack.baritone) { + sendMessage(isRu() ? "Баритон не найден (можешь скачать на https://meteorclient.com)" : "Baritone not found (you can download it at https://meteorclient.com)"); return SINGLE_SUCCESS; } WayPointManager.WayPoint wp = context.getArgument("name", WayPointManager.WayPoint.class); - if(!mc.world.getRegistryKey().getValue().getPath().equals(wp.getDimension())){ - sendMessage(isRu() ? "Метка в другом измерении" : "Waypoint in another dimension"); + if (!mc.world.getRegistryKey().getValue().getPath().equals(wp.getDimension())) { + sendMessage(isRu() ? "Метка в другом измерении" : "Waypoint is in another dimension"); return SINGLE_SUCCESS; } BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("goto " + wp.getX() + " " + wp.getY() + " " + wp.getZ()); diff --git a/src/main/java/thunder/hack/features/cmd/impl/GpsCommand.java b/src/main/java/thunder/hack/features/cmd/impl/GpsCommand.java index 9f555f75..5144f7d8 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/GpsCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/GpsCommand.java @@ -31,7 +31,6 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) sendMessage("GPS настроен на X: " + ThunderHack.gps_position.getX() + " Z: " + ThunderHack.gps_position.getZ()); return SINGLE_SUCCESS; }))); - builder.executes(context -> { sendMessage("Попробуй .gps off / .gps x z"); return SINGLE_SUCCESS; diff --git a/src/main/java/thunder/hack/features/cmd/impl/KitCommand.java b/src/main/java/thunder/hack/features/cmd/impl/KitCommand.java index 5fde96c1..590a555e 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/KitCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/KitCommand.java @@ -19,7 +19,6 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class KitCommand extends Command { - final static private String PATH = "ThunderHackRecode/misc/AutoGear.json"; public KitCommand() { diff --git a/src/main/java/thunder/hack/features/cmd/impl/LoginCommand.java b/src/main/java/thunder/hack/features/cmd/impl/LoginCommand.java index c56a5e9c..7ba6a60b 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/LoginCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/LoginCommand.java @@ -17,6 +17,7 @@ import java.util.Optional; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; +import static thunder.hack.features.modules.client.ClientSettings.isRu; public class LoginCommand extends Command { public LoginCommand() { @@ -27,13 +28,13 @@ public LoginCommand() { public void executeBuild(@NotNull LiteralArgumentBuilder builder) { builder.then(arg("name", StringArgumentType.word()).executes(context -> { login(context.getArgument("name", String.class)); - sendMessage("Аккаунт изменен на: " + mc.getSession().getUsername()); + sendMessage((isRu() ? "Аккаунт изменен на: " : "Switched account to: ") + mc.getSession().getUsername()); return SINGLE_SUCCESS; })); builder.executes(context -> { - sendMessage("Использование: .login "); + sendMessage(isRu() ? "Использование: .login " : "Usage: .login "); return SINGLE_SUCCESS; }); @@ -43,11 +44,10 @@ public void login(String name) { try { setSession(new Session(name, Uuids.getOfflinePlayerUuid(name), "", Optional.empty(), Optional.empty(), Session.AccountType.MOJANG)); } catch (Exception exception) { - sendMessage("Неверное имя! " + exception); + sendMessage((isRu() ? "Неверное имя! " : "Incorrect username! ") + exception); } } - public void setSession(Session session) { IMinecraftClient mca = (IMinecraftClient) mc; mca.setSessionT(session); diff --git a/src/main/java/thunder/hack/features/cmd/impl/MacroCommand.java b/src/main/java/thunder/hack/features/cmd/impl/MacroCommand.java index ee05c21a..c1457f3b 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/MacroCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/MacroCommand.java @@ -25,7 +25,7 @@ public MacroCommand() { @Override public void executeBuild(@NotNull LiteralArgumentBuilder builder) { builder.then(literal("list").executes(context -> { - sendMessage(isRu() ? "Макросы:" : "Macro list:"); + sendMessage(isRu() ? "Макросы:" : "Macros:"); sendMessage(" "); Managers.MACRO.getMacros().forEach(macro -> sendMessage(macro.getName() + (macro.getBind() != -1 ? " [" + toString(macro.getBind()) + "]" : "") + " {" + macro.getText() + "}")); return SINGLE_SUCCESS; diff --git a/src/main/java/thunder/hack/features/cmd/impl/ModuleCommand.java b/src/main/java/thunder/hack/features/cmd/impl/ModuleCommand.java index 3130e9a1..226466fd 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/ModuleCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/ModuleCommand.java @@ -9,7 +9,6 @@ import net.minecraft.command.CommandSource; import net.minecraft.util.Formatting; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.cmd.Command; import thunder.hack.features.cmd.args.ModuleArgumentType; diff --git a/src/main/java/thunder/hack/features/cmd/impl/NukerCommand.java b/src/main/java/thunder/hack/features/cmd/impl/NukerCommand.java index 5241e44c..f90df5da 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/NukerCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/NukerCommand.java @@ -6,9 +6,9 @@ import net.minecraft.registry.Registries; import net.minecraft.util.Formatting; import org.jetbrains.annotations.NotNull; +import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.features.cmd.Command; import thunder.hack.features.cmd.args.SearchArgumentType; -import thunder.hack.core.manager.client.ModuleManager; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; import static thunder.hack.features.modules.client.ClientSettings.isRu; @@ -30,7 +30,7 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) String blockName = context.getArgument("block", String.class); Block result = getRegisteredBlock(blockName); - if(result != null){ + if (result != null) { ModuleManager.nuker.selectedBlocks.getValue().add(result); sendMessage(Formatting.GREEN + blockName + (isRu() ? " добавлен в Nuker" : " added to Nuker")); } else { @@ -44,7 +44,7 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) String blockName = context.getArgument("block", String.class); Block result = getRegisteredBlock(blockName); - if(result != null){ + if (result != null) { ModuleManager.nuker.selectedBlocks.getValue().remove(blockName); sendMessage(Formatting.GREEN + blockName + (isRu() ? " удален из Nuker" : " removed from Nuker")); } else { @@ -60,7 +60,7 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) } else { StringBuilder f = new StringBuilder("Nuker list: "); - for (String name : ModuleManager.nuker.selectedBlocks.getValue().getItemsById()) + for (String name : ModuleManager.nuker.selectedBlocks.getValue().getItemsById()) try { f.append(name).append(", "); } catch (Exception ignored) { @@ -75,7 +75,7 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) public static Block getRegisteredBlock(String blockName) { for (Block block : Registries.BLOCK) { - if (block.getTranslationKey().replace("block.minecraft.","").equalsIgnoreCase(blockName.replace("block.minecraft.",""))) { + if (block.getTranslationKey().replace("block.minecraft.", "").equalsIgnoreCase(blockName.replace("block.minecraft.", ""))) { return block; } } diff --git a/src/main/java/thunder/hack/features/cmd/impl/PrefixCommand.java b/src/main/java/thunder/hack/features/cmd/impl/PrefixCommand.java index 4bd28115..11f5c04d 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/PrefixCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/PrefixCommand.java @@ -5,12 +5,12 @@ import net.minecraft.command.CommandSource; import net.minecraft.util.Formatting; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.cmd.Command; import thunder.hack.features.modules.client.ClientSettings; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; +import static thunder.hack.features.modules.client.ClientSettings.isRu; public class PrefixCommand extends Command { public PrefixCommand() { @@ -22,15 +22,13 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) builder.then(literal("set").then(arg("prefix", StringArgumentType.greedyString()).executes(context -> { String prefix = context.getArgument("prefix", String.class); Managers.COMMAND.setPrefix(prefix); - if (ClientSettings.language.getValue() == ClientSettings.Language.RU) sendMessage(Formatting.GREEN + "Префикс изменен на " + prefix); - else sendMessage(Formatting.GREEN + "Prefix changed to " + prefix); + sendMessage(Formatting.GREEN + (isRu() ? "Префикс изменен на " : "Changed prefix to ") + prefix); ClientSettings.prefix.setValue(prefix); return SINGLE_SUCCESS; }))); builder.executes(context -> { - if (ClientSettings.language.getValue() == ClientSettings.Language.RU) sendMessage(Formatting.GREEN + "Текущий префикс:" + Managers.COMMAND.getPrefix()); - else sendMessage(Formatting.GREEN + "Current prefix:" + Managers.COMMAND.getPrefix()); + sendMessage(Formatting.GREEN + (isRu() ? "Текущий префикс: " : "Current prefix: ") + Managers.COMMAND.getPrefix()); return SINGLE_SUCCESS; }); } diff --git a/src/main/java/thunder/hack/features/cmd/impl/RctCommand.java b/src/main/java/thunder/hack/features/cmd/impl/RctCommand.java index 7404e91c..31ff1ba7 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/RctCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/RctCommand.java @@ -11,7 +11,7 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class RctCommand extends Command { - public RctCommand(){ + public RctCommand() { super("rct"); } @@ -20,7 +20,7 @@ public void executeBuild(LiteralArgumentBuilder builder) { builder.executes(context -> { String sName = mc.player.networkHandler.getServerInfo() == null ? "none" : mc.player.networkHandler.getServerInfo().address; - if(!sName.contains("funtime") && !sName.contains("spookytime")){ + if (!sName.contains("funtime") && !sName.contains("spookytime")) { sendMessage(isRu() ? "Rct работает только на фанике и спуки" : "Rct works only on funtime and spookytime"); return SINGLE_SUCCESS; } @@ -39,5 +39,4 @@ public void executeBuild(LiteralArgumentBuilder builder) { return SINGLE_SUCCESS; }); } - } diff --git a/src/main/java/thunder/hack/features/cmd/impl/ResetBindsCommand.java b/src/main/java/thunder/hack/features/cmd/impl/ResetBindsCommand.java index 82f12ff9..a73f8a00 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/ResetBindsCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/ResetBindsCommand.java @@ -3,7 +3,6 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import net.minecraft.command.CommandSource; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.cmd.Command; import thunder.hack.features.modules.Module; diff --git a/src/main/java/thunder/hack/features/cmd/impl/TreasureCommand.java b/src/main/java/thunder/hack/features/cmd/impl/TreasureCommand.java index 46659035..3c6e558f 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/TreasureCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/TreasureCommand.java @@ -17,18 +17,16 @@ public TreasureCommand() { @Override public void executeBuild(LiteralArgumentBuilder builder) { builder.executes(context -> { - if (mc.player.getMainHandStack().getItem().toString().equals("filled_map")) { Record nbt = mc.player.getMainHandStack().getOrDefault(DataComponentTypes.MAP_DECORATIONS, PotionContentsComponent.DEFAULT); - if(nbt == null) - return SINGLE_SUCCESS; + if (nbt == null) return SINGLE_SUCCESS; StringBuilder result = new StringBuilder(); String rawNbt = nbt.toString(); for (int i = rawNbt.indexOf("x="); i < rawNbt.indexOf(", rotation") - 2; i++) result.append(rawNbt.charAt(i)); sendMessage(isRu() ? "Нашел! Координаты: " + result : "Found! Coords: " + result); - } else sendMessage(isRu() ? "Возьми карту в руки!" : "Get map in hand!"); + } else sendMessage(isRu() ? "Возьми карту в руки!" : "Take a map into your hand!"); return SINGLE_SUCCESS; }); diff --git a/src/main/java/thunder/hack/features/cmd/impl/VClipCommand.java b/src/main/java/thunder/hack/features/cmd/impl/VClipCommand.java index dfcdae04..d6f73055 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/VClipCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/VClipCommand.java @@ -21,7 +21,6 @@ public VClipCommand() { @Override public void executeBuild(@NotNull LiteralArgumentBuilder builder) { - builder.then(literal("down").executes(context -> { int i; float y = 0.0f; diff --git a/src/main/java/thunder/hack/features/cmd/impl/WayPointCommand.java b/src/main/java/thunder/hack/features/cmd/impl/WayPointCommand.java index 063c893e..5e508ecb 100644 --- a/src/main/java/thunder/hack/features/cmd/impl/WayPointCommand.java +++ b/src/main/java/thunder/hack/features/cmd/impl/WayPointCommand.java @@ -6,14 +6,13 @@ import net.minecraft.command.CommandSource; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.cmd.Command; import thunder.hack.features.cmd.args.WayPointArgumentType; import thunder.hack.core.manager.world.WayPointManager; -import thunder.hack.features.modules.client.ClientSettings; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; +import static thunder.hack.features.modules.client.ClientSettings.isRu; public class WayPointCommand extends Command { public WayPointCommand() { @@ -23,8 +22,7 @@ public WayPointCommand() { @Override public void executeBuild(@NotNull LiteralArgumentBuilder builder) { builder.then(literal("list").executes(context -> { - if (ClientSettings.language.getValue() == ClientSettings.Language.RU) sendMessage("Метки:"); - else sendMessage("WayPoints:"); + sendMessage(isRu() ? "Метки:" : "Waypoints:"); sendMessage(" "); Managers.WAYPOINT.getWayPoints().forEach(wp -> sendMessage(wp.getName() + " X: " + wp.getX() + " Y: " + wp.getY() + " Z: " + wp.getZ() + " Server: " + wp.getServer() + " Dimension: " + wp.getDimension())); @@ -34,14 +32,8 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) builder.then(literal("remove").then(arg("name", WayPointArgumentType.create()).executes(context -> { WayPointManager.WayPoint wp = context.getArgument("name", WayPointManager.WayPoint.class); - Managers.WAYPOINT.removeWayPoint(wp); - - if (ClientSettings.language.getValue() == ClientSettings.Language.RU) { - sendMessage("Удалена метка " + wp.getName()); - } else { - sendMessage("Removed waypoint " + wp.getName()); - } + sendMessage(isRu() ? "Удалена метка " : "Deleted waypoint " + wp.getName()); return SINGLE_SUCCESS; }))); @@ -51,11 +43,7 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) WayPointManager.WayPoint wp = new WayPointManager.WayPoint((int) mc.player.getX(), (int) mc.player.getY(), (int) mc.player.getZ(), name, (mc.isInSingleplayer() ? "SinglePlayer" : mc.getNetworkHandler().getServerInfo().address), mc.world.getRegistryKey().getValue().getPath()); Managers.WAYPOINT.addWayPoint(wp); - if (ClientSettings.language.getValue() == ClientSettings.Language.RU) { - sendMessage("Добавлена метка " + name + " с координатами x: " + ((int) mc.player.getX()) + " y: " + ((int) mc.player.getY()) + " z: " + ((int) mc.player.getZ())); - } else { - sendMessage("Added waypoint " + name + " with coords x: " + ((int) mc.player.getX()) + " y: " + ((int) mc.player.getY()) + " z: " + ((int) mc.player.getZ())); - } + sendMessage((isRu() ? "Добавлена метка " + name + " с координатами" : "Added waypoint " + name + " with coords") + " X: " + ((int) mc.player.getX()) + " Y: " + ((int) mc.player.getY()) + " Z: " + ((int) mc.player.getZ())); return SINGLE_SUCCESS; }).then(arg("x", IntegerArgumentType.integer()) @@ -67,11 +55,7 @@ public void executeBuild(@NotNull LiteralArgumentBuilder builder) WayPointManager.WayPoint wp = new WayPointManager.WayPoint(pos.getX(), pos.getY(), pos.getZ(), name, (mc.isInSingleplayer() ? "SinglePlayer" : mc.getNetworkHandler().getServerInfo().address), mc.world.getRegistryKey().getValue().getPath()); Managers.WAYPOINT.addWayPoint(wp); - if (ClientSettings.language.getValue() == ClientSettings.Language.RU) { - sendMessage("Добавлена метка " + name + " с координатами x: " + pos.getX() + " y: " + pos.getY() + " z: " + pos.getZ()); - } else { - sendMessage("Added waypoint " + name + " with coords x: " + pos.getX() + " y: " + pos.getY() + " z: " + pos.getZ()); - } + sendMessage((isRu() ? "Добавлена метка " + name + " с координатами X: " : "Added waypoint " + name + " with coords") + pos.getX() + " Y: " + pos.getY() + " Z: " + pos.getZ()); return SINGLE_SUCCESS; })))))); diff --git a/src/main/java/thunder/hack/features/hud/HudElement.java b/src/main/java/thunder/hack/features/hud/HudElement.java index 53e76738..d534d614 100644 --- a/src/main/java/thunder/hack/features/hud/HudElement.java +++ b/src/main/java/thunder/hack/features/hud/HudElement.java @@ -37,7 +37,6 @@ public void onRender2D(DrawContext context) { if (mc.currentScreen instanceof ChatScreen || mc.currentScreen instanceof HudEditorGui) { if (mouseButton && mouseState) { - pos.getValue().setX(Math.clamp(Render2DEngine.scrollAnimate((normaliseX() - dragX) / mc.getWindow().getScaledWidth(), pos.getValue().getX(), .1f), 0, 1f)); pos.getValue().setY(Math.clamp(Render2DEngine.scrollAnimate((normaliseY() - dragY) / mc.getWindow().getScaledHeight(), pos.getValue().getY(), .1f), @@ -89,11 +88,9 @@ public void onRender2D(DrawContext context) { } anyHovered = true; } - // Render2DEngine.drawRect(context.getMatrices(),getPosX(), getPosY(), width, height, Color.RED); } - @EventHandler @SuppressWarnings("unused") public void onMouse(@NotNull EventMouse event) { @@ -119,7 +116,6 @@ public void onMouse(@NotNull EventMouse event) { } if (isNear(hudElement.getHitY(), getHitY())) pos.getValue().setY((hudElement.getHitY() + hitDifY) / mc.getWindow().getScaledHeight()); - } } diff --git a/src/main/java/thunder/hack/features/hud/impl/CandleHud.java b/src/main/java/thunder/hack/features/hud/impl/CandleHud.java index 8cea6bad..09c1b33c 100644 --- a/src/main/java/thunder/hack/features/hud/impl/CandleHud.java +++ b/src/main/java/thunder/hack/features/hud/impl/CandleHud.java @@ -13,7 +13,6 @@ import java.awt.*; public class CandleHud extends HudElement { - public CandleHud() { super("Candle", 10, 100); } diff --git a/src/main/java/thunder/hack/features/hud/impl/ChestCounter.java b/src/main/java/thunder/hack/features/hud/impl/ChestCounter.java index 55818723..5905f1b5 100644 --- a/src/main/java/thunder/hack/features/hud/impl/ChestCounter.java +++ b/src/main/java/thunder/hack/features/hud/impl/ChestCounter.java @@ -52,11 +52,9 @@ public Pair getChestCount() { for (BlockEntity be : getBlockEntities()) { if (be instanceof ChestBlockEntity chest) { ChestType chestType = mc.world.getBlockState(chest.getPos()).get(ChestBlock.CHEST_TYPE); - if(chestType == ChestType.SINGLE) { + if (chestType == ChestType.SINGLE) { singleCount++; - } else { - doubleCount++; - } + } else doubleCount++; } } return new Pair<>(singleCount, doubleCount / 2); diff --git a/src/main/java/thunder/hack/features/hud/impl/Companion.java b/src/main/java/thunder/hack/features/hud/impl/Companion.java index edddae80..e3589353 100644 --- a/src/main/java/thunder/hack/features/hud/impl/Companion.java +++ b/src/main/java/thunder/hack/features/hud/impl/Companion.java @@ -6,9 +6,9 @@ import org.jetbrains.annotations.NotNull; import thunder.hack.core.Managers; import thunder.hack.events.impl.TotemPopEvent; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.hud.HudElement; import thunder.hack.features.modules.combat.AntiBot; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.setting.Setting; import thunder.hack.utility.Timer; import thunder.hack.utility.math.MathUtility; @@ -20,7 +20,6 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class Companion extends HudElement { - public Companion() { super("2DCompanion", 50, 10); } @@ -40,11 +39,10 @@ public void onUpdate() { continue; if (isRu()) - message = player.getName().getString() + " попнул " + (Managers.COMBAT.popList.get(player.getName().getString()) > 1 ? Managers.COMBAT.popList.get(player.getName().getString()) + "" + " тотемов и сдох!" : "тотем и сдох!"); + message = player.getName().getString() + " попнул " + (Managers.COMBAT.popList.get(player.getName().getString()) > 1 ? Managers.COMBAT.popList.get(player.getName().getString()) + " тотемов и сдох! ИЗЗЗЗИИ" : "тотем и сдох! ИЗЗЗЗИИ"); else - message = player.getName().getString() + " popped " + (Managers.COMBAT.popList.get(player.getName().getString()) > 1 ? Managers.COMBAT.popList.get(player.getName().getString()) + "" + " totems and died EZ LMAO!" : "totem and died EZ LMAO!"); + message = player.getName().getString() + " popped " + (Managers.COMBAT.popList.get(player.getName().getString()) > 1 ? Managers.COMBAT.popList.get(player.getName().getString()) + " totems and died EZ LMAO!" : "totem and died EZ LMAO!"); lastPop.reset(); - } } @@ -55,13 +53,13 @@ public void onRender2D(DrawContext context) { context.getMatrices().translate((int) getPosX() + 100, (int) getPosY() + 100, 0); context.getMatrices().scale((float) scale.getValue() / 100f, (float) scale.getValue() / 100f, 1); context.getMatrices().translate(-((int) getPosX() + 100), -((int) getPosY() + 100), 0); - if(mode.getValue() == Mode.Boykisser) + if (mode.getValue() == Mode.Boykisser) context.drawTexture(TextureStorage.boykisser, (int) getPosX(), (int) getPosY(), 0, currentFrame * 128, 130, 128, 130, 6784); - else if(mode.getValue() == Mode.Paimon) + else if (mode.getValue() == Mode.Paimon) context.drawTexture(TextureStorage.paimon, (int) getPosX(), (int) getPosY(), 0, currentFrame * 200, 200, 200, 200, 10600); - else if(mode.getValue() == Mode.Baltika) + else if (mode.getValue() == Mode.Baltika) context.drawTexture(TextureStorage.baltika, (int) getPosX(), (int) getPosY(), 0, 0, 421, 800, 421, 800); - else if(mode.getValue() == Mode.Kowk) + else if (mode.getValue() == Mode.Kowk) context.drawTexture(TextureStorage.kowk, (int) getPosX(), (int) getPosY(), 0, 0, 287, 252, 287, 252); context.getMatrices().pop(); @@ -70,7 +68,7 @@ else if(mode.getValue() == Mode.Kowk) float factor = MathUtility.clamp(lastPop.getPassedTimeMs(), 0, 500) / 500f; Render2DEngine.drawRound(context.getMatrices(), getPosX() + scale.getValue() / 3f, getPosY() + 70 - scale.getValue(), factor * w, 10, 3, new Color(0xFCD7DD)); - Render2DEngine.addWindow(context.getMatrices(), getPosX() + scale.getValue() / 3f, getPosY() + 72 - scale.getValue(), factor * w + getPosX() + scale.getValue() / 3f, 20 + getPosY() + 72 - scale.getValue(), 1f); + Render2DEngine.addWindow(context.getMatrices(), getPosX() + scale.getValue() / 3f, getPosY() + 72 - scale.getValue(), factor * w + getPosX() + scale.getValue() / 3f, 20 + getPosY() + 72 - scale.getValue(), 1f); FontRenderers.sf_bold.drawString(context.getMatrices(), message, getPosX() + 2 + scale.getValue() / 3f, getPosY() + 72 - scale.getValue(), new Color(0x484848).getRGB()); Render2DEngine.popWindow(); } @@ -81,8 +79,8 @@ else if(mode.getValue() == Mode.Kowk) if (currentFrame > 52) currentFrame = 0; } - - if(mode.getValue() == Mode.Baltika) + + if (mode.getValue() == Mode.Baltika) setBounds(getPosX() + 100, getPosY() + 100, (scale.getValue() * 3f), (scale.getValue() * 3f)); else setBounds(getPosX(), getPosY(), (scale.getValue() * 3f), (scale.getValue() * 3f)); @@ -94,11 +92,12 @@ public void onTotemPop(@NotNull TotemPopEvent event) { if (event.getEntity() == mc.player) return; if (isRu()) - message = event.getEntity().getName().getString() + " попнул " + (event.getPops() > 1 ? event.getPops() + "" + " тотемов!" : "тотем!"); + message = event.getEntity().getName().getString() + " попнул " + (event.getPops() > 1 ? event.getPops() + " тотемов!" : "тотем!"); else - message = event.getEntity().getName().getString() + " popped " + (event.getPops() > 1 ? event.getPops() + "" + " totems!" : " a totem!"); + message = event.getEntity().getName().getString() + " popped " + (event.getPops() > 1 ? event.getPops() + " totems!" : " a totem!"); lastPop.reset(); } + private enum Mode { Boykisser, Paimon, Baltika, Kowk } diff --git a/src/main/java/thunder/hack/features/hud/impl/Coords.java b/src/main/java/thunder/hack/features/hud/impl/Coords.java index 84e29f67..5fde9a02 100644 --- a/src/main/java/thunder/hack/features/hud/impl/Coords.java +++ b/src/main/java/thunder/hack/features/hud/impl/Coords.java @@ -51,8 +51,8 @@ public void onRender2D(DrawContext context) { Render2DEngine.renderGradientTexture(context.getMatrices(), pX + 2, getPosY() + 1, 10, 10, 0, 0, 512, 512, 512, 512, HudEditor.getColor(270), HudEditor.getColor(0), HudEditor.getColor(180), HudEditor.getColor(90)); Render2DEngine.endRender(); - } + FontRenderers.getModulesRenderer().drawString(context.getMatrices(), coordinates, pX + 18, getPosY() + 5, HudEditor.getColor(1).getRGB()); setBounds(pX, getPosY(), FontRenderers.getModulesRenderer().getStringWidth(coordinates) + 21, 13f); } diff --git a/src/main/java/thunder/hack/features/hud/impl/Crosshair.java b/src/main/java/thunder/hack/features/hud/impl/Crosshair.java index a5fb99f1..b37787aa 100644 --- a/src/main/java/thunder/hack/features/hud/impl/Crosshair.java +++ b/src/main/java/thunder/hack/features/hud/impl/Crosshair.java @@ -18,7 +18,6 @@ import java.awt.*; public class Crosshair extends Module { - public Crosshair() { super("Crosshair", Category.HUD); } @@ -53,12 +52,10 @@ public void onRender2D(DrawContext context) { float yawDelta = mc.player.prevHeadYaw - mc.player.getHeadYaw(); float pitchDelta = prevPitch - mc.player.getPitch(); - if (yawDelta > 0) xAnim = AnimationUtility.fast(xAnim, midX - range.getValue(), speed.getValue()); else if (yawDelta < 0) xAnim = AnimationUtility.fast(xAnim, midX + range.getValue(), speed.getValue()); else xAnim = AnimationUtility.fast(xAnim, midX, backSpeed.getValue()); - if (pitchDelta > 0) yAnim = AnimationUtility.fast(yAnim, midY - range.getValue(), speed.getValue()); else if (pitchDelta < 0) yAnim = AnimationUtility.fast(yAnim, midY + range.getValue(), speed.getValue()); else yAnim = AnimationUtility.fast(yAnim, midY, backSpeed.getValue()); diff --git a/src/main/java/thunder/hack/features/hud/impl/CrosshairArrows.java b/src/main/java/thunder/hack/features/hud/impl/CrosshairArrows.java index 9cfe1fd0..b49e9abb 100644 --- a/src/main/java/thunder/hack/features/hud/impl/CrosshairArrows.java +++ b/src/main/java/thunder/hack/features/hud/impl/CrosshairArrows.java @@ -19,12 +19,10 @@ import static thunder.hack.features.hud.impl.RadarRewrite.getRotations; public class CrosshairArrows extends HudElement { - public CrosshairArrows() { super("CrosshairArrows", 0, 0); } - public static Setting glow = new Setting<>("Glow", false); private final Setting width = new Setting<>("Height", 2.28f, 0.1f, 5f); private final Setting down = new Setting<>("Down", new BooleanSettingGroup(false)); diff --git a/src/main/java/thunder/hack/features/hud/impl/FpsCounter.java b/src/main/java/thunder/hack/features/hud/impl/FpsCounter.java index 4aae6c1c..70037de9 100644 --- a/src/main/java/thunder/hack/features/hud/impl/FpsCounter.java +++ b/src/main/java/thunder/hack/features/hud/impl/FpsCounter.java @@ -18,7 +18,6 @@ public FpsCounter() { super("Fps", 50, 10); } - public void onRender2D(DrawContext context) { super.onRender2D(context); @@ -26,7 +25,7 @@ public void onRender2D(DrawContext context) { float pX = getPosX() > mc.getWindow().getScaledWidth() / 2f ? getPosX() - FontRenderers.getModulesRenderer().getStringWidth(str) : getPosX(); - if(HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { + if (HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { Render2DEngine.drawRoundedBlur(context.getMatrices(), pX, getPosY(), FontRenderers.getModulesRenderer().getStringWidth(str) + 21, 13f, 3, HudEditor.blurColor.getValue().getColorObject()); Render2DEngine.drawRect(context.getMatrices(), pX + 14, getPosY() + 2, 0.5f, 8, new Color(0x44FFFFFF, true)); Render2DEngine.setupRender(); diff --git a/src/main/java/thunder/hack/features/hud/impl/GapplesHud.java b/src/main/java/thunder/hack/features/hud/impl/GapplesHud.java index 01674c9d..8a58b55d 100644 --- a/src/main/java/thunder/hack/features/hud/impl/GapplesHud.java +++ b/src/main/java/thunder/hack/features/hud/impl/GapplesHud.java @@ -28,7 +28,6 @@ public GapplesHud() { private final Setting crapple = new Setting<>("Crapple", true); public void onRender2D(DrawContext context) { - Item targetItem = crapple.getValue() ? Items.GOLDEN_APPLE : Items.ENCHANTED_GOLDEN_APPLE; if (getItemCount(targetItem) == 0) @@ -50,7 +49,6 @@ public void onRender2D(DrawContext context) { context.getMatrices().multiply(RotationAxis.NEGATIVE_Z.rotation((float) Math.toRadians(-Render2DEngine.interpolateFloat(prevAngle, angle, Render3DEngine.getTickDelta())))); context.getMatrices().translate(-xPos, -yPos, 0); - RenderSystem.setShaderColor(0.3f, 0.3f, 0.3f, 1f); context.getMatrices().translate(xPos + 20, yPos - 9, 0); context.drawItem(targetItem.getDefaultStack(), 0, 0); diff --git a/src/main/java/thunder/hack/features/hud/impl/KillFeed.java b/src/main/java/thunder/hack/features/hud/impl/KillFeed.java index 382d1ac9..695521a0 100644 --- a/src/main/java/thunder/hack/features/hud/impl/KillFeed.java +++ b/src/main/java/thunder/hack/features/hud/impl/KillFeed.java @@ -24,7 +24,6 @@ import java.util.Objects; public class KillFeed extends HudElement { - public KillFeed() { super("KillFeed", 50, 50); } @@ -51,7 +50,7 @@ public void onRender2D(DrawContext context) { Render2DEngine.drawHudBase(context.getMatrices(), getPosX(), getPosY(), hAnimation, vAnimation, HudEditor.hudRound.getValue()); - if(HudEditor.hudStyle.is(HudEditor.HudStyle.Glowing)) { + if (HudEditor.hudStyle.is(HudEditor.HudStyle.Glowing)) { FontRenderers.sf_bold.drawCenteredString(context.getMatrices(), "KillFeed", getPosX() + hAnimation / 2, getPosY() + 4, HudEditor.textColor.getValue().getColorObject()); } else { FontRenderers.sf_bold.drawGradientCenteredString(context.getMatrices(), "KillFeed", getPosX() + hAnimation / 2, getPosY() + 4, 10); diff --git a/src/main/java/thunder/hack/features/hud/impl/KillStats.java b/src/main/java/thunder/hack/features/hud/impl/KillStats.java index 9741dd9b..6af0d7a4 100644 --- a/src/main/java/thunder/hack/features/hud/impl/KillStats.java +++ b/src/main/java/thunder/hack/features/hud/impl/KillStats.java @@ -18,10 +18,9 @@ import java.awt.*; - public class KillStats extends HudElement { - int death = 0,killstreak = 0,kills = 0; - public KillStats(){ + int death = 0, killstreak = 0, kills = 0; + public KillStats() { super("KillStats",100,35); } @@ -33,7 +32,7 @@ public void onDisable() { } @EventHandler - private void death(PacketEvent.Receive event){ + private void death(PacketEvent.Receive event) { if(event.getPacket() instanceof EntityStatusS2CPacket pac && pac.getStatus() == 3){ if(!(pac.getEntity(mc.world) instanceof PlayerEntity)) return; if(pac.getEntity(mc.world) == mc.player){ @@ -46,6 +45,7 @@ else if(Aura.target == pac.getEntity(mc.world) || AutoCrystal.target == pac.getE } } } + public void onRender2D(DrawContext context) { super.onRender2D(context); diff --git a/src/main/java/thunder/hack/features/hud/impl/LegacyHud.java b/src/main/java/thunder/hack/features/hud/impl/LegacyHud.java index 3c5a1f32..d414d92a 100644 --- a/src/main/java/thunder/hack/features/hud/impl/LegacyHud.java +++ b/src/main/java/thunder/hack/features/hud/impl/LegacyHud.java @@ -61,7 +61,6 @@ public LegacyHud() { private final Setting biome = new Setting<>("Biome", false); public Setting time = new Setting<>("Time", false); - public Setting waterMarkY = new Setting<>("WatermarkPosY", 2, 0, 20, v -> waterMark.getValue()); private int color; @@ -77,20 +76,12 @@ public void onRender2D(DrawContext context) { int height = mc.getWindow().getScaledHeight(); int offset; - switch (customFont.getValue()) { - case Minecraft -> { - offset = 10; - } - case Monsterrat -> { - offset = 9; - } - default -> { - offset = 8; - } + case Minecraft -> offset = 10; + case Monsterrat -> offset = 9; + default -> offset = 8; } - color = colorSetting.getValue().getColor(); if (waterMark.getValue()) @@ -111,7 +102,6 @@ public void onRender2D(DrawContext context) { j += offset; drawText(context, str, (width - 2 - getStringWidth(str)), (height - j)); } - } int i = (mc.currentScreen instanceof ChatScreen && renderingUp.getValue()) ? 13 : (renderingUp.getValue() ? -2 : 0); @@ -140,7 +130,8 @@ public void onRender2D(DrawContext context) { } } } - if(worldTime.getValue()){ + + if(worldTime.getValue()) { String str2 = "WorldTime: " + Formatting.WHITE + mc.world.getTimeOfDay() % 24000; drawText(context, str2, width - getStringWidth(str2) - 2, renderingUp.getValue() ? (height - 2 - (i += offset)) : (2 + i++ * offset)); } @@ -163,7 +154,7 @@ public void onRender2D(DrawContext context) { String str = "Chests: " + Formatting.WHITE + "S:" + chests.getLeft() + " D:" + chests.getRight(); drawText(context, str, (width - getStringWidth(str) - 2), renderingUp.getValue() ? (height - 2 - (i += offset)) : (2 + i++ * offset)); } - if(biome.getValue()){ + if(biome.getValue()) { String str3 = "Biome: " + Formatting.WHITE + biome(); drawText(context, str3, width - getStringWidth(str3) - 2, renderingUp.getValue() ? (height - 2 - (i += offset)) : (2 + i++ * offset)); } @@ -209,10 +200,7 @@ public void onRender2D(DrawContext context) { drawText(context, direction1, 2, (height - i - 11)); } - - if (coords.getValue()) - drawText(context, coordinates, 2, (height - i)); - + if (coords.getValue()) drawText(context, coordinates, 2, (height - i)); if (armor.getValue()) renderArmorHUD(true, context); if (totems.getValue()) renderTotemHUD(context); if (greeter.getValue()) renderGreeter(context); @@ -222,15 +210,9 @@ private void drawText(DrawContext context, String str, int x, int y, int color) if (!customFont.getValue().equals(Font.Minecraft)) { FontRenderer adapter; switch (customFont.getValue()) { - case Monsterrat -> { - adapter = FontRenderers.monsterrat; - } - case SF -> { - adapter = FontRenderers.sf_medium; - } - default -> { - adapter = FontRenderers.modules; - } + case Monsterrat -> adapter = FontRenderers.monsterrat; + case SF -> adapter = FontRenderers.sf_medium; + default -> adapter = FontRenderers.modules; } adapter.drawString(context.getMatrices(), str.replace(Formatting.WHITE + "", ""), x + 0.5, y + 0.5, Color.BLACK.getRGB()); adapter.drawString(context.getMatrices(), str, x, y, color); @@ -243,15 +225,9 @@ private void drawText(DrawContext context, String str, int x, int y) { if (!customFont.getValue().equals(Font.Minecraft)) { FontRenderer adapter; switch (customFont.getValue()) { - case Monsterrat -> { - adapter = FontRenderers.monsterrat; - } - case SF -> { - adapter = FontRenderers.sf_medium; - } - default -> { - adapter = FontRenderers.modules; - } + case Monsterrat -> adapter = FontRenderers.monsterrat; + case SF -> adapter = FontRenderers.sf_medium; + default -> adapter = FontRenderers.modules; } adapter.drawString(context.getMatrices(), str.replace(Formatting.WHITE + "", ""), x + 0.5, y + 0.5, Color.BLACK.getRGB()); adapter.drawString(context.getMatrices(), str, x, y, color); diff --git a/src/main/java/thunder/hack/features/hud/impl/MemoryHud.java b/src/main/java/thunder/hack/features/hud/impl/MemoryHud.java index 6328b7bd..0497f67a 100644 --- a/src/main/java/thunder/hack/features/hud/impl/MemoryHud.java +++ b/src/main/java/thunder/hack/features/hud/impl/MemoryHud.java @@ -25,7 +25,6 @@ public void onRender2D(DrawContext context) { long o = t - f; String str = "Mem: " + Formatting.WHITE + toMiB(o) + "/" + toMiB(m) + "MB [" + (o * 100L / m) + "%]"; - float pX = getPosX() > mc.getWindow().getScaledWidth() / 2f ? getPosX() - FontRenderers.getModulesRenderer().getStringWidth(str) : getPosX(); if(HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { diff --git a/src/main/java/thunder/hack/features/hud/impl/ModuleList.java b/src/main/java/thunder/hack/features/hud/impl/ModuleList.java index 00a598ba..e01bc6b9 100644 --- a/src/main/java/thunder/hack/features/hud/impl/ModuleList.java +++ b/src/main/java/thunder/hack/features/hud/impl/ModuleList.java @@ -71,7 +71,7 @@ public void onRender2D(DrawContext context) { stringWidth = (int) (FontRenderers.modules.getStringWidth(module.getDisplayName() + Formatting.GRAY + ((module.getDisplayInfo() != null) ? (" [" + Formatting.WHITE + module.getDisplayInfo() + Formatting.GRAY + "]") : "")) + 3); Color color1 = HudEditor.getColor(offset); - if(HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { + if (HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { Render2DEngine.drawRoundedBlur(context.getMatrices(), reverse ? reversedX - stringWidth : getPosX(), getPosY() + offset, stringWidth + 1.0f, 9.0f, 2, HudEditor.blurColor.getValue().getColorObject()); } else { Render2DEngine.drawRect(context.getMatrices(), reverse ? reversedX - stringWidth : getPosX(), getPosY() + offset, stringWidth + 1.0f, 9.0f, mode.getValue() == Mode.ColorRect ? color1 : color3.getValue().getColorObject()); diff --git a/src/main/java/thunder/hack/features/hud/impl/PVPResources.java b/src/main/java/thunder/hack/features/hud/impl/PVPResources.java index c08454d1..58225657 100644 --- a/src/main/java/thunder/hack/features/hud/impl/PVPResources.java +++ b/src/main/java/thunder/hack/features/hud/impl/PVPResources.java @@ -14,7 +14,6 @@ import java.util.List; public class PVPResources extends HudElement { - public PVPResources() { super("PVPResources", 50, 50); } diff --git a/src/main/java/thunder/hack/features/hud/impl/PingHud.java b/src/main/java/thunder/hack/features/hud/impl/PingHud.java index 2bdbbef7..43892412 100644 --- a/src/main/java/thunder/hack/features/hud/impl/PingHud.java +++ b/src/main/java/thunder/hack/features/hud/impl/PingHud.java @@ -5,16 +5,15 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.util.Formatting; import thunder.hack.core.Managers; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.hud.HudElement; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.TextureStorage; import java.awt.*; public class PingHud extends HudElement { - public PingHud() { super("Ping", 50, 10); } @@ -25,7 +24,7 @@ public void onRender2D(DrawContext context) { String str = "Ping " + Formatting.WHITE + Managers.SERVER.getPing(); float pX = getPosX() > mc.getWindow().getScaledWidth() / 2f ? getPosX() - FontRenderers.getModulesRenderer().getStringWidth(str) : getPosX(); - if(HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { + if (HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { Render2DEngine.drawRoundedBlur(context.getMatrices(), pX, getPosY(), FontRenderers.getModulesRenderer().getStringWidth(str) + 21, 13f, 3, HudEditor.blurColor.getValue().getColorObject()); Render2DEngine.drawRect(context.getMatrices(), pX + 14, getPosY() + 2, 0.5f, 8, new Color(0x44FFFFFF, true)); diff --git a/src/main/java/thunder/hack/features/hud/impl/PotionHud.java b/src/main/java/thunder/hack/features/hud/impl/PotionHud.java index 456ff5a2..18cdb71e 100644 --- a/src/main/java/thunder/hack/features/hud/impl/PotionHud.java +++ b/src/main/java/thunder/hack/features/hud/impl/PotionHud.java @@ -4,9 +4,9 @@ import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.util.Formatting; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.hud.HudElement; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.setting.Setting; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.animation.AnimationUtility; @@ -33,8 +33,7 @@ public static String getDuration(StatusEffectInstance pe) { } } - /* - + /* Render2DEngine.addWindow(context.getMatrices(), getPosX(), getPosY(), getPosX() + hAnimation, getPosY() + vAnimation, 1f); for (StatusEffectInstance potionEffect : effects) { StatusEffect potion = potionEffect.getEffectType().value(); @@ -53,10 +52,7 @@ public static String getDuration(StatusEffectInstance pe) { Color c = new Color(potionEffect.getEffectType().value().getColor()); FontRenderers.sf_bold_mini.drawString(context.getMatrices(), s + " " + s2, getPosX() + 5, getPosY() + 20 + y_offset, colored.getValue() ? c.getRGB() : HudEditor.textColor.getValue().getColor()); y_offset += 10; - } - - */ - + }*/ public void onRender2D(DrawContext context) { super.onRender2D(context); @@ -104,7 +100,6 @@ public void onRender2D(DrawContext context) { } } - Render2DEngine.addWindow(context.getMatrices(), getPosX(), getPosY(), getPosX() + hAnimation, getPosY() + vAnimation, 1f); int y_offset = 0; for (StatusEffectInstance potionEffect : mc.player.getStatusEffects()) { diff --git a/src/main/java/thunder/hack/features/hud/impl/Radar.java b/src/main/java/thunder/hack/features/hud/impl/Radar.java index 9f02785a..7e4beac1 100644 --- a/src/main/java/thunder/hack/features/hud/impl/Radar.java +++ b/src/main/java/thunder/hack/features/hud/impl/Radar.java @@ -131,7 +131,7 @@ public String getText(Setting c, PlayerEntity player) { return c12.getValue() + player.getName().getString() + Formatting.RESET; } case Ping -> { - return c22.getValue()+ (NameTags.getEntityPing(player) + "ms") + Formatting.RESET; + return c22.getValue() + (NameTags.getEntityPing(player) + "ms") + Formatting.RESET; } case Distance -> { return c32.getValue() + (((int) Math.ceil(mc.player.distanceTo(player))) + "m") + Formatting.RESET; diff --git a/src/main/java/thunder/hack/features/hud/impl/RadarRewrite.java b/src/main/java/thunder/hack/features/hud/impl/RadarRewrite.java index de640035..a13fbcec 100644 --- a/src/main/java/thunder/hack/features/hud/impl/RadarRewrite.java +++ b/src/main/java/thunder/hack/features/hud/impl/RadarRewrite.java @@ -111,8 +111,6 @@ public void drawEllipsCompas(MatrixStack matrices, int yaw, float x, float y, fl } public void drawElipse(MatrixStack matrices, float x, float y, float rx, float ry, float start, float end, float margin, float width, Color color, String direction) { - - float sin; float cos; float endOffset; diff --git a/src/main/java/thunder/hack/features/hud/impl/Speedometer.java b/src/main/java/thunder/hack/features/hud/impl/Speedometer.java index c911aeec..fcbe786e 100644 --- a/src/main/java/thunder/hack/features/hud/impl/Speedometer.java +++ b/src/main/java/thunder/hack/features/hud/impl/Speedometer.java @@ -6,9 +6,9 @@ import net.minecraft.util.Formatting; import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.hud.HudElement; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.setting.Setting; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.render.Render2DEngine; @@ -37,7 +37,7 @@ public void onRender2D(DrawContext context) { float pX = getPosX() > mc.getWindow().getScaledWidth() / 2f ? getPosX() - FontRenderers.getModulesRenderer().getStringWidth(str) : getPosX(); - if(HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { + if (HudEditor.hudStyle.is(HudEditor.HudStyle.Blurry)) { Render2DEngine.drawRoundedBlur(context.getMatrices(), pX, getPosY(), FontRenderers.getModulesRenderer().getStringWidth(str) + 21, 13f, 3, HudEditor.blurColor.getValue().getColorObject()); Render2DEngine.drawRect(context.getMatrices(), pX + 14, getPosY() + 2, 0.5f, 8, new Color(0x44FFFFFF, true)); diff --git a/src/main/java/thunder/hack/features/hud/impl/StaffBoard.java b/src/main/java/thunder/hack/features/hud/impl/StaffBoard.java index 7ac8c3fa..e22f42cd 100644 --- a/src/main/java/thunder/hack/features/hud/impl/StaffBoard.java +++ b/src/main/java/thunder/hack/features/hud/impl/StaffBoard.java @@ -54,7 +54,7 @@ public static List getOnlinePlayerD() { || player.getProfile().getName().toLowerCase().contains("ruthless") || player.getScoreboardTeam().getPrefix().getString().contains("YT") || (player.getScoreboardTeam().getPrefix().getString().contains("Y") && player.getScoreboardTeam().getPrefix().getString().contains("T"))) { - String name = Arrays.asList(player.getScoreboardTeam().getPlayerList().stream().toArray()).toString().replace("[", "").replace("]", ""); + String name = Arrays.asList(player.getScoreboardTeam().getPlayerList().toArray()).toString().replace("[", "").replace("]", ""); if (player.getGameMode() == GameMode.SPECTATOR) { S.add(player.getScoreboardTeam().getPrefix().getString() + name + ":gm3"); @@ -70,7 +70,7 @@ public List getVanish() { List list = new ArrayList<>(); for (Team s : mc.world.getScoreboard().getTeams()) { if (s.getPrefix().getString().isEmpty() || mc.isInSingleplayer()) continue; - String name = Arrays.asList(s.getPlayerList().stream().toArray()).toString().replace("[", "").replace("]", ""); + String name = Arrays.asList(s.getPlayerList().toArray()).toString().replace("[", "").replace("]", ""); if (getOnlinePlayer().contains(name) || name.isEmpty()) continue; diff --git a/src/main/java/thunder/hack/features/hud/impl/TargetHud.java b/src/main/java/thunder/hack/features/hud/impl/TargetHud.java index 38986a80..3314c982 100644 --- a/src/main/java/thunder/hack/features/hud/impl/TargetHud.java +++ b/src/main/java/thunder/hack/features/hud/impl/TargetHud.java @@ -57,7 +57,6 @@ public class TargetHud extends HudElement { private final Setting mini = new Setting<>("Mini", false, v -> Mode.getValue() == ModeEn.NurikZapen); private final Setting absorp = new Setting<>("Absorption", true); - private static Identifier custom; public EaseOutBack animation = new EaseOutBack(); diff --git a/src/main/java/thunder/hack/features/hud/impl/TotemCounter.java b/src/main/java/thunder/hack/features/hud/impl/TotemCounter.java index 53ead21c..9098c397 100644 --- a/src/main/java/thunder/hack/features/hud/impl/TotemCounter.java +++ b/src/main/java/thunder/hack/features/hud/impl/TotemCounter.java @@ -24,8 +24,7 @@ public TotemCounter() { private float angle, prevAngle; public void onRender2D(DrawContext context) { - - if(getItemCount(Items.TOTEM_OF_UNDYING) == 0) + if (getItemCount(Items.TOTEM_OF_UNDYING) == 0) return; float xPos = ModuleManager.crosshair.getAnimatedPosX(); @@ -44,7 +43,7 @@ public void onRender2D(DrawContext context) { context.getMatrices().translate(-(xPos - 36), -(yPos - 9), 0); RenderSystem.setShaderColor(1f, 1f - factor, 1f - factor, 1f); - if(factor > 0) + if (factor > 0) Render2DEngine.drawBlurredShadow(context.getMatrices(), xPos - 34, yPos - 6, 11, 11, 8, Render2DEngine.injectAlpha(new Color(0xFF0000), (int) (255 * factor))); FontRenderers.sf_bold_mini.drawCenteredString(context.getMatrices(), getItemCount(Items.TOTEM_OF_UNDYING) + "",xPos - 28, yPos + 8, -1); @@ -54,14 +53,14 @@ public void onRender2D(DrawContext context) { @EventHandler public void onTotemPop(TotemPopEvent e) { - if(e.getEntity() == mc.player) + if (e.getEntity() == mc.player) angle = -15; } @Override public void onUpdate() { prevAngle = angle; - if(angle < 0) + if (angle < 0) angle++; } diff --git a/src/main/java/thunder/hack/features/modules/client/AntiCrash.java b/src/main/java/thunder/hack/features/modules/client/AntiCrash.java index a30fc3f2..c454f8de 100644 --- a/src/main/java/thunder/hack/features/modules/client/AntiCrash.java +++ b/src/main/java/thunder/hack/features/modules/client/AntiCrash.java @@ -40,6 +40,5 @@ public void onPacketReceive(PacketEvent.@NotNull Receive receive) { } receive.cancel(); } - } } \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/client/AntiServerAdd.java b/src/main/java/thunder/hack/features/modules/client/AntiServerAdd.java index 98a8431c..e1224c15 100644 --- a/src/main/java/thunder/hack/features/modules/client/AntiServerAdd.java +++ b/src/main/java/thunder/hack/features/modules/client/AntiServerAdd.java @@ -1,10 +1,8 @@ package thunder.hack.features.modules.client; -import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; -import org.jetbrains.annotations.NotNull; import thunder.hack.features.modules.Module; -public class AntiServerAdd extends Module { +public class AntiServerAdd extends Module { //эмпти модул public AntiServerAdd() { super("AntiServerAdd", Category.CLIENT); } diff --git a/src/main/java/thunder/hack/features/modules/client/AntiServerRP.java b/src/main/java/thunder/hack/features/modules/client/AntiServerRP.java index a3ae51ba..3578929c 100644 --- a/src/main/java/thunder/hack/features/modules/client/AntiServerRP.java +++ b/src/main/java/thunder/hack/features/modules/client/AntiServerRP.java @@ -9,7 +9,6 @@ import thunder.hack.utility.math.MathUtility; public final class AntiServerRP extends Module { - public AntiServerRP() { super("AntiServerRP", Category.CLIENT); } diff --git a/src/main/java/thunder/hack/features/modules/client/BaritoneSettings.java b/src/main/java/thunder/hack/features/modules/client/BaritoneSettings.java index dd9d1dc2..0d99d0d0 100644 --- a/src/main/java/thunder/hack/features/modules/client/BaritoneSettings.java +++ b/src/main/java/thunder/hack/features/modules/client/BaritoneSettings.java @@ -13,16 +13,18 @@ public final class BaritoneSettings extends Module { public BaritoneSettings() { super("BaritoneSettings", Category.CLIENT); } + public final Setting allowBreakBlock = new Setting<>("AllowBreakBlock", true); public final Setting allowPlace = new Setting<>("AllowPlace", true); public final Setting allowSprint = new Setting<>("AllowSprint", true); public final Setting debug = new Setting<>("Debug", false); public final Setting enterPortal = new Setting<>("EnterPortal", false); public final Setting desktopNotifications = new Setting<>("DesktopNotifications", false); + @EventHandler - public void onSettingChange(EventSetting e){ - if(!ThunderHack.baritone) { - sendMessage(isRu() ? "Баритон не найден (можешь скачать на https://meteorclient.com)" : "Baritone not found (you can download it on https://meteorclient.com)"); + public void onSettingChange(EventSetting e) { + if (!ThunderHack.baritone) { + sendMessage(isRu() ? "Баритон не найден (можешь скачать на https://meteorclient.com)" : "Baritone not found (you can download it at https://meteorclient.com)"); return; } BaritoneAPI.getSettings().allowBreak.value = allowBreakBlock.getValue(); diff --git a/src/main/java/thunder/hack/features/modules/client/ChatTranslator.java b/src/main/java/thunder/hack/features/modules/client/ChatTranslator.java index 98a90fed..49b67260 100644 --- a/src/main/java/thunder/hack/features/modules/client/ChatTranslator.java +++ b/src/main/java/thunder/hack/features/modules/client/ChatTranslator.java @@ -5,7 +5,6 @@ import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket; import net.minecraft.util.Formatting; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; @@ -18,6 +17,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -27,7 +27,6 @@ import static org.apache.commons.lang3.StringEscapeUtils.unescapeHtml4; public class ChatTranslator extends Module { - public ChatTranslator() { super("ChatTranslator", Category.CLIENT); } @@ -92,9 +91,9 @@ public void onPacketSend(PacketEvent.Send e) { public String translate(String text, String to) throws UnsupportedEncodingException, MalformedURLException { StringBuilder response = new StringBuilder(); - URL url = new URL(String.format("https://translate.google.com/m?hl=en&sl=auto&tl=%s&ie=UTF-8&prev=_m&q=%s", to, URLEncoder.encode(text.trim(), "UTF-8"))); + URL url = new URL(String.format("https://translate.google.com/m?hl=en&sl=auto&tl=%s&ie=UTF-8&prev=_m&q=%s", to, URLEncoder.encode(text.trim(), StandardCharsets.UTF_8))); try { - try (BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"))) { + try (BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8))) { String line; while ((line = br.readLine()) != null) response.append(line + "\n"); diff --git a/src/main/java/thunder/hack/features/modules/client/ClickGui.java b/src/main/java/thunder/hack/features/modules/client/ClickGui.java index cd7d53b5..2e499ba6 100644 --- a/src/main/java/thunder/hack/features/modules/client/ClickGui.java +++ b/src/main/java/thunder/hack/features/modules/client/ClickGui.java @@ -4,7 +4,6 @@ import meteordevelopment.orbit.EventHandler; import net.minecraft.util.Identifier; import thunder.hack.ThunderHack; -import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.EventSetting; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.font.FontRenderers; diff --git a/src/main/java/thunder/hack/features/modules/client/ClientSpoof.java b/src/main/java/thunder/hack/features/modules/client/ClientSpoof.java index 986a2da7..faa1f167 100644 --- a/src/main/java/thunder/hack/features/modules/client/ClientSpoof.java +++ b/src/main/java/thunder/hack/features/modules/client/ClientSpoof.java @@ -1,6 +1,5 @@ package thunder.hack.features.modules.client; -import org.jetbrains.annotations.NotNull; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; @@ -17,24 +16,14 @@ public enum Mode { Vanilla, Lunar1_20_4, Lunar1_20_1, Custom, Null } + @SuppressWarnings("StringOperationCanBeSimplified") public String getClientName() { - switch (mode.getValue()) { - case Vanilla -> { - return "vanilla"; - } - case Lunar1_20_4 -> { - return "lunarclient:1.20.4"; - } - case Lunar1_20_1 -> { - return "lunarclient:1.20.1"; - } - case Custom -> { - return (String) custom.getValue(); - } - default -> - { - return null; - } - } + return switch (mode.getValue()) { + case Vanilla -> "vanilla"; + case Lunar1_20_4 -> "lunarclient:1.20.4"; + case Lunar1_20_1 -> "lunarclient:1.20.1"; + case Custom -> custom.getValue().toString(); + default -> null; + }; } } diff --git a/src/main/java/thunder/hack/features/modules/client/Notifications.java b/src/main/java/thunder/hack/features/modules/client/Notifications.java index 3abcfc55..e0a90dd5 100644 --- a/src/main/java/thunder/hack/features/modules/client/Notifications.java +++ b/src/main/java/thunder/hack/features/modules/client/Notifications.java @@ -4,7 +4,6 @@ import thunder.hack.setting.Setting; public final class Notifications extends Module { - public Notifications() { super("Notifications", Category.CLIENT); } diff --git a/src/main/java/thunder/hack/features/modules/client/Rotations.java b/src/main/java/thunder/hack/features/modules/client/Rotations.java index afa0c1b1..f00717f2 100644 --- a/src/main/java/thunder/hack/features/modules/client/Rotations.java +++ b/src/main/java/thunder/hack/features/modules/client/Rotations.java @@ -2,7 +2,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.EventFixVelocity; @@ -13,7 +12,6 @@ import thunder.hack.features.modules.combat.Aura; import thunder.hack.setting.Setting; - public class Rotations extends Module { public Rotations() { super("Rotations", Category.CLIENT); @@ -63,7 +61,6 @@ public void modifyVelocity(EventPlayerTravel e) { return; } - if (moveFix.getValue() == MoveFix.Focused && !Float.isNaN(fixRotation) && !mc.player.isRiding()) { if (e.isPre()) { prevYaw = mc.player.getYaw(); diff --git a/src/main/java/thunder/hack/features/modules/client/SoundFX.java b/src/main/java/thunder/hack/features/modules/client/SoundFX.java index 0d7b1112..66bd1887 100644 --- a/src/main/java/thunder/hack/features/modules/client/SoundFX.java +++ b/src/main/java/thunder/hack/features/modules/client/SoundFX.java @@ -1,9 +1,7 @@ package thunder.hack.features.modules.client; import meteordevelopment.orbit.EventHandler; -import net.minecraft.entity.decoration.EndCrystalEntity; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.EventDeath; import thunder.hack.events.impl.EventAttack; @@ -12,7 +10,6 @@ import thunder.hack.features.modules.combat.AutoCrystal; import thunder.hack.setting.Setting; - public final class SoundFX extends Module { public SoundFX() { super("SoundFX", Category.CLIENT); diff --git a/src/main/java/thunder/hack/features/modules/client/ThunderHackGui.java b/src/main/java/thunder/hack/features/modules/client/ThunderHackGui.java index b8dccf15..d179659b 100644 --- a/src/main/java/thunder/hack/features/modules/client/ThunderHackGui.java +++ b/src/main/java/thunder/hack/features/modules/client/ThunderHackGui.java @@ -12,7 +12,6 @@ public final class ThunderHackGui extends Module { public static final Setting onColor2 = new Setting<>("OnColor2", new ColorSetting(new Color(32, 1, 96, 255).getRGB())); public static final Setting scrollSpeed = new Setting<>("ScrollSpeed", 1f, 0.1F, 2.0F); - public ThunderHackGui() { super("ThunderGui", Category.CLIENT); } diff --git a/src/main/java/thunder/hack/features/modules/client/UnHook.java b/src/main/java/thunder/hack/features/modules/client/UnHook.java index 0a68b83b..79948baf 100644 --- a/src/main/java/thunder/hack/features/modules/client/UnHook.java +++ b/src/main/java/thunder/hack/features/modules/client/UnHook.java @@ -15,10 +15,7 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; -public class UnHook extends Module { - - // Йо фабос, засунь в о4ко себе фалос - // Yo dude shove a dick up your ass +public class UnHook extends Module { // Йо фабос, засунь в о4ко себе фалос public UnHook() { super("UnHook", Category.CLIENT); } diff --git a/src/main/java/thunder/hack/features/modules/combat/AimBot.java b/src/main/java/thunder/hack/features/modules/combat/AimBot.java index cf201768..5f1ba629 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AimBot.java +++ b/src/main/java/thunder/hack/features/modules/combat/AimBot.java @@ -1,4 +1,3 @@ - package thunder.hack.features.modules.combat; import meteordevelopment.orbit.EventHandler; @@ -13,7 +12,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.EventSync; @@ -141,9 +139,7 @@ public void onSync(EventSync event) { if (mode.is(Mode.CSAim)) { if (target != null && (mc.player.canSee(target) || ignoreWalls.getValue())) { if (mc.player.age % delay.getValue() == 0) { - event.addPostAction(() -> { - sendSequencedPacket(id -> new PlayerInteractItemC2SPacket(Hand.MAIN_HAND, id, mc.player.getYaw(), mc.player.getPitch())); - }); + event.addPostAction(() -> sendSequencedPacket(id -> new PlayerInteractItemC2SPacket(Hand.MAIN_HAND, id, mc.player.getYaw(), mc.player.getPitch()))); } } else { rotationYaw = mc.player.getYaw(); diff --git a/src/main/java/thunder/hack/features/modules/combat/AntiBot.java b/src/main/java/thunder/hack/features/modules/combat/AntiBot.java index 5095272c..5170013e 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AntiBot.java +++ b/src/main/java/thunder/hack/features/modules/combat/AntiBot.java @@ -19,8 +19,8 @@ public final class AntiBot extends Module { public static ArrayList bots = new ArrayList<>(); public Setting remove = new Setting<>("Remove", false); public Setting onlyAura = new Setting<>("OnlyAura", true); - private final Setting mode = new Setting("Mode", Mode.UUIDCheck); - public Setting checkticks = new Setting("checkTicks", 3, 0, 10, v -> mode.getValue() == Mode.MotionCheck); + private final Setting mode = new Setting<>("Mode", Mode.UUIDCheck); + public Setting checkticks = new Setting<>("checkTicks", 3, 0, 10, v -> mode.getValue() == Mode.MotionCheck); private final Timer clearTimer = new Timer(); private int ticks = 0; diff --git a/src/main/java/thunder/hack/features/modules/combat/AntiLegitMiss.java b/src/main/java/thunder/hack/features/modules/combat/AntiLegitMiss.java index 119249e3..844b5227 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AntiLegitMiss.java +++ b/src/main/java/thunder/hack/features/modules/combat/AntiLegitMiss.java @@ -7,7 +7,6 @@ import thunder.hack.features.modules.Module; public class AntiLegitMiss extends Module { - public AntiLegitMiss() { super("AntiLegitMiss", Category.COMBAT); } diff --git a/src/main/java/thunder/hack/features/modules/combat/Aura.java b/src/main/java/thunder/hack/features/modules/combat/Aura.java index 8d5535f0..c8be5009 100644 --- a/src/main/java/thunder/hack/features/modules/combat/Aura.java +++ b/src/main/java/thunder/hack/features/modules/combat/Aura.java @@ -391,8 +391,7 @@ public void onPacketReceive(PacketEvent.@NotNull Receive e) { if (resolver.is(Resolver.BackTrack) && e.getPacket() instanceof CommonPingS2CPacket ping && target != null) { Managers.ASYNC.run(() -> mc.executeSync(() -> ping.apply(mc.getNetworkHandler())), backTicks.getValue() * 25L); e.cancel(); - } - */ + }*/ } @Override @@ -448,7 +447,7 @@ private boolean autoCrit() { return true; } - private boolean shieldBreaker(boolean instant) { + private boolean shieldBreaker(boolean instant) { //todo - Actual value of parameter 'instant' is always 'false' int axeSlot = InventoryUtility.getAxe().slot(); if (axeSlot == -1) return false; if (!shieldBreaker.getValue()) return false; diff --git a/src/main/java/thunder/hack/features/modules/combat/AutoAnchor.java b/src/main/java/thunder/hack/features/modules/combat/AutoAnchor.java index 5ec105d2..c861dec6 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AutoAnchor.java +++ b/src/main/java/thunder/hack/features/modules/combat/AutoAnchor.java @@ -529,8 +529,8 @@ public void placeAnchor(PlaceData data, boolean instant) { renderPos = data.bp(); } - // if (!placedAnchors.containsKey(data.bp())) - // placedAnchors.put(data.bp(), System.currentTimeMillis()); + //if (!placedAnchors.containsKey(data.bp())) + //placedAnchors.put(data.bp(), System.currentTimeMillis()); renderPositions.put(data.bp(), System.currentTimeMillis()); diff --git a/src/main/java/thunder/hack/features/modules/combat/AutoAnvil.java b/src/main/java/thunder/hack/features/modules/combat/AutoAnvil.java index 7770ac15..762bcb70 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AutoAnvil.java +++ b/src/main/java/thunder/hack/features/modules/combat/AutoAnvil.java @@ -9,7 +9,6 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Items; import net.minecraft.util.math.BlockPos; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.player.CombatManager; import thunder.hack.events.impl.EventTick; @@ -63,7 +62,7 @@ private void onTick(EventTick event) { Block targetBlock = mc.world.getBlockState(BlockPos.ofFloored(target.getPos())).getBlock(); - if(!(targetBlock instanceof PressurePlateBlock) && targetBlock != Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE && targetBlock != Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE && placePlates.getValue()) { + if (!(targetBlock instanceof PressurePlateBlock) && targetBlock != Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE && targetBlock != Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE && placePlates.getValue()) { InteractionUtility.placeBlock(BlockPos.ofFloored(target.getPos()), rotate.getValue(), interact.getValue(), placeMode.getValue(), plateResult, true, true); return; } diff --git a/src/main/java/thunder/hack/features/modules/combat/AutoBuff.java b/src/main/java/thunder/hack/features/modules/combat/AutoBuff.java index 5a5958c1..bfbaff4a 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AutoBuff.java +++ b/src/main/java/thunder/hack/features/modules/combat/AutoBuff.java @@ -41,8 +41,7 @@ public AutoBuff() { public static int getPotionSlot(Potions potion) { for (int i = 0; i < 9; ++i) - if (isStackPotion(mc.player.getInventory().getStack(i), potion)) - return i; + if (isStackPotion(mc.player.getInventory().getStack(i), potion)) return i; return -1; } @@ -51,8 +50,7 @@ public static boolean isPotionOnHotBar(Potions potions) { } public static boolean isStackPotion(ItemStack stack, Potions potion) { - if (stack == null) - return false; + if (stack == null) return false; if (stack.getItem() instanceof SplashPotionItem) { PotionContentsComponent potionContentsComponent = stack.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT); @@ -68,8 +66,7 @@ public static boolean isStackPotion(ItemStack stack, Potions potion) { } for (StatusEffectInstance effect : potionContentsComponent.getEffects()) { - if (effect.getEffectType() == id) - return true; + if (effect.getEffectType() == id) return true; } } return false; @@ -77,8 +74,7 @@ public static boolean isStackPotion(ItemStack stack, Potions potion) { @EventHandler public void onPostRotationSet(EventAfterRotate event) { - if (Aura.target != null && mc.player.getAttackCooldownProgress(1) > 0.5f) - return; + if (Aura.target != null && mc.player.getAttackCooldownProgress(1) > 0.5f) return; if (mc.player.age > 80 && shouldThrow()) { mc.player.setPitch(90); spoofed = true; @@ -86,21 +82,14 @@ public void onPostRotationSet(EventAfterRotate event) { } private boolean shouldThrow() { - return (!mc.player.hasStatusEffect(StatusEffects.SPEED) && isPotionOnHotBar(Potions.SPEED) && speed.getValue()) - || (!mc.player.hasStatusEffect(StatusEffects.STRENGTH) && isPotionOnHotBar(Potions.STRENGTH) && strength.getValue()) - || (!mc.player.hasStatusEffect(StatusEffects.FIRE_RESISTANCE) && isPotionOnHotBar(Potions.FIRERES) && fire.getValue()) - || (mc.player.getHealth() + mc.player.getAbsorptionAmount() < healthH.getValue() && isPotionOnHotBar(Potions.HEAL) && heal.getValue().isEnabled()) - || (!mc.player.hasStatusEffect(StatusEffects.REGENERATION) && triggerOn.is(TriggerOn.LackOfRegen) && isPotionOnHotBar(Potions.REGEN) && regen.getValue().isEnabled()) - || (mc.player.getHealth() + mc.player.getAbsorptionAmount() < healthR.getValue() && triggerOn.is(TriggerOn.Health) && isPotionOnHotBar(Potions.REGEN) && regen.getValue().isEnabled()); + return (!mc.player.hasStatusEffect(StatusEffects.SPEED) && isPotionOnHotBar(Potions.SPEED) && speed.getValue()) || (!mc.player.hasStatusEffect(StatusEffects.STRENGTH) && isPotionOnHotBar(Potions.STRENGTH) && strength.getValue()) || (!mc.player.hasStatusEffect(StatusEffects.FIRE_RESISTANCE) && isPotionOnHotBar(Potions.FIRERES) && fire.getValue()) || (mc.player.getHealth() + mc.player.getAbsorptionAmount() < healthH.getValue() && isPotionOnHotBar(Potions.HEAL) && heal.getValue().isEnabled()) || (!mc.player.hasStatusEffect(StatusEffects.REGENERATION) && triggerOn.is(TriggerOn.LackOfRegen) && isPotionOnHotBar(Potions.REGEN) && regen.getValue().isEnabled()) || (mc.player.getHealth() + mc.player.getAbsorptionAmount() < healthR.getValue() && triggerOn.is(TriggerOn.Health) && isPotionOnHotBar(Potions.REGEN) && regen.getValue().isEnabled()); } @EventHandler public void onPostSync(EventPostSync e) { - if (Aura.target != null && mc.player.getAttackCooldownProgress(1) > 0.5f) - return; + if (Aura.target != null && mc.player.getAttackCooldownProgress(1) > 0.5f) return; - if (onDaGround.getValue() && !mc.player.isOnGround()) - return; + if (onDaGround.getValue() && !mc.player.isOnGround()) return; if (mc.player.age > 80 && shouldThrow() && timer.passedMs(1000) && spoofed) { if (!mc.player.hasStatusEffect(StatusEffects.SPEED) && isPotionOnHotBar(Potions.SPEED) && speed.getValue()) @@ -115,9 +104,7 @@ public void onPostSync(EventPostSync e) { if (mc.player.getHealth() + mc.player.getAbsorptionAmount() < healthH.getValue() && heal.getValue().isEnabled() && isPotionOnHotBar(Potions.HEAL)) throwPotion(Potions.HEAL); - if (((!mc.player.hasStatusEffect(StatusEffects.REGENERATION) && triggerOn.is(TriggerOn.LackOfRegen)) || - (mc.player.getHealth() + mc.player.getAbsorptionAmount() < healthR.getValue() && triggerOn.is(TriggerOn.Health))) - && isPotionOnHotBar(Potions.REGEN) && regen.getValue().isEnabled()) + if (((!mc.player.hasStatusEffect(StatusEffects.REGENERATION) && triggerOn.is(TriggerOn.LackOfRegen)) || (mc.player.getHealth() + mc.player.getAbsorptionAmount() < healthR.getValue() && triggerOn.is(TriggerOn.Health))) && isPotionOnHotBar(Potions.REGEN) && regen.getValue().isEnabled()) throwPotion(Potions.REGEN); sendPacket(new UpdateSelectedSlotC2SPacket(mc.player.getInventory().selectedSlot)); @@ -127,8 +114,7 @@ && isPotionOnHotBar(Potions.REGEN) && regen.getValue().isEnabled()) } public void throwPotion(Potions potion) { - if (pauseAura.getValue()) - ModuleManager.aura.pause(); + if (pauseAura.getValue()) ModuleManager.aura.pause(); sendPacket(new UpdateSelectedSlotC2SPacket(getPotionSlot(potion))); sendSequencedPacket(id -> new PlayerInteractItemC2SPacket(Hand.MAIN_HAND, id, mc.player.getYaw(), mc.player.getPitch())); } diff --git a/src/main/java/thunder/hack/features/modules/combat/AutoGApple.java b/src/main/java/thunder/hack/features/modules/combat/AutoGApple.java index 6783c675..94c18cc0 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AutoGApple.java +++ b/src/main/java/thunder/hack/features/modules/combat/AutoGApple.java @@ -1,7 +1,6 @@ package thunder.hack.features.modules.combat; import meteordevelopment.orbit.EventHandler; -import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.util.Formatting; import thunder.hack.core.manager.client.ModuleManager; @@ -15,7 +14,7 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public final class AutoGApple extends Module { - public final Setting Delay = new Setting("UseDelay", 0, 0, 2000); + public final Setting Delay = new Setting<>("UseDelay", 0, 0, 2000); private final Setting health = new Setting<>("health", 15f, 1f, 36f); public Setting absorption = new Setting<>("Absorption", false); public Setting autoTotemIntegration = new Setting<>("AutoTotemIntegration", true); @@ -23,7 +22,6 @@ public final class AutoGApple extends Module { private boolean isActive; private final Timer useDelay = new Timer(); - public AutoGApple() { super("AutoGApple", Category.COMBAT); } diff --git a/src/main/java/thunder/hack/features/modules/combat/AutoTrap.java b/src/main/java/thunder/hack/features/modules/combat/AutoTrap.java index 7fefa3fc..dce9b5fa 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AutoTrap.java +++ b/src/main/java/thunder/hack/features/modules/combat/AutoTrap.java @@ -2,7 +2,6 @@ import net.minecraft.entity.player.PlayerEntity; import org.jetbrains.annotations.Nullable; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.player.CombatManager; import thunder.hack.features.modules.base.TrapModule; diff --git a/src/main/java/thunder/hack/features/modules/combat/AutoWeb.java b/src/main/java/thunder/hack/features/modules/combat/AutoWeb.java index e067a318..e6a3b121 100644 --- a/src/main/java/thunder/hack/features/modules/combat/AutoWeb.java +++ b/src/main/java/thunder/hack/features/modules/combat/AutoWeb.java @@ -13,7 +13,6 @@ import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.world.RaycastContext; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.EventTick; import thunder.hack.features.modules.Module; diff --git a/src/main/java/thunder/hack/features/modules/combat/Breaker.java b/src/main/java/thunder/hack/features/modules/combat/Breaker.java index 9fc975e4..f10c3895 100644 --- a/src/main/java/thunder/hack/features/modules/combat/Breaker.java +++ b/src/main/java/thunder/hack/features/modules/combat/Breaker.java @@ -24,7 +24,6 @@ import java.util.Comparator; public final class Breaker extends Module { - private final Setting targetMode = new Setting<>("Target", Target.AutoCrystal); private final Setting onlyIfHole = new Setting<>("OnlyIfHole", false); private final Setting targetBy = new Setting<>("TargetBy", CombatManager.TargetBy.Distance, v -> targetMode.is(Target.Breaker)); diff --git a/src/main/java/thunder/hack/features/modules/combat/Burrow.java b/src/main/java/thunder/hack/features/modules/combat/Burrow.java index c9f5f3f4..b1290d88 100644 --- a/src/main/java/thunder/hack/features/modules/combat/Burrow.java +++ b/src/main/java/thunder/hack/features/modules/combat/Burrow.java @@ -20,7 +20,6 @@ import thunder.hack.events.impl.EventPostSync; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.client.ClientSettings; import thunder.hack.setting.Setting; import thunder.hack.utility.Timer; import thunder.hack.utility.math.MathUtility; @@ -30,6 +29,8 @@ import java.lang.reflect.Field; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public final class Burrow extends Module { private final Setting mode = new Setting<>("Mode", Mode.Default); private final Setting offsetMode = new Setting<>("Mode", OffsetMode.Smart, v -> mode.getValue() == Mode.Default); @@ -105,7 +106,7 @@ public void onPostSync(EventPostSync e) { if (wait.getValue()) { BlockPos currentPos = getPlayerPos(); if (!currentPos.equals(startPos)) { - disable(ClientSettings.isRu() ? "Отключен из-за движения!" : "Disabled due to movement!"); + disable(isRu() ? "Отключен из-за движения!" : "Disabled due to movement!"); return; } } @@ -113,7 +114,7 @@ public void onPostSync(EventPostSync e) { BlockPos pos = getPosition(mc.player); if (!mc.world.getBlockState(pos).isReplaceable()) { if (!wait.getValue()) - disable(ClientSettings.isRu() ? "Невозможно поставить блок! Отключаю.." : "Can't place the block! Disabling.."); + disable(isRu() ? "Невозможно поставить блок! Отключаю.." : "Can't place the block! Disabling.."); return; } @@ -127,7 +128,7 @@ public void onPostSync(EventPostSync e) { continue; } if (!wait.getValue()) - disable(ClientSettings.isRu() ? "Невозможно поставить блок! Отключаю.." : "Can't place the block on! Disabling.."); + disable(isRu() ? "Невозможно поставить блок! Отключаю.." : "Can't place the block on! Disabling.."); return; } } @@ -143,7 +144,7 @@ private void handleWeb(BlockPos pos) { SearchInvResult webResult = InventoryUtility.findBlockInHotBar(Blocks.COBWEB); if (!webResult.found()) { - disable(ClientSettings.isRu() ? "Нет паутины!" : "No webs found!"); + disable(isRu() ? "Нет паутины!" : "No webs found!"); return; } @@ -156,7 +157,7 @@ private void handleWeb(BlockPos pos) { timer.reset(); InventoryUtility.returnSlot(); if (!wait.getValue() || placeDisable.getValue()) - disable(ClientSettings.isRu() ? "Успешно забурровился! Отключаю.." : "Successfully burrowed! Disabling.."); + disable(isRu() ? "Успешно забурровился! Отключаю.." : "Successfully burrowed! Disabling.."); } } @@ -164,7 +165,7 @@ private void handleSkull(BlockPos pos) { SearchInvResult skullResult = InventoryUtility.getSkull(); if (!skullResult.found()) { - disable(ClientSettings.isRu() ? "Нет голов!" : "No heads found!"); + disable(isRu() ? "Нет голов!" : "No heads found!"); return; } @@ -176,7 +177,7 @@ private void handleSkull(BlockPos pos) { timer.reset(); InventoryUtility.returnSlot(); if (!wait.getValue() || placeDisable.getValue()) - disable(ClientSettings.isRu() ? "Успешно забурровился! Отключаю.." : "Successfully burrowed! Disabling.."); + disable(isRu() ? "Успешно забурровился! Отключаю.." : "Successfully burrowed! Disabling.."); } } @@ -197,7 +198,7 @@ public void handleDefault(BlockPos pos) { BlockState upState = mc.world.getBlockState(upUp); if (upState.blocksMovement()) { if (!wait.getValue()) - disable(ClientSettings.isRu() ? "Над головой блок, невозможно забурровиться! Отключаю.." : "Above the head block, impossible to burrow! Disabling.."); + disable(isRu() ? "Над головой блок, невозможно забурровиться! Отключаю.." : "Above the head block, impossible to burrow! Disabling.."); return; } } @@ -207,7 +208,7 @@ public void handleDefault(BlockPos pos) { int slot = (!obbyResult.found() || mc.world.getBlockState(pos.down()).getBlock() == Blocks.ENDER_CHEST ? echestResult.slot() : obbyResult.slot()); if (slot == -1) { - disable(ClientSettings.isRu() ? "Нет блоков!" : "No Block found!"); + disable(isRu() ? "Нет блоков!" : "No Block found!"); return; } @@ -219,7 +220,7 @@ public void handleDefault(BlockPos pos) { float[] r = InteractionUtility.getPlaceAngle(pos, InteractionUtility.Interact.Strict, true); if (mc.isInSingleplayer()) { - disable(ClientSettings.isRu() ? "Дебил! Ты в одиночке.." : "Retard! You're in singleplayer.."); + disable(isRu() ? "Дебил! Ты в одиночке.." : "Retard! You're in singleplayer.."); return; } @@ -244,7 +245,7 @@ public void handleDefault(BlockPos pos) { InventoryUtility.returnSlot(); if (!wait.getValue() || placeDisable.getValue()) - disable(ClientSettings.isRu() ? "Успешно забурровился! Отключаю.." : "Successfully burrowed! Disabling.."); + disable(isRu() ? "Успешно забурровился! Отключаю.." : "Successfully burrowed! Disabling.."); } } diff --git a/src/main/java/thunder/hack/features/modules/combat/HitBox.java b/src/main/java/thunder/hack/features/modules/combat/HitBox.java index 5398c314..b9564ce7 100644 --- a/src/main/java/thunder/hack/features/modules/combat/HitBox.java +++ b/src/main/java/thunder/hack/features/modules/combat/HitBox.java @@ -6,7 +6,6 @@ import static thunder.hack.core.manager.client.ServerManager.round2; public final class HitBox extends Module { - public HitBox() { super("HitBoxes", Category.COMBAT); } diff --git a/src/main/java/thunder/hack/features/modules/combat/HoleFill.java b/src/main/java/thunder/hack/features/modules/combat/HoleFill.java index eb82a106..7b5e71b0 100644 --- a/src/main/java/thunder/hack/features/modules/combat/HoleFill.java +++ b/src/main/java/thunder/hack/features/modules/combat/HoleFill.java @@ -10,7 +10,6 @@ import net.minecraft.world.RaycastContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.EventTick; diff --git a/src/main/java/thunder/hack/features/modules/combat/LegitHelper.java b/src/main/java/thunder/hack/features/modules/combat/LegitHelper.java index 4a8f1588..9af76317 100644 --- a/src/main/java/thunder/hack/features/modules/combat/LegitHelper.java +++ b/src/main/java/thunder/hack/features/modules/combat/LegitHelper.java @@ -7,7 +7,6 @@ import net.minecraft.entity.decoration.EndCrystalEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.item.CrossbowItem; import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.*; import net.minecraft.screen.slot.SlotActionType; @@ -19,7 +18,6 @@ import net.minecraft.world.RaycastContext; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.AsyncManager; import thunder.hack.core.manager.client.ModuleManager; @@ -43,7 +41,6 @@ import static thunder.hack.features.modules.combat.Criticals.getInteractType; public class LegitHelper extends Module { - public LegitHelper() { super("LegitHelper", Category.COMBAT); } diff --git a/src/main/java/thunder/hack/features/modules/combat/PistonPush.java b/src/main/java/thunder/hack/features/modules/combat/PistonPush.java index 6fc4f42c..26a3435d 100644 --- a/src/main/java/thunder/hack/features/modules/combat/PistonPush.java +++ b/src/main/java/thunder/hack/features/modules/combat/PistonPush.java @@ -9,7 +9,6 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.EventPostSync; import thunder.hack.events.impl.EventSync; diff --git a/src/main/java/thunder/hack/features/modules/combat/Quiver.java b/src/main/java/thunder/hack/features/modules/combat/Quiver.java index f65c0923..62f118c5 100644 --- a/src/main/java/thunder/hack/features/modules/combat/Quiver.java +++ b/src/main/java/thunder/hack/features/modules/combat/Quiver.java @@ -15,7 +15,6 @@ import thunder.hack.utility.player.SearchInvResult; import thunder.hack.utility.world.HoleUtility; -import java.awt.*; import java.util.Objects; import static thunder.hack.features.modules.client.ClientSettings.isRu; @@ -95,15 +94,13 @@ private void releaseBow() { } private SearchInvResult getArrow(String name) { - SearchInvResult result = InventoryUtility.findInInventory(stack -> { + return InventoryUtility.findInInventory(stack -> { if (stack.getItem() instanceof TippedArrowItem tai) { String key = tai.getTranslationKey(stack); return key.contains("effect." + name); } return false; }); - - return result; } private void switchInvSlot(int from, int to) { @@ -116,5 +113,4 @@ private void switchInvSlot(int from, int to) { clickSlot(from); sendPacket(new CloseHandledScreenC2SPacket(mc.player.currentScreenHandler.syncId)); } - } diff --git a/src/main/java/thunder/hack/features/modules/combat/Surround.java b/src/main/java/thunder/hack/features/modules/combat/Surround.java index cc3da040..f17864b4 100644 --- a/src/main/java/thunder/hack/features/modules/combat/Surround.java +++ b/src/main/java/thunder/hack/features/modules/combat/Surround.java @@ -1,16 +1,12 @@ package thunder.hack.features.modules.combat; -import com.google.common.collect.Lists; import meteordevelopment.orbit.EventHandler; import meteordevelopment.orbit.EventPriority; import net.minecraft.entity.EntityType; import net.minecraft.entity.MovementType; import net.minecraft.entity.decoration.EndCrystalEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.s2c.play.*; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/thunder/hack/features/modules/combat/TNTAura.java b/src/main/java/thunder/hack/features/modules/combat/TNTAura.java index 51245b02..6483d471 100644 --- a/src/main/java/thunder/hack/features/modules/combat/TNTAura.java +++ b/src/main/java/thunder/hack/features/modules/combat/TNTAura.java @@ -14,7 +14,6 @@ import net.minecraft.util.math.Direction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.EventTick; import thunder.hack.features.modules.Module; diff --git a/src/main/java/thunder/hack/features/modules/combat/TriggerBot.java b/src/main/java/thunder/hack/features/modules/combat/TriggerBot.java index 3c09b179..e5c90e5b 100644 --- a/src/main/java/thunder/hack/features/modules/combat/TriggerBot.java +++ b/src/main/java/thunder/hack/features/modules/combat/TriggerBot.java @@ -6,7 +6,6 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.PlayerUpdateEvent; diff --git a/src/main/java/thunder/hack/features/modules/misc/AntiAFK.java b/src/main/java/thunder/hack/features/modules/misc/AntiAFK.java index ddbc6942..1ac5f16a 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AntiAFK.java +++ b/src/main/java/thunder/hack/features/modules/misc/AntiAFK.java @@ -2,7 +2,6 @@ import meteordevelopment.orbit.EventHandler; import meteordevelopment.orbit.EventPriority; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.EventKeyboardInput; import thunder.hack.events.impl.EventSetting; @@ -15,7 +14,6 @@ import java.util.concurrent.ThreadLocalRandom; public class AntiAFK extends Module { - public AntiAFK() { super("AntiAFK", Category.MISC); } diff --git a/src/main/java/thunder/hack/features/modules/misc/AntiAttack.java b/src/main/java/thunder/hack/features/modules/misc/AntiAttack.java index 77589422..439e3e0d 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AntiAttack.java +++ b/src/main/java/thunder/hack/features/modules/misc/AntiAttack.java @@ -4,15 +4,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.DonkeyEntity; import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.combat.AutoAnchor; import thunder.hack.setting.Setting; import static thunder.hack.features.modules.combat.Criticals.getEntity; @@ -38,11 +35,10 @@ private void onPacketSend(PacketEvent.@NotNull Send e) { e.cancel(); if (entity instanceof ZombifiedPiglinEntity && zoglin.getValue()) e.cancel(); - if(entity instanceof VillagerEntity && villager.getValue()){ + if (entity instanceof VillagerEntity && villager.getValue()) { e.cancel(); - } - else if(oneHp.getValue() && entity instanceof LivingEntity lent){ - if(lent.getHealth() <= hp.getValue()){ + } else if (oneHp.getValue() && entity instanceof LivingEntity lent) { + if (lent.getHealth() <= hp.getValue()) { e.cancel(); } } diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoAuth.java b/src/main/java/thunder/hack/features/modules/misc/AutoAuth.java index 9366e414..738b39cc 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoAuth.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoAuth.java @@ -2,7 +2,6 @@ import meteordevelopment.orbit.EventHandler; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoDuel.java b/src/main/java/thunder/hack/features/modules/misc/AutoDuel.java index 2bf8d3d2..3e25e012 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoDuel.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoDuel.java @@ -38,7 +38,6 @@ public void onPacketReceive(PacketEvent.@NotNull Receive event) { if (event.getPacket() instanceof GameMessageS2CPacket pac) { final String message = pac.content().getString().toLowerCase(); - switch (mode.getValue()) { case Accept -> { if (!pac.content.getString().contains("duel request received from " + nickname.getValue().toLowerCase())) diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoEZ.java b/src/main/java/thunder/hack/features/modules/misc/AutoEZ.java index 5d1f4d94..8280a7fb 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoEZ.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoEZ.java @@ -60,7 +60,7 @@ public static void loadEZ() { } boolean newline = false; for (String l : lines) { - if (l.equals("")) { + if (l.isEmpty()) { newline = true; break; } @@ -70,7 +70,7 @@ public static void loadEZ() { if (newline) { StringBuilder spamChunk = new StringBuilder(); for (String l : lines) { - if (l.equals("")) { + if (l.isEmpty()) { if (!spamChunk.isEmpty()) { spamList.add(spamChunk.toString()); spamChunk = new StringBuilder(); diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoFish.java b/src/main/java/thunder/hack/features/modules/misc/AutoFish.java index 47c52505..48a579cb 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoFish.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoFish.java @@ -9,7 +9,6 @@ import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import net.minecraft.sound.SoundEvents; import net.minecraft.util.Hand; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; @@ -38,11 +37,9 @@ private enum DetectMode { Sound, DataTracker } - @Override public void onEnable() { - if (fullNullCheck()) - disable("NPE protection"); + if (fullNullCheck()) disable("NPE protection"); } @Override @@ -50,11 +47,10 @@ public void onDisable() { flag = false; } - @EventHandler public void onPacketReceive(PacketEvent.Receive e) { - if(e.getPacket() instanceof PlaySoundS2CPacket sound && detectMode.getValue() == DetectMode.Sound) - if(sound.getSound().value().equals(SoundEvents.ENTITY_FISHING_BOBBER_SPLASH) && mc.player.fishHook != null && mc.player.fishHook.squaredDistanceTo(sound.getX(), sound.getY(), sound.getZ()) < 4f) + if (e.getPacket() instanceof PlaySoundS2CPacket sound && detectMode.getValue() == DetectMode.Sound) + if (sound.getSound().value().equals(SoundEvents.ENTITY_FISHING_BOBBER_SPLASH) && mc.player.fishHook != null && mc.player.fishHook.squaredDistanceTo(sound.getX(), sound.getY(), sound.getZ()) < 4f) catchFish(); } @@ -72,8 +68,7 @@ public void onUpdate() { } } - if(!cooldown.passedMs(1000)) - return; + if (!cooldown.passedMs(1000)) return; if (timeout.passedMs(45000) && mc.player.getMainHandStack().getItem() instanceof FishingRodItem) { mc.interactionManager.interactItem(mc.player, Hand.MAIN_HAND); @@ -97,8 +92,7 @@ private void catchFish() { mc.interactionManager.interactItem(mc.player, Hand.MAIN_HAND); sendPacket(new HandSwingC2SPacket(Hand.MAIN_HAND)); - if (autoSell.getValue() && timeout.passedMs(1000)) - mc.player.networkHandler.sendChatCommand("sellfish"); + if (autoSell.getValue() && timeout.passedMs(1000)) mc.player.networkHandler.sendChatCommand("sellfish"); try { Thread.sleep((int) MathUtility.random(899, 1399)); @@ -115,8 +109,7 @@ private void catchFish() { private int getRodSlot() { for (int i = 0; i < 9; i++) { final ItemStack item = mc.player.getInventory().getStack(i); - if (item.getItem() == Items.FISHING_ROD && item.getDamage() < 52) - return i; + if (item.getItem() == Items.FISHING_ROD && item.getDamage() < 52) return i; } return -1; } diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoFlyme.java b/src/main/java/thunder/hack/features/modules/misc/AutoFlyme.java index 0d7aabdf..9d0e13a4 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoFlyme.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoFlyme.java @@ -11,6 +11,10 @@ import thunder.hack.utility.player.MovementUtility; public class AutoFlyme extends Module { + public AutoFlyme() { + super("AutoFlyme", Category.MISC); + } + public final Setting instantSpeed = new Setting<>("InstantSpeed", true); public final Setting hover = new Setting<>("hover", false); public final Setting useTimer = new Setting<>("UseTimer", false); @@ -19,13 +23,8 @@ public class AutoFlyme extends Module { public Setting speed = new Setting<>("speed", 1.05f, 0.0f, 8f, v -> hover.getValue()); //фаннигейм перешел на матрикс, и теперь можно летать со скоростью 582 км/ч :skull: - private final Timer timer = new Timer(); - public AutoFlyme() { - super("AutoFlyme", Category.MISC); - } - @Override public void onEnable() { if (!mc.player.getAbilities().flying) { diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoLeave.java b/src/main/java/thunder/hack/features/modules/misc/AutoLeave.java index b6978462..871ec119 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoLeave.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoLeave.java @@ -8,12 +8,13 @@ import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.client.ClientSettings; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.SettingGroup; import thunder.hack.utility.Timer; import thunder.hack.utility.player.InventoryUtility; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class AutoLeave extends Module { public AutoLeave() { super("AutoLeave", Category.MISC); @@ -27,8 +28,8 @@ public AutoLeave() { private final Setting leaveIf = new Setting<>("Leave if", new SettingGroup(false, 0)); private final Setting low_hp = new Setting<>("LowHp", false).addToGroup(leaveIf); private final Setting totems = new Setting<>("Totems", false).addToGroup(leaveIf); - private final Setting totemsCount = new Setting("TotemsCount", 2, 0, 10, v -> totems.getValue()); - private final Setting leaveHp = new Setting("HP", 8.0f, 1f, 20.0f, v -> low_hp.getValue()); + private final Setting totemsCount = new Setting<>("TotemsCount", 2, 0, 10, v -> totems.getValue()); + private final Setting leaveHp = new Setting<>("HP", 8.0f, 1f, 20.0f, v -> low_hp.getValue()); private final Setting staff = new Setting<>("Staff", LeaveMode.None).addToGroup(leaveIf); private final Setting players = new Setting<>("Players", LeaveMode.Leave).addToGroup(leaveIf); private final Setting distance = new Setting<>("Distance", 256, 4, 256, v -> players.getValue() != LeaveMode.None).addToGroup(leaveIf); @@ -61,12 +62,12 @@ public void onUpdate() { switch (players.getValue()) { case Command -> { if (autoDisable.getValue()) disable(); - sendMessage(ClientSettings.isRu() ? "Ливнул т.к. рядом появился игрок!" : "Logged out because there was a player!"); + sendMessage(isRu() ? "Ливнул т.к. рядом появился игрок!" : "Logged out because there was a player!"); mc.player.networkHandler.sendChatCommand(command.getValue()); return; } case Leave -> { - leave(ClientSettings.isRu() ? "Ливнул т.к. рядом появился игрок" : "Logged out because there was a player"); + leave(isRu() ? "Ливнул т.к. рядом появился игрок" : "Logged out because there was a player"); return; } } @@ -74,13 +75,13 @@ public void onUpdate() { } if (totems.getValue() && InventoryUtility.getItemCount(Items.TOTEM_OF_UNDYING) <= totemsCount.getValue()) - leave(ClientSettings.isRu() ? "Ливнул т.к. кончились тотемы" : "Logged out because out of totems"); + leave(isRu() ? "Ливнул т.к. кончились тотемы" : "Logged out because out of totems"); if (mc.player.getHealth() < leaveHp.getValue() && low_hp.getValue()) - leave(ClientSettings.isRu() ? "Ливнул т.к. мало хп" : "Logged out because ur hp is low"); + leave(isRu() ? "Ливнул т.к. мало хп" : "Logged out because ur hp is low"); if (staff.getValue() != LeaveMode.None && ModuleManager.staffBoard.isDisabled() && mc.player.age % 5 == 0) - sendMessage(ClientSettings.isRu() ? "Включи StaffBoard!" : "Turn on StaffBoard!"); + sendMessage(isRu() ? "Включи StaffBoard!" : "Turn on StaffBoard!"); } private void leave(String message) { @@ -95,7 +96,7 @@ private void leave(String message) { else mc.player.networkHandler.getConnection().disconnect(Text.of("[AutoLeave] " + message)); } - public void onStaff() { + /*public void onStaff() { todo if (!chatDelay.passedMs(1000)) return; chatDelay.reset(); @@ -103,20 +104,18 @@ public void onStaff() { if (hurtTimer.passedMs(30000) || !antiKTLeave.getValue()) { switch (staff.getValue()) { case Command -> { - sendMessage(ClientSettings.isRu() ? "Ливнул т.к. хелпер в спеке!" : "Logged out because helper in vanish!"); + sendMessage(isRu() ? "Ливнул т.к. хелпер в спеке!" : "Logged out because helper in vanish!"); mc.player.networkHandler.sendChatCommand(command.getValue()); if (autoDisable.getValue()) disable(); } - case Leave -> - leave(ClientSettings.isRu() ? "Ливнул т.к. хелпер в спеке!" : "Logged out because helper in vanish!"); + case Leave -> leave(isRu() ? "Ливнул т.к. хелпер в спеке!" : "Logged out because helper in vanish!"); } } - } + }*/ public static boolean isStaff(String name) { - if(name == null) - return false; + if (name == null) return false; name = name.toLowerCase(); diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoTpAccept.java b/src/main/java/thunder/hack/features/modules/misc/AutoTpAccept.java index 73948b86..d869fc66 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoTpAccept.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoTpAccept.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.gui.font.FontRenderers; @@ -17,7 +16,6 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class AutoTpAccept extends Module { - public AutoTpAccept() { super("AutoTPaccept", Category.MISC); } @@ -41,8 +39,7 @@ public void onPacketReceive(PacketEvent.Receive event) { else tpTask = new TpTask(() -> acceptRequest(packet.content.getString()), System.currentTimeMillis()); } - } else - acceptRequest(packet.content().getString()); + } else acceptRequest(packet.content().getString()); } } } diff --git a/src/main/java/thunder/hack/features/modules/misc/AutoTrader.java b/src/main/java/thunder/hack/features/modules/misc/AutoTrader.java index 3b939129..3f3ea1ff 100644 --- a/src/main/java/thunder/hack/features/modules/misc/AutoTrader.java +++ b/src/main/java/thunder/hack/features/modules/misc/AutoTrader.java @@ -10,8 +10,8 @@ import net.minecraft.util.Hand; import net.minecraft.village.TradeOffer; import net.minecraft.village.TradeOfferList; -import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.features.modules.Module; +import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.BooleanSettingGroup; import thunder.hack.setting.impl.SettingGroup; @@ -24,6 +24,9 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class AutoTrader extends Module { + public AutoTrader() { + super("AutoTrader", Category.MISC); + } private final Setting buy = new Setting<>("Buy", new BooleanSettingGroup(true)); private final Setting buyItem = new Setting<>("BuyItem", "apple").addToGroup(buy); @@ -33,10 +36,6 @@ public class AutoTrader extends Module { private final Setting noVillagers = new Setting<>("NoVillagers", true).addToGroup(disable); private final Setting noItems = new Setting<>("NoItems", false).addToGroup(disable); - public AutoTrader() { - super("AutoTrader", Category.MISC); - } - private int interactTicks, cooldown; private int lastVillager; private HashMap villagers = new HashMap<>(); @@ -94,7 +93,7 @@ public void onUpdate() { .min(Comparator.comparing(e -> mc.player.distanceTo(e))).orElse(null); if (ent != null) { - float[] angles = InteractionUtility.calculateAngle(ent.getEyePos().add(Math.random() * 0.2, 0,Math.random() * 0.2)); + float[] angles = InteractionUtility.calculateAngle(ent.getEyePos().add(Math.random() * 0.2, 0, Math.random() * 0.2)); mc.player.setYaw(angles[0]); mc.player.setPitch(angles[1]); mc.interactionManager.interactEntity(mc.player, ent, Hand.MAIN_HAND); @@ -106,7 +105,6 @@ public void onUpdate() { } private boolean goodDeal(TradeOffer offer) { - boolean selectedBuyItem = (offer.getSellItem().getItem().getTranslationKey().equals("item.minecraft." + buyItem.getValue()) || offer.getSellItem().getItem().getTranslationKey().equals("block.minecraft." + buyItem.getValue())); diff --git a/src/main/java/thunder/hack/features/modules/misc/ChatUtils.java b/src/main/java/thunder/hack/features/modules/misc/ChatUtils.java index 1d127390..a1484396 100644 --- a/src/main/java/thunder/hack/features/modules/misc/ChatUtils.java +++ b/src/main/java/thunder/hack/features/modules/misc/ChatUtils.java @@ -12,12 +12,10 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.events.impl.TotemPopEvent; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.client.ClientSettings; import thunder.hack.injection.accesors.IGameMessageS2CPacket; import thunder.hack.gui.notification.Notification; import thunder.hack.setting.Setting; @@ -26,6 +24,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class ChatUtils extends Module { private final Setting welcomer = new Setting<>("Welcomer", Welcomer.Off); private final Setting prefix = new Setting<>("Prefix", Prefix.None); @@ -184,7 +184,7 @@ public void onPacketReceive(PacketEvent.Receive event) { if (mention.getValue()) { if (pac.content.getString().contains(mc.player.getName().getString()) && messageTimer.passedMs(1000)) { - Managers.NOTIFICATION.publicity("ChatUtils", ClientSettings.language.getValue() == ClientSettings.Language.RU ? "Тебя помянули в чате!" : "You were mentioned in the chat!", 4, Notification.Type.WARNING); + Managers.NOTIFICATION.publicity("ChatUtils", isRu() ? "Тебя помянули в чате!" : "You were mentioned in the chat!", 4, Notification.Type.WARNING); mc.world.playSound(mc.player, mc.player.getBlockPos(), SoundEvents.ENTITY_PLAYER_LEVELUP, SoundCategory.BLOCKS, 5f, 1f); } } @@ -230,7 +230,7 @@ public boolean antiBot(@NotNull String s) { public void onPacketSend(PacketEvent.@NotNull Send e) { if (e.getPacket() instanceof ChatMessageC2SPacket pac) { if (antiCoordLeak.getValue() && pac.chatMessage.replaceAll("\\D", "").length() >= 6) { - sendMessage("[ChatUtils] " + (ClientSettings.language.getValue() == ClientSettings.Language.RU ? "В сообщении содержатся координаты!" : "The message contains coordinates!")); + sendMessage("[ChatUtils] " + (isRu() ? "В сообщении содержатся координаты!" : "The message contains coordinates!")); e.cancel(); } @@ -277,9 +277,8 @@ public void onPacketSend(PacketEvent.@NotNull Send e) { } message = builder.toString(); } - if (translit.getValue()) { - message = transliterate(message.toString()); - } + if (translit.getValue()) + message = transliterate(message); skip = message; mc.player.networkHandler.sendChatMessage(skip); e.cancel(); diff --git a/src/main/java/thunder/hack/features/modules/misc/ChestStealer.java b/src/main/java/thunder/hack/features/modules/misc/ChestStealer.java index ac8ec514..795bb969 100644 --- a/src/main/java/thunder/hack/features/modules/misc/ChestStealer.java +++ b/src/main/java/thunder/hack/features/modules/misc/ChestStealer.java @@ -19,13 +19,11 @@ import thunder.hack.utility.math.MathUtility; import java.util.ArrayList; -import java.util.List; import java.util.Random; import static thunder.hack.features.modules.render.StorageEsp.getBlockEntities; public class ChestStealer extends Module { - public ChestStealer() { super("ChestStealer", Category.MISC); } diff --git a/src/main/java/thunder/hack/features/modules/misc/ChorusExploit.java b/src/main/java/thunder/hack/features/modules/misc/ChorusExploit.java index 4f7f93d4..12a1e645 100644 --- a/src/main/java/thunder/hack/features/modules/misc/ChorusExploit.java +++ b/src/main/java/thunder/hack/features/modules/misc/ChorusExploit.java @@ -12,7 +12,6 @@ import thunder.hack.events.impl.EventSync; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.combat.AutoCrystal; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.Bind; import thunder.hack.setting.impl.ColorSetting; diff --git a/src/main/java/thunder/hack/features/modules/misc/Ghost.java b/src/main/java/thunder/hack/features/modules/misc/Ghost.java index 2c41d332..b3ed623c 100644 --- a/src/main/java/thunder/hack/features/modules/misc/Ghost.java +++ b/src/main/java/thunder/hack/features/modules/misc/Ghost.java @@ -8,16 +8,15 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class Ghost extends Module { - private boolean bypass = false; - public Ghost() { super("Ghost", Category.MISC); } + private boolean bypass = false; + @Override public void onEnable() { bypass = false; - sendMessage(isRu() ? "Для возрождения выключи модуль!" : "To revive, turn off the module!"); } @Override @@ -34,6 +33,7 @@ public void onUpdate() { bypass = true; mc.setScreen(null); mc.player.setPosition(mc.player.getX(), mc.player.getY(), mc.player.getZ()); + sendMessage(isRu() ? "Для возрождения выключи модуль!" : "To revive, turn off the module!"); } } diff --git a/src/main/java/thunder/hack/features/modules/misc/ItemScroller.java b/src/main/java/thunder/hack/features/modules/misc/ItemScroller.java index f55d33de..647b8cd5 100644 --- a/src/main/java/thunder/hack/features/modules/misc/ItemScroller.java +++ b/src/main/java/thunder/hack/features/modules/misc/ItemScroller.java @@ -10,24 +10,24 @@ import thunder.hack.setting.Setting; public class ItemScroller extends Module { - public Setting delay = new Setting<>("Delay",80,0,500); - public ItemScroller() { super("ItemScroller", Category.MISC); } + public Setting delay = new Setting<>("Delay",80,0,500); + private boolean pauseListening = false; @EventHandler public void onClick(EventClickSlot e) { - if((isKeyPressed(GLFW.GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW.GLFW_KEY_RIGHT_SHIFT)) + if ((isKeyPressed(GLFW.GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW.GLFW_KEY_RIGHT_SHIFT)) && (isKeyPressed(GLFW.GLFW_KEY_LEFT_CONTROL) || isKeyPressed(GLFW.GLFW_KEY_RIGHT_CONTROL)) && e.getSlotActionType() == SlotActionType.THROW && !pauseListening) { Item copy = mc.player.currentScreenHandler.slots.get(e.getSlot()).getStack().getItem(); pauseListening = true; - for(int i2 = 0; i2 < mc.player.currentScreenHandler.slots.size(); ++i2) { - if(mc.player.currentScreenHandler.slots.get(i2).getStack().getItem() == copy) + for (int i2 = 0; i2 < mc.player.currentScreenHandler.slots.size(); ++i2) { + if (mc.player.currentScreenHandler.slots.get(i2).getStack().getItem() == copy) mc.interactionManager.clickSlot(mc.player.currentScreenHandler.syncId, i2, 1, SlotActionType.THROW, mc.player); } pauseListening = false; diff --git a/src/main/java/thunder/hack/features/modules/misc/LagNotifier.java b/src/main/java/thunder/hack/features/modules/misc/LagNotifier.java index a2416921..0638fc72 100644 --- a/src/main/java/thunder/hack/features/modules/misc/LagNotifier.java +++ b/src/main/java/thunder/hack/features/modules/misc/LagNotifier.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.PacketEvent; @@ -23,6 +22,10 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class LagNotifier extends Module { + public LagNotifier() { + super("LagNotifier", Category.MISC); + } + private final Setting rubberbandNotify = new Setting<>("Rubberband", true); private final Setting serverResponseNotify = new Setting<>("ServerResponse", true); private final Setting responseTreshold = new Setting<>("ResponseTreshold", 5, 0, 15, v -> serverResponseNotify.getValue()); @@ -34,10 +37,6 @@ public class LagNotifier extends Module { private boolean isLagging = false; - public LagNotifier() { - super("LagNotifier", Category.MISC); - } - @Override public void onEnable() { notifyTimer = new Timer(); diff --git a/src/main/java/thunder/hack/features/modules/misc/MessageAppend.java b/src/main/java/thunder/hack/features/modules/misc/MessageAppend.java index b3639539..ec601585 100644 --- a/src/main/java/thunder/hack/features/modules/misc/MessageAppend.java +++ b/src/main/java/thunder/hack/features/modules/misc/MessageAppend.java @@ -3,7 +3,6 @@ import meteordevelopment.orbit.EventHandler; import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; @@ -12,13 +11,12 @@ import java.util.Objects; public class MessageAppend extends Module { - private final Setting word = new Setting<>("word", " TH RECODE"); - private String skip; - public MessageAppend() { super("MessageAppend", Category.MISC); } + private final Setting word = new Setting<>("word", " TH RECODE"); + private String skip; @EventHandler public void onPacketSend(PacketEvent.Send e) { diff --git a/src/main/java/thunder/hack/features/modules/misc/MiddleClick.java b/src/main/java/thunder/hack/features/modules/misc/MiddleClick.java index e4c4937a..57524fe1 100644 --- a/src/main/java/thunder/hack/features/modules/misc/MiddleClick.java +++ b/src/main/java/thunder/hack/features/modules/misc/MiddleClick.java @@ -18,12 +18,11 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.features.cmd.Command; import thunder.hack.core.manager.client.AsyncManager; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.EventSync; +import thunder.hack.features.cmd.Command; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.combat.Aura; import thunder.hack.setting.Setting; @@ -49,7 +48,7 @@ public MiddleClick() { private final Setting silent = new Setting<>("Silent", true); private final Setting inventory = new Setting<>("Inventory", true); private final Setting swapDelay = new Setting<>("SwapDelay", 100, 0, 1000, v -> !silent.getValue()); - private final Setting antiWaste = new Setting<>("AntiWaste",new BooleanSettingGroup(true)); + private final Setting antiWaste = new Setting<>("AntiWaste", new BooleanSettingGroup(true)); private final Setting durability = new Setting<>("StopOn", 90, 0, 100).addToGroup(antiWaste); public final Setting antiPickUp = new Setting<>("AntiPickUp", true); private final Setting feetExp = new Setting<>("FeetXP", false); @@ -68,14 +67,14 @@ private void onSync(EventSync event) { HitResult target = mc.crosshairTarget; if (mc.player.isFallFlying()) { - if(mc.options.pickItemKey.isPressed()) + if (mc.options.pickItemKey.isPressed()) onFlying.getValue().doAction(event); state = onFlying.getValue().toString(); return; } if (target instanceof EntityHitResult ehr && ehr.getEntity() instanceof PlayerEntity) { - if(mc.options.pickItemKey.isPressed()) + if (mc.options.pickItemKey.isPressed()) onEntity.getValue().doAction(event); state = onEntity.getValue().toString(); return; @@ -83,17 +82,17 @@ private void onSync(EventSync event) { if (target instanceof BlockHitResult bhr) { if (mc.world.isAir(bhr.getBlockPos())) { - if(mc.options.pickItemKey.isPressed()) + if (mc.options.pickItemKey.isPressed()) onAir.getValue().doAction(event); state = onAir.getValue().toString(); } else { - if(mc.options.pickItemKey.isPressed()) + if (mc.options.pickItemKey.isPressed()) onBlock.getValue().doAction(event); state = onBlock.getValue().toString(); } return; } - if(mc.options.pickItemKey.isPressed()) + if (mc.options.pickItemKey.isPressed()) onAir.getValue().doAction(event); state = onAir.getValue().toString(); } @@ -301,7 +300,8 @@ public enum Action { }); }), - None((EventSync e) -> {}); + None((EventSync e) -> { + }); private final Consumer r; diff --git a/src/main/java/thunder/hack/features/modules/misc/NoCommentExploit.java b/src/main/java/thunder/hack/features/modules/misc/NoCommentExploit.java index 4826935c..bfee3735 100644 --- a/src/main/java/thunder/hack/features/modules/misc/NoCommentExploit.java +++ b/src/main/java/thunder/hack/features/modules/misc/NoCommentExploit.java @@ -8,7 +8,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.chunk.Chunk; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.cmd.Command; import thunder.hack.events.impl.PacketEvent; diff --git a/src/main/java/thunder/hack/features/modules/misc/PVETools.java b/src/main/java/thunder/hack/features/modules/misc/PVETools.java index 25d4eb9a..4cef22fe 100644 --- a/src/main/java/thunder/hack/features/modules/misc/PVETools.java +++ b/src/main/java/thunder/hack/features/modules/misc/PVETools.java @@ -1,4 +1,4 @@ -package thunder.hack.features.modules.misc; +/*package thunder.hack.features.modules.misc; import meteordevelopment.orbit.EventHandler; import thunder.hack.events.impl.EventPostSync; @@ -18,7 +18,7 @@ public PVETools() { private final Setting autoBoneMeal = new Setting<>("AutoBoneMeal", false); private final Setting Harvester = new Setting<>("Harvester", false); - // Sheeps + // Sheep private final Setting SheepPaint = new Setting<>("SheepPaint", false); private final Setting SheepShear = new Setting<>("SheepShear", false); @@ -36,4 +36,4 @@ public void onSync(EventSync e) { } // ПИЗДЕЦ НЕ ТРОГАЙТЕ МОДУЛЬ! -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/misc/PearlChaser.java b/src/main/java/thunder/hack/features/modules/misc/PearlChaser.java index c16d1950..4e38f5cf 100644 --- a/src/main/java/thunder/hack/features/modules/misc/PearlChaser.java +++ b/src/main/java/thunder/hack/features/modules/misc/PearlChaser.java @@ -38,10 +38,7 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class PearlChaser extends Module { - - // Better targeting?.. - - public PearlChaser() { + public PearlChaser() { //todo better targeting?.. super("PearlChaser", Category.MISC); } diff --git a/src/main/java/thunder/hack/features/modules/misc/ServerHelper.java b/src/main/java/thunder/hack/features/modules/misc/ServerHelper.java index f84ed1b7..1bd1b9ff 100644 --- a/src/main/java/thunder/hack/features/modules/misc/ServerHelper.java +++ b/src/main/java/thunder/hack/features/modules/misc/ServerHelper.java @@ -5,7 +5,6 @@ import net.minecraft.client.network.PlayerListEntry; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,13 +12,11 @@ import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket; import net.minecraft.network.packet.c2s.play.CommandExecutionC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket; -import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket; import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket; import net.minecraft.screen.GenericContainerScreenHandler; import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; import net.minecraft.util.Hand; -import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.StringUtils; import thunder.hack.ThunderHack; diff --git a/src/main/java/thunder/hack/features/modules/misc/Spammer.java b/src/main/java/thunder/hack/features/modules/misc/Spammer.java index 013733fe..91e54572 100644 --- a/src/main/java/thunder/hack/features/modules/misc/Spammer.java +++ b/src/main/java/thunder/hack/features/modules/misc/Spammer.java @@ -3,11 +3,9 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.apache.commons.io.IOUtils; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.hud.impl.StaffBoard; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.client.ClientSettings; import thunder.hack.setting.Setting; import thunder.hack.utility.Timer; @@ -18,12 +16,14 @@ import java.util.List; import java.util.Random; +import static thunder.hack.features.modules.client.ClientSettings.isRu; + public class Spammer extends Module { public static ArrayList SpamList = new ArrayList<>(); - public Setting mode = new Setting<>("mode",Mode.Chat); - public Setting messages = new Setting<>("messages",Messages.File); + public Setting mode = new Setting<>("mode", Mode.Chat); + public Setting messages = new Setting<>("messages", Messages.File); public Setting whisper_prefix = new Setting<>("prefix", WhisperPrefix.W, v -> mode.getValue() == Mode.Whispers); - public Setting global = new Setting<>("global", true,v -> mode.getValue() == Mode.Chat); + public Setting global = new Setting<>("global", true, v -> mode.getValue() == Mode.Chat); public Setting antiSpam = new Setting<>("AntiSpam", false); public Setting delay = new Setting<>("delay", 5f, 0f, 30f); private final Timer timer_delay = new Timer(); @@ -85,25 +85,29 @@ public static void loadSpammer() { } } - public String getPlayerName(){ - try{ + public String getPlayerName() { + try { List list = StaffBoard.getOnlinePlayer(); - if(list.isEmpty()) + if (list.isEmpty()) return ""; - return list.get(random.nextInt(0,list.size() - 1)); - }catch (NullPointerException e){return null;} + return list.get(random.nextInt(0, list.size() - 1)); + } catch (NullPointerException e) { + return null; + } } - private void changeFact(){ + + private void changeFact() { Managers.ASYNC.run(() -> { - try{ + try { String jsonResponse = IOUtils.toString(new URL("https://catfact.ninja/fact?max_length=200"), StandardCharsets.UTF_8); JsonObject jsonObject = new JsonParser().parse(jsonResponse).getAsJsonObject(); fact = jsonObject.get("fact").getAsString(); - }catch (IOException e){ - disable(ClientSettings.isRu() ? "Не удалось загрузить факт,может ты включишь интернет?" : "Failed to load the fact, can you turn on the Internet?"); + } catch (IOException e) { + disable(isRu() ? "Не удалось загрузить факт, может ты включишь интернет?" : "Failed to load the fact, can you turn on the Internet?"); } }); } + public static String generateRandomSymbol() { Random random = new Random(); String randomSymbol = "["; @@ -124,43 +128,50 @@ public void onEnable() { public void onUpdate() { if (timer_delay.passedMs((long) (delay.getValue() * 1000))) { String c; - if(messages.getValue() == Messages.File){ + if (messages.getValue() == Messages.File) { if (SpamList.isEmpty()) { - disable(ClientSettings.isRu() ? "Файл spammer пустой!" : "The spammer file is empty!"); + disable(isRu() ? "Файл spammer пустой!" : "The spammer file is empty!"); return; } c = SpamList.get(new Random().nextInt(SpamList.size())); - }else{ - if(fact == null){return;} + } else { + if (fact == null) { + return; + } c = fact; changeFact(); } - if(antiSpam.getValue()){ - c += generateRandomSymbol(); + if (antiSpam.getValue()) { + c += generateRandomSymbol(); } - if(mode.getValue() == Mode.Chat){ + if (mode.getValue() == Mode.Chat) { if (c.charAt(0) == '/') { c = c.replace("/", ""); mc.player.networkHandler.sendCommand(c); } else mc.player.networkHandler.sendChatMessage(global.getValue() ? "!" + c : c); - }else{ - try{ + } else { + try { String prefix = whisper_prefix.getValue().prefix; mc.player.networkHandler.sendCommand(prefix + getPlayerName() + " " + c); - }catch (NullPointerException e){} + } catch (NullPointerException e) { + } } timer_delay.reset(); } } - private enum Messages{File,CatFacts} - private enum Mode{Chat,Whispers} + + private enum Messages {File, CatFacts} + + private enum Mode {Chat, Whispers} + private enum WhisperPrefix { W("w "), Msg("msg "), Tell("tell "); final String prefix; + WhisperPrefix(String p) { prefix = p; } diff --git a/src/main/java/thunder/hack/features/modules/misc/StashLogger.java b/src/main/java/thunder/hack/features/modules/misc/StashLogger.java index de9921d9..05e4f472 100644 --- a/src/main/java/thunder/hack/features/modules/misc/StashLogger.java +++ b/src/main/java/thunder/hack/features/modules/misc/StashLogger.java @@ -6,7 +6,6 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.world.chunk.WorldChunk; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ConfigManager; import thunder.hack.gui.notification.Notification; diff --git a/src/main/java/thunder/hack/features/modules/misc/TapeMouse.java b/src/main/java/thunder/hack/features/modules/misc/TapeMouse.java index 9989af8b..2958ed2b 100644 --- a/src/main/java/thunder/hack/features/modules/misc/TapeMouse.java +++ b/src/main/java/thunder/hack/features/modules/misc/TapeMouse.java @@ -4,8 +4,8 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; -import thunder.hack.injection.accesors.IMinecraftClient; import thunder.hack.features.modules.Module; +import thunder.hack.injection.accesors.IMinecraftClient; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.BooleanSettingGroup; import thunder.hack.utility.Timer; @@ -28,21 +28,20 @@ private enum Mode {Right, Left} @Override public void onUpdate() { - if(timer.every((long) (delay.getValue() + (randomize.getValue().isEnabled() ? MathUtility.random(0, randomizeValue.getValue()) : 0)))) - if(mode.getValue() == Mode.Left) { - if(!legit.getValue()) { + if (timer.every((long) (delay.getValue() + (randomize.getValue().isEnabled() ? MathUtility.random(0, randomizeValue.getValue()) : 0)))) + if (mode.getValue() == Mode.Left) { + if (!legit.getValue()) { HitResult hr = mc.crosshairTarget; - if(hr != null) { - if(hr instanceof EntityHitResult ehr && ehr.getEntity() != null) { + if (hr != null) { + if (hr instanceof EntityHitResult ehr && ehr.getEntity() != null) { mc.interactionManager.attackEntity(mc.player, ehr.getEntity()); mc.player.swingHand(Hand.MAIN_HAND); - } else if(hr instanceof BlockHitResult bhr && bhr.getBlockPos() != null && bhr.getSide() != null && !mc.world.isAir(bhr.getBlockPos())) { + } else if (hr instanceof BlockHitResult bhr && bhr.getBlockPos() != null && bhr.getSide() != null && !mc.world.isAir(bhr.getBlockPos())) { mc.interactionManager.attackBlock(bhr.getBlockPos(), bhr.getSide()); mc.player.swingHand(Hand.MAIN_HAND); } } } else ((IMinecraftClient) mc).idoAttack(); - } - else ((IMinecraftClient) mc).idoItemUse(); + } else ((IMinecraftClient) mc).idoItemUse(); } } diff --git a/src/main/java/thunder/hack/features/modules/misc/TotemPopCounter.java b/src/main/java/thunder/hack/features/modules/misc/TotemPopCounter.java index b1eaa134..c776267b 100644 --- a/src/main/java/thunder/hack/features/modules/misc/TotemPopCounter.java +++ b/src/main/java/thunder/hack/features/modules/misc/TotemPopCounter.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Formatting; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.TotemPopEvent; import thunder.hack.features.modules.Module; diff --git a/src/main/java/thunder/hack/features/modules/misc/VisualRange.java b/src/main/java/thunder/hack/features/modules/misc/VisualRange.java index bf82c1e6..f4365397 100644 --- a/src/main/java/thunder/hack/features/modules/misc/VisualRange.java +++ b/src/main/java/thunder/hack/features/modules/misc/VisualRange.java @@ -6,7 +6,6 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.Formatting; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.EventEntityRemoved; @@ -44,8 +43,7 @@ public void onEntityAdded(EventEntitySpawn event) { public void onEntityRemoved(EventEntityRemoved event) { if (!isValid(event.entity)) return; - if (entities.contains(event.entity.getName().getString())) - entities.remove(event.entity.getName().getString()); + if (entities.contains(event.entity.getName().getString())) entities.remove(event.entity.getName().getString()); else return; if (leave.getValue()) notify(event.entity, false); @@ -53,7 +51,7 @@ public void onEntityRemoved(EventEntityRemoved event) { public void notify(Entity entity, boolean enter) { String message = ""; - if(ModuleManager.nameProtect.isEnabled() && NameProtect.hideFriends.getValue()){ + if (ModuleManager.nameProtect.isEnabled() && NameProtect.hideFriends.getValue()) { message = Formatting.AQUA + NameProtect.newName.getValue(); } if (Managers.FRIEND.isFriend(entity.getName().getString())) @@ -62,15 +60,13 @@ public void notify(Entity entity, boolean enter) { if (enter) message += Formatting.GREEN + " was found!"; - else message += Formatting.RED + " left to X:" + (int)entity.getX() + " Z:" + (int) entity.getZ(); + else message += Formatting.RED + " left to X:" + (int) entity.getX() + " Z:" + (int) entity.getZ(); - if (mode.is(Mode.Chat) || mode.is(Mode.Both)) - sendMessage(message); + if (mode.is(Mode.Chat) || mode.is(Mode.Both)) sendMessage(message); if (mode.is(Mode.Notification) || mode.is(Mode.Both)) Managers.NOTIFICATION.publicity("VisualRange", message, 2, Notification.Type.WARNING); - if (soundpl.getValue()) { try { if (enter) diff --git a/src/main/java/thunder/hack/features/modules/movement/AntiVoid.java b/src/main/java/thunder/hack/features/modules/movement/AntiVoid.java index cfb84760..5ca343e8 100644 --- a/src/main/java/thunder/hack/features/modules/movement/AntiVoid.java +++ b/src/main/java/thunder/hack/features/modules/movement/AntiVoid.java @@ -10,21 +10,20 @@ import thunder.hack.setting.Setting; public class AntiVoid extends Module { - public AntiVoid() { super("AntiVoid", Category.MOVEMENT); } private static final Setting mode = new Setting<>("Mode", Mode.NCP); - private final Setting sendPacket = new Setting<>("SendPacket", true, v-> mode.getValue() == Mode.NCP); + private final Setting sendPacket = new Setting<>("SendPacket", true, v -> mode.getValue() == Mode.NCP); private enum Mode {NCP, Timer} boolean timerFlag; @Override - public void onDisable(){ - if(timerFlag) + public void onDisable() { + if (timerFlag) ThunderHack.TICK_TIMER = 1f; } diff --git a/src/main/java/thunder/hack/features/modules/movement/AutoSprint.java b/src/main/java/thunder/hack/features/modules/movement/AutoSprint.java index dfaa9981..62f174e0 100644 --- a/src/main/java/thunder/hack/features/modules/movement/AutoSprint.java +++ b/src/main/java/thunder/hack/features/modules/movement/AutoSprint.java @@ -6,15 +6,15 @@ import thunder.hack.setting.Setting; public class AutoSprint extends Module { - public static final Setting sprint = new Setting<>("KeepSprint", true); - public static final Setting motion = new Setting("Motion", 1f, 0f, 1f, v -> sprint.getValue()); - private final Setting stopWhileUsing = new Setting<>("StopWhileUsing", false); - private final Setting pauseWhileAura = new Setting<>("PauseWhileAura", false); - public AutoSprint() { super("AutoSprint", Category.MOVEMENT); } + public static final Setting sprint = new Setting<>("KeepSprint", true); + public static final Setting motion = new Setting<>("Motion", 1f, 0f, 1f, v -> sprint.getValue()); + private final Setting stopWhileUsing = new Setting<>("StopWhileUsing", false); + private final Setting pauseWhileAura = new Setting<>("PauseWhileAura", false); + @Override public void onUpdate() { mc.player.setSprinting( diff --git a/src/main/java/thunder/hack/features/modules/movement/AutoWalk.java b/src/main/java/thunder/hack/features/modules/movement/AutoWalk.java index af76ee55..41bfd50b 100644 --- a/src/main/java/thunder/hack/features/modules/movement/AutoWalk.java +++ b/src/main/java/thunder/hack/features/modules/movement/AutoWalk.java @@ -3,12 +3,9 @@ import meteordevelopment.orbit.EventHandler; import thunder.hack.events.impl.EventKeyboardInput; import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; -import thunder.hack.utility.player.MovementUtility; public class AutoWalk extends Module { - public AutoWalk() { super("AutoWalk", Category.MOVEMENT); } diff --git a/src/main/java/thunder/hack/features/modules/movement/Avoid.java b/src/main/java/thunder/hack/features/modules/movement/Avoid.java index 2f8fc427..184ae22b 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Avoid.java +++ b/src/main/java/thunder/hack/features/modules/movement/Avoid.java @@ -5,8 +5,6 @@ import net.minecraft.block.Blocks; import net.minecraft.block.PressurePlateBlock; import net.minecraft.block.TripwireBlock; -import net.minecraft.entity.Entity; -import net.minecraft.entity.mob.EndermanEntity; import thunder.hack.events.impl.EventCollision; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; @@ -30,8 +28,7 @@ public Avoid() { @EventHandler public void onCollide(EventCollision e) { - if (fullNullCheck()) - return; + if (fullNullCheck()) return; Block b = e.getState().getBlock(); boolean avoidUnloaded = !mc.world.isChunkLoaded(e.getPos().getX() >> 4, e.getPos().getZ() >> 4) && unloaded.getValue(); diff --git a/src/main/java/thunder/hack/features/modules/movement/Blink.java b/src/main/java/thunder/hack/features/modules/movement/Blink.java index d891096f..a5a3ed56 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Blink.java +++ b/src/main/java/thunder/hack/features/modules/movement/Blink.java @@ -3,9 +3,12 @@ import meteordevelopment.orbit.EventHandler; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.c2s.common.CommonPongC2SPacket; import net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket; +import net.minecraft.network.packet.c2s.play.*; import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket; +import net.minecraft.util.math.Vec3d; import org.lwjgl.glfw.GLFW; import thunder.hack.events.impl.EventTick; import thunder.hack.events.impl.PacketEvent; @@ -15,9 +18,6 @@ import thunder.hack.setting.impl.ColorSetting; import thunder.hack.utility.player.PlayerEntityCopy; import thunder.hack.utility.render.Render3DEngine; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.c2s.play.*; -import net.minecraft.util.math.Vec3d; import java.awt.*; import java.util.ArrayList; @@ -28,12 +28,15 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class Blink extends Module { + public Blink() { + super("Blink", Category.MOVEMENT); + } private final Setting pulse = new Setting<>("Pulse", false); private final Setting autoDisable = new Setting<>("AutoDisable", false); private final Setting disableOnVelocity = new Setting<>("DisableOnVelocity", false); - private final Setting disablePackets = new Setting<>("DisablePackets", 17, 1, 1000, v-> autoDisable.getValue() ); - private final Setting pulsePackets = new Setting<>("PulsePackets", 20, 1, 1000, v-> pulse.getValue()); + private final Setting disablePackets = new Setting<>("DisablePackets", 17, 1, 1000, v -> autoDisable.getValue()); + private final Setting pulsePackets = new Setting<>("PulsePackets", 20, 1, 1000, v -> pulse.getValue()); private final Setting render = new Setting<>("Render", true); private final Setting renderMode = new Setting<>("Render Mode", RenderMode.Circle, value -> render.getValue()); private final Setting circleColor = new Setting<>("Color", new ColorSetting(0xFFda6464), value -> render.getValue() && renderMode.getValue() == RenderMode.Circle || renderMode.getValue() == RenderMode.Both); @@ -54,10 +57,6 @@ private enum RenderMode { private final Queue> storedTransactions = new LinkedList<>(); private final AtomicBoolean sending = new AtomicBoolean(false); - public Blink() { - super("Blink", Category.MOVEMENT); - } - @Override public void onEnable() { if (mc.player == null @@ -96,7 +95,7 @@ public String getDisplayInfo() { @EventHandler public void onPacketReceive(PacketEvent.Receive event) { - if(event.getPacket() instanceof EntityVelocityUpdateS2CPacket vel && vel.getId() == mc.player.getId() && disableOnVelocity.getValue()) + if (event.getPacket() instanceof EntityVelocityUpdateS2CPacket vel && vel.getId() == mc.player.getId() && disableOnVelocity.getValue()) disable(isRu() ? "Выключенно из-за велосити!" : "Disabled due to velocity!"); } @@ -110,7 +109,7 @@ public void onPacketSend(PacketEvent.Send event) { return; } - if(packet instanceof CommonPongC2SPacket) { + if (packet instanceof CommonPongC2SPacket) { storedTransactions.add(packet); } @@ -129,7 +128,7 @@ public void onPacketSend(PacketEvent.Send event) { public void onUpdate(EventTick event) { if (fullNullCheck()) return; - if(isKeyPressed(cancel)) { + if (isKeyPressed(cancel)) { storedPackets.clear(); mc.player.setPos(lastPos.getX(), lastPos.getY(), lastPos.getZ()); mc.player.setVelocity(prevVelocity); @@ -151,7 +150,7 @@ public void onUpdate(EventTick event) { } } - if(autoDisable.getValue()) { + if (autoDisable.getValue()) { if (storedPackets.size() >= disablePackets.getValue()) { disable(); } diff --git a/src/main/java/thunder/hack/features/modules/movement/BoatFly.java b/src/main/java/thunder/hack/features/modules/movement/BoatFly.java index c3677226..4cee05d1 100644 --- a/src/main/java/thunder/hack/features/modules/movement/BoatFly.java +++ b/src/main/java/thunder/hack/features/modules/movement/BoatFly.java @@ -4,7 +4,10 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.vehicle.BoatEntity; -import net.minecraft.network.packet.c2s.play.*; +import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; +import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket; import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket; import net.minecraft.network.packet.s2c.play.EntityAttachS2CPacket; import net.minecraft.network.packet.s2c.play.EntityS2CPacket; @@ -26,6 +29,10 @@ import java.util.ArrayList; public class BoatFly extends Module { + public BoatFly() { + super("BoatFly", Category.MOVEMENT); + } + private final Setting mode = new Setting<>("Mode", Mode.Packet); private final Setting phase = new Setting<>("Phase", false); @@ -42,7 +49,7 @@ public class BoatFly extends Module { private final Setting limit = new Setting<>("Limit", true).addToGroup(advanced); private final Setting ongroundpacket = new Setting<>("OnGroundPacket", false).addToGroup(advanced); private final Setting spoofpackets = new Setting<>("SpoofPackets", false).addToGroup(advanced); - private final Setting jitter = new Setting<>("Jitter", 0.1f, 0.0f, 10f, v-> spoofpackets.getValue()).addToGroup(advanced); + private final Setting jitter = new Setting<>("Jitter", 0.1f, 0.0f, 10f, v -> spoofpackets.getValue()).addToGroup(advanced); private final Setting cancelrotations = new Setting<>("CancelRotations", true).addToGroup(advanced); private final Setting cancel = new Setting<>("Cancel", true).addToGroup(advanced); private final Setting pause = new Setting<>("Pause", false).addToGroup(advanced); @@ -52,7 +59,6 @@ public class BoatFly extends Module { private final Setting timer = new Setting<>("Timer", 1f, 0.1f, 5f).addToGroup(advanced); public final Setting hideBoat = new Setting<>("HideBoat", true).addToGroup(advanced); - private final ArrayList vehiclePackets = new ArrayList<>(); private int ticksEnabled = 0; private int enableDelay = 0; @@ -60,10 +66,6 @@ public class BoatFly extends Module { private boolean returnGravity = false; private boolean jitterSwitch = false; - public BoatFly() { - super("BoatFly", Category.MOVEMENT); - } - @Override public void onEnable() { if (fullNullCheck()) { @@ -248,7 +250,7 @@ public void onPacketSend(PacketEvent.Send event) { if (returnGravity && event.getPacket() instanceof VehicleMoveC2SPacket) event.cancel(); - if(event.getPacket() instanceof PlayerInputC2SPacket && allowShift.getValue()) { + if (event.getPacket() instanceof PlayerInputC2SPacket && allowShift.getValue()) { event.cancel(); } diff --git a/src/main/java/thunder/hack/features/modules/movement/ClickTP.java b/src/main/java/thunder/hack/features/modules/movement/ClickTP.java index b93fabbd..e2f8aa28 100644 --- a/src/main/java/thunder/hack/features/modules/movement/ClickTP.java +++ b/src/main/java/thunder/hack/features/modules/movement/ClickTP.java @@ -15,19 +15,19 @@ import thunder.hack.utility.render.Render3DEngine; public class ClickTP extends Module { + public ClickTP() { + super("ClickTP", Category.MOVEMENT); + } + private final Setting blockOffset = new Setting<>("BlockOffset", 1.0f, -1f, 1f); private final Setting spoofs = new Setting<>("Spoofs", 0, 0, 40); private final Setting ground = new Setting<>("Ground", false); private int delay; - public ClickTP() { - super("ClickTP", Category.MOVEMENT); - } - @EventHandler public void onSync(EventSync e) { - if(delay >= 0) + if (delay >= 0) delay--; if (mc.options.pickItemKey.isPressed() && delay < 0) { diff --git a/src/main/java/thunder/hack/features/modules/movement/ElytraPlus.java b/src/main/java/thunder/hack/features/modules/movement/ElytraPlus.java index 7b5f076c..10d36802 100644 --- a/src/main/java/thunder/hack/features/modules/movement/ElytraPlus.java +++ b/src/main/java/thunder/hack/features/modules/movement/ElytraPlus.java @@ -383,7 +383,7 @@ private void doMotionPacket(EventMove e) { e.setY(-0.07840000152587923); if ((infDurability.getValue() || ncpStrict.is(NCPStrict.Motion))) { - if (!MovementUtility.isMoving() && Math.abs(e.getX()) < 0.121 && Math.abs(e.getX()) < 0.121) { + if (!MovementUtility.isMoving() && Math.abs(e.getX()) < 0.121) { float angleToRad = (float) Math.toRadians(4.5 * (mc.player.age % 80)); e.setX(Math.sin(angleToRad) * 0.12); e.setZ(Math.cos(angleToRad) * 0.12); diff --git a/src/main/java/thunder/hack/features/modules/movement/ElytraRecast.java b/src/main/java/thunder/hack/features/modules/movement/ElytraRecast.java index b3532b81..cece0f09 100644 --- a/src/main/java/thunder/hack/features/modules/movement/ElytraRecast.java +++ b/src/main/java/thunder/hack/features/modules/movement/ElytraRecast.java @@ -16,17 +16,12 @@ import thunder.hack.setting.Setting; import thunder.hack.utility.math.MathUtility; +//https://github.com/InLieuOfLuna/elytra-recast <-- Author of this exploit public class ElytraRecast extends Module { public ElytraRecast() { super("ElytraRecast", Category.MOVEMENT); } - /* - https://github.com/InLieuOfLuna/elytra-recast - ^ Author of this exploit - */ - - public Setting exploit = new Setting<>("Exploit", Exploit.None); public Setting changePitch = new Setting<>("ChangePitch", true); public Setting pitchValue = new Setting<>("PitchValue", 55f, -90f, 90f, v -> changePitch.getValue()); @@ -36,7 +31,6 @@ public ElytraRecast() { private float prevClientPitch, prevClientYaw, jitter; - private enum Exploit { None, Strict, Strong } @@ -47,8 +41,7 @@ public void onSync(EventSync e) { mc.player.setPitch(pitchValue.getValue()); switch (exploit.getValue()) { - case None -> { - } + case None -> {} case Strict -> mc.player.setYaw(mc.player.getYaw() + jitter); case Strong -> mc.player.setPitch(pitchValue.getValue() - Math.abs(jitter / 2f)); } diff --git a/src/main/java/thunder/hack/features/modules/movement/Flight.java b/src/main/java/thunder/hack/features/modules/movement/Flight.java index ce913527..82d2761e 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Flight.java +++ b/src/main/java/thunder/hack/features/modules/movement/Flight.java @@ -15,6 +15,9 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class Flight extends Module { + public Flight() { + super("Flight", Category.MOVEMENT); + } private final Setting mode = new Setting<>("Mode", Mode.Vanilla); private final Setting hSpeed = new Setting<>("Horizontal", 1f, 0.0f, 10.0f, v -> !mode.is(Mode.StormBreak)); @@ -28,9 +31,6 @@ public class Flight extends Module { public boolean onPosLook = false; private int flyTicks = 0; - public Flight() { - super("Flight", Module.Category.MOVEMENT); - } @EventHandler public void onEventSync(EventSync event) { @@ -83,7 +83,6 @@ public void onUpdate() { if (flyTicks-- > boostTicks.getValue()) mc.player.setVelocity(mc.player.getVelocity().x, velocityMotion, mc.player.getVelocity().getZ()); - if (mode.is(Mode.MatrixJump)) { if (mc.player.fallDistance == 0) return; diff --git a/src/main/java/thunder/hack/features/modules/movement/GuiMove.java b/src/main/java/thunder/hack/features/modules/movement/GuiMove.java index 933f9890..5a25279c 100644 --- a/src/main/java/thunder/hack/features/modules/movement/GuiMove.java +++ b/src/main/java/thunder/hack/features/modules/movement/GuiMove.java @@ -20,15 +20,14 @@ import java.util.concurrent.atomic.AtomicBoolean; public class GuiMove extends Module { + public GuiMove() { + super("GuiMove", Category.MOVEMENT); + } private final Setting clickBypass = new Setting<>("Bypass", Bypass.None); private final Setting rotateOnArrows = new Setting<>("RotateOnArrows", true); private final Setting sneak = new Setting<>("sneak", false); - public GuiMove() { - super("GuiMove", Category.MOVEMENT); - } - private final Queue storedClicks = new LinkedList<>(); private AtomicBoolean pause = new AtomicBoolean(); @@ -54,7 +53,7 @@ public void onUpdate() { if (isKeyPressed(263)) deltaX -= 30f; - if(deltaX != 0 || deltaY != 0) + if (deltaX != 0 || deltaY != 0) mc.player.changeLookDirection(deltaX, deltaY); } @@ -65,7 +64,7 @@ public void onUpdate() { @EventHandler public void onClickSlot(EventClickSlot e) { - if(clickBypass.is(Bypass.DisableClicks) && (MovementUtility.isMoving() || mc.options.jumpKey.isPressed())) + if (clickBypass.is(Bypass.DisableClicks) && (MovementUtility.isMoving() || mc.options.jumpKey.isPressed())) e.cancel(); } @@ -111,8 +110,8 @@ public void onPacketSend(PacketEvent.Send e) { } } - if(e.getPacket() instanceof CloseHandledScreenC2SPacket) { - if(clickBypass.is(Bypass.Delay)) { + if (e.getPacket() instanceof CloseHandledScreenC2SPacket) { + if (clickBypass.is(Bypass.Delay)) { pause.set(true); while (!storedClicks.isEmpty()) sendPacket(storedClicks.poll()); diff --git a/src/main/java/thunder/hack/features/modules/movement/HoleAnchor.java b/src/main/java/thunder/hack/features/modules/movement/HoleAnchor.java index c42fb237..1b5dcfd5 100644 --- a/src/main/java/thunder/hack/features/modules/movement/HoleAnchor.java +++ b/src/main/java/thunder/hack/features/modules/movement/HoleAnchor.java @@ -11,13 +11,13 @@ import static thunder.hack.utility.world.HoleUtility.validTwoBlockIndestructible; public class HoleAnchor extends Module { - private final Setting pitch = new Setting<>("Pitch", 60, 0, 90); - private final Setting pull = new Setting<>("Pull", true); - public HoleAnchor() { super("HoleAnchor", Category.MOVEMENT); } + private final Setting pitch = new Setting<>("Pitch", 60, 0, 90); + private final Setting pull = new Setting<>("Pull", true); + @EventHandler public void onPlayerUpdate(PlayerUpdateEvent e) { if (mc.player.getPitch() > pitch.getValue()) { diff --git a/src/main/java/thunder/hack/features/modules/movement/HoleSnap.java b/src/main/java/thunder/hack/features/modules/movement/HoleSnap.java index d889018e..edbe8372 100644 --- a/src/main/java/thunder/hack/features/modules/movement/HoleSnap.java +++ b/src/main/java/thunder/hack/features/modules/movement/HoleSnap.java @@ -23,6 +23,10 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class HoleSnap extends Module { + public HoleSnap() { + super("HoleSnap", Category.MOVEMENT); + } + private final Setting mode = new Setting<>("Mode", Mode.Yaw); private final Setting searchRange = new Setting<>("Search Range", 5, 1, 20); private final Setting searchFOV = new Setting<>("Search FOV", 360, 1, 360); @@ -37,10 +41,6 @@ public class HoleSnap extends Module { private BlockPos hole; private float prevClientYaw; - public HoleSnap() { - super("HoleSnap", Category.MOVEMENT); - } - @Override public void onEnable() { hole = findHole(); diff --git a/src/main/java/thunder/hack/features/modules/movement/Jesus.java b/src/main/java/thunder/hack/features/modules/movement/Jesus.java index 15de15d1..d6c95ea3 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Jesus.java +++ b/src/main/java/thunder/hack/features/modules/movement/Jesus.java @@ -2,28 +2,17 @@ import meteordevelopment.orbit.EventHandler; import net.minecraft.block.*; -import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; -import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.MathHelper; -import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.events.impl.EventCollision; -import thunder.hack.events.impl.EventFluidCollision; -import thunder.hack.events.impl.EventSync; -import thunder.hack.events.impl.PacketEvent; -import thunder.hack.injection.accesors.IPlayerMoveC2SPacket; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; public class Jesus extends Module { - public final Setting mode = new Setting<>("Mode", Mode.SOLID); - public Jesus() { super("Jesus", Category.MOVEMENT); } + public final Setting mode = new Setting<>("Mode", Mode.SOLID); + @EventHandler public void onCollide(EventCollision e) { if (e.getState().getBlock() instanceof FluidBlock) { diff --git a/src/main/java/thunder/hack/features/modules/movement/LevitationControl.java b/src/main/java/thunder/hack/features/modules/movement/LevitationControl.java index 1f15ba85..52af86ff 100644 --- a/src/main/java/thunder/hack/features/modules/movement/LevitationControl.java +++ b/src/main/java/thunder/hack/features/modules/movement/LevitationControl.java @@ -7,12 +7,13 @@ import thunder.hack.setting.Setting; public class LevitationControl extends Module { - private final Setting upAmplifier = new Setting<>("Up Speed", 1, 1, 5); - private final Setting downAmplifier = new Setting<>("Down Speed", 1, 1, 5); public LevitationControl() { super("LevitCtrl", Category.MOVEMENT); } + private final Setting upAmplifier = new Setting<>("Up Speed", 1, 1, 5); + private final Setting downAmplifier = new Setting<>("Down Speed", 1, 1, 5); + @EventHandler public void onMove(EventMove e) { if (mc.player.hasStatusEffect(StatusEffects.LEVITATION)) { diff --git a/src/main/java/thunder/hack/features/modules/movement/LongJump.java b/src/main/java/thunder/hack/features/modules/movement/LongJump.java index 6faba734..27989c17 100644 --- a/src/main/java/thunder/hack/features/modules/movement/LongJump.java +++ b/src/main/java/thunder/hack/features/modules/movement/LongJump.java @@ -15,7 +15,6 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class LongJump extends Module { - public LongJump() { super("LongJump", Category.MOVEMENT); } @@ -32,7 +31,7 @@ public LongJump() { @EventHandler public void onMove(EventMove e) { - if(prevPosition != null && mc.player.getPos().squaredDistanceTo(prevPosition) > maxDistance.getPow2Value()) + if (prevPosition != null && mc.player.getPos().squaredDistanceTo(prevPosition) > maxDistance.getPow2Value()) disable(isRu() ? "Прыжок выполнен! Отключаю.." : "Jump complete! Disabling.."); if (MovementUtility.isMoving()) { @@ -46,7 +45,7 @@ public void onMove(EventMove e) { ++stage; } case 1 -> { - mc.player.setVelocity(mc.player.getVelocity().getX(),0.42 + isJumpBoost(),mc.player.getVelocity().getZ()); + mc.player.setVelocity(mc.player.getVelocity().getX(), 0.42 + isJumpBoost(), mc.player.getVelocity().getZ()); e.setY(0.42 + isJumpBoost()); plannedSpeed *= 2.149f; ++stage; diff --git a/src/main/java/thunder/hack/features/modules/movement/NoFall.java b/src/main/java/thunder/hack/features/modules/movement/NoFall.java index 31fdbdcf..d0248a85 100644 --- a/src/main/java/thunder/hack/features/modules/movement/NoFall.java +++ b/src/main/java/thunder/hack/features/modules/movement/NoFall.java @@ -8,8 +8,8 @@ import thunder.hack.events.impl.EventSync; import thunder.hack.events.impl.EventTick; import thunder.hack.events.impl.PacketEvent; -import thunder.hack.injection.accesors.IPlayerMoveC2SPacket; import thunder.hack.features.modules.Module; +import thunder.hack.injection.accesors.IPlayerMoveC2SPacket; import thunder.hack.setting.Setting; import thunder.hack.utility.player.InteractionUtility; import thunder.hack.utility.player.InventoryUtility; @@ -33,15 +33,6 @@ public NoFall() { private thunder.hack.utility.Timer pearlCooldown = new thunder.hack.utility.Timer(); private boolean retrieveFlag; - - private enum Mode { - Rubberband, Items, MatrixOffGround, Vanilla, Grim2b2t - } - - private enum FallDistance { - Calc, Custom - } - private boolean cancelGround = false; @EventHandler @@ -51,10 +42,8 @@ public void onSync(EventSync e) { if (isFalling()) { switch (mode.getValue()) { - case Rubberband -> { - sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(true)); - } - + case MatrixOffGround, Vanilla -> cancelGround = true; + case Rubberband -> sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(true)); case Items -> { BlockPos playerPos = BlockPos.ofFloored(mc.player.getPos()); @@ -81,10 +70,6 @@ public void onSync(EventSync e) { doSnowDrop(snowResult, playerPos); } } - - case MatrixOffGround, Vanilla -> { - cancelGround = true; - } } } else if (retrieveFlag) { InventoryUtility.saveSlot(); @@ -171,7 +156,7 @@ public boolean isFalling() { if (mc.player.isFallFlying()) return false; - if(mode.is(Mode.Grim2b2t)) + if (mode.is(Mode.Grim2b2t)) return mc.player.fallDistance > 3f; switch (fallDistance.getValue()) { @@ -202,4 +187,12 @@ public void onPacketSend(PacketEvent.Send e) { public void onEnable() { cancelGround = false; } + + private enum Mode { + Rubberband, Items, MatrixOffGround, Vanilla, Grim2b2t + } + + private enum FallDistance { + Calc, Custom + } } diff --git a/src/main/java/thunder/hack/features/modules/movement/NoPush.java b/src/main/java/thunder/hack/features/modules/movement/NoPush.java index 01aa6aaa..9cdf4228 100644 --- a/src/main/java/thunder/hack/features/modules/movement/NoPush.java +++ b/src/main/java/thunder/hack/features/modules/movement/NoPush.java @@ -3,7 +3,6 @@ import meteordevelopment.orbit.EventHandler; import net.minecraft.entity.projectile.FishingBobberEntity; import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket; -import org.jetbrains.annotations.NotNull; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; @@ -18,7 +17,6 @@ public NoPush() { public Setting water = new Setting<>("Liquids", true); public Setting fishingHook = new Setting<>("FishingHook", true); - @EventHandler public void onPacketReceive(PacketEvent.Receive e) { if (e.getPacket() instanceof EntityStatusS2CPacket pac && pac.getStatus() == 31 && pac.getEntity(mc.world) instanceof FishingBobberEntity hook && fishingHook.getValue()) diff --git a/src/main/java/thunder/hack/features/modules/movement/NoSlow.java b/src/main/java/thunder/hack/features/modules/movement/NoSlow.java index 133d4e10..be7b1694 100644 --- a/src/main/java/thunder/hack/features/modules/movement/NoSlow.java +++ b/src/main/java/thunder/hack/features/modules/movement/NoSlow.java @@ -93,13 +93,13 @@ public void onUpdate() { @EventHandler public void onKeyboardInput(EventKeyboardInput e) { - if(mode.getValue() == Mode.Matrix3 && mc.player.isUsingItem() && !mc.player.isFallFlying()) { + if (mode.getValue() == Mode.Matrix3 && mc.player.isUsingItem() && !mc.player.isFallFlying()) { mc.player.input.movementForward *= 5f; mc.player.input.movementSideways *= 5f; float mult = 1f; if (mc.player.isOnGround()) { - if(mc.player.input.movementForward != 0 && mc.player.input.movementSideways != 0) { + if (mc.player.input.movementForward != 0 && mc.player.input.movementSideways != 0) { mc.player.input.movementForward *= 0.35f; mc.player.input.movementSideways *= 0.35f; } else { @@ -107,7 +107,7 @@ public void onKeyboardInput(EventKeyboardInput e) { mc.player.input.movementSideways *= 0.5f; } } else { - if(mc.player.input.movementForward != 0 && mc.player.input.movementSideways != 0) { + if (mc.player.input.movementForward != 0 && mc.player.input.movementSideways != 0) { mult = 0.47f; } else { mult = 0.67f; diff --git a/src/main/java/thunder/hack/features/modules/movement/NoWaterCollision.java b/src/main/java/thunder/hack/features/modules/movement/NoWaterCollision.java index 2dbf357d..b779d382 100644 --- a/src/main/java/thunder/hack/features/modules/movement/NoWaterCollision.java +++ b/src/main/java/thunder/hack/features/modules/movement/NoWaterCollision.java @@ -1,6 +1,5 @@ package thunder.hack.features.modules.movement; -import org.jetbrains.annotations.NotNull; import thunder.hack.features.modules.Module; public class NoWaterCollision extends Module { diff --git a/src/main/java/thunder/hack/features/modules/movement/Parkour.java b/src/main/java/thunder/hack/features/modules/movement/Parkour.java index c254bfaf..01b77b1e 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Parkour.java +++ b/src/main/java/thunder/hack/features/modules/movement/Parkour.java @@ -5,7 +5,6 @@ import thunder.hack.setting.Setting; public class Parkour extends Module { - public Parkour() { super("Parkour", Category.MOVEMENT); } diff --git a/src/main/java/thunder/hack/features/modules/movement/Phase.java b/src/main/java/thunder/hack/features/modules/movement/Phase.java index d07660bb..83463766 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Phase.java +++ b/src/main/java/thunder/hack/features/modules/movement/Phase.java @@ -24,7 +24,6 @@ import static thunder.hack.features.modules.player.AutoTool.getTool; public class Phase extends Module { - public Phase() { super("Phase", Category.MOVEMENT); } diff --git a/src/main/java/thunder/hack/features/modules/movement/SafeWalk.java b/src/main/java/thunder/hack/features/modules/movement/SafeWalk.java index 4e256468..a29a0860 100644 --- a/src/main/java/thunder/hack/features/modules/movement/SafeWalk.java +++ b/src/main/java/thunder/hack/features/modules/movement/SafeWalk.java @@ -3,7 +3,7 @@ import thunder.hack.features.modules.Module; public class SafeWalk extends Module { - public SafeWalk(){ - super("SafeWalk",Category.MOVEMENT); + public SafeWalk() { + super("SafeWalk", Category.MOVEMENT); } } diff --git a/src/main/java/thunder/hack/features/modules/movement/Speed.java b/src/main/java/thunder/hack/features/modules/movement/Speed.java index 602f710a..e6aa4ef5 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Speed.java +++ b/src/main/java/thunder/hack/features/modules/movement/Speed.java @@ -33,7 +33,6 @@ import static thunder.hack.utility.player.MovementUtility.isMoving; public class Speed extends Module { - public Speed() { super("Speed", Category.MOVEMENT); } diff --git a/src/main/java/thunder/hack/features/modules/movement/Spider.java b/src/main/java/thunder/hack/features/modules/movement/Spider.java index 7c13ed38..5885a54b 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Spider.java +++ b/src/main/java/thunder/hack/features/modules/movement/Spider.java @@ -5,23 +5,23 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.network.packet.c2s.play.*; -import net.minecraft.screen.slot.SlotActionType; +import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket; +import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; -import thunder.hack.events.impl.EventPostSync; import thunder.hack.events.impl.EventSync; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; import thunder.hack.utility.player.MovementUtility; -import thunder.hack.utility.player.PlayerUtility; public class Spider extends Module { - public final Setting delay = new Setting("delay", 2, 1, 15); - private final Setting mode = new Setting("Mode", Mode.Matrix); + public final Setting delay = new Setting<>("delay", 2, 1, 15); + private final Setting mode = new Setting<>("Mode", Mode.Matrix); public Spider() { super("Spider", Category.MOVEMENT); diff --git a/src/main/java/thunder/hack/features/modules/movement/Step.java b/src/main/java/thunder/hack/features/modules/movement/Step.java index a7469da0..c89c43de 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Step.java +++ b/src/main/java/thunder/hack/features/modules/movement/Step.java @@ -61,8 +61,7 @@ public void onUpdate() { timer = false; } - if (mc.player.isOnGround() && stepTimer.passedMs(stepDelay.getValue())) - setStepHeight(height.getValue()); + if (mc.player.isOnGround() && stepTimer.passedMs(stepDelay.getValue())) setStepHeight(height.getValue()); else setStepHeight(0.6F); } @@ -71,8 +70,7 @@ public void onStep(EventSync event) { if (mode.getValue() == Mode.NCP) { double stepHeight = mc.player.getY() - mc.player.prevY; - if (stepHeight <= 0.75 || stepHeight > height.getValue() || (strict.getValue() && stepHeight > 1)) - return; + if (stepHeight <= 0.75 || stepHeight > height.getValue() || (strict.getValue() && stepHeight > 1)) return; double[] offsets = getOffset(stepHeight); if (offsets != null && offsets.length > 1) { diff --git a/src/main/java/thunder/hack/features/modules/movement/Strafe.java b/src/main/java/thunder/hack/features/modules/movement/Strafe.java index 8e20201c..0707e4ad 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Strafe.java +++ b/src/main/java/thunder/hack/features/modules/movement/Strafe.java @@ -12,8 +12,8 @@ import thunder.hack.core.Core; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.*; -import thunder.hack.injection.accesors.ISPacketEntityVelocity; import thunder.hack.features.modules.Module; +import thunder.hack.injection.accesors.ISPacketEntityVelocity; import thunder.hack.setting.Setting; import thunder.hack.utility.player.InventoryUtility; import thunder.hack.utility.player.MovementUtility; @@ -21,8 +21,9 @@ import static thunder.hack.utility.player.MovementUtility.isMoving; public class Strafe extends Module { - - // Outdated + public Strafe() { // Outdated + super("Strafe", Category.MOVEMENT); + } private final Setting boost = new Setting<>("Boost", Boost.None); private final Setting setSpeed = new Setting<>("speed", 1.3F, 0.0F, 2f, v -> boost.getValue() == Boost.Elytra); @@ -35,10 +36,6 @@ public class Strafe extends Module { public static int noSlowTicks; static long disableTime; - public Strafe() { - super("Strafe", Category.MOVEMENT); - } - public double calculateSpeed(EventMove move) { float speedAttributes = getAIMoveSpeed(); final float frictionFactor = mc.world.getBlockState(new BlockPos.Mutable().set(mc.player.getX(), getBoundingBox().getMin(Direction.Axis.Y) - move.getY(), mc.player.getZ())).getBlock().getSlipperiness() * 0.91F; diff --git a/src/main/java/thunder/hack/features/modules/movement/Timer.java b/src/main/java/thunder/hack/features/modules/movement/Timer.java index e2af4797..b8d6560e 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Timer.java +++ b/src/main/java/thunder/hack/features/modules/movement/Timer.java @@ -16,6 +16,10 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class Timer extends Module { + public Timer() { + super("Timer", Category.MOVEMENT); + } + private final Setting mode = new Setting<>("Mode", Mode.Normal); private final Setting old = new Setting<>("Old", false, v -> mode.is(Mode.Matrix)); public final Setting speed = new Setting<>("Speed", 2.0f, 0.1f, 10.0f, v -> mode.getValue() != Mode.Shift); @@ -26,11 +30,6 @@ public class Timer extends Module { public static float energy, yaw, pitch; private static double prevPosX, prevPosY, prevPosZ; private long cancelTime; - private CommonPingS2CPacket pingPacket; - - public Timer() { - super("Timer", Category.MOVEMENT); - } @Override public void onEnable() { @@ -50,10 +49,7 @@ public void onDisable() { @Override public void onUpdate() { switch (mode.getValue()) { - case Normal -> { - ThunderHack.TICK_TIMER = speed.getValue(); - } - + case Normal -> ThunderHack.TICK_TIMER = speed.getValue(); case Matrix -> { if (!MovementUtility.isMoving()) { ThunderHack.TICK_TIMER = 1f; diff --git a/src/main/java/thunder/hack/features/modules/movement/Velocity.java b/src/main/java/thunder/hack/features/modules/movement/Velocity.java index 750af556..2e8b68c9 100644 --- a/src/main/java/thunder/hack/features/modules/movement/Velocity.java +++ b/src/main/java/thunder/hack/features/modules/movement/Velocity.java @@ -4,24 +4,27 @@ import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.s2c.common.CommonPingS2CPacket; -import net.minecraft.network.packet.s2c.play.*; +import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.ExplosionS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.PacketEvent; +import thunder.hack.features.modules.Module; import thunder.hack.injection.accesors.IClientPlayerEntity; import thunder.hack.injection.accesors.IExplosionS2CPacket; import thunder.hack.injection.accesors.ISPacketEntityVelocity; -import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; import thunder.hack.utility.player.MovementUtility; -public class Velocity extends Module { +//TY <3 +//https://github.com/SkidderMC/FDPClient/blob/main/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/vanilla/JumpVelocity.kt - /* - TY <3 - https://github.com/SkidderMC/FDPClient/blob/main/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/vanilla/JumpVelocity.kt - */ +public class Velocity extends Module { + public Velocity() { + super("Velocity", Category.MOVEMENT); + } public Setting onlyAura = new Setting<>("OnlyDuringAura", false); public Setting pauseInWater = new Setting<>("PauseInLiquids", false); @@ -37,10 +40,6 @@ public class Velocity extends Module { public Setting failRate = new Setting<>("FailRate", 0.3f, 0.0f, 1.0f, v -> mode.getValue() == modeEn.Jump && fail.getValue()); public Setting jumpRate = new Setting<>("FailJumpRate", 0.25f, 0.0f, 1.0f, v -> mode.getValue() == modeEn.Jump && fail.getValue()); - public Velocity() { - super("Velocity", Module.Category.MOVEMENT); - } - private boolean doJump, failJump, skip, flag; private int grimTicks, ccCooldown; @@ -49,10 +48,10 @@ public Velocity() { public void onPacketReceive(PacketEvent.Receive e) { if (fullNullCheck()) return; - if(mc.player != null && (mc.player.isTouchingWater() || mc.player.isSubmergedInWater() || mc.player.isInLava()) && pauseInWater.getValue()) + if (mc.player != null && (mc.player.isTouchingWater() || mc.player.isSubmergedInWater() || mc.player.isInLava()) && pauseInWater.getValue()) return; - if(mc.player != null && mc.player.isOnFire() && fire.getValue() && (mc.player.hurtTime > 0)){ + if (mc.player != null && mc.player.isOnFire() && fire.getValue() && (mc.player.hurtTime > 0)) { return; } @@ -71,8 +70,8 @@ public void onPacketReceive(PacketEvent.Receive e) { flag = true; } else { flag = false; - ((ISPacketEntityVelocity) pac).setMotionX(((int) ((double) pac.getVelocityX() * -0.1))); - ((ISPacketEntityVelocity) pac).setMotionZ(((int) ((double) pac.getVelocityZ() * -0.1))); + ((ISPacketEntityVelocity) pac).setMotionX(((int) (pac.getVelocityX() * -0.1))); + ((ISPacketEntityVelocity) pac).setMotionZ(((int) (pac.getVelocityZ() * -0.1))); } } case Redirect -> { @@ -92,9 +91,7 @@ public void onPacketReceive(PacketEvent.Receive e) { e.cancel(); sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX(), -999.0, mc.player.getZ(), true)); } - case Cancel -> { - e.cancel(); - } + case Cancel -> e.cancel(); case Jump -> { ((ISPacketEntityVelocity) pac).setMotionX((int) ((float) pac.getVelocityX() * horizontal.getValue() / 100f)); ((ISPacketEntityVelocity) pac).setMotionZ((int) ((float) pac.getVelocityZ() * horizontal.getValue() / 100f)); @@ -113,7 +110,6 @@ public void onPacketReceive(PacketEvent.Receive e) { // EXPLOSION if (e.getPacket() instanceof ExplosionS2CPacket explosion && explosions.getValue()) { - switch (mode.getValue()) { case Cancel -> { ((IExplosionS2CPacket) explosion).setMotionX(0); @@ -144,7 +140,7 @@ public void onPacketReceive(PacketEvent.Receive e) { // LAGBACK if (e.getPacket() instanceof PlayerPositionLookS2CPacket) { - if(cc.getValue() || mode.getValue() == modeEn.GrimNew) + if (cc.getValue() || mode.getValue() == modeEn.GrimNew) ccCooldown = 5; } } @@ -152,7 +148,7 @@ public void onPacketReceive(PacketEvent.Receive e) { @Override public void onUpdate() { - if(mc.player != null && (mc.player.isTouchingWater() || mc.player.isSubmergedInWater()) && pauseInWater.getValue()) + if (mc.player != null && (mc.player.isTouchingWater() || mc.player.isSubmergedInWater()) && pauseInWater.getValue()) return; switch (mode.getValue()) { @@ -197,8 +193,8 @@ public void onUpdate() { } case GrimNew -> { if (flag) { - if(ccCooldown <= 0) { - sendPacket(new PlayerMoveC2SPacket.Full(mc.player.getX(), mc.player.getY(), mc.player.getZ(), ((IClientPlayerEntity)mc.player).getLastYaw(), ((IClientPlayerEntity)mc.player).getLastPitch(), mc.player.isOnGround())); + if (ccCooldown <= 0) { + sendPacket(new PlayerMoveC2SPacket.Full(mc.player.getX(), mc.player.getY(), mc.player.getZ(), ((IClientPlayerEntity) mc.player).getLastYaw(), ((IClientPlayerEntity) mc.player).getLastPitch(), mc.player.isOnGround())); sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, BlockPos.ofFloored(mc.player.getPos()), Direction.DOWN)); } flag = false; diff --git a/src/main/java/thunder/hack/features/modules/movement/WaterSpeed.java b/src/main/java/thunder/hack/features/modules/movement/WaterSpeed.java index fb908b7c..fb9be930 100644 --- a/src/main/java/thunder/hack/features/modules/movement/WaterSpeed.java +++ b/src/main/java/thunder/hack/features/modules/movement/WaterSpeed.java @@ -1,20 +1,14 @@ package thunder.hack.features.modules.movement; import meteordevelopment.orbit.EventHandler; -import net.minecraft.client.render.entity.model.ParrotEntityModel; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.entity.player.PlayerEntity; import thunder.hack.events.impl.EventMove; -import thunder.hack.events.impl.EventPlayerTravel; -import thunder.hack.events.impl.EventSprint; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.player.MovementUtility; -import static net.minecraft.entity.EntityPose.STANDING; - public class WaterSpeed extends Module { public WaterSpeed() { super("WaterSpeed", Category.MOVEMENT); diff --git a/src/main/java/thunder/hack/features/modules/player/AirPlace.java b/src/main/java/thunder/hack/features/modules/player/AirPlace.java index 9e2d5760..e5766fdf 100644 --- a/src/main/java/thunder/hack/features/modules/player/AirPlace.java +++ b/src/main/java/thunder/hack/features/modules/player/AirPlace.java @@ -18,6 +18,10 @@ import java.awt.*; public class AirPlace extends Module { + public AirPlace() { + super("AirPlace", Category.PLAYER); + } + private final Setting range = new Setting<>("Range", 5f, 0f, 6f); private final Setting renderGroup = new Setting<>("Render", new SettingGroup(false, 0)); @@ -29,10 +33,6 @@ public class AirPlace extends Module { private BlockHitResult hit; private int cooldown; - public AirPlace() { - super("AirPlace", Category.PLAYER); - } - @Override public void onUpdate() { if (cooldown > 0) diff --git a/src/main/java/thunder/hack/features/modules/player/AntiAim.java b/src/main/java/thunder/hack/features/modules/player/AntiAim.java index 5d091009..8d5e78c6 100644 --- a/src/main/java/thunder/hack/features/modules/player/AntiAim.java +++ b/src/main/java/thunder/hack/features/modules/player/AntiAim.java @@ -17,12 +17,13 @@ public AntiAim() { private final Setting pitchMode = new Setting<>("PitchMode", Mode.None); private final Setting yawMode = new Setting<>("YawMode", Mode.None); - public enum Mode {None, RandomAngle, Spin, Sinus, Fixed, Static} + public enum Mode {None, RandomAngle, Spin, Sinus, Fixed, Static, Jitter} public Setting Speed = new Setting<>("Speed", 1, 1, 45); public Setting yawDelta = new Setting<>("YawDelta", 60, -360, 360); public Setting pitchDelta = new Setting<>("PitchDelta", 10, -90, 90); + public Setting yawOffset = new Setting<>("YawOffset", 0, -180, 180); public final Setting bodySync = new Setting<>("BodySync", true); public final Setting allowInteract = new Setting<>("AllowInteract", true); @@ -73,7 +74,7 @@ public void onCalc(PlayerUpdateEvent e) { if (yawMode.getValue() == Mode.Sinus) { yaw_sinus_step += Speed.getValue() / 10f; - rotationYaw = (float) (mc.player.getYaw() + yawDelta.getValue() * Math.sin(yaw_sinus_step)); + rotationYaw = (float) ((mc.player.getYaw() + yawDelta.getValue() * Math.sin(yaw_sinus_step)) + yawOffset.getValue()); } if (pitchMode.getValue() == Mode.Fixed) @@ -89,6 +90,31 @@ public void onCalc(PlayerUpdateEvent e) { if (yawMode.getValue() == Mode.Static) rotationYaw = mc.player.getYaw() % 360 + yawDelta.getValue(); + + // господи какое говно я написал + if (pitchMode.getValue() == Mode.Jitter) { + + if (mc.player.age % (Speed.getValue() * 2) == 0) { + rotationPitch = pitchDelta.getValue() / 2f; + } + + if (mc.player.age % (Speed.getValue() * 2) == Speed.getValue()) { + rotationPitch = pitchDelta.getValue() / -2f; + } + } + + if (yawMode.getValue() == Mode.Jitter) { + + if (mc.player.age % (Speed.getValue() * 2) == 0) { + rotationYaw = yawDelta.getValue() / 2f + (float) yawOffset.getValue() + mc.player.getYaw(); + } + + if (mc.player.age % (Speed.getValue() * 2) == Speed.getValue()) { + rotationYaw = yawDelta.getValue() / -2f + (float) yawOffset.getValue() + mc.player.getYaw(); + } + + } + ModuleManager.rotations.fixRotation = rotationYaw; } } \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/player/AutoArmor.java b/src/main/java/thunder/hack/features/modules/player/AutoArmor.java index 2c738b59..af79864b 100644 --- a/src/main/java/thunder/hack/features/modules/player/AutoArmor.java +++ b/src/main/java/thunder/hack/features/modules/player/AutoArmor.java @@ -108,7 +108,6 @@ private int getProtection(ItemStack is) { EquipmentSlot slot = is.getItem() instanceof ArmorItem ai ? ai.getSlotType() : EquipmentSlot.BODY; - if (is.getItem() instanceof ElytraItem) { if (!ElytraItem.isUsable(is)) return 0; @@ -146,8 +145,6 @@ private int getProtection(ItemStack is) { ItemEnchantmentsComponent enchants = EnchantmentHelper.getEnchantments(is); //mc.world.getRegistryManager().get(Enchantments.BLAST_PROTECTION.getRegistryRef()).getEntry(Enchantments.BLAST_PROTECTION).get() - - if (enchants.getEnchantments().contains(mc.world.getRegistryManager().get(Enchantments.PROTECTION.getRegistryRef()).getEntry(Enchantments.PROTECTION).get())) prot += enchants.getLevel(mc.world.getRegistryManager().get(Enchantments.PROTECTION.getRegistryRef()).getEntry(Enchantments.PROTECTION).get()) * protectionMultiplier; diff --git a/src/main/java/thunder/hack/features/modules/player/AutoEat.java b/src/main/java/thunder/hack/features/modules/player/AutoEat.java index abac9c1b..3e20928c 100644 --- a/src/main/java/thunder/hack/features/modules/player/AutoEat.java +++ b/src/main/java/thunder/hack/features/modules/player/AutoEat.java @@ -7,18 +7,12 @@ import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket; import net.minecraft.util.Hand; -import org.jetbrains.annotations.NotNull; import thunder.hack.ThunderHack; import thunder.hack.injection.accesors.IMinecraftClient; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; -import java.util.Stack; - -import static thunder.hack.features.modules.client.ClientSettings.isRu; - public class AutoEat extends Module { - public AutoEat() { super("AutoEat", Category.PLAYER); } diff --git a/src/main/java/thunder/hack/features/modules/player/AutoRespawn.java b/src/main/java/thunder/hack/features/modules/player/AutoRespawn.java index 00abce5a..4711024a 100644 --- a/src/main/java/thunder/hack/features/modules/player/AutoRespawn.java +++ b/src/main/java/thunder/hack/features/modules/player/AutoRespawn.java @@ -2,7 +2,6 @@ import net.minecraft.client.gui.screen.DeathScreen; import net.minecraft.util.Formatting; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.world.WayPointManager; import thunder.hack.features.modules.Module; @@ -10,7 +9,10 @@ import thunder.hack.utility.Timer; public class AutoRespawn extends Module { - private final Timer timer = new Timer(); + public AutoRespawn() { + super("AutoRespawn", Category.PLAYER); + } + private final Setting deathcoords = new Setting<>("deathcoords", true); private final Setting autokit = new Setting<>("Auto Kit", false); private final Setting kit = new Setting<>("kit name", "kitname", v -> autokit.getValue()); @@ -19,10 +21,7 @@ public class AutoRespawn extends Module { private boolean flag; private int waypointCount = 0; - - public AutoRespawn() { - super("AutoRespawn", Category.PLAYER); - } + private final Timer timer = new Timer(); @Override public void onUpdate() { @@ -37,7 +36,7 @@ public void onUpdate() { waypointCount += 1; if(deathcoords.getValue()) sendMessage(Formatting.GOLD + "[PlayerDeath] " + Formatting.YELLOW + (int) mc.player.getX() + " " + (int) mc.player.getY() + " " + (int) mc.player.getZ()); - if(autowaypoint.getValue()){ + if(autowaypoint.getValue()) { WayPointManager.WayPoint wp = new WayPointManager.WayPoint((int) mc.player.getX(), (int) mc.player.getY(), (int) mc.player.getZ(), "Death №" + waypointCount, (mc.isInSingleplayer() ? "SinglePlayer" : mc.getNetworkHandler().getServerInfo().address), mc.world.getRegistryKey().getValue().getPath()); Managers.WAYPOINT.addWayPoint(wp); } diff --git a/src/main/java/thunder/hack/features/modules/player/AutoSex.java b/src/main/java/thunder/hack/features/modules/player/AutoSex.java index 57ffa02a..126a57b0 100644 --- a/src/main/java/thunder/hack/features/modules/player/AutoSex.java +++ b/src/main/java/thunder/hack/features/modules/player/AutoSex.java @@ -1,7 +1,6 @@ package thunder.hack.features.modules.player; import net.minecraft.entity.player.PlayerEntity; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; diff --git a/src/main/java/thunder/hack/features/modules/player/AutoTool.java b/src/main/java/thunder/hack/features/modules/player/AutoTool.java index 13b27aa7..ee4f229f 100644 --- a/src/main/java/thunder/hack/features/modules/player/AutoTool.java +++ b/src/main/java/thunder/hack/features/modules/player/AutoTool.java @@ -1,7 +1,5 @@ package thunder.hack.features.modules.player; -import thunder.hack.features.modules.Module; -import thunder.hack.setting.Setting; import net.minecraft.block.AirBlock; import net.minecraft.block.EnderChestBlock; import net.minecraft.enchantment.EnchantmentHelper; @@ -10,6 +8,8 @@ import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import thunder.hack.features.modules.Module; +import thunder.hack.setting.Setting; import java.util.ArrayList; import java.util.List; @@ -30,10 +30,10 @@ public AutoTool() { @Override public void onUpdate() { - if (!(mc.crosshairTarget instanceof BlockHitResult )) return; + if (!(mc.crosshairTarget instanceof BlockHitResult)) return; BlockHitResult result = (BlockHitResult) mc.crosshairTarget; BlockPos pos = result.getBlockPos(); - if(mc.world.getBlockState(pos).isAir()) + if (mc.world.getBlockState(pos).isAir()) return; if (getTool(pos) != -1 && mc.options.attackKey.isPressed()) { @@ -46,10 +46,9 @@ public void onUpdate() { swap = true; swapDelay = System.currentTimeMillis(); - } else if (swap && !lastItem.isEmpty() && System.currentTimeMillis() >= swapDelay + 300 && swapBack.getValue()) { - - if (silent.getValue()) mc.player.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(lastItem.get(0))); + if (silent.getValue()) + mc.player.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(lastItem.get(0))); else mc.player.getInventory().selectedSlot = lastItem.get(0); itemIndex = lastItem.get(0); @@ -58,7 +57,6 @@ public void onUpdate() { } } - public static int getTool(final BlockPos pos) { int index = -1; float CurrentFastest = 1.0f; diff --git a/src/main/java/thunder/hack/features/modules/player/DurabilityAlert.java b/src/main/java/thunder/hack/features/modules/player/DurabilityAlert.java index 09e20206..25b40026 100644 --- a/src/main/java/thunder/hack/features/modules/player/DurabilityAlert.java +++ b/src/main/java/thunder/hack/features/modules/player/DurabilityAlert.java @@ -5,11 +5,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.modules.Module; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.setting.Setting; import thunder.hack.utility.Timer; import thunder.hack.utility.render.TextureStorage; diff --git a/src/main/java/thunder/hack/features/modules/player/ElytraReplace.java b/src/main/java/thunder/hack/features/modules/player/ElytraReplace.java index c090fba4..aee69ea8 100644 --- a/src/main/java/thunder/hack/features/modules/player/ElytraReplace.java +++ b/src/main/java/thunder/hack/features/modules/player/ElytraReplace.java @@ -4,9 +4,7 @@ import net.minecraft.item.ElytraItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.item.TippedArrowItem; import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; import thunder.hack.gui.notification.Notification; diff --git a/src/main/java/thunder/hack/features/modules/player/ElytraSwap.java b/src/main/java/thunder/hack/features/modules/player/ElytraSwap.java index 70fcdff4..7086ec47 100644 --- a/src/main/java/thunder/hack/features/modules/player/ElytraSwap.java +++ b/src/main/java/thunder/hack/features/modules/player/ElytraSwap.java @@ -3,10 +3,12 @@ import meteordevelopment.orbit.EventHandler; import net.minecraft.item.Item; import net.minecraft.item.Items; -import net.minecraft.network.packet.c2s.play.*; +import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; +import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket; +import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket; import net.minecraft.screen.slot.SlotActionType; import net.minecraft.util.Hand; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; @@ -14,7 +16,6 @@ import thunder.hack.setting.impl.Bind; import thunder.hack.utility.Timer; import thunder.hack.utility.player.InventoryUtility; -import thunder.hack.utility.player.PlayerUtility; import thunder.hack.utility.player.SearchInvResult; import static thunder.hack.features.modules.client.ClientSettings.isRu; @@ -63,7 +64,7 @@ public void onUpdate() { @EventHandler public void onPacketSend(PacketEvent.SendPost e) { - if(e.getPacket() instanceof ClientCommandC2SPacket command + if (e.getPacket() instanceof ClientCommandC2SPacket command && command.getMode() == ClientCommandC2SPacket.Mode.START_FALL_FLYING && mode.getValue() == Mode.Bind && startFireWork.getValue()) { @@ -116,23 +117,23 @@ private void swapChest(boolean disable) { if (mc.player.getInventory().getStack(38).getItem() == Items.ELYTRA) { int slot = getChestPlateSlot(); if (slot != -1) { - if(delay.getValue()) - Managers.ASYNC.run(() -> { - swapping = true; - clickSlot(slot); - try { - Thread.sleep(200); - } catch (Exception ignored) { - } - clickSlot(6); - try { - Thread.sleep(200); - } catch (Exception ignored) { - } - clickSlot(slot); - sendPacket(new CloseHandledScreenC2SPacket(mc.player.currentScreenHandler.syncId)); - swapping = false; - }); + if (delay.getValue()) + Managers.ASYNC.run(() -> { + swapping = true; + clickSlot(slot); + try { + Thread.sleep(200); + } catch (Exception ignored) { + } + clickSlot(6); + try { + Thread.sleep(200); + } catch (Exception ignored) { + } + clickSlot(slot); + sendPacket(new CloseHandledScreenC2SPacket(mc.player.currentScreenHandler.syncId)); + swapping = false; + }); else { clickSlot(slot); clickSlot(6); @@ -145,30 +146,32 @@ private void swapChest(boolean disable) { return; } } else if (result.found()) { - if(delay.getValue()) - new Thread(() -> { - swapping = true; - clickSlot(result.slot()); - try { - Thread.sleep(200); - } catch (Exception ignored) {} - clickSlot(6); - try { - Thread.sleep(200); - } catch (Exception ignored) {} - clickSlot(result.slot()); - sendPacket(new CloseHandledScreenC2SPacket(mc.player.currentScreenHandler.syncId)); - if(startFireWork.getValue() && mc.player.fallDistance > 0) - sendPacket(new ClientCommandC2SPacket( mc.player, ClientCommandC2SPacket.Mode.START_FALL_FLYING)); - swapping = false; - }).start(); + if (delay.getValue()) + new Thread(() -> { + swapping = true; + clickSlot(result.slot()); + try { + Thread.sleep(200); + } catch (Exception ignored) { + } + clickSlot(6); + try { + Thread.sleep(200); + } catch (Exception ignored) { + } + clickSlot(result.slot()); + sendPacket(new CloseHandledScreenC2SPacket(mc.player.currentScreenHandler.syncId)); + if (startFireWork.getValue() && mc.player.fallDistance > 0) + sendPacket(new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.START_FALL_FLYING)); + swapping = false; + }).start(); else { clickSlot(result.slot()); clickSlot(6); clickSlot(result.slot()); sendPacket(new CloseHandledScreenC2SPacket(mc.player.currentScreenHandler.syncId)); - if(startFireWork.getValue() && mc.player.fallDistance > 0) - sendPacket(new ClientCommandC2SPacket( mc.player, ClientCommandC2SPacket.Mode.START_FALL_FLYING)); + if (startFireWork.getValue() && mc.player.fallDistance > 0) + sendPacket(new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.START_FALL_FLYING)); } } else { if (disable) disable(isRu() ? "У тебя нет элитры!" : "You don't have an elytra!"); diff --git a/src/main/java/thunder/hack/features/modules/player/MouseElytraFix.java b/src/main/java/thunder/hack/features/modules/player/MouseElytraFix.java index ffd7b98c..dbd7aebe 100644 --- a/src/main/java/thunder/hack/features/modules/player/MouseElytraFix.java +++ b/src/main/java/thunder/hack/features/modules/player/MouseElytraFix.java @@ -7,7 +7,6 @@ import thunder.hack.utility.Timer; public class MouseElytraFix extends Module { - public MouseElytraFix() { super("MouseElytraFix", Category.PLAYER); } @@ -29,7 +28,6 @@ public void onUpdate() { mc.interactionManager.clickSlot(0, -999, 1, SlotActionType.PICKUP, mc.player); } } - } public static int findEmptySlot() { diff --git a/src/main/java/thunder/hack/features/modules/player/NoEntityTrace.java b/src/main/java/thunder/hack/features/modules/player/NoEntityTrace.java index f8268206..4e33eae6 100644 --- a/src/main/java/thunder/hack/features/modules/player/NoEntityTrace.java +++ b/src/main/java/thunder/hack/features/modules/player/NoEntityTrace.java @@ -4,11 +4,10 @@ import thunder.hack.setting.Setting; public final class NoEntityTrace extends Module { - public static final Setting ponly = new Setting<>("Pickaxe Only", true); - public static final Setting noSword = new Setting<>("No Sword", true); - - public NoEntityTrace() { super("NoEntityTrace", Category.PLAYER); } -} + + public static final Setting ponly = new Setting<>("Pickaxe Only", true); + public static final Setting noSword = new Setting<>("No Sword", true); +} \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/player/SpeedMine.java b/src/main/java/thunder/hack/features/modules/player/SpeedMine.java index 14259150..4070bea3 100644 --- a/src/main/java/thunder/hack/features/modules/player/SpeedMine.java +++ b/src/main/java/thunder/hack/features/modules/player/SpeedMine.java @@ -30,27 +30,30 @@ import thunder.hack.events.impl.EventAttackBlock; import thunder.hack.events.impl.EventSync; import thunder.hack.events.impl.PacketEvent; -import thunder.hack.injection.accesors.IInteractionManager; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.combat.AutoCrystal; +import thunder.hack.injection.accesors.IInteractionManager; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.BooleanSettingGroup; import thunder.hack.setting.impl.ColorSetting; import thunder.hack.setting.impl.SettingGroup; import thunder.hack.utility.Timer; -import thunder.hack.utility.world.ExplosionUtility; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.player.InteractionUtility; import thunder.hack.utility.player.InventoryUtility; import thunder.hack.utility.player.PlayerUtility; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.Render3DEngine; +import thunder.hack.utility.world.ExplosionUtility; import java.awt.*; import java.util.ArrayList; import java.util.Objects; public final class SpeedMine extends Module { + public SpeedMine() { + super("SpeedMine", Category.PLAYER); + } public final Setting mode = new Setting<>("Mode", Mode.Packet); public final Setting doubleMine = new Setting<>("DoubleMine", false); @@ -82,9 +85,6 @@ public final class SpeedMine extends Module { private final Setting startFillColor = new Setting<>("Start Fill Color", new ColorSetting(new Color(255, 0, 0, 120)), v -> mode.getValue() != Mode.Damage).addToGroup(render); private final Setting endFillColor = new Setting<>("End Fill Color", new ColorSetting(new Color(47, 255, 0, 120)), v -> mode.getValue() != Mode.Damage).addToGroup(render); - public SpeedMine() { - super("SpeedMine", Category.PLAYER); - } public ArrayList actions = new ArrayList<>(); @@ -126,10 +126,12 @@ public void onRender3D(MatrixStack stack) { switch (renderMode.getValue()) { case Block -> new Box(a.getPos()); - case Grow -> new Box(a.getPos().getX(), a.getPos().getY(), a.getPos().getZ(), a.getPos().getX() + 1, a.getPos().getY() + noom, a.getPos().getZ() + 1); - case Shrink -> new Box(a.getPos().getX(), a.getPos().getY(), a.getPos().getZ(), a.getPos().getX(), a.getPos().getY(), a.getPos().getZ()) - .shrink(noom, noom, noom) - .offset(0.5 + noom * 0.5, 0.5 + noom * 0.5, 0.5 + noom * 0.5); + case Grow -> + new Box(a.getPos().getX(), a.getPos().getY(), a.getPos().getZ(), a.getPos().getX() + 1, a.getPos().getY() + noom, a.getPos().getZ() + 1); + case Shrink -> + new Box(a.getPos().getX(), a.getPos().getY(), a.getPos().getZ(), a.getPos().getX(), a.getPos().getY(), a.getPos().getZ()) + .shrink(noom, noom, noom) + .offset(0.5 + noom * 0.5, 0.5 + noom * 0.5, 0.5 + noom * 0.5); }; Render3DEngine.FILLED_QUEUE.add(new Render3DEngine.FillAction( diff --git a/src/main/java/thunder/hack/features/modules/render/AspectRatio.java b/src/main/java/thunder/hack/features/modules/render/AspectRatio.java index 709c0c18..30c123bb 100644 --- a/src/main/java/thunder/hack/features/modules/render/AspectRatio.java +++ b/src/main/java/thunder/hack/features/modules/render/AspectRatio.java @@ -1,11 +1,9 @@ package thunder.hack.features.modules.render; -import org.jetbrains.annotations.NotNull; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; public class AspectRatio extends Module { - public AspectRatio() { super("AspectRatio", Category.RENDER); } diff --git a/src/main/java/thunder/hack/features/modules/render/BlockESP.java b/src/main/java/thunder/hack/features/modules/render/BlockESP.java index 25eface0..17404bdd 100644 --- a/src/main/java/thunder/hack/features/modules/render/BlockESP.java +++ b/src/main/java/thunder/hack/features/modules/render/BlockESP.java @@ -25,7 +25,9 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class BlockESP extends Module { - + public BlockESP() { + super("BlockESP", Category.RENDER); + } public final Setting selectedBlocks = new Setting<>("SelectedBlocks", new ItemSelectSetting(new ArrayList<>())); public static ArrayList blocks = new ArrayList<>(); @@ -38,17 +40,11 @@ public class BlockESP extends Module { private final Setting fill = new Setting<>("Fill", true); private final Setting outline = new Setting<>("Outline", true); - private final ExecutorService searchThread = Executors.newSingleThreadExecutor(); private final Timer searchTimer = new Timer(); private long lastFrameTime; private boolean canContinue; - - public BlockESP() { - super("BlockESP", Category.RENDER); - } - @Override public void onEnable() { blocks.clear(); diff --git a/src/main/java/thunder/hack/features/modules/render/BreakHighLight.java b/src/main/java/thunder/hack/features/modules/render/BreakHighLight.java index e795a05f..f9428bdd 100644 --- a/src/main/java/thunder/hack/features/modules/render/BreakHighLight.java +++ b/src/main/java/thunder/hack/features/modules/render/BreakHighLight.java @@ -20,7 +20,7 @@ public BreakHighLight() { super("BreakHighLight", Category.RENDER); } - private final Setting mode = new Setting("Mode", Mode.Shrink); + private final Setting mode = new Setting<>("Mode", Mode.Shrink); private final Setting color = new Setting<>("Color", new ColorSetting(new Color(0x90FD0000, true))); private final Setting color2 = new Setting<>("Color2", new ColorSetting(new Color(0xFFFD0000, true))); @@ -37,7 +37,7 @@ public void onRender3D(MatrixStack stack) { if (mc.interactionManager.isBreakingBlock() && mc.crosshairTarget != null && mc.crosshairTarget instanceof BlockHitResult bhr && !mc.world.isAir(bhr.getBlockPos())) { Box shrunkMineBox = new Box(bhr.getBlockPos().getX(), bhr.getBlockPos().getY(), bhr.getBlockPos().getZ(), bhr.getBlockPos().getX(), bhr.getBlockPos().getY(), bhr.getBlockPos().getZ()); - float noom; //ам ням не ебался + float noom; //ам ням ебался switch (mode.getValue()) { case Grow -> noom = Render2DEngine.interpolateFloat(prevProgress, MathUtility.clamp(mc.interactionManager.currentBreakingProgress, 0f, 1f), Render3DEngine.getTickDelta()); diff --git a/src/main/java/thunder/hack/features/modules/render/Chams.java b/src/main/java/thunder/hack/features/modules/render/Chams.java index 1b5b7c3d..691a93ca 100644 --- a/src/main/java/thunder/hack/features/modules/render/Chams.java +++ b/src/main/java/thunder/hack/features/modules/render/Chams.java @@ -269,21 +269,12 @@ private void setupTransforms(PlayerEntity entity, MatrixStack matrices, float an } private static float getYaw(Direction direction) { - switch (direction) { - case SOUTH: { - return 90.0f; - } - case WEST: { - return 0.0f; - } - case NORTH: { - return 270.0f; - } - case EAST: { - return 180.0f; - } - } - return 0.0f; + return switch (direction) { + case NORTH -> 270.0f; + case SOUTH -> 90.0f; + case EAST -> 180.0f; + default -> 0.0f; + }; } @EventHandler diff --git a/src/main/java/thunder/hack/features/modules/render/DamageTint.java b/src/main/java/thunder/hack/features/modules/render/DamageTint.java index 772ff78f..5a1f4cf8 100644 --- a/src/main/java/thunder/hack/features/modules/render/DamageTint.java +++ b/src/main/java/thunder/hack/features/modules/render/DamageTint.java @@ -8,7 +8,6 @@ import java.awt.*; public class DamageTint extends Module { - public DamageTint() { super("DamageTint", Category.RENDER); } diff --git a/src/main/java/thunder/hack/features/modules/render/ESP.java b/src/main/java/thunder/hack/features/modules/render/ESP.java index 3bbfc46b..bb8746e7 100644 --- a/src/main/java/thunder/hack/features/modules/render/ESP.java +++ b/src/main/java/thunder/hack/features/modules/render/ESP.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.joml.Matrix4f; import org.joml.Vector4d; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.gui.font.FontRenderers; import thunder.hack.injection.accesors.IAreaEffectCloudEntity; @@ -39,7 +38,6 @@ import static thunder.hack.utility.render.animation.AnimationUtility.fast; - public class ESP extends Module { public ESP() { super("ESP", Category.RENDER); @@ -437,8 +435,7 @@ private static Vec3d[] getVectors(@NotNull Entity ent) { double z = ent.prevZ + (ent.getZ() - ent.prevZ) * Render3DEngine.getTickDelta(); Box axisAlignedBB2 = ent.getBoundingBox(); Box axisAlignedBB = new Box(axisAlignedBB2.minX - ent.getX() + x - 0.05, axisAlignedBB2.minY - ent.getY() + y, axisAlignedBB2.minZ - ent.getZ() + z - 0.05, axisAlignedBB2.maxX - ent.getX() + x + 0.05, axisAlignedBB2.maxY - ent.getY() + y + 0.15, axisAlignedBB2.maxZ - ent.getZ() + z + 0.05); - Vec3d[] vectors = new Vec3d[]{new Vec3d(axisAlignedBB.minX, axisAlignedBB.minY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.minX, axisAlignedBB.maxY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.minY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.maxY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.minX, axisAlignedBB.minY, axisAlignedBB.maxZ), new Vec3d(axisAlignedBB.minX, axisAlignedBB.maxY, axisAlignedBB.maxZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.minY, axisAlignedBB.maxZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.maxY, axisAlignedBB.maxZ)}; - return vectors; + return new Vec3d[]{new Vec3d(axisAlignedBB.minX, axisAlignedBB.minY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.minX, axisAlignedBB.maxY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.minY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.maxY, axisAlignedBB.minZ), new Vec3d(axisAlignedBB.minX, axisAlignedBB.minY, axisAlignedBB.maxZ), new Vec3d(axisAlignedBB.minX, axisAlignedBB.maxY, axisAlignedBB.maxZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.minY, axisAlignedBB.maxZ), new Vec3d(axisAlignedBB.maxX, axisAlignedBB.maxY, axisAlignedBB.maxZ)}; } private int getAreaCloudColor(AreaEffectCloudEntity ent) { diff --git a/src/main/java/thunder/hack/features/modules/render/FOV.java b/src/main/java/thunder/hack/features/modules/render/FOV.java index f326bab8..7a868de6 100644 --- a/src/main/java/thunder/hack/features/modules/render/FOV.java +++ b/src/main/java/thunder/hack/features/modules/render/FOV.java @@ -4,11 +4,11 @@ import thunder.hack.setting.Setting; public class FOV extends Module { - public final Setting fovModifier = new Setting<>("FOV modifier", 120, 0, 358); - public final Setting itemFov = new Setting<>("Item Fov", false); - public final Setting itemFovModifier = new Setting<>("Item FOV modifier", 120, 0, 358); - public FOV() { super("FOV", Category.RENDER); } -} + + public final Setting fovModifier = new Setting<>("FOV modifier", 120, 0, 358); + public final Setting itemFov = new Setting<>("Item Fov", false); + public final Setting itemFovModifier = new Setting<>("Item FOV modifier", 120, 0, 358); +} \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/render/FreeCam.java b/src/main/java/thunder/hack/features/modules/render/FreeCam.java index 3a64470f..56d3e89c 100644 --- a/src/main/java/thunder/hack/features/modules/render/FreeCam.java +++ b/src/main/java/thunder/hack/features/modules/render/FreeCam.java @@ -2,7 +2,6 @@ import meteordevelopment.orbit.EventHandler; import meteordevelopment.orbit.EventPriority; -import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import org.lwjgl.glfw.GLFW; @@ -14,20 +13,19 @@ import thunder.hack.utility.render.Render3DEngine; public class FreeCam extends Module { + public FreeCam() { + super("FreeCam", Category.RENDER); + } + private final Setting speed = new Setting<>("HSpeed", 1f, 0.1f, 3f); private final Setting hspeed = new Setting<>("VSpeed", 0.42f, 0.1f, 3f); private final Setting freeze = new Setting<>("Freeze", false); public final Setting track = new Setting<>("Track", false); - private float fakeYaw, fakePitch, prevFakeYaw, prevFakePitch, prevScroll; private double fakeX, fakeY, fakeZ, prevFakeX, prevFakeY, prevFakeZ; public LivingEntity trackEntity; - public FreeCam() { - super("FreeCam", Category.RENDER); - } - @Override public void onEnable() { mc.chunkCullingEnabled = false; @@ -50,7 +48,7 @@ public void onEnable() { @EventHandler public void onAttack(EventAttack e) { - if(!e.isPre() && e.getEntity() instanceof LivingEntity entity && track.getValue()) + if (!e.isPre() && e.getEntity() instanceof LivingEntity entity && track.getValue()) trackEntity = entity; } @@ -65,10 +63,10 @@ public void onSync(EventSync e) { prevFakeYaw = fakeYaw; prevFakePitch = fakePitch; - if(isKeyPressed(GLFW.GLFW_KEY_ESCAPE) || isKeyPressed(GLFW.GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW.GLFW_KEY_RIGHT_SHIFT)) + if (isKeyPressed(GLFW.GLFW_KEY_ESCAPE) || isKeyPressed(GLFW.GLFW_KEY_LEFT_SHIFT) || isKeyPressed(GLFW.GLFW_KEY_RIGHT_SHIFT)) trackEntity = null; - if(trackEntity != null) { + if (trackEntity != null) { fakeYaw = trackEntity.getYaw(); fakePitch = trackEntity.getPitch(); @@ -90,7 +88,7 @@ public void onSync(EventSync e) { public void onKeyboardInput(EventKeyboardInput e) { if (mc.player == null) return; - if(trackEntity == null) { + if (trackEntity == null) { double[] motion = MovementUtility.forward(speed.getValue()); prevFakeX = fakeX; @@ -131,8 +129,8 @@ public void onPacketSend(PacketEvent.Send e) { @EventHandler public void onScroll(EventMouse e) { - if(e.getAction() == 2) { - if(e.getButton() > 0) speed.setValue(speed.getValue() + 0.05f); + if (e.getAction() == 2) { + if (e.getButton() > 0) speed.setValue(speed.getValue() + 0.05f); else speed.setValue(speed.getValue() - 0.05f); prevScroll = e.getButton(); } diff --git a/src/main/java/thunder/hack/features/modules/render/Fullbright.java b/src/main/java/thunder/hack/features/modules/render/Fullbright.java index 54ee6dbd..ef216861 100644 --- a/src/main/java/thunder/hack/features/modules/render/Fullbright.java +++ b/src/main/java/thunder/hack/features/modules/render/Fullbright.java @@ -2,7 +2,6 @@ import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; -import thunder.hack.setting.impl.ColorSetting; public class Fullbright extends Module { public Fullbright() { diff --git a/src/main/java/thunder/hack/features/modules/render/HitBubbles.java b/src/main/java/thunder/hack/features/modules/render/HitBubbles.java index 300899e9..fbe6f12f 100644 --- a/src/main/java/thunder/hack/features/modules/render/HitBubbles.java +++ b/src/main/java/thunder/hack/features/modules/render/HitBubbles.java @@ -6,7 +6,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.RotationAxis; import net.minecraft.util.math.Vec3d; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.events.impl.EventAttack; diff --git a/src/main/java/thunder/hack/features/modules/render/HitParticles.java b/src/main/java/thunder/hack/features/modules/render/HitParticles.java index 8392214a..a2e4da99 100644 --- a/src/main/java/thunder/hack/features/modules/render/HitParticles.java +++ b/src/main/java/thunder/hack/features/modules/render/HitParticles.java @@ -27,6 +27,9 @@ import static thunder.hack.utility.render.Render2DEngine.*; public class HitParticles extends Module { + public HitParticles() { + super("HitParticles", Category.RENDER); + } private final Setting mode = new Setting<>("Mode", Mode.Stars); private final Setting physics = new Setting<>("Physics", Physics.Fall); @@ -40,10 +43,6 @@ public class HitParticles extends Module { private final Setting colorH = new Setting<>("HealColor", new ColorSetting(3142544), v -> mode.is(Mode.Text)); private final Setting colorD = new Setting<>("DamageColor", new ColorSetting(15811379), v -> mode.is(Mode.Text)); - public HitParticles() { - super("HitParticles", Category.RENDER); - } - private final HashMap healthMap = new HashMap<>(); private final CopyOnWriteArrayList particles = new CopyOnWriteArrayList<>(); diff --git a/src/main/java/thunder/hack/features/modules/render/HoleESP.java b/src/main/java/thunder/hack/features/modules/render/HoleESP.java index 5e0d5c5d..2c0e589b 100644 --- a/src/main/java/thunder/hack/features/modules/render/HoleESP.java +++ b/src/main/java/thunder/hack/features/modules/render/HoleESP.java @@ -21,6 +21,10 @@ import java.util.concurrent.CopyOnWriteArrayList; public class HoleESP extends Module { + public HoleESP() { + super("HoleESP", Category.RENDER); + } + private final Setting mode = new Setting<>("Mode", Mode.CubeOutline); private final Setting rangeXZ = new Setting<>("Range XY", 10, 1, 128); private final Setting rangeY = new Setting<>("Range Y", 5, 1, 128); @@ -32,21 +36,9 @@ public class HoleESP extends Module { private final Setting lineWith = new Setting<>("Line Width", 0.5f, 0.01f, 5f); public final Setting culling = new Setting<>("Culling", true, v -> mode.getValue() == Mode.Fade || mode.getValue() == Mode.Fade2); - private enum Mode { - Fade, - Fade2, - CubeOutline, - CubeFill, - CubeBoth - } - private final Timer logicTimer = new Timer(); private final List positions = new CopyOnWriteArrayList<>(); - public HoleESP() { - super("HoleESP", Category.RENDER); - } - @Override public void onDisable() { positions.clear(); @@ -79,7 +71,6 @@ public void renderFade(@NotNull HoleESP.BoxWithColor posWithColor) { ); } - public void renderFade2(@NotNull HoleESP.BoxWithColor boxWithColor) { Render3DEngine.FADE_QUEUE.add( new Render3DEngine.FadeAction(boxWithColor.box, getColor(boxWithColor.box, boxWithColor.color(), 60), getColor(boxWithColor.box, boxWithColor.color(), 0) @@ -188,4 +179,12 @@ private void findHoles() { public record BoxWithColor(Box box, Color color) { } + + private enum Mode { + Fade, + Fade2, + CubeOutline, + CubeFill, + CubeBoth + } } diff --git a/src/main/java/thunder/hack/features/modules/render/ItemESP.java b/src/main/java/thunder/hack/features/modules/render/ItemESP.java index efddf8e5..d5c7435c 100644 --- a/src/main/java/thunder/hack/features/modules/render/ItemESP.java +++ b/src/main/java/thunder/hack/features/modules/render/ItemESP.java @@ -38,10 +38,6 @@ public ItemESP() { private final Setting circleColor = new Setting<>("CircleColor", new ColorSetting(new Color(-1).getRGB()), v -> espMode.getValue() == ESPMode.Circle && !useHudColor.getValue()); private final Setting cPoints = new Setting<>("CirclePoints", 12, 3, 32, v -> espMode.getValue() == ESPMode.Circle); - private enum ESPMode { - Rect, Circle, None - } - public void onRender2D(DrawContext context) { for (Entity ent : mc.world.getEntities()) { if (!(ent instanceof ItemEntity)) continue; @@ -176,4 +172,8 @@ private static Box getBox(Entity ent) { Box axisAlignedBB = new Box(axisAlignedBB2.minX - ent.getX() + x - 0.05, axisAlignedBB2.minY - ent.getY() + y, axisAlignedBB2.minZ - ent.getZ() + z - 0.05, axisAlignedBB2.maxX - ent.getX() + x + 0.05, axisAlignedBB2.maxY - ent.getY() + y + 0.15, axisAlignedBB2.maxZ - ent.getZ() + z + 0.05); return axisAlignedBB; } + + private enum ESPMode { + Rect, Circle, None + } } \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/render/KillEffect.java b/src/main/java/thunder/hack/features/modules/render/KillEffect.java index b51c955a..9b7cb8b2 100644 --- a/src/main/java/thunder/hack/features/modules/render/KillEffect.java +++ b/src/main/java/thunder/hack/features/modules/render/KillEffect.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundCategory; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; @@ -20,6 +19,10 @@ import java.util.concurrent.ConcurrentHashMap; public class KillEffect extends Module { + public KillEffect() { + super("KillEffect", Category.RENDER); + } + private final Setting mode = new Setting<>("Mode", Mode.Orthodox); private final Setting speed = new Setting<>("Y Speed", 0, -10, 10, value -> mode.getValue() == Mode.Orthodox); public final Setting volume = new Setting<>("Volume", 100, 0, 100); @@ -36,10 +39,6 @@ private enum Mode { LightningBolt } - public KillEffect() { - super("KillEffect", Category.RENDER); - } - @Override public void onRender3D(MatrixStack stack) { if (mc.world == null) return; diff --git a/src/main/java/thunder/hack/features/modules/render/LogoutSpots.java b/src/main/java/thunder/hack/features/modules/render/LogoutSpots.java index af693b86..3d49b7dd 100644 --- a/src/main/java/thunder/hack/features/modules/render/LogoutSpots.java +++ b/src/main/java/thunder/hack/features/modules/render/LogoutSpots.java @@ -38,22 +38,18 @@ import java.util.UUID; public class LogoutSpots extends Module { + public LogoutSpots() { + super("LogoutSpots", Category.RENDER); + } + private final Setting renderMode = new Setting<>("RenderMode", RenderMode.TexturedChams); private final Setting color = new Setting<>("Color", new ColorSetting(0x8800FF00)); private final Setting notifications = new Setting<>("Notifications", true); private final Setting ignoreBots = new Setting<>("IgnoreBots", true); - private enum RenderMode { - Chams, TexturedChams, Box - } - private final Map playerCache = Maps.newConcurrentMap(); private final Map logoutCache = Maps.newConcurrentMap(); - public LogoutSpots() { - super("LogoutSpots", Category.RENDER); - } - @EventHandler public void onPacketReceive(PacketEvent.Receive e) { if (e.getPacket() instanceof PlayerListS2CPacket pac) { @@ -204,4 +200,8 @@ private boolean isABot(PlayerEntity ent) { && (FakePlayer.fakePlayer == null || ent.getId() != FakePlayer.fakePlayer.getId()) && !ent.getName().getString().contains("-"); } + + private enum RenderMode { + Chams, TexturedChams, Box + } } \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/render/NameTags.java b/src/main/java/thunder/hack/features/modules/render/NameTags.java index 05b238be..9e89564e 100644 --- a/src/main/java/thunder/hack/features/modules/render/NameTags.java +++ b/src/main/java/thunder/hack/features/modules/render/NameTags.java @@ -39,7 +39,6 @@ import org.jetbrains.annotations.NotNull; import org.joml.Vector4d; import org.lwjgl.opengl.GL11; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.player.FriendManager; import thunder.hack.core.manager.client.ModuleManager; @@ -61,6 +60,19 @@ import java.util.*; public class NameTags extends Module { + private final Map, String> encMap = new HashMap<>(); + + public NameTags() { + super("NameTags", Category.RENDER); + encMap.put(Enchantments.BLAST_PROTECTION, "B"); + encMap.put(Enchantments.PROTECTION, "P"); + encMap.put(Enchantments.SHARPNESS, "S"); + encMap.put(Enchantments.EFFICIENCY, "E"); + encMap.put(Enchantments.UNBREAKING, "U"); + encMap.put(Enchantments.POWER, "PO"); + encMap.put(Enchantments.THORNS, "T"); + } + private final Setting self = new Setting<>("Self", false); private final Setting scale = new Setting<>("Scale", 1f, 0.1f, 10f); private final Setting resize = new Setting<>("Resize", false); @@ -88,34 +100,6 @@ public class NameTags extends Module { private final Setting armorMode = new Setting<>("ArmorMode", Armor.Full); private final Setting health = new Setting<>("Health", Health.Number); - private final Map, String> encMap = new HashMap<>(); - - public enum Font { - Fancy, Fast - } - - public enum Armor { - None, Full, Durability - } - - public enum Health { - Number, Hearts, Dots - } - - private enum OutlineColor { - Sync, Custom, None, New - } - - public NameTags() { - super("NameTags", Category.RENDER); - encMap.put(Enchantments.BLAST_PROTECTION, "B"); - encMap.put(Enchantments.PROTECTION, "P"); - encMap.put(Enchantments.SHARPNESS, "S"); - encMap.put(Enchantments.EFFICIENCY, "E"); - encMap.put(Enchantments.UNBREAKING, "U"); - encMap.put(Enchantments.POWER, "PO"); - encMap.put(Enchantments.THORNS, "T"); - } public void onRender2D(DrawContext context) { if (mc.options.hudHidden) return; @@ -144,7 +128,6 @@ public void onRender2D(DrawContext context) { if (ping.getValue()) final_string += getPingColor(getEntityPing(ent)) + getEntityPing(ent) + "ms " + Formatting.WHITE; if (gamemode.getValue()) final_string += translateGamemode(getEntityGamemode(ent)) + " "; - if (FriendManager.friends.stream().anyMatch(i -> i.contains(ent.getDisplayName().getString())) && NameProtect.hideFriends.getValue() && ModuleManager.nameProtect.isEnabled()) { final_string += NameProtect.getCustomName() + " "; } else { @@ -557,10 +540,11 @@ public Identifier getTexture(boolean half) { if (health > 15) return Formatting.GREEN + ""; return Formatting.RED + ""; } - public @NotNull String getPingColor(int ping){ - if(ping <= 60) return Formatting.GREEN + ""; - if(ping > 60 && ping < 120) return Formatting.YELLOW + ""; - return Formatting.RED + ""; + + public @NotNull String getPingColor(int ping) { + if (ping <= 60) return Formatting.GREEN + ""; + if (ping > 60 && ping < 120) return Formatting.YELLOW + ""; + return Formatting.RED + ""; } private @NotNull Color getHealthColor2(float health) { @@ -662,4 +646,20 @@ private void drawBackground(DrawContext context, int x, int y, float[] colors) { context.drawTexture(TextureStorage.container, x, y, 0, 0, 176, 67, 176, 67); RenderSystem.enableBlend(); } + + public enum Font { + Fancy, Fast + } + + public enum Armor { + None, Full, Durability + } + + public enum Health { + Number, Hearts, Dots + } + + private enum OutlineColor { + Sync, Custom, None, New + } } \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/render/NoBob.java b/src/main/java/thunder/hack/features/modules/render/NoBob.java index d5cbb04a..4c3bc5b5 100644 --- a/src/main/java/thunder/hack/features/modules/render/NoBob.java +++ b/src/main/java/thunder/hack/features/modules/render/NoBob.java @@ -19,7 +19,7 @@ public void bobView(MatrixStack matrices, float tickDelta) { float g = -(mc.player.horizontalSpeed + (mc.player.horizontalSpeed - mc.player.prevHorizontalSpeed) * tickDelta); float h = MathHelper.lerp(tickDelta, mc.player.prevStrideDistance, mc.player.strideDistance); - matrices.translate( 0, -Math.abs(g * h * (mode.is(Mode.Sexy) ? 0.00035 : 0.)) , 0); + matrices.translate(0, -Math.abs(g * h * (mode.is(Mode.Sexy) ? 0.00035 : 0.)), 0); } public enum Mode { diff --git a/src/main/java/thunder/hack/features/modules/render/NoRender.java b/src/main/java/thunder/hack/features/modules/render/NoRender.java index 63e9090f..c7a9b1b9 100644 --- a/src/main/java/thunder/hack/features/modules/render/NoRender.java +++ b/src/main/java/thunder/hack/features/modules/render/NoRender.java @@ -1,7 +1,6 @@ package thunder.hack.features.modules.render; import meteordevelopment.orbit.EventHandler; -import net.minecraft.client.render.block.entity.MobSpawnerBlockEntityRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.decoration.ArmorStandEntity; @@ -11,7 +10,6 @@ import net.minecraft.entity.projectile.thrown.ExperienceBottleEntity; import net.minecraft.entity.projectile.thrown.PotionEntity; import net.minecraft.network.packet.s2c.play.TitleS2CPacket; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.EventSync; import thunder.hack.events.impl.PacketEvent; @@ -25,10 +23,10 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class NoRender extends Module { - public NoRender() { super("NoRender", Category.RENDER); } + public final Setting disableGuiBackGround = new Setting<>("noGuiBackGround", true); public final Setting noSwing = new Setting<>("NoHandSwing", false); public final Setting auto = new Setting<>("Auto", false); diff --git a/src/main/java/thunder/hack/features/modules/render/Particles.java b/src/main/java/thunder/hack/features/modules/render/Particles.java index 5d9a1902..081237b2 100644 --- a/src/main/java/thunder/hack/features/modules/render/Particles.java +++ b/src/main/java/thunder/hack/features/modules/render/Particles.java @@ -22,16 +22,12 @@ import java.util.ArrayList; import java.util.List; -import static thunder.hack.utility.render.Render2DEngine.*; - +// Фабос, чекнул сурс - сдох отец, спастишь - сдохнет мать public class Particles extends Module { - public Particles() { super("Particles", Category.RENDER); } - // Фабос, чекнул сурс - сдох отец, спастишь - сдохнет мать - private final Setting FireFlies = new Setting<>("FireFlies", new BooleanSettingGroup(true)); private final Setting ffcount = new Setting<>("FFCount", 30, 20, 200).addToGroup(FireFlies); private final Setting ffsize = new Setting<>("FFSize", 1f, 0.1f, 2.0f).addToGroup(FireFlies); @@ -42,19 +38,6 @@ public Particles() { private final Setting color = new Setting<>("Color", new ColorSetting(3649978), v -> lmode.getValue() == ColorMode.Custom); private final Setting physics = new Setting<>("Physics", Physics.Fly, v -> mode.getValue() != Mode.Off); - - public enum ColorMode { - Custom, Sync - } - - public enum Mode { - Off, SnowFlake, Stars, Hearts, Dollars, Bloom; - } - - public enum Physics { - Drop, Fly - } - private final ArrayList fireFlies = new ArrayList<>(); private final ArrayList particles = new ArrayList<>(); @@ -126,7 +109,6 @@ public void onRender3D(MatrixStack stack) { public class FireFly extends ParticleBase { private final List trails = new ArrayList<>(); - public FireFly(float posX, float posY, float posZ, float motionX, float motionY, float motionZ) { super(posX, posY, posZ, motionX, motionY, motionZ); } @@ -184,7 +166,6 @@ public void render(BufferBuilder bufferBuilder) { } } - public class ParticleBase { protected float prevposX, prevposY, prevposZ, posX, posY, posZ, motionX, motionY, motionZ; @@ -257,4 +238,16 @@ public void render(BufferBuilder bufferBuilder) { bufferBuilder.vertex(matrix1, 0, 0, 0).texture(0, 0).color(Render2DEngine.injectAlpha(color1, (int) (255 * ((float) age / (float) maxAge))).getRGB()); } } + + public enum ColorMode { + Custom, Sync + } + + public enum Mode { + Off, SnowFlake, Stars, Hearts, Dollars, Bloom; + } + + public enum Physics { + Drop, Fly + } } diff --git a/src/main/java/thunder/hack/features/modules/render/PenisESP.java b/src/main/java/thunder/hack/features/modules/render/PenisESP.java index 5d8f8a06..81ac1567 100644 --- a/src/main/java/thunder/hack/features/modules/render/PenisESP.java +++ b/src/main/java/thunder/hack/features/modules/render/PenisESP.java @@ -9,27 +9,27 @@ import thunder.hack.setting.Setting; import thunder.hack.setting.impl.ColorSetting; import thunder.hack.utility.render.Render3DEngine; -import static thunder.hack.core.Managers.FRIEND; - import java.awt.*; import java.util.ArrayList; import java.util.List; +import static thunder.hack.core.Managers.FRIEND; + public class PenisESP extends Module { - private final Setting onlyOwn = new Setting<>("OnlyOwn",false); - private final Setting ballSize = new Setting<>("BallSize",0.1f,0.1f,0.5f); - private final Setting penisSize = new Setting<>("PenisSize",1.5f,0.1f,3.0f); - private final Setting friendSize = new Setting<>("FriendSize",1.5f,0.1f,3.0f); - private final Setting enemySize = new Setting<>("EnemySize",0.5f,0.1f,3.0f); - private final Setting gradation = new Setting<>("Gradation",30,20,100); - private final Setting penisColor = new Setting<>("PenisColor", new ColorSetting(new Color(231, 180, 122,255))); - private final Setting headColor = new Setting<>("HeadColor", new ColorSetting(new Color(240, 50, 180,255))); - - public PenisESP(){ - super("PenisESP",Category.RENDER); + public PenisESP() { + super("PenisESP", Category.RENDER); } + private final Setting onlyOwn = new Setting<>("OnlyOwn", false); + private final Setting ballSize = new Setting<>("BallSize", 0.1f, 0.1f, 0.5f); + private final Setting penisSize = new Setting<>("PenisSize", 1.5f, 0.1f, 3.0f); + private final Setting friendSize = new Setting<>("FriendSize", 1.5f, 0.1f, 3.0f); + private final Setting enemySize = new Setting<>("EnemySize", 0.5f, 0.1f, 3.0f); + private final Setting gradation = new Setting<>("Gradation", 30, 20, 100); + private final Setting penisColor = new Setting<>("PenisColor", new ColorSetting(new Color(231, 180, 122, 255))); + private final Setting headColor = new Setting<>("HeadColor", new ColorSetting(new Color(240, 50, 180, 255))); + @Override public void onRender2D(DrawContext event) { for (PlayerEntity player : mc.world.getPlayers()) { @@ -42,8 +42,8 @@ public void onRender2D(DrawContext event) { Vec3d left = forward.add(Vec3d.fromPolar(0, player.getYaw() - 90).multiply(ballSize.getValue())); Vec3d right = forward.add(Vec3d.fromPolar(0, player.getYaw() + 90).multiply(ballSize.getValue())); - drawBall(player, ballSize.getValue(), gradation.getValue(), left, penisColor.getValue().getColorObject(), 0); - drawBall(player, ballSize.getValue(), gradation.getValue(), right, penisColor.getValue().getColorObject(), 0); + drawBall(player, ballSize.getValue(), gradation.getValue(), left, penisColor.getValue().getColorObject(), 0); + drawBall(player, ballSize.getValue(), gradation.getValue(), right, penisColor.getValue().getColorObject(), 0); drawPenis(player, event.getMatrices(), size, forward); } } @@ -84,7 +84,7 @@ public void drawBall(PlayerEntity player, double radius, int gradation, Vec3d po } } - Render3DEngine.drawLine(vec3d,new Vec3d(x2,y2,z2),color); + Render3DEngine.drawLine(vec3d, new Vec3d(x2, y2, z2), color); } } } @@ -99,11 +99,11 @@ public void drawPenis(PlayerEntity player, MatrixStack event, double size, Vec3d if (!vec3d.isInRange(copy, 0.145)) return; if (vec3d.isInRange(copy, 0.135)) return; Vec3d pos = vec3d.add(Vec3d.fromPolar(0, player.getYaw()).multiply(size)); - Render3DEngine.drawLine(vec3d,pos,penisColor.getValue().getColorObject()); + Render3DEngine.drawLine(vec3d, pos, penisColor.getValue().getColorObject()); }); - drawBall(player, 0.1, gradation.getValue(), start, penisColor.getValue().getColorObject(), 1); - drawBall(player, 0.1, gradation.getValue(), end, headColor.getValue().getColorObject(), 2); + drawBall(player, 0.1, gradation.getValue(), start, penisColor.getValue().getColorObject(), 1); + drawBall(player, 0.1, gradation.getValue(), end, headColor.getValue().getColorObject(), 2); } public List getVec3ds(Vec3d vec3d, double radius) { diff --git a/src/main/java/thunder/hack/features/modules/render/PopChams.java b/src/main/java/thunder/hack/features/modules/render/PopChams.java index 1493eb2e..650d5ea7 100644 --- a/src/main/java/thunder/hack/features/modules/render/PopChams.java +++ b/src/main/java/thunder/hack/features/modules/render/PopChams.java @@ -30,6 +30,9 @@ import java.util.concurrent.CopyOnWriteArrayList; public final class PopChams extends Module { + public PopChams() { + super("PopChams", Category.RENDER); + } private final Setting mode = new Setting<>("Mode", Mode.Textured); private final Setting secondLayer = new Setting<>("SecondLayer", true); @@ -44,10 +47,6 @@ private enum Mode { Simple, Textured } - public PopChams() { - super("PopChams", Category.RENDER); - } - @Override public void onUpdate() { popList.forEach(person -> person.update(popList)); diff --git a/src/main/java/thunder/hack/features/modules/render/Shaders.java b/src/main/java/thunder/hack/features/modules/render/Shaders.java index 3f0014dd..0fcc73ea 100644 --- a/src/main/java/thunder/hack/features/modules/render/Shaders.java +++ b/src/main/java/thunder/hack/features/modules/render/Shaders.java @@ -4,23 +4,21 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.decoration.EndCrystalEntity; import net.minecraft.entity.player.PlayerEntity; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ShaderManager; -import thunder.hack.injection.accesors.IGameRenderer; import thunder.hack.features.modules.Module; +import thunder.hack.injection.accesors.IGameRenderer; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.ColorSetting; import thunder.hack.setting.impl.SettingGroup; import thunder.hack.utility.render.Render3DEngine; +//Thanks to @0x3C50 for Shader rendering example public class Shaders extends Module { public Shaders() { super("Shaders", Category.RENDER); } - //Thanks to @0x3C50 for Shader rendering example - private final Setting select = new Setting<>("Select", new SettingGroup(false, 0)); private final Setting hands = new Setting<>("Hands", true).addToGroup(select); private final Setting players = new Setting<>("Players", true).addToGroup(select); diff --git a/src/main/java/thunder/hack/features/modules/render/Skeleton.java b/src/main/java/thunder/hack/features/modules/render/Skeleton.java index ac83a7a1..a4d0f77e 100644 --- a/src/main/java/thunder/hack/features/modules/render/Skeleton.java +++ b/src/main/java/thunder/hack/features/modules/render/Skeleton.java @@ -1,10 +1,10 @@ -package thunder.hack.features.modules.render; +/*package thunder.hack.features.modules.render; -import org.jetbrains.annotations.NotNull; import thunder.hack.features.modules.Module; -public class Skeleton extends Module { +public class Skeleton extends Module { TODO public Skeleton() { super("Skeleton", Category.RENDER); } } +*/ \ No newline at end of file diff --git a/src/main/java/thunder/hack/features/modules/render/SoundESP.java b/src/main/java/thunder/hack/features/modules/render/SoundESP.java index 97a63655..eddba2f7 100644 --- a/src/main/java/thunder/hack/features/modules/render/SoundESP.java +++ b/src/main/java/thunder/hack/features/modules/render/SoundESP.java @@ -1,14 +1,11 @@ package thunder.hack.features.modules.render; import com.google.common.collect.Lists; -import meteordevelopment.orbit.EventHandler; import net.minecraft.client.gui.DrawContext; -import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import net.minecraft.util.math.Vec3d; import org.joml.Vector4d; -import thunder.hack.events.impl.PacketEvent; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.modules.Module; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.ColorSetting; import thunder.hack.utility.render.Render2DEngine; @@ -28,7 +25,7 @@ public SoundESP() { private List sounds = new ArrayList<>(); public void add(double x, double y, double z, String name) { - sounds.add(new Sound(x, y, z, name.replace("minecraft.block.", "").replace("minecraft.entity", "").replace(".", " "))); + sounds.add(new Sound(x, y, z, name.replace("minecraft.block.", "").replace("minecraft.entity", "").replace(".", " "))); } public void onRender2D(DrawContext context) { @@ -52,13 +49,13 @@ public void onRender2D(DrawContext context) { float textWidth = (FontRenderers.sf_bold.getStringWidth(s.name) * 1); float tagX = (float) ((posX + diff - textWidth / 2) * 1); - float alpha = (float) (1f - Math.pow(1f - ((float)s.ticks / 60f), 3f)); + float alpha = (float) (1f - Math.pow(1f - ((float) s.ticks / 60f), 3f)); context.getMatrices().push(); context.getMatrices().translate(tagX - 2 + (textWidth + 4) / 2f, (float) (posY - 13f) + 6.5f, 0); context.getMatrices().scale(scale.getValue(), scale.getValue(), 1f); context.getMatrices().translate(-(tagX - 2 + (textWidth + 4) / 2f), -(float) ((posY - 13f) + 6.5f), 0); - Render2DEngine.drawRect(context.getMatrices(), tagX - 2, (float) (posY - 13f), textWidth + 4, 11, fillColorA.getValue().withAlpha((int)(fillColorA.getValue().getAlpha() * alpha)).getColorObject()); + Render2DEngine.drawRect(context.getMatrices(), tagX - 2, (float) (posY - 13f), textWidth + 4, 11, fillColorA.getValue().withAlpha((int) (fillColorA.getValue().getAlpha() * alpha)).getColorObject()); FontRenderers.sf_bold.drawString(context.getMatrices(), s.name, tagX, (float) posY - 10, Render2DEngine.applyOpacity(-1, alpha)); context.getMatrices().pop(); } diff --git a/src/main/java/thunder/hack/features/modules/render/StorageEsp.java b/src/main/java/thunder/hack/features/modules/render/StorageEsp.java index a315f810..5f0d1985 100644 --- a/src/main/java/thunder/hack/features/modules/render/StorageEsp.java +++ b/src/main/java/thunder/hack/features/modules/render/StorageEsp.java @@ -10,7 +10,6 @@ import net.minecraft.util.math.Box; import net.minecraft.world.chunk.WorldChunk; import org.jetbrains.annotations.Nullable; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; @@ -54,7 +53,7 @@ public StorageEsp() { private final Setting minecartColor = new Setting<>("MinecartColor", new ColorSetting(0x8800FF00)); public void onRender3D(MatrixStack stack) { - if(mc.options.hudHidden) return; + if (mc.options.hudHidden) return; for (BlockEntity blockEntity : getBlockEntities()) { Color color = getColor(blockEntity); @@ -113,7 +112,8 @@ public void onRender3D(MatrixStack stack) { private Color getColor(BlockEntity bEnt) { Color color = null; - if (bEnt instanceof TrappedChestBlockEntity && trappedChest.getValue()) color = trappedChestColor.getValue().getColorObject(); + if (bEnt instanceof TrappedChestBlockEntity && trappedChest.getValue()) + color = trappedChestColor.getValue().getColorObject(); else if (bEnt instanceof ChestBlockEntity && chest.getValue() && bEnt.getType() != BlockEntityType.TRAPPED_CHEST) color = chestColor.getValue().getColorObject(); else if (bEnt instanceof EnderChestBlockEntity && echest.getValue()) diff --git a/src/main/java/thunder/hack/features/modules/render/Tooltips.java b/src/main/java/thunder/hack/features/modules/render/Tooltips.java index 8d8ab5c2..b71dfc11 100644 --- a/src/main/java/thunder/hack/features/modules/render/Tooltips.java +++ b/src/main/java/thunder/hack/features/modules/render/Tooltips.java @@ -2,14 +2,9 @@ import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.ContainerComponent; -import net.minecraft.component.type.NbtComponent; -import net.minecraft.inventory.Inventories; -import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.util.collection.DefaultedList; +import net.minecraft.item.ItemStack; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NbtCompound; public class Tooltips extends Module { public Tooltips() { @@ -17,8 +12,8 @@ public Tooltips() { } public static final Setting middleClickOpen = new Setting<>("MiddleClickOpen", true); - public static final Setting storage = new Setting<>("Storage", true); - public static final Setting maps = new Setting<>("Maps", true); + public static final Setting storage = new Setting<>("Storage", true); + public static final Setting maps = new Setting<>("Maps", true); public final Setting shulkerRegear = new Setting<>("ShulkerRegear", true); public final Setting shulkerRegearShiftMode = new Setting<>("RegearShift", true); diff --git a/src/main/java/thunder/hack/features/modules/render/TotemAnimation.java b/src/main/java/thunder/hack/features/modules/render/TotemAnimation.java index 2fd4bac2..6eb9de1a 100644 --- a/src/main/java/thunder/hack/features/modules/render/TotemAnimation.java +++ b/src/main/java/thunder/hack/features/modules/render/TotemAnimation.java @@ -39,7 +39,6 @@ public void onUpdate() { public void renderFloatingItem(float tickDelta) { if (floatingItem != null && floatingItemTimeLeft > 0 && !mode.is(Mode.Off)) { - int scaledWidth = mc.getWindow().getScaledWidth(); int scaledHeight = mc.getWindow().getScaledHeight(); diff --git a/src/main/java/thunder/hack/features/modules/render/Tracers.java b/src/main/java/thunder/hack/features/modules/render/Tracers.java index 1bb6763b..0bab61b2 100644 --- a/src/main/java/thunder/hack/features/modules/render/Tracers.java +++ b/src/main/java/thunder/hack/features/modules/render/Tracers.java @@ -3,7 +3,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.Vec3d; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; import thunder.hack.setting.Setting; @@ -13,7 +12,6 @@ import java.awt.*; public class Tracers extends Module { - public Tracers() { super("Tracers", Category.RENDER); } @@ -23,9 +21,7 @@ public Tracers() { private final Setting color = new Setting<>("Color", new ColorSetting(new Color(0x93FF0000, true))); private final Setting friendColor = new Setting<>("Friends", new ColorSetting(new Color(0x9317DE5D, true))); - public void onRender3D(MatrixStack stack) { - for (PlayerEntity player : Managers.ASYNC.getAsyncPlayers()) { if (player == mc.player) continue; diff --git a/src/main/java/thunder/hack/features/modules/render/Trails.java b/src/main/java/thunder/hack/features/modules/render/Trails.java index fb6dc160..056ee61a 100644 --- a/src/main/java/thunder/hack/features/modules/render/Trails.java +++ b/src/main/java/thunder/hack/features/modules/render/Trails.java @@ -18,7 +18,6 @@ import net.minecraft.world.RaycastContext; import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.client.HudEditor; @@ -34,7 +33,7 @@ import java.util.ArrayList; import java.util.List; -import static thunder.hack.utility.render.Render2DEngine.*; +import static thunder.hack.utility.render.Render2DEngine.applyOpacity; public class Trails extends Module { public Trails() { @@ -94,9 +93,9 @@ public void onRender3D(MatrixStack stack) { bufferBuilder.vertex(stack.peek().getPositionMatrix(), (float) pos.x, (float) pos.y + down.getValue(), (float) pos.z).color(Render2DEngine.injectAlpha(((IEntity) entity).getTrails().get(i).color(), (int) ((alpha * ctx.animation(Render3DEngine.getTickDelta())) * 255)).getRGB()); bufferBuilder.vertex(stack.peek().getPositionMatrix(), (float) pos.x, (float) pos.y + width.getValue() + down.getValue(), (float) pos.z).color(Render2DEngine.injectAlpha(((IEntity) entity).getTrails().get(i).color(), (int) ((alpha * ctx.animation(Render3DEngine.getTickDelta())) * 255)).getRGB()); } - + Render2DEngine.endBuilding(bufferBuilder); - + Render3DEngine.endRender(); RenderSystem.enableCull(); RenderSystem.disableDepthTest(); diff --git a/src/main/java/thunder/hack/features/modules/render/Trajectories.java b/src/main/java/thunder/hack/features/modules/render/Trajectories.java index 86d7ddb0..cf804815 100644 --- a/src/main/java/thunder/hack/features/modules/render/Trajectories.java +++ b/src/main/java/thunder/hack/features/modules/render/Trajectories.java @@ -23,20 +23,15 @@ import thunder.hack.utility.render.Render3DEngine; public class Trajectories extends Module { + public Trajectories() { + super("Trajectories", Category.RENDER); + } + private final Setting mode = new Setting<>("ColorMode", Mode.Sync); private final Setting color = new Setting<>("Color", new ColorSetting(0x2250b4b4), v -> mode.getValue() == Mode.Custom); private final Setting lmode = new Setting<>("LandedColorMode", Mode.Sync); private final Setting lcolor = new Setting<>("LandedColor", new ColorSetting(0x2250b4b4), v -> lmode.getValue() == Mode.Custom); - private enum Mode { - Custom, - Sync - } - - public Trajectories() { - super("Trajectories", Category.RENDER); - } - private boolean isThrowable(Item item) { return item instanceof EnderPearlItem || item instanceof TridentItem || item instanceof ExperienceBottleItem || item instanceof SnowballItem || item instanceof EggItem || item instanceof SplashPotionItem || item instanceof LingeringPotionItem; } @@ -60,7 +55,7 @@ private int getThrowPitch(Item item) { @Override public void onRender3D(MatrixStack stack) { - if(mc.options.hudHidden) return; + if (mc.options.hudHidden) return; if (mc.player == null || mc.world == null || !mc.options.getPerspective().isFirstPerson()) return; Hand hand; @@ -108,7 +103,6 @@ private void calcTrajectory(Item item, float yaw) { double motionY = -MathHelper.sin((mc.player.getPitch() - getThrowPitch(item)) / 180.0f * 3.141593f) * maxDist; double motionZ = MathHelper.cos(yaw / 180.0f * 3.1415927f) * MathHelper.cos(mc.player.getPitch() / 180.0f * 3.1415927f) * maxDist; - float power = mc.player.getItemUseTime() / 20.0f; power = (power * power + power * 2.0f) / 3.0f; @@ -129,7 +123,6 @@ private void calcTrajectory(Item item, float yaw) { if (!mc.player.isOnGround()) motionY += mc.player.getVelocity().getY(); - Vec3d lastPos; for (int i = 0; i < 300; i++) { lastPos = new Vec3d(x, y, z); @@ -177,7 +170,6 @@ private void calcTrajectory(Item item, float yaw) { )); - break; } @@ -187,4 +179,9 @@ private void calcTrajectory(Item item, float yaw) { Render3DEngine.drawLine(lastPos, pos, mode.getValue() == Mode.Sync ? HudEditor.getColor(i) : color.getValue().getColorObject()); } } + + private enum Mode { + Custom, + Sync + } } diff --git a/src/main/java/thunder/hack/features/modules/render/TunnelEsp.java b/src/main/java/thunder/hack/features/modules/render/TunnelEsp.java index 788317de..4cdff6b5 100644 --- a/src/main/java/thunder/hack/features/modules/render/TunnelEsp.java +++ b/src/main/java/thunder/hack/features/modules/render/TunnelEsp.java @@ -30,7 +30,7 @@ public void onRender3D(MatrixStack stack) { try { for (Box box_ : renderBoxes) { // рандомные генерации - if(box_.getLengthZ() < 5 && box_.getLengthX() < 5) + if (box_.getLengthZ() < 5 && box_.getLengthX() < 5) continue; if (box.getValue()) Render3DEngine.drawFilledBox(stack, box_, color.getValue().getColorObject()); @@ -77,7 +77,7 @@ public void onThread() { } } - private Box getFullBox(Box raw, int x, int y, int z, int mode){ + private Box getFullBox(Box raw, int x, int y, int z, int mode) { BlockPos checkBp1 = new BlockPos(x, y, z + 1); Function check = getCheckByMode(mode); @@ -167,7 +167,7 @@ private static boolean one_one(BlockPos pos) { } - private static boolean isAir(BlockPos bp){ + private static boolean isAir(BlockPos bp) { return mc.world.isAir(bp); } } diff --git a/src/main/java/thunder/hack/features/modules/render/ViewModel.java b/src/main/java/thunder/hack/features/modules/render/ViewModel.java index 6ab8b991..62a3c717 100644 --- a/src/main/java/thunder/hack/features/modules/render/ViewModel.java +++ b/src/main/java/thunder/hack/features/modules/render/ViewModel.java @@ -16,7 +16,6 @@ public ViewModel() { super("ViewModel", Category.RENDER); } - public final Setting syncHands = new Setting<>("SyncHands", true); public final Setting mainHand = new Setting<>("MainHand", new SettingGroup(false, 0)); @@ -60,7 +59,6 @@ private float rotate(float value, float speed) { return value - speed <= 180 && value - speed > -180 ? value - speed : 180; } - @EventHandler public void onSettingChange(EventSetting e) { if (!syncHands.getValue()) diff --git a/src/main/java/thunder/hack/features/modules/render/WorldTweaks.java b/src/main/java/thunder/hack/features/modules/render/WorldTweaks.java index 36f80c5c..83e7279a 100644 --- a/src/main/java/thunder/hack/features/modules/render/WorldTweaks.java +++ b/src/main/java/thunder/hack/features/modules/render/WorldTweaks.java @@ -15,12 +15,12 @@ public WorldTweaks() { super("WorldTweaks", Category.RENDER); } - public static final Setting fogModify = new Setting("FogModify", new BooleanSettingGroup(true)); - public static final Setting fogStart = new Setting("FogStart", 0, 0, 256).addToGroup(fogModify); - public static final Setting fogEnd = new Setting("FogEnd", 64, 10, 256).addToGroup(fogModify); + public static final Setting fogModify = new Setting<>("FogModify", new BooleanSettingGroup(true)); + public static final Setting fogStart = new Setting<>("FogStart", 0, 0, 256).addToGroup(fogModify); + public static final Setting fogEnd = new Setting<>("FogEnd", 64, 10, 256).addToGroup(fogModify); public static final Setting fogColor = new Setting<>("FogColor", new ColorSetting(new Color(0xA900FF))).addToGroup(fogModify); public final Setting ctime = new Setting<>("ChangeTime", false); - public final Setting ctimeVal = new Setting("Time", 21, 0, 23); + public final Setting ctimeVal = new Setting<>("Time", 21, 0, 23); long oldTime; diff --git a/src/main/java/thunder/hack/features/modules/render/XRay.java b/src/main/java/thunder/hack/features/modules/render/XRay.java index 3a32cd92..87f760de 100644 --- a/src/main/java/thunder/hack/features/modules/render/XRay.java +++ b/src/main/java/thunder/hack/features/modules/render/XRay.java @@ -14,11 +14,11 @@ import net.minecraft.util.math.MathHelper; import org.jetbrains.annotations.NotNull; import thunder.hack.events.impl.EventMove; -import thunder.hack.events.impl.PacketEvent; import thunder.hack.events.impl.EventSetting; -import thunder.hack.gui.font.FontRenderers; +import thunder.hack.events.impl.PacketEvent; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.setting.Setting; import thunder.hack.utility.Timer; import thunder.hack.utility.math.FrameRateCounter; @@ -34,7 +34,6 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class XRay extends Module { - public XRay() { super("XRay", Category.MISC); } @@ -67,10 +66,6 @@ public XRay() { private int done, all; private Box area = new Box(BlockPos.ORIGIN); - private enum Plugin { - Old, New; - } - @Override public void onEnable() { ores.clear(); @@ -145,8 +140,7 @@ public void onUpdate() { }); } - public void onRender3D(MatrixStack stack) { - // FABOS IDI NAHUI + public void onRender3D(MatrixStack stack) { //FABOS IDI NAHUI for (BlockPos pos : ores) { Block block = mc.world.getBlockState(pos).getBlock(); if ((block == Blocks.DIAMOND_ORE || block == Blocks.DEEPSLATE_DIAMOND_ORE) && diamond.getValue()) @@ -169,7 +163,8 @@ public void onRender3D(MatrixStack stack) { if (displayBlock != null && (done != all)) draw(displayBlock, 255, 0, 60); - if (brutForce.getValue()) Render3DEngine.OUTLINE_QUEUE.add(new Render3DEngine.OutlineAction(area, HudEditor.getColor(1), 2)); + if (brutForce.getValue()) + Render3DEngine.OUTLINE_QUEUE.add(new Render3DEngine.OutlineAction(area, HudEditor.getColor(1), 2)); if (toCheck.isEmpty() || !brutForce.getValue()) return; @@ -217,7 +212,7 @@ public void onRender2D(DrawContext context) { double time = 0; try { time = MathUtility.round((all - done) * ((1000. / FrameRateCounter.INSTANCE.getFps() + delay.getValue()) / 1000f), 1); - } catch (NumberFormatException e) { + } catch (NumberFormatException ignored) { } FontRenderers.sf_bold.drawCenteredString(context.getMatrices(), done + " / " + all + (isRu() ? " Осталось: " : " Estimated time: ") + time + "s", posX + 68, posY + 18, -1); @@ -270,4 +265,8 @@ private boolean isDelayed() { return this.time++ > 10; } } + + private enum Plugin { + Old, New; + } } diff --git a/src/main/java/thunder/hack/gui/clickui/AbstractButton.java b/src/main/java/thunder/hack/gui/clickui/AbstractButton.java index 1991c14b..375c0885 100644 --- a/src/main/java/thunder/hack/gui/clickui/AbstractButton.java +++ b/src/main/java/thunder/hack/gui/clickui/AbstractButton.java @@ -6,6 +6,7 @@ public class AbstractButton { public float x, y, width, height; public float target_offset; public float offsetY; + public void init() { } diff --git a/src/main/java/thunder/hack/gui/clickui/AbstractCategory.java b/src/main/java/thunder/hack/gui/clickui/AbstractCategory.java index cb1e5fe7..7deb2f43 100644 --- a/src/main/java/thunder/hack/gui/clickui/AbstractCategory.java +++ b/src/main/java/thunder/hack/gui/clickui/AbstractCategory.java @@ -36,8 +36,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) { prevTargetX = x; this.x = this.prevX + mouseX; this.y = this.prevY + mouseY; - } else - prevTargetX = x; + } else prevTargetX = x; } public void mouseClicked(int mouseX, int mouseY, int button) { @@ -117,7 +116,7 @@ public void setModuleOffset(float v, float mx, float my) { } } - public void tick(){ + public void tick() { } public void hudClicked(Module module) { diff --git a/src/main/java/thunder/hack/gui/clickui/Category.java b/src/main/java/thunder/hack/gui/clickui/Category.java index 00b96317..aa7e66df 100644 --- a/src/main/java/thunder/hack/gui/clickui/Category.java +++ b/src/main/java/thunder/hack/gui/clickui/Category.java @@ -7,12 +7,12 @@ import net.minecraft.util.Identifier; import thunder.hack.ThunderHack; import thunder.hack.core.manager.client.ModuleManager; -import thunder.hack.gui.clickui.impl.SearchBar; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.client.BaritoneSettings; import thunder.hack.features.modules.client.ClickGui; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.clickui.impl.SearchBar; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.animation.AnimationUtility; diff --git a/src/main/java/thunder/hack/gui/clickui/ClickGUI.java b/src/main/java/thunder/hack/gui/clickui/ClickGUI.java index f92171b5..f2fc25b1 100644 --- a/src/main/java/thunder/hack/gui/clickui/ClickGUI.java +++ b/src/main/java/thunder/hack/gui/clickui/ClickGUI.java @@ -9,11 +9,11 @@ import org.lwjgl.glfw.GLFW; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.hud.HudElement; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.client.ClickGui; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.animation.AnimationUtility; import thunder.hack.utility.render.animation.EaseOutBack; @@ -70,7 +70,7 @@ protected void init() { int windowHeight = 18; int halfWidth = mc.getWindow().getScaledWidth() / 2; - int halfWidthCats = (int) ((((float)Module.Category.values().size() - 1) / 2f) * (ModuleManager.clickGui.moduleWidth.getValue() + 4f)); + int halfWidthCats = (int) ((((float) Module.Category.values().size() - 1) / 2f) * (ModuleManager.clickGui.moduleWidth.getValue() + 4f)); for (final Module.Category category : Managers.MODULE.getCategories()) { if (category == Module.Category.HUD) continue; @@ -213,13 +213,13 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) { "\nDelete + Left Mouse Click по модулю, чтобы сбросить его настройки" : "Left Mouse Click to enable module" + - "\nRight Mouse Click to open module settings" + - "\nMiddle Mouse Click to bind module" + - "\nCtrl + F to start searching" + - "\nDrag n Drop config there to load" + - "\nShift + Left Mouse Click to change module visibility in Array list" + - "\nMiddle Mouse Click on slider to enter value from keyboard" + - "\nDelete + Left Mouse Click on module to reset", + "\nRight Mouse Click to open module settings" + + "\nMiddle Mouse Click to bind module" + + "\nCtrl + F to start searching" + + "\nDrag n Drop config there to load" + + "\nShift + Left Mouse Click to change module visibility in Array list" + + "\nMiddle Mouse Click on slider to enter value from keyboard" + + "\nDelete + Left Mouse Click on module to reset", 5, mc.getWindow().getScaledHeight() - 80, HudEditor.getColor(0).getRGB()); if (!HudElement.anyHovered && !ClickGUI.anyHovered) diff --git a/src/main/java/thunder/hack/gui/clickui/ModuleButton.java b/src/main/java/thunder/hack/gui/clickui/ModuleButton.java index 019aaa4f..9994c006 100644 --- a/src/main/java/thunder/hack/gui/clickui/ModuleButton.java +++ b/src/main/java/thunder/hack/gui/clickui/ModuleButton.java @@ -9,17 +9,16 @@ import net.minecraft.util.math.RotationAxis; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.features.cmd.Command; import thunder.hack.core.manager.client.ModuleManager; -import thunder.hack.gui.clickui.impl.*; -import thunder.hack.gui.font.FontRenderers; +import thunder.hack.features.cmd.Command; import thunder.hack.features.hud.impl.TargetHud; -import thunder.hack.gui.misc.DialogScreen; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.client.ClickGui; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.clickui.impl.*; +import thunder.hack.gui.font.FontRenderers; +import thunder.hack.gui.misc.DialogScreen; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.*; import thunder.hack.utility.render.Render2DEngine; diff --git a/src/main/java/thunder/hack/gui/clickui/impl/BindElement.java b/src/main/java/thunder/hack/gui/clickui/impl/BindElement.java index dac934e4..bee8cff1 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/BindElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/BindElement.java @@ -20,12 +20,12 @@ public BindElement(Setting setting) { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); - FontRenderers.sf_medium_mini.drawString(context.getMatrices(),setting.getName(), getX() + 6, (getY() + height / 2 - 3) + 2, new Color(-1).getRGB()); + FontRenderers.sf_medium_mini.drawString(context.getMatrices(), setting.getName(), getX() + 6, (getY() + height / 2 - 3) + 2, new Color(-1).getRGB()); float tWidth = FontRenderers.sf_medium_mini.getStringWidth(isListening ? "..." : (((Bind) setting.getValue()).getBind())); Render2DEngine.drawRect(context.getMatrices(), getX() + (getWidth() - tWidth - 11), getY() + 2, tWidth + 4, 10, new Color(0x94000000, true)); - FontRenderers.sf_medium_mini.drawString(context.getMatrices(),isListening ? "..." : (((Bind) setting.getValue()).getBind()), getX() + (getWidth() - tWidth - 9), (getY() + height / 2 - 1), new Color(-1).getRGB()); + FontRenderers.sf_medium_mini.drawString(context.getMatrices(), isListening ? "..." : (((Bind) setting.getValue()).getBind()), getX() + (getWidth() - tWidth - 9), (getY() + height / 2 - 1), new Color(-1).getRGB()); } @Override diff --git a/src/main/java/thunder/hack/gui/clickui/impl/BooleanElement.java b/src/main/java/thunder/hack/gui/clickui/impl/BooleanElement.java index e058d955..1787ae85 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/BooleanElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/BooleanElement.java @@ -3,10 +3,10 @@ import net.minecraft.client.gui.DrawContext; import org.lwjgl.glfw.GLFW; import thunder.hack.core.Managers; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.AbstractElement; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.font.FontRenderers; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.utility.render.Render2DEngine; diff --git a/src/main/java/thunder/hack/gui/clickui/impl/BooleanParentElement.java b/src/main/java/thunder/hack/gui/clickui/impl/BooleanParentElement.java index 89434d4c..c6e324d9 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/BooleanParentElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/BooleanParentElement.java @@ -5,10 +5,10 @@ import net.minecraft.util.math.RotationAxis; import org.lwjgl.glfw.GLFW; import thunder.hack.core.Managers; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.AbstractElement; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.font.FontRenderers; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.BooleanSettingGroup; import thunder.hack.utility.render.Render2DEngine; diff --git a/src/main/java/thunder/hack/gui/clickui/impl/ItemSelectElement.java b/src/main/java/thunder/hack/gui/clickui/impl/ItemSelectElement.java index 878d5927..18b99582 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/ItemSelectElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/ItemSelectElement.java @@ -5,8 +5,8 @@ import thunder.hack.core.Managers; import thunder.hack.gui.clickui.AbstractElement; import thunder.hack.gui.font.FontRenderers; -import thunder.hack.gui.windows.impl.ItemSelectWindow; import thunder.hack.gui.windows.WindowsScreen; +import thunder.hack.gui.windows.impl.ItemSelectWindow; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.ItemSelectSetting; @@ -24,9 +24,9 @@ public ItemSelectElement(Setting setting) { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - super.render(context,mouseX,mouseY,delta); + super.render(context, mouseX, mouseY, delta); MatrixStack matrixStack = context.getMatrices(); - FontRenderers.icons.drawString(matrixStack, "H", x + width - 14f, y + 6f, new Color(0xFFECECEC, true).getRGB()); + FontRenderers.icons.drawString(matrixStack, "H", x + width - 14f, y + 6f, new Color(0xFFECECEC, true).getRGB()); FontRenderers.sf_medium_mini.drawString(matrixStack, setting.getName(), x + 6f, (y + height / 2 - 1f), new Color(-1).getRGB()); } diff --git a/src/main/java/thunder/hack/gui/clickui/impl/ModeElement.java b/src/main/java/thunder/hack/gui/clickui/impl/ModeElement.java index 1ebd4a14..a3906b7f 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/ModeElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/ModeElement.java @@ -3,11 +3,10 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.RotationAxis; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.AbstractElement; import thunder.hack.gui.font.FontRenderers; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.TextureStorage; @@ -54,23 +53,23 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) { matrixStack.pop(); - if(setting.group != null) + if (setting.group != null) Render2DEngine.drawRect(context.getMatrices(), x + 4, y, 1f, 17, HudEditor.getColor(1)); - FontRenderers.sf_medium_mini.drawString(matrixStack, setting2.getName(), (setting.group != null ? 2f : 0f) + (x + 6), (y + wheight / 2 - (6 / 2f)) + 3, new Color(-1).getRGB()); + FontRenderers.sf_medium_mini.drawString(matrixStack, setting2.getName(), (setting.group != null ? 2f : 0f) + (x + 6), (y + wheight / 2 - (6 / 2f)) + 3, new Color(-1).getRGB()); - if(animation2 < 0.99 && !Objects.equals(setting2.currentEnumName(), prevMode)) { + if (animation2 < 0.99 && !Objects.equals(setting2.currentEnumName(), prevMode)) { FontRenderers.sf_medium_mini.drawString(matrixStack, prevMode, (int) (x + width - 18 - FontRenderers.sf_medium_mini.getStringWidth(prevMode)), 3 + (y + wheight / 2 - 3f) - animation2 * 5, Render2DEngine.applyOpacity(new Color(-1), animation2)); FontRenderers.sf_medium_mini.drawString(matrixStack, setting2.currentEnumName(), (x + width - 18 - FontRenderers.sf_medium_mini.getStringWidth(setting2.currentEnumName())), 3 + (y + wheight / 2 - 3f) - animation2 * 5 + 5, Render2DEngine.applyOpacity(new Color(-1), 1f - animation2)); } else - FontRenderers.sf_medium_mini.drawString(matrixStack, setting2.currentEnumName(), (x + width - 18 - FontRenderers.sf_medium_mini.getStringWidth(setting.currentEnumName())), 3 + (y + wheight / 2 - 3f), new Color(-1).getRGB()); + FontRenderers.sf_medium_mini.drawString(matrixStack, setting2.currentEnumName(), (x + width - 18 - FontRenderers.sf_medium_mini.getStringWidth(setting.currentEnumName())), 3 + (y + wheight / 2 - 3f), new Color(-1).getRGB()); if (open) { Color color = HudEditor.getColor(0); double offsetY = 0; for (int i = 0; i <= setting2.getModes().length - 1; i++) { - FontRenderers.sf_medium_mini.drawString(matrixStack, setting2.getModes()[i], x + width / 2f - (FontRenderers.sf_medium_mini.getStringWidth(setting2.getModes()[i]) / 2f), (y + wheight + 2 + offsetY), setting2.currentEnumName().equalsIgnoreCase(setting2.getModes()[i]) ? color.getRGB() : new Color(-1).getRGB()); + FontRenderers.sf_medium_mini.drawString(matrixStack, setting2.getModes()[i], x + width / 2f - (FontRenderers.sf_medium_mini.getStringWidth(setting2.getModes()[i]) / 2f), (y + wheight + 2 + offsetY), setting2.currentEnumName().equalsIgnoreCase(setting2.getModes()[i]) ? color.getRGB() : new Color(-1).getRGB()); offsetY += 12; } } @@ -86,7 +85,7 @@ public void mouseClicked(int mouseX, int mouseY, int button) { Managers.SOUND.playBoolean(); } else { open = !open; - if(open) { + if (open) { Managers.SOUND.playSwipeIn(); } else { Managers.SOUND.playSwipeOut(); @@ -109,7 +108,6 @@ public void mouseClicked(int mouseX, int mouseY, int button) { super.mouseClicked(mouseX, mouseY, button); } - public void setWHeight(double height) { this.wheight = height; } diff --git a/src/main/java/thunder/hack/gui/clickui/impl/ParentElement.java b/src/main/java/thunder/hack/gui/clickui/impl/ParentElement.java index 3757fbdf..b341727c 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/ParentElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/ParentElement.java @@ -3,7 +3,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.RotationAxis; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.gui.clickui.AbstractElement; import thunder.hack.gui.font.FontRenderers; diff --git a/src/main/java/thunder/hack/gui/clickui/impl/SearchBar.java b/src/main/java/thunder/hack/gui/clickui/impl/SearchBar.java index cde24bc7..3bced7f3 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/SearchBar.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/SearchBar.java @@ -74,12 +74,8 @@ public void keyTyped(int keyCode) { listening = false; moduleName = ""; } - case GLFW.GLFW_KEY_BACKSPACE -> { - moduleName = SliderElement.removeLastChar(moduleName); - } - case GLFW.GLFW_KEY_SPACE -> { - moduleName = moduleName + " "; - } + case GLFW.GLFW_KEY_BACKSPACE -> moduleName = SliderElement.removeLastChar(moduleName); + case GLFW.GLFW_KEY_SPACE -> moduleName = moduleName + " "; } } } diff --git a/src/main/java/thunder/hack/gui/clickui/impl/SliderElement.java b/src/main/java/thunder/hack/gui/clickui/impl/SliderElement.java index 4639affb..6f702c12 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/SliderElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/SliderElement.java @@ -7,10 +7,10 @@ import org.lwjgl.glfw.GLFW; import thunder.hack.ThunderHack; import thunder.hack.core.Managers; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.AbstractElement; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.font.FontRenderers; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.render.Render2DEngine; @@ -21,7 +21,6 @@ import static thunder.hack.core.manager.IManager.mc; public class SliderElement extends AbstractElement { - private final float min, max; private float animation, prevValue; private boolean dragging, listening; diff --git a/src/main/java/thunder/hack/gui/clickui/impl/StringElement.java b/src/main/java/thunder/hack/gui/clickui/impl/StringElement.java index 77cab673..96d7dccd 100644 --- a/src/main/java/thunder/hack/gui/clickui/impl/StringElement.java +++ b/src/main/java/thunder/hack/gui/clickui/impl/StringElement.java @@ -1,8 +1,6 @@ package thunder.hack.gui.clickui.impl; -import net.minecraft.SharedConstants; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.util.InputUtil; import net.minecraft.util.StringHelper; import org.lwjgl.glfw.GLFW; import thunder.hack.ThunderHack; @@ -72,12 +70,8 @@ public void keyTyped(int keyCode) { currentString = ""; listening = !listening; } - case GLFW.GLFW_KEY_BACKSPACE -> { - currentString = SliderElement.removeLastChar(currentString); - } - case GLFW.GLFW_KEY_SPACE -> { - currentString = currentString + " "; - } + case GLFW.GLFW_KEY_BACKSPACE -> currentString = SliderElement.removeLastChar(currentString); + case GLFW.GLFW_KEY_SPACE -> currentString = currentString + " "; } } } diff --git a/src/main/java/thunder/hack/gui/font/FontRenderers.java b/src/main/java/thunder/hack/gui/font/FontRenderers.java index 848616d8..fc66ebcc 100644 --- a/src/main/java/thunder/hack/gui/font/FontRenderers.java +++ b/src/main/java/thunder/hack/gui/font/FontRenderers.java @@ -29,7 +29,7 @@ public class FontRenderers { public static FontRenderer getModulesRenderer() { return modules; } - + public static @NotNull FontRenderer create(float size, String name) throws IOException, FontFormatException { return new FontRenderer(Font.createFont(Font.TRUETYPE_FONT, Objects.requireNonNull(ThunderHack.class.getClassLoader().getResourceAsStream("assets/thunderhack/fonts/" + name + ".ttf"))).deriveFont(Font.PLAIN, size / 2f), size / 2f); } diff --git a/src/main/java/thunder/hack/gui/font/Texture.java b/src/main/java/thunder/hack/gui/font/Texture.java index 43b89d41..843e9e7d 100644 --- a/src/main/java/thunder/hack/gui/font/Texture.java +++ b/src/main/java/thunder/hack/gui/font/Texture.java @@ -3,7 +3,6 @@ import net.minecraft.util.Identifier; public class Texture { - final Identifier id; public Texture(String path) { diff --git a/src/main/java/thunder/hack/gui/hud/HudEditorGui.java b/src/main/java/thunder/hack/gui/hud/HudEditorGui.java index a116d57b..fd1cf18b 100644 --- a/src/main/java/thunder/hack/gui/hud/HudEditorGui.java +++ b/src/main/java/thunder/hack/gui/hud/HudEditorGui.java @@ -10,11 +10,11 @@ import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; import thunder.hack.features.hud.HudElement; +import thunder.hack.features.modules.Module; +import thunder.hack.features.modules.client.ClickGui; import thunder.hack.gui.clickui.AbstractCategory; import thunder.hack.gui.clickui.Category; import thunder.hack.gui.clickui.ClickGUI; -import thunder.hack.features.modules.Module; -import thunder.hack.features.modules.client.ClickGui; import java.util.List; diff --git a/src/main/java/thunder/hack/gui/mainmenu/CreditsScreen.java b/src/main/java/thunder/hack/gui/mainmenu/CreditsScreen.java index 5a8a9ddf..9b91bb28 100644 --- a/src/main/java/thunder/hack/gui/mainmenu/CreditsScreen.java +++ b/src/main/java/thunder/hack/gui/mainmenu/CreditsScreen.java @@ -18,16 +18,12 @@ import thunder.hack.utility.render.TextureStorage; import java.awt.*; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URL; import java.util.ArrayList; import java.util.Objects; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import static thunder.hack.features.modules.Module.mc; diff --git a/src/main/java/thunder/hack/gui/mainmenu/MainMenuButton.java b/src/main/java/thunder/hack/gui/mainmenu/MainMenuButton.java index ee12079f..38f1791d 100644 --- a/src/main/java/thunder/hack/gui/mainmenu/MainMenuButton.java +++ b/src/main/java/thunder/hack/gui/mainmenu/MainMenuButton.java @@ -1,14 +1,10 @@ package thunder.hack.gui.mainmenu; import net.minecraft.client.gui.DrawContext; -import net.minecraft.entity.decoration.ArmorStandEntity; import org.jetbrains.annotations.NotNull; import thunder.hack.gui.font.FontRenderers; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.utility.render.Render2DEngine; -import java.awt.*; - import static thunder.hack.features.modules.Module.mc; public class MainMenuButton { @@ -35,15 +31,15 @@ public void onRender(DrawContext context, float mouseX, float mouseY) { float halfOfWidth = mc.getWindow().getScaledWidth() / 2f; float halfOfHeight = mc.getWindow().getScaledHeight() / 2f; Render2DEngine.drawHudBase(context.getMatrices(), halfOfWidth + posX, halfOfHeight + posY, width, height, 10); - boolean hovered = Render2DEngine.isHovered(mouseX, mouseY,halfOfWidth + posX, halfOfHeight + posY, width, height); - FontRenderers.monsterrat.drawCenteredString(context.getMatrices(), name,halfOfWidth + posX + width / 2f, halfOfHeight + posY + height / 2f - 3f, hovered ? -1 : Render2DEngine.applyOpacity(-1, 0.7f)); + boolean hovered = Render2DEngine.isHovered(mouseX, mouseY, halfOfWidth + posX, halfOfHeight + posY, width, height); + FontRenderers.monsterrat.drawCenteredString(context.getMatrices(), name, halfOfWidth + posX + width / 2f, halfOfHeight + posY + height / 2f - 3f, hovered ? -1 : Render2DEngine.applyOpacity(-1, 0.7f)); } public void onClick(int mouseX, int mouseY) { float halfOfWidth = mc.getWindow().getScaledWidth() / 2f; float halfOfHeight = mc.getWindow().getScaledHeight() / 2f; - boolean hovered = Render2DEngine.isHovered(mouseX, mouseY,halfOfWidth + posX, halfOfHeight + posY, width, height); + boolean hovered = Render2DEngine.isHovered(mouseX, mouseY, halfOfWidth + posX, halfOfHeight + posY, width, height); if (hovered) action.run(); } } diff --git a/src/main/java/thunder/hack/gui/mainmenu/MainMenuScreen.java b/src/main/java/thunder/hack/gui/mainmenu/MainMenuScreen.java index e6ab2d47..0a535c43 100644 --- a/src/main/java/thunder/hack/gui/mainmenu/MainMenuScreen.java +++ b/src/main/java/thunder/hack/gui/mainmenu/MainMenuScreen.java @@ -12,7 +12,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Util; import org.jetbrains.annotations.NotNull; -import thunder.hack.ThunderHack; import thunder.hack.api.IAddon; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ModuleManager; @@ -137,7 +136,7 @@ public void render(@NotNull DrawContext context, int mouseX, int mouseY, float d int offset = 0; for (IAddon addon : Managers.ADDON.getAddons()) { - // for (String addon : Arrays.asList("Addon", "Addon2", "Addon3", "Addon4", "Addon5")) { + // for (String addon : Arrays.asList("Addon", "Addon2", "Addon3", "Addon4", "Addon5")) { textWidth = (int) FontRenderers.sf_bold.getStringWidth(addon.getName() + " |"); textX = screenWidth - textWidth - 5; FontRenderers.sf_bold.drawString(context.getMatrices(), addon.getName() + Formatting.WHITE + " |", textX, 13 + offset, Color.GRAY.getRGB()); diff --git a/src/main/java/thunder/hack/gui/misc/DialogScreen.java b/src/main/java/thunder/hack/gui/misc/DialogScreen.java index 8a3cf844..3051a4f3 100644 --- a/src/main/java/thunder/hack/gui/misc/DialogScreen.java +++ b/src/main/java/thunder/hack/gui/misc/DialogScreen.java @@ -7,7 +7,6 @@ import org.jetbrains.annotations.NotNull; import thunder.hack.gui.font.FontRenderers; import thunder.hack.utility.render.Render2DEngine; -import thunder.hack.utility.render.TextureStorage; import java.awt.*; diff --git a/src/main/java/thunder/hack/gui/misc/GuiScanner.java b/src/main/java/thunder/hack/gui/misc/GuiScanner.java index ee13a7b5..fdaefd0d 100644 --- a/src/main/java/thunder/hack/gui/misc/GuiScanner.java +++ b/src/main/java/thunder/hack/gui/misc/GuiScanner.java @@ -4,8 +4,8 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; import thunder.hack.core.manager.client.ModuleManager; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.modules.misc.NoCommentExploit; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.utility.render.Render2DEngine; import java.awt.*; @@ -28,7 +28,7 @@ public GuiScanner() { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - if(mc.player == null) return; + if (mc.player == null) return; radarx = mc.getWindow().getScaledWidth() / 8; radarx1 = ((mc.getWindow().getScaledWidth() * 5) / 8); @@ -104,7 +104,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { if (mouseX > consolex && mouseX < consolex1 && mouseY > consoley1 + 20 && mouseY < consoley1 + 36) { track = !track; } - if (mouseX > consolex && mouseX < consolex1 && mouseY > consoley1 + 38 && mouseY < consoley1 + 53) { + if (mouseX > consolex && mouseX < consolex1 && mouseY > consoley1 + 38 && mouseY < consoley1 + 53) { ModuleManager.noCommentExploit.couti = 1; consoleout.clear(); } diff --git a/src/main/java/thunder/hack/gui/notification/Notification.java b/src/main/java/thunder/hack/gui/notification/Notification.java index c0accec1..233e7df0 100644 --- a/src/main/java/thunder/hack/gui/notification/Notification.java +++ b/src/main/java/thunder/hack/gui/notification/Notification.java @@ -2,8 +2,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Formatting; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.FontRenderers; import thunder.hack.utility.Timer; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.render.Render2DEngine; diff --git a/src/main/java/thunder/hack/gui/thundergui/ThunderGui.java b/src/main/java/thunder/hack/gui/thundergui/ThunderGui.java index 48b53db1..a8644ee6 100644 --- a/src/main/java/thunder/hack/gui/thundergui/ThunderGui.java +++ b/src/main/java/thunder/hack/gui/thundergui/ThunderGui.java @@ -6,12 +6,12 @@ import org.lwjgl.glfw.GLFW; import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.features.cmd.Command; import thunder.hack.core.manager.client.ConfigManager; -import thunder.hack.gui.font.FontRenderers; -import thunder.hack.gui.thundergui.components.*; +import thunder.hack.features.cmd.Command; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.client.ThunderHackGui; +import thunder.hack.gui.font.FontRenderers; +import thunder.hack.gui.thundergui.components.*; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.BooleanSettingGroup; import thunder.hack.setting.impl.ColorSetting; @@ -29,6 +29,11 @@ import static thunder.hack.features.modules.Module.mc; import static thunder.hack.utility.render.animation.AnimationUtility.fast; +/** + * Кто спиздит у того мать у меня под столом + * + * @Copyright by Pan4ur#2144 + **/ public class ThunderGui extends Screen { public static CurrentMode currentMode = CurrentMode.Modules; public static boolean scroll_lock = false; @@ -48,12 +53,6 @@ public class ThunderGui extends Screen { public final CopyOnWriteArrayList friends = new CopyOnWriteArrayList<>(); private final int main_width = 400; - /** - * Кто спиздит у того мать у меня под столом - * - * @Copyright by Pan4ur#2144 - **/ - public int main_posX = 100; public int main_posY = 100; public Module.Category current_category = Module.Category.COMBAT; @@ -217,12 +216,10 @@ public void renderGui(DrawContext context, int mouseX, int mouseY, float partial manager_animation = fast(manager_animation, 0, 15f); category_animation = fast(category_animation, 0, 15f); - // Основная плита - // Main GUI + // Основная плита / Main GUI Render2DEngine.drawRound(context.getMatrices(), main_posX, main_posY, main_width, main_height, 9f, ThunderHackGui.getColorByTheme(0)); - // Плита с лого - // Main GUI logo + // Плита с лого / Main GUI logo Render2DEngine.drawRound(context.getMatrices(), main_posX + 5, main_posY + 5, 90, 30, 7f, ThunderHackGui.getColorByTheme(1)); context.getMatrices().push(); @@ -590,7 +587,8 @@ public void keyTyped(String typedChar, int keyCode) throws IOException { search_string = (removeLastChar(search_string)); return; } - if(keyCode >= GLFW.GLFW_KEY_A && keyCode <= GLFW.GLFW_KEY_Z || keyCode >= GLFW.GLFW_KEY_0 && keyCode <= GLFW.GLFW_KEY_9) search_string = (search_string + typedChar); + if (keyCode >= GLFW.GLFW_KEY_A && keyCode <= GLFW.GLFW_KEY_Z || keyCode >= GLFW.GLFW_KEY_0 && keyCode <= GLFW.GLFW_KEY_9) + search_string = (search_string + typedChar); } if (listening_config) { if (config_string.equalsIgnoreCase("Save config")) { diff --git a/src/main/java/thunder/hack/gui/thundergui/components/BooleanComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/BooleanComponent.java index 7e6d3e02..62e78e56 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/BooleanComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/BooleanComponent.java @@ -1,10 +1,9 @@ package thunder.hack.gui.thundergui.components; import net.minecraft.client.util.math.MatrixStack; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; -import thunder.hack.features.modules.client.ClickGui; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.utility.render.Render2DEngine; diff --git a/src/main/java/thunder/hack/gui/thundergui/components/BooleanParentComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/BooleanParentComponent.java index 69086ea0..6076f1fd 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/BooleanParentComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/BooleanParentComponent.java @@ -1,9 +1,9 @@ package thunder.hack.gui.thundergui.components; import net.minecraft.client.util.math.MatrixStack; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.BooleanSettingGroup; import thunder.hack.utility.render.Render2DEngine; @@ -23,16 +23,16 @@ public BooleanParentComponent(Setting setting) { @Override public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) { - super.render(stack,mouseX, mouseY, partialTicks); + super.render(stack, mouseX, mouseY, partialTicks); if ((getY() > ThunderGui.getInstance().main_posY + ThunderGui.getInstance().height) || getY() < ThunderGui.getInstance().main_posY) { return; } - FontRenderers.modules.drawString(stack,getSetting().getName(), (float) getX(), (float) getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); + FontRenderers.modules.drawString(stack, getSetting().getName(), (float) getX(), (float) getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); animation = fast(animation, getParentSetting().getValue().isEnabled() ? 1 : 0, 15f); double paddingX = 7 * animation; Color color = HudEditor.getColor(1); - Render2DEngine.drawRound(stack,(float) (x + width - 18), (float) (y + height / 2 - 4), 15, 8, 4, paddingX > 4 ? color : new Color(0xFFB2B1B1)); - Render2DEngine.drawRound(stack,(float) (x + width - 17 + paddingX), (float) (y + height / 2 - 3), 6, 6, 3, new Color(-1)); + Render2DEngine.drawRound(stack, (float) (x + width - 18), (float) (y + height / 2 - 4), 15, 8, 4, paddingX > 4 ? color : new Color(0xFFB2B1B1)); + Render2DEngine.drawRound(stack, (float) (x + width - 17 + paddingX), (float) (y + height / 2 - 3), 6, 6, 3, new Color(-1)); } @Override diff --git a/src/main/java/thunder/hack/gui/thundergui/components/CategoryPlate.java b/src/main/java/thunder/hack/gui/thundergui/components/CategoryPlate.java index c10c79fa..e82ed818 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/CategoryPlate.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/CategoryPlate.java @@ -1,9 +1,9 @@ package thunder.hack.gui.thundergui.components; import net.minecraft.client.util.math.MatrixStack; +import thunder.hack.features.modules.Module; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; -import thunder.hack.features.modules.Module; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.render.Render2DEngine; diff --git a/src/main/java/thunder/hack/gui/thundergui/components/ColorPickerComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/ColorPickerComponent.java index 1e8ff265..222a2abb 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/ColorPickerComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/ColorPickerComponent.java @@ -1,13 +1,13 @@ package thunder.hack.gui.thundergui.components; +import net.minecraft.client.util.math.MatrixStack; import thunder.hack.ThunderHack; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; -import thunder.hack.setting.impl.ColorSetting; import thunder.hack.setting.Setting; +import thunder.hack.setting.impl.ColorSetting; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.render.Render2DEngine; -import net.minecraft.client.util.math.MatrixStack; import java.awt.*; @@ -43,15 +43,15 @@ public ColorSetting getColorSetting() { @Override public void render(MatrixStack stack, int mouseX, int mouseY, float delta) { - super.render(stack,mouseX, mouseY, delta); + super.render(stack, mouseX, mouseY, delta); if ((getY() > ThunderGui.getInstance().main_posY + ThunderGui.getInstance().height) || getY() < ThunderGui.getInstance().main_posY) { return; } - FontRenderers.modules.drawString(stack,getSetting().getName(), (float) getX(), (float) getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); - Render2DEngine.drawBlurredShadow(stack,(int) (x + width - 20), (int) (y + 5), 14, 6, 10, getColorSetting().getColorObject()); - Render2DEngine.drawRound(stack,(float) (x + width - 20), (float) (y + 5), 14, 6, 1, getColorSetting().getColorObject()); + FontRenderers.modules.drawString(stack, getSetting().getName(), getX(), getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); + Render2DEngine.drawBlurredShadow(stack, (int) (x + width - 20), (int) (y + 5), 14, 6, 10, getColorSetting().getColorObject()); + Render2DEngine.drawRound(stack, x + width - 20, y + 5, 14, 6, 1, getColorSetting().getColorObject()); if (open) - renderPicker(stack,mouseX, mouseY, getColorSetting().getColorObject()); + renderPicker(stack, mouseX, mouseY, getColorSetting().getColorObject()); } @Override @@ -59,9 +59,9 @@ public void onTick() { super.onTick(); } - private void renderPicker(MatrixStack stack,int mouseX, int mouseY, Color color) { + private void renderPicker(MatrixStack stack, int mouseX, int mouseY, Color color) { double cx = x + 6; - float cy = (float) (y + 20); + float cy = y + 20; double cw = width - 38; double ch = height - 20; @@ -86,21 +86,21 @@ private void renderPicker(MatrixStack stack,int mouseX, int mouseY, Color color) Color colorA = Color.getHSBColor(hue, 0.0F, 1.0F), colorB = Color.getHSBColor(hue, 1.0F, 1.0F); Color colorC = new Color(0, 0, 0, 0), colorD = new Color(0, 0, 0); - Render2DEngine.horizontalGradient(stack,(float)(cx + 40), cy, (float) (cx + cw), (float) (cy + ch), colorA, colorB); + Render2DEngine.horizontalGradient(stack, (float) (cx + 40), cy, (float) (cx + cw), (float) (cy + ch), colorA, colorB); Render2DEngine.verticalGradient(stack, (float) (cx + 40), cy, (float) (cx + cw), (float) (cy + ch), colorC, colorD); for (float i = 1f; i < ch - 2f; i += 1f) { float curHue = (float) (1f / (ch / i)); - Render2DEngine.drawRect(stack,(float) (cx + cw + 4), (float) (cy + i), 8, 1, Color.getHSBColor(curHue, 1f, 1f)); + Render2DEngine.drawRect(stack, (float) (cx + cw + 4), cy + i, 8, 1, Color.getHSBColor(curHue, 1f, 1f)); } - Render2DEngine.drawRect(stack,(float) (cx + cw + 17), (float) (cy + 1), 8, (float) (ch - 3), new Color(-1)); + Render2DEngine.drawRect(stack, (float) (cx + cw + 17), cy + 1, 8, (float) (ch - 3), new Color(-1)); Render2DEngine.verticalGradient(stack, (float) (cx + cw + 17), (float) (cy + 0.8), (float) (cx + cw + 25), (float) (cy + ch - 2), new Color(color.getRed(), color.getGreen(), color.getBlue(), 255), new Color(0, 0, 0, 0)); - Render2DEngine.drawRect(stack,(float) (cx + cw + 3), hpos + 0.5f, 10, 1, Color.WHITE); - Render2DEngine.drawRect(stack,(float) (cx + cw + 16), apos + 0.5f, 10, 1, Color.WHITE); - Render2DEngine.drawRound(stack,spos, bpos, 3, 3, 1.5f, new Color(-1)); + Render2DEngine.drawRect(stack, (float) (cx + cw + 3), hpos + 0.5f, 10, 1, Color.WHITE); + Render2DEngine.drawRect(stack, (float) (cx + cw + 16), apos + 0.5f, 10, 1, Color.WHITE); + Render2DEngine.drawRound(stack, spos, bpos, 3, 3, 1.5f, new Color(-1)); Color value = Color.getHSBColor(hue, saturation, brightness); @@ -113,13 +113,13 @@ private void renderPicker(MatrixStack stack,int mouseX, int mouseY, Color color) } if (hfocused) { - hue = (float) -((ch - MathUtility.clamp((float) (mouseY - cy), 0, (float) ch)) / ch); + hue = (float) -((ch - MathUtility.clamp(mouseY - cy, 0, (float) ch)) / ch); value = Color.getHSBColor(hue, saturation, brightness); setColor(new Color(value.getRed(), value.getGreen(), value.getBlue(), alpha)); } if (afocused) { - alpha = (int) (((ch - MathUtility.clamp((float) (mouseY - cy), 0, (float) ch)) / ch) * 255); + alpha = (int) (((ch - MathUtility.clamp(mouseY - cy, 0, (float) ch)) / ch) * 255); setColor(new Color(value.getRed(), value.getGreen(), value.getBlue(), alpha)); } @@ -127,13 +127,13 @@ private void renderPicker(MatrixStack stack,int mouseX, int mouseY, Color color) copy_focused = Render2DEngine.isHovered(mouseX, mouseY, getX(), cy + 13, 40, 10); paste_focused = Render2DEngine.isHovered(mouseX, mouseY, getX(), cy + 26, 40, 10); - Render2DEngine.drawRound(stack,(float) getX(), (float) cy, 40, 10, 2f, getColorSetting().isRainbow() ? new Color(86, 63, 105, 250) : (rainbow_focused ? new Color(66, 48, 80, 250) : new Color(50, 35, 60, 250))); - Render2DEngine.drawRound(stack,(float) getX(), (float) cy + 13, 40, 10, 2f, copy_focused ? new Color(66, 48, 80, 250) : new Color(50, 35, 60, 250)); - Render2DEngine.drawRound(stack,(float) getX(), (float) cy + 26, 40, 9.5f, 2f, paste_focused ? new Color(66, 48, 80, 250) : new Color(50, 35, 60, 250)); + Render2DEngine.drawRound(stack, getX(), cy, 40, 10, 2f, getColorSetting().isRainbow() ? new Color(86, 63, 105, 250) : (rainbow_focused ? new Color(66, 48, 80, 250) : new Color(50, 35, 60, 250))); + Render2DEngine.drawRound(stack, getX(), cy + 13, 40, 10, 2f, copy_focused ? new Color(66, 48, 80, 250) : new Color(50, 35, 60, 250)); + Render2DEngine.drawRound(stack, getX(), cy + 26, 40, 9.5f, 2f, paste_focused ? new Color(66, 48, 80, 250) : new Color(50, 35, 60, 250)); - FontRenderers.modules.drawCenteredString(stack,"rainbow", (float) getX() + 20, (float) cy + 3, rainbow_focused ? -1 : (getColorSetting().isRainbow() ? getColorSetting().getColor() : new Color(0xB5FFFFFF, true).getRGB())); - FontRenderers.modules.drawCenteredString(stack,"copy", (float) getX() + 20, (float) cy + 15.5f, copy_focused ? -1 : new Color(0xB5FFFFFF, true).getRGB()); - FontRenderers.modules.drawCenteredString(stack,"paste", (float) getX() + 20, (float) cy + 28.5f, paste_focused ? -1 : new Color(0xB5FFFFFF, true).getRGB()); + FontRenderers.modules.drawCenteredString(stack, "rainbow", getX() + 20, cy + 3, rainbow_focused ? -1 : (getColorSetting().isRainbow() ? getColorSetting().getColor() : new Color(0xB5FFFFFF, true).getRGB())); + FontRenderers.modules.drawCenteredString(stack, "copy", getX() + 20, cy + 15.5f, copy_focused ? -1 : new Color(0xB5FFFFFF, true).getRGB()); + FontRenderers.modules.drawCenteredString(stack, "paste", getX() + 20, cy + 28.5f, paste_focused ? -1 : new Color(0xB5FFFFFF, true).getRGB()); } private void updatePos() { diff --git a/src/main/java/thunder/hack/gui/thundergui/components/ConfigComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/ConfigComponent.java index 6fcb0925..f7110795 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/ConfigComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/ConfigComponent.java @@ -1,11 +1,10 @@ package thunder.hack.gui.thundergui.components; import net.minecraft.client.gui.DrawContext; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; +import thunder.hack.features.modules.client.ThunderHackGui; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; -import thunder.hack.features.modules.client.ThunderHackGui; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.animation.AnimationUtility; @@ -47,43 +46,46 @@ public void render(DrawContext context, int MouseX, int MouseY) { } if (Managers.CONFIG.currentConfig.getName().equals(name + ".th")) { - Render2DEngine.drawGradientRound(context.getMatrices(),posX + 5, posY, 285, 30, 4f, + Render2DEngine.drawGradientRound(context.getMatrices(), posX + 5, posY, 285, 30, 4f, Render2DEngine.applyOpacity(new Color(55, 44, 66, 255), getFadeFactor()), Render2DEngine.applyOpacity(new Color(25, 20, 30, 255), getFadeFactor()), Render2DEngine.applyOpacity(ThunderHackGui.onColor1.getValue().getColorObject(), getFadeFactor()), Render2DEngine.applyOpacity(ThunderHackGui.onColor2.getValue().getColorObject(), getFadeFactor())); - } else Render2DEngine.drawRound(context.getMatrices(),posX + 5, posY, 285, 30, 4f, Render2DEngine.applyOpacity(new Color(44, 35, 52, 255), getFadeFactor())); + } else + Render2DEngine.drawRound(context.getMatrices(), posX + 5, posY, 285, 30, 4f, Render2DEngine.applyOpacity(new Color(44, 35, 52, 255), getFadeFactor())); if (first_open) { - Render2DEngine.addWindow(context.getMatrices(),posX + 5, posY, posX + 5 + 285, posY + 30,1f); - Render2DEngine.drawBlurredShadow(context.getMatrices(),MouseX - 20, MouseY - 20, 40, 40, 60, Render2DEngine.applyOpacity(new Color(0xC3555A7E, true), getFadeFactor())); + Render2DEngine.addWindow(context.getMatrices(), posX + 5, posY, posX + 5 + 285, posY + 30, 1f); + Render2DEngine.drawBlurredShadow(context.getMatrices(), MouseX - 20, MouseY - 20, 40, 40, 60, Render2DEngine.applyOpacity(new Color(0xC3555A7E, true), getFadeFactor())); Render2DEngine.popWindow(); first_open = false; } if (isHovered(MouseX, MouseY)) { - Render2DEngine.addWindow(context.getMatrices(),posX + 5, posY, posX + 5 + 285, posY + 30,1f); - Render2DEngine.drawBlurredShadow(context.getMatrices(),MouseX - 20, MouseY - 20, 40, 40, 60, Render2DEngine.applyOpacity(new Color(0xC3555A7E, true), getFadeFactor())); + Render2DEngine.addWindow(context.getMatrices(), posX + 5, posY, posX + 5 + 285, posY + 30, 1f); + Render2DEngine.drawBlurredShadow(context.getMatrices(), MouseX - 20, MouseY - 20, 40, 40, 60, Render2DEngine.applyOpacity(new Color(0xC3555A7E, true), getFadeFactor())); Render2DEngine.popWindow(); } - Render2DEngine.drawRound(context.getMatrices(),posX + 250, posY + 8, 30, 14, 2f, Render2DEngine.applyOpacity(new Color(25, 20, 30, 255), getFadeFactor())); + Render2DEngine.drawRound(context.getMatrices(), posX + 250, posY + 8, 30, 14, 2f, Render2DEngine.applyOpacity(new Color(25, 20, 30, 255), getFadeFactor())); if (Render2DEngine.isHovered(MouseX, MouseY, posX + 252, posY + 10, 10, 10)) { - Render2DEngine.drawRound(context.getMatrices(),posX + 252, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(21, 58, 0, 255), getFadeFactor())); - } else Render2DEngine.drawRound(context.getMatrices(),posX + 252, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(32, 89, 0, 255), getFadeFactor())); + Render2DEngine.drawRound(context.getMatrices(), posX + 252, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(21, 58, 0, 255), getFadeFactor())); + } else + Render2DEngine.drawRound(context.getMatrices(), posX + 252, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(32, 89, 0, 255), getFadeFactor())); if (Render2DEngine.isHovered(MouseX, MouseY, posX + 268, posY + 10, 10, 10)) { - Render2DEngine.drawRound(context.getMatrices(),posX + 268, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(65, 1, 13, 255), getFadeFactor())); - } else Render2DEngine.drawRound(context.getMatrices(),posX + 268, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(94, 1, 18, 255), getFadeFactor())); + Render2DEngine.drawRound(context.getMatrices(), posX + 268, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(65, 1, 13, 255), getFadeFactor())); + } else + Render2DEngine.drawRound(context.getMatrices(), posX + 268, posY + 10, 10, 10, 2f, Render2DEngine.applyOpacity(new Color(94, 1, 18, 255), getFadeFactor())); - FontRenderers.icons.drawString(context.getMatrices(),"x", posX + 252, posY + 13, Render2DEngine.applyOpacity(-1, getFadeFactor())); - FontRenderers.icons.drawString(context.getMatrices(),"w", posX + 268, posY + 13, Render2DEngine.applyOpacity(-1, getFadeFactor())); + FontRenderers.icons.drawString(context.getMatrices(), "x", posX + 252, posY + 13, Render2DEngine.applyOpacity(-1, getFadeFactor())); + FontRenderers.icons.drawString(context.getMatrices(), "w", posX + 268, posY + 13, Render2DEngine.applyOpacity(-1, getFadeFactor())); - FontRenderers.mid_icons.drawString(context.getMatrices(),"u", posX + 7, posY + 5, Render2DEngine.applyOpacity(-1, getFadeFactor())); - FontRenderers.modules.drawString(context.getMatrices(),name, posX + 37, posY + 6, Render2DEngine.applyOpacity(-1, getFadeFactor())); - FontRenderers.settings.drawString(context.getMatrices(),"updated on: " + date, posX + 37, posY + 17, Render2DEngine.applyOpacity(new Color(0xFFBDBDBD, true).getRGB(), getFadeFactor())); + FontRenderers.mid_icons.drawString(context.getMatrices(), "u", posX + 7, posY + 5, Render2DEngine.applyOpacity(-1, getFadeFactor())); + FontRenderers.modules.drawString(context.getMatrices(), name, posX + 37, posY + 6, Render2DEngine.applyOpacity(-1, getFadeFactor())); + FontRenderers.settings.drawString(context.getMatrices(), "updated on: " + date, posX + 37, posY + 17, Render2DEngine.applyOpacity(new Color(0xFFBDBDBD, true).getRGB(), getFadeFactor())); } private float getFadeFactor() { diff --git a/src/main/java/thunder/hack/gui/thundergui/components/FriendComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/FriendComponent.java index dfdd7c1d..70251010 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/FriendComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/FriendComponent.java @@ -4,12 +4,12 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.texture.NativeImage; import net.minecraft.client.texture.NativeImageBackedTexture; +import net.minecraft.util.Identifier; import thunder.hack.core.Core; import thunder.hack.core.Managers; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; import thunder.hack.utility.render.Render2DEngine; -import net.minecraft.util.Identifier; import thunder.hack.utility.render.TextureStorage; import thunder.hack.utility.render.animation.AnimationUtility; diff --git a/src/main/java/thunder/hack/gui/thundergui/components/ModeComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/ModeComponent.java index 84ef43e2..10cfacf5 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/ModeComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/ModeComponent.java @@ -1,17 +1,15 @@ package thunder.hack.gui.thundergui.components; +import net.minecraft.client.util.math.MatrixStack; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; -import thunder.hack.features.modules.client.ClickGui; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.utility.render.Render2DEngine; -import net.minecraft.client.util.math.MatrixStack; import java.awt.*; public class ModeComponent extends SettingElement { - int progress = 0; private double wheight; private boolean open; @@ -22,54 +20,42 @@ public ModeComponent(Setting setting) { @Override public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) { - super.render(stack,mouseX, mouseY, partialTicks); + super.render(stack, mouseX, mouseY, partialTicks); if ((getY() > ThunderGui.getInstance().main_posY + ThunderGui.getInstance().height) || getY() < ThunderGui.getInstance().main_posY) { return; } - FontRenderers.modules.drawString(stack,getSetting().getName(), (float) getX(), (float) getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); - + FontRenderers.modules.drawString(stack, getSetting().getName(), getX(), getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); if (open) { double offsetY2 = 0; for (int i = 0; i <= setting.getModes().length - 1; i++) { offsetY2 += 12; } - Render2DEngine.drawRound(stack,(float) (x + 114), (float) (y + 2), 62F, (float) (11 + offsetY2), 0.5f, new Color(50, 35, 60, 121)); + Render2DEngine.drawRound(stack, x + 114, y + 2, 62F, (float) (11 + offsetY2), 0.5f, new Color(50, 35, 60, 121)); } if (mouseX > x + 114 && mouseX < x + 176 && mouseY > y + 2 && mouseY < y + 15) { - Render2DEngine.drawRound(stack,(float) (x + 114), (float) (y + 2), 62, 11, 0.5f, new Color(82, 57, 100, 178)); + Render2DEngine.drawRound(stack, x + 114, y + 2, 62, 11, 0.5f, new Color(82, 57, 100, 178)); } else { - Render2DEngine.drawRound(stack,(float) (x + 114), (float) (y + 2), 62, 11, 0.5f, new Color(50, 35, 60, 178)); + Render2DEngine.drawRound(stack, x + 114, y + 2, 62, 11, 0.5f, new Color(50, 35, 60, 178)); } - FontRenderers.modules.drawString(stack,setting.currentEnumName(), (float) (x + 116), (float) (y + 6), new Color(0xB0FFFFFF, true).getRGB()); + FontRenderers.modules.drawString(stack, setting.currentEnumName(), x + 116, y + 6, new Color(0xB0FFFFFF, true).getRGB()); - String arrow = "n"; - switch (progress) { - case 0: - arrow = "n"; - break; - case 1: - arrow = "o"; - break; - case 2: - arrow = "p"; - break; - case 3: - arrow = "q"; - break; - case 4: - arrow = "r"; - break; - } - FontRenderers.icons.drawString(stack,arrow, (int) (x + 166), (int) (y + 7), -1); + String arrow = switch (progress) { + case 1 -> "o"; + case 2 -> "p"; + case 3 -> "q"; + case 4 -> "r"; + default -> "n"; + }; + FontRenderers.icons.drawString(stack, arrow, (int) (x + 166), (int) (y + 7), -1); double offsetY = 13; if (open) { Color color = HudEditor.getColor(1); for (int i = 0; i <= setting.getModes().length - 1; i++) { - FontRenderers.settings.drawString(stack,setting.getModes()[i], (float) (x + 116), (float) ((y + 5) + offsetY), setting.currentEnumName().equalsIgnoreCase(setting.getModes()[i]) ? color.getRGB() : -1); + FontRenderers.settings.drawString(stack, setting.getModes()[i], x + 116, (float) ((y + 5) + offsetY), setting.currentEnumName().equalsIgnoreCase(setting.getModes()[i]) ? color.getRGB() : -1); offsetY += 12; } } @@ -110,5 +96,4 @@ public void setWHeight(double height) { public boolean isOpen() { return open; } - -} +} \ No newline at end of file diff --git a/src/main/java/thunder/hack/gui/thundergui/components/ModulePlate.java b/src/main/java/thunder/hack/gui/thundergui/components/ModulePlate.java index bd1d9345..b633c3ed 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/ModulePlate.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/ModulePlate.java @@ -4,10 +4,10 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.RotationAxis; import thunder.hack.features.cmd.Command; -import thunder.hack.gui.font.FontRenderers; -import thunder.hack.gui.thundergui.ThunderGui; import thunder.hack.features.modules.Module; import thunder.hack.features.modules.client.ThunderHackGui; +import thunder.hack.gui.font.FontRenderers; +import thunder.hack.gui.thundergui.ThunderGui; import thunder.hack.setting.impl.Bind; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.animation.AnimationUtility; @@ -18,7 +18,6 @@ import static thunder.hack.features.modules.Module.mc; public class ModulePlate { - float scroll_animation = 0f; private final Module module; private int posX; @@ -96,7 +95,6 @@ public void render(MatrixStack stack, int MouseX, int MouseY) { if (listening_bind) { FontRenderers.modules.drawString(stack, "PressKey", posX + 85 - FontRenderers.modules.getStringWidth("PressKey"), posY + 5, Render2DEngine.applyOpacity(new Color(0xB0B0B0), getFadeFactor()).getRGB()); } else if (!Objects.equals(module.getBind().getBind(), "None")) { - String sbind = module.getBind().getBind(); if (sbind.equals("LEFT_CONTROL")) { sbind = "LCtrl"; @@ -167,7 +165,6 @@ public void onTick() { } } - private boolean isHovered(int mouseX, int mouseY) { return mouseX > posX && mouseX < posX + 90 && mouseY > posY && mouseY < posY + 30; } @@ -244,5 +241,4 @@ public double getPosY() { public Module getModule() { return this.module; } - } diff --git a/src/main/java/thunder/hack/gui/thundergui/components/ParentComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/ParentComponent.java index b38bce16..70d324fc 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/ParentComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/ParentComponent.java @@ -1,16 +1,15 @@ package thunder.hack.gui.thundergui.components; +import net.minecraft.client.util.math.MatrixStack; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.thundergui.ThunderGui; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.SettingGroup; import thunder.hack.utility.render.Render2DEngine; -import net.minecraft.client.util.math.MatrixStack; import java.awt.*; public class ParentComponent extends SettingElement { - public ParentComponent(Setting setting) { super(setting); SettingGroup settingGroup = (SettingGroup) setting.getValue(); @@ -19,13 +18,13 @@ public ParentComponent(Setting setting) { @Override public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) { - super.render(stack,mouseX, mouseY, partialTicks); + super.render(stack, mouseX, mouseY, partialTicks); if ((getY() > ThunderGui.getInstance().main_posY + ThunderGui.getInstance().height) || getY() < ThunderGui.getInstance().main_posY) { return; } - FontRenderers.modules.drawCenteredString(stack,getSetting().getName(), (float) (getX() + width / 2f), (float) getY() + 2, new Color(0xB0FFFFFF, true).getRGB()); - Render2DEngine.draw2DGradientRect(stack,(float) (getX() + 10), (float) (getY() + 6), (float) ((getX() + width / 2f) - 20), (float) (getY() + 7), new Color(0x0FFFFFF, true), new Color(0x0FFFFFF, true), new Color(0xB0FFFFFF, true), new Color(0xB0FFFFFF, true)); - Render2DEngine.draw2DGradientRect(stack,(float) (getX() + width / 2f + 20f), (float) (getY() + 6), (float) (getX() + width - 10), (float) (getY() + 7), new Color(0xB0FFFFFF, true), new Color(0xB0FFFFFF, true), new Color(0x0FFFFFF, true), new Color(0x0FFFFFF, true)); + FontRenderers.modules.drawCenteredString(stack, getSetting().getName(), getX() + width / 2f, getY() + 2, new Color(0xB0FFFFFF, true).getRGB()); + Render2DEngine.draw2DGradientRect(stack, getX() + 10, getY() + 6, (getX() + width / 2f) - 20, getY() + 7, new Color(0x0FFFFFF, true), new Color(0x0FFFFFF, true), new Color(0xB0FFFFFF, true), new Color(0xB0FFFFFF, true)); + Render2DEngine.draw2DGradientRect(stack, getX() + width / 2f + 20f, getY() + 6, getX() + width - 10, getY() + 7, new Color(0xB0FFFFFF, true), new Color(0xB0FFFFFF, true), new Color(0x0FFFFFF, true), new Color(0x0FFFFFF, true)); } @Override diff --git a/src/main/java/thunder/hack/gui/thundergui/components/SettingElement.java b/src/main/java/thunder/hack/gui/thundergui/components/SettingElement.java index 907130a2..3c0f849c 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/SettingElement.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/SettingElement.java @@ -1,9 +1,8 @@ package thunder.hack.gui.thundergui.components; -import thunder.hack.gui.thundergui.ThunderGui; +import net.minecraft.client.util.math.MatrixStack; import thunder.hack.setting.Setting; import thunder.hack.utility.render.Render2DEngine; -import net.minecraft.client.util.math.MatrixStack; import thunder.hack.utility.render.animation.AnimationUtility; import java.io.IOException; diff --git a/src/main/java/thunder/hack/gui/thundergui/components/SliderComponent.java b/src/main/java/thunder/hack/gui/thundergui/components/SliderComponent.java index 709cb80a..53aefa0d 100644 --- a/src/main/java/thunder/hack/gui/thundergui/components/SliderComponent.java +++ b/src/main/java/thunder/hack/gui/thundergui/components/SliderComponent.java @@ -1,5 +1,7 @@ package thunder.hack.gui.thundergui.components; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.MathHelper; import org.lwjgl.glfw.GLFW; import thunder.hack.ThunderHack; import thunder.hack.gui.font.FontRenderers; @@ -7,14 +9,11 @@ import thunder.hack.setting.Setting; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.render.Render2DEngine; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.MathHelper; import java.awt.*; import java.util.Objects; public class SliderComponent extends SettingElement { - private final float min; private final float max; public boolean listening; @@ -23,7 +22,6 @@ public class SliderComponent extends SettingElement { private double stranimation; private boolean dragging; - public SliderComponent(Setting setting) { super(setting); this.min = ((Number) setting.getMin()).floatValue(); @@ -32,7 +30,7 @@ public SliderComponent(Setting setting) { public static String removeLastChar(String str) { String output = ""; - if (str != null && str.length() > 0) { + if (str != null && !str.isEmpty()) { output = str.substring(0, str.length() - 1); } return output; @@ -40,38 +38,38 @@ public static String removeLastChar(String str) { @Override public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) { - super.render(stack,mouseX, mouseY, partialTicks); + super.render(stack, mouseX, mouseY, partialTicks); if ((getY() > ThunderGui.getInstance().main_posY + ThunderGui.getInstance().height) || getY() < ThunderGui.getInstance().main_posY) { return; } - FontRenderers.modules.drawString(stack,getSetting().getName(), (float) getX(), (float) getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); + FontRenderers.modules.drawString(stack, getSetting().getName(), getX(), getY() + 5, isHovered() ? -1 : new Color(0xB0FFFFFF, true).getRGB()); double currentPos = (((Number) setting.getValue()).floatValue() - min) / (max - min); stranimation = stranimation + (((Number) setting.getValue()).floatValue() * 100 / 100 - stranimation) / 2.0D; animation = Render2DEngine.scrollAnimate(animation, (float) currentPos, .5f); Color color = new Color(0xFFE1E1E1); - Render2DEngine.drawRound(stack,(float) (x + 54), (float) (y + height - 8), (float) (90), 1, 0.5f, new Color(0xff0E0E0E)); - Render2DEngine.drawRound(stack,(float) (x + 54), (float) (y + height - 8), (90) * animation, 1, 0.5f, color); - Render2DEngine.drawRound(stack,(float) ((x + 52 + (90) * animation)), (float) (y + height - 9.5f), (float) 4, 4, 1.5f, color); + Render2DEngine.drawRound(stack, x + 54, y + height - 8, (float) (90), 1, 0.5f, new Color(0xff0E0E0E)); + Render2DEngine.drawRound(stack, x + 54, y + height - 8, (90) * animation, 1, 0.5f, color); + Render2DEngine.drawRound(stack, (x + 52 + (90) * animation), y + height - 9.5f, (float) 4, 4, 1.5f, color); if (mouseX > x + 154 && mouseX < x + 176 && mouseY > y + height - 11 && mouseY < y + height - 4) { - Render2DEngine.drawRound(stack,(float) (x + 154), (float) (y + height - 11), 22, 7, 0.5f, new Color(82, 57, 100, 178)); + Render2DEngine.drawRound(stack, x + 154, y + height - 11, 22, 7, 0.5f, new Color(82, 57, 100, 178)); } else { - Render2DEngine.drawRound(stack,(float) (x + 154), (float) (y + height - 11), 22, 7, 0.5f, new Color(50, 35, 60, 178)); + Render2DEngine.drawRound(stack, x + 154, y + height - 11, 22, 7, 0.5f, new Color(50, 35, 60, 178)); } if (!listening) { if (setting.getValue() instanceof Float) - FontRenderers.modules.drawString(stack,String.valueOf(MathUtility.round((Float) setting.getValue(), 2)), (float) (x + 156), (float) (y + height - 9), new Color(0xBAFFFFFF, true).getRGB()); + FontRenderers.modules.drawString(stack, String.valueOf(MathUtility.round((Float) setting.getValue(), 2)), x + 156, y + height - 9, new Color(0xBAFFFFFF, true).getRGB()); if (setting.getValue() instanceof Integer) - FontRenderers.modules.drawString(stack,String.valueOf(setting.getValue()), (float) (x + 156), (float) (y + height - 9), new Color(0xBAFFFFFF, true).getRGB()); + FontRenderers.modules.drawString(stack, String.valueOf(setting.getValue()), x + 156, y + height - 9, new Color(0xBAFFFFFF, true).getRGB()); } else { if (Objects.equals(Stringnumber, "")) { - FontRenderers.modules.drawString(stack,"...", (float) (x + 156), (float) (y + height - 9), new Color(0xBAFFFFFF, true).getRGB()); + FontRenderers.modules.drawString(stack, "...", x + 156, y + height - 9, new Color(0xBAFFFFFF, true).getRGB()); } else { - FontRenderers.modules.drawString(stack,Stringnumber, (float) (x + 156), (float) (y + height - 9), new Color(0xBAFFFFFF, true).getRGB()); + FontRenderers.modules.drawString(stack, Stringnumber, x + 156, y + height - 9, new Color(0xBAFFFFFF, true).getRGB()); } } @@ -108,7 +106,7 @@ public void mouseClicked(int mouseX, int mouseY, int button) { } } - if(listening) + if (listening) ThunderHack.currentKeyListener = ThunderHack.KeyListening.Sliders; } @@ -126,7 +124,7 @@ public void resetAnimation() { @Override public void keyTyped(String typedChar, int keyCode) { - if(ThunderHack.currentKeyListener != ThunderHack.KeyListening.Sliders) + if (ThunderHack.currentKeyListener != ThunderHack.KeyListening.Sliders) return; if (this.listening) { diff --git a/src/main/java/thunder/hack/gui/windows/impl/ConfigWindow.java b/src/main/java/thunder/hack/gui/windows/impl/ConfigWindow.java index 80db52e7..db97e277 100644 --- a/src/main/java/thunder/hack/gui/windows/impl/ConfigWindow.java +++ b/src/main/java/thunder/hack/gui/windows/impl/ConfigWindow.java @@ -5,19 +5,16 @@ import net.minecraft.client.util.InputUtil; import net.minecraft.util.StringHelper; import org.lwjgl.glfw.GLFW; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.clickui.impl.SliderElement; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.windows.WindowBase; -import thunder.hack.gui.windows.WindowsScreen; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.PositionSetting; import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.TextureStorage; -import thunder.hack.utility.render.animation.AnimationUtility; import java.awt.*; import java.util.ArrayList; @@ -144,7 +141,7 @@ public void mouseClicked(double mouseX, double mouseY, int button) { boolean hoveringRemove = Render2DEngine.isHovered(mouseX, mouseY, getX() + getWidth() - 15, configPlate.offset + getY() + 36 + getScrollOffset(), 11, 11); boolean hoverLoad = Render2DEngine.isHovered(mouseX, mouseY, getX() + getWidth() - 39, configPlate.offset + getY() + 36 + getScrollOffset(), 22, 11); - if(hoverLoad) + if (hoverLoad) Managers.CONFIG.load(configPlate.name()); if (hoveringRemove) { diff --git a/src/main/java/thunder/hack/gui/windows/impl/FriendsWindow.java b/src/main/java/thunder/hack/gui/windows/impl/FriendsWindow.java index 2a839857..c955152e 100644 --- a/src/main/java/thunder/hack/gui/windows/impl/FriendsWindow.java +++ b/src/main/java/thunder/hack/gui/windows/impl/FriendsWindow.java @@ -6,14 +6,12 @@ import net.minecraft.util.Formatting; import net.minecraft.util.StringHelper; import org.lwjgl.glfw.GLFW; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.clickui.impl.SliderElement; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.windows.WindowBase; -import thunder.hack.gui.windows.WindowsScreen; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.PositionSetting; import thunder.hack.utility.render.Render2DEngine; @@ -81,7 +79,6 @@ public void render(DrawContext context, int mouseX, int mouseY) { Render2DEngine.horizontalGradient(context.getMatrices(), getX() + 2 + getWidth() / 2f - 2, getY() + 33f, getX() + 2 + getWidth() - 4, getY() + 33.5f, HudEditor.textColor.getValue().getColorObject(), Render2DEngine.injectAlpha(HudEditor.textColor.getValue().getColorObject(), 0)); - Render2DEngine.addWindow(context.getMatrices(), getX(), getY() + 38, getX() + getWidth(), getY() + getHeight() - 1, 1f); int id = 0; diff --git a/src/main/java/thunder/hack/gui/windows/impl/ItemSelectWindow.java b/src/main/java/thunder/hack/gui/windows/impl/ItemSelectWindow.java index 3288deae..07d3d887 100644 --- a/src/main/java/thunder/hack/gui/windows/impl/ItemSelectWindow.java +++ b/src/main/java/thunder/hack/gui/windows/impl/ItemSelectWindow.java @@ -12,9 +12,7 @@ import net.minecraft.util.Formatting; import net.minecraft.util.StringHelper; import org.lwjgl.glfw.GLFW; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; -import thunder.hack.features.cmd.Command; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.clickui.impl.SliderElement; import thunder.hack.gui.font.FontRenderers; @@ -31,7 +29,6 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class ItemSelectWindow extends WindowBase { - private Setting itemSetting; private ArrayList itemPlates = new ArrayList<>(); private ArrayList allItems = new ArrayList<>(); @@ -88,7 +85,6 @@ public void render(DrawContext context, int mouseX, int mouseY) { FontRenderers.sf_medium_mini.drawString(context.getMatrices(), "All", getX() + 25, getY() + 25, tabColor1); FontRenderers.sf_medium_mini.drawString(context.getMatrices(), "Selected", getX() + 60, getY() + 25, tabColor2); - if (!allTab && itemPlates.isEmpty()) { FontRenderers.sf_medium.drawCenteredString(context.getMatrices(), isRu() ? "Тут пока пусто" : "It's empty here yet", getX() + getWidth() / 2f, getY() + getHeight() / 2f, new Color(0xBDBDBD).getRGB()); diff --git a/src/main/java/thunder/hack/gui/windows/impl/MacroWindow.java b/src/main/java/thunder/hack/gui/windows/impl/MacroWindow.java index cff480f5..c988ccad 100644 --- a/src/main/java/thunder/hack/gui/windows/impl/MacroWindow.java +++ b/src/main/java/thunder/hack/gui/windows/impl/MacroWindow.java @@ -5,14 +5,13 @@ import net.minecraft.client.util.InputUtil; import net.minecraft.util.StringHelper; import org.lwjgl.glfw.GLFW; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.MacroManager; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.clickui.impl.SliderElement; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.windows.WindowBase; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.PositionSetting; import thunder.hack.utility.render.Render2DEngine; @@ -37,7 +36,6 @@ private enum ListeningType { Name, Text, Bind } - public MacroWindow(float x, float y, float width, float height, Setting position) { super(x, y, width, height, "Macros", position, TextureStorage.macrosIcon); refresh(); diff --git a/src/main/java/thunder/hack/gui/windows/impl/ProxyWindow.java b/src/main/java/thunder/hack/gui/windows/impl/ProxyWindow.java index d8b2a250..6284a8da 100644 --- a/src/main/java/thunder/hack/gui/windows/impl/ProxyWindow.java +++ b/src/main/java/thunder/hack/gui/windows/impl/ProxyWindow.java @@ -6,14 +6,13 @@ import net.minecraft.util.Formatting; import net.minecraft.util.StringHelper; import org.lwjgl.glfw.GLFW; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.core.manager.client.ProxyManager; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.clickui.impl.SliderElement; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.windows.WindowBase; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.PositionSetting; import thunder.hack.utility.render.Render2DEngine; @@ -27,9 +26,7 @@ import static thunder.hack.features.modules.client.ClientSettings.isRu; public class ProxyWindow extends WindowBase { - // name ip port login password - private static ProxyWindow instance; private ArrayList proxyPlates = new ArrayList<>(); private int listeningId = -1; @@ -349,21 +346,11 @@ public void keyPressed(int keyCode, int scanCode, int modifiers) { if (listeningId == -3) { switch (listeningType) { - case Name -> { - addName = paste; - } - case Ip -> { - addIp = paste; - } - case Port -> { - addPort = paste; - } - case Login -> { - addLogin = paste; - } - case Password -> { - addPassword = paste; - } + case Name -> addName = paste; + case Ip -> addIp = paste; + case Port -> addPort = paste; + case Login -> addLogin = paste; + case Password -> addPassword = paste; } } return; @@ -428,21 +415,11 @@ public void keyPressed(int keyCode, int scanCode, int modifiers) { if (listeningId == -3) { switch (listeningType) { - case Name -> { - addName = SliderElement.removeLastChar(addName); - } - case Ip -> { - addIp = SliderElement.removeLastChar(addIp); - } - case Port -> { - addPort = SliderElement.removeLastChar(addPort); - } - case Login -> { - addLogin = SliderElement.removeLastChar(addLogin); - } - case Password -> { - addPassword = SliderElement.removeLastChar(addPassword); - } + case Name -> addName = SliderElement.removeLastChar(addName); + case Ip -> addIp = SliderElement.removeLastChar(addIp); + case Port -> addPort = SliderElement.removeLastChar(addPort); + case Login -> addLogin = SliderElement.removeLastChar(addLogin); + case Password -> addPassword = SliderElement.removeLastChar(addPassword); } } } diff --git a/src/main/java/thunder/hack/gui/windows/impl/WaypointWindow.java b/src/main/java/thunder/hack/gui/windows/impl/WaypointWindow.java index 61dd254a..614b3b24 100644 --- a/src/main/java/thunder/hack/gui/windows/impl/WaypointWindow.java +++ b/src/main/java/thunder/hack/gui/windows/impl/WaypointWindow.java @@ -7,11 +7,11 @@ import org.lwjgl.glfw.GLFW; import thunder.hack.core.Managers; import thunder.hack.core.manager.world.WayPointManager; +import thunder.hack.features.modules.client.HudEditor; import thunder.hack.gui.clickui.ClickGUI; import thunder.hack.gui.clickui.impl.SliderElement; import thunder.hack.gui.font.FontRenderers; import thunder.hack.gui.windows.WindowBase; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.setting.Setting; import thunder.hack.setting.impl.PositionSetting; import thunder.hack.utility.render.Render2DEngine; @@ -266,7 +266,8 @@ public void mouseClicked(double mouseX, double mouseY, int button) { if (hoveringAdd) { try { Managers.WAYPOINT.addWayPoint(new WayPointManager.WayPoint(Integer.parseInt(addX), Integer.parseInt(addY), Integer.parseInt(addZ), addName, addServer, addDimension)); - } catch (Exception ignored){} + } catch (Exception ignored) { + } refresh(); } } @@ -358,7 +359,7 @@ public void keyPressed(int keyCode, int scanCode, int modifiers) { } case X -> { String num = SliderElement.removeLastChar(String.valueOf(plate.waypoint.getX())); - if(num.isEmpty()) + if (num.isEmpty()) num = "0"; plate.waypoint.setX(Integer.parseInt(num)); @@ -366,7 +367,7 @@ public void keyPressed(int keyCode, int scanCode, int modifiers) { } case Y -> { String num = SliderElement.removeLastChar(String.valueOf(plate.waypoint.getY())); - if(num.isEmpty()) + if (num.isEmpty()) num = "0"; plate.waypoint.setY(Integer.parseInt(num)); @@ -374,7 +375,7 @@ public void keyPressed(int keyCode, int scanCode, int modifiers) { } case Z -> { String num = SliderElement.removeLastChar(String.valueOf(plate.waypoint.getZ())); - if(num.isEmpty()) + if (num.isEmpty()) num = "0"; plate.waypoint.setZ(Integer.parseInt(num)); @@ -386,21 +387,11 @@ public void keyPressed(int keyCode, int scanCode, int modifiers) { if (listeningId == -3) { switch (listeningType) { - case Name -> { - addName = SliderElement.removeLastChar(addName); - } - case Server -> { - addServer = SliderElement.removeLastChar(addServer); - } - case X -> { - addX = SliderElement.removeLastChar(addX); - } - case Y -> { - addY = SliderElement.removeLastChar(addY); - } - case Z -> { - addZ = SliderElement.removeLastChar(addZ); - } + case Name -> addName = SliderElement.removeLastChar(addName); + case Server -> addServer = SliderElement.removeLastChar(addServer); + case X -> addX = SliderElement.removeLastChar(addX); + case Y -> addY = SliderElement.removeLastChar(addY); + case Z -> addZ = SliderElement.removeLastChar(addZ); } } } @@ -425,9 +416,12 @@ public void charTyped(char key, int keyCode) { switch (listeningType) { case Name -> plate.waypoint.setName(plate.waypoint.getName() + key); case Server -> plate.waypoint.setServer(plate.waypoint.getServer() + key); - case X -> plate.waypoint.setX(Integer.parseInt(String.valueOf(plate.waypoint.getX()) + key)); - case Y -> plate.waypoint.setY(Integer.parseInt(String.valueOf(plate.waypoint.getY()) + key)); - case Z -> plate.waypoint.setZ(Integer.parseInt(String.valueOf(plate.waypoint.getZ()) + key)); + case X -> + plate.waypoint.setX(Integer.parseInt(String.valueOf(plate.waypoint.getX()) + key)); + case Y -> + plate.waypoint.setY(Integer.parseInt(String.valueOf(plate.waypoint.getY()) + key)); + case Z -> + plate.waypoint.setZ(Integer.parseInt(String.valueOf(plate.waypoint.getZ()) + key)); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/thunder/hack/injection/MixinPlayerListHud.java b/src/main/java/thunder/hack/injection/MixinPlayerListHud.java index b3ab0152..73119830 100644 --- a/src/main/java/thunder/hack/injection/MixinPlayerListHud.java +++ b/src/main/java/thunder/hack/injection/MixinPlayerListHud.java @@ -21,7 +21,7 @@ @Mixin(PlayerListHud.class) public class MixinPlayerListHud { private static final Comparator ENTRY_ORDERING = Comparator.comparingInt((entry) -> ((PlayerListEntry) entry).getGameMode() == GameMode.SPECTATOR ? 1 : 0) - .thenComparing((entry) -> (String) Nullables.mapOrElse(((PlayerListEntry) entry).getScoreboardTeam(), Team::getName, "")) + .thenComparing((entry) -> Nullables.mapOrElse(((PlayerListEntry) entry).getScoreboardTeam(), Team::getName, "")) .thenComparing((entry) -> ((PlayerListEntry) entry).getProfile().getName(), String::compareToIgnoreCase); @Inject(method = "collectPlayerEntries", at = @At("HEAD"), cancellable = true) diff --git a/src/main/java/thunder/hack/setting/Setting.java b/src/main/java/thunder/hack/setting/Setting.java index 4fe040bd..47877a4b 100644 --- a/src/main/java/thunder/hack/setting/Setting.java +++ b/src/main/java/thunder/hack/setting/Setting.java @@ -1,6 +1,5 @@ package thunder.hack.setting; - import thunder.hack.ThunderHack; import thunder.hack.events.impl.EventSetting; import thunder.hack.features.modules.Module; @@ -43,7 +42,7 @@ public Setting(String name, T defaultValue, T min, T max, Predicate visibilit this.defaultValue = defaultValue; this.value = defaultValue; this.min = min; - this. max = max; + this.max = max; this.plannedValue = defaultValue; this.visibility = visibility; this.hasRestriction = true; @@ -181,7 +180,7 @@ public boolean isBindSetting() { public boolean isStringSetting() { return value instanceof String; } - + public boolean isItemSelectSetting() { return value instanceof ItemSelectSetting; } @@ -205,11 +204,11 @@ public Setting addToGroup(Setting group) { public boolean isVisible() { if (group != null) { - if(group.getValue() instanceof BooleanSettingGroup bp) + if (group.getValue() instanceof BooleanSettingGroup bp) if (!bp.isExtended()) return false; - if(group.getValue() instanceof SettingGroup p) + if (group.getValue() instanceof SettingGroup p) if (!p.isExtended()) return false; } diff --git a/src/main/java/thunder/hack/utility/OptifineCapes.java b/src/main/java/thunder/hack/utility/OptifineCapes.java index d6592c65..ccbee348 100644 --- a/src/main/java/thunder/hack/utility/OptifineCapes.java +++ b/src/main/java/thunder/hack/utility/OptifineCapes.java @@ -5,20 +5,10 @@ import net.minecraft.client.texture.NativeImage; import net.minecraft.client.texture.NativeImageBackedTexture; import net.minecraft.util.Identifier; -import net.minecraft.util.Util; -import thunder.hack.features.cmd.Command; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -import static thunder.hack.features.modules.Module.mc; public final class OptifineCapes { /** diff --git a/src/main/java/thunder/hack/utility/discord/DiscordEventHandlers.java b/src/main/java/thunder/hack/utility/discord/DiscordEventHandlers.java index 244f58fa..d8193785 100644 --- a/src/main/java/thunder/hack/utility/discord/DiscordEventHandlers.java +++ b/src/main/java/thunder/hack/utility/discord/DiscordEventHandlers.java @@ -21,6 +21,4 @@ public class DiscordEventHandlers extends Structure { protected List getFieldOrder() { return Arrays.asList("ready", "disconnected", "errored", "joinGame", "spectateGame", "joinRequest"); } - - -} +} \ No newline at end of file diff --git a/src/main/java/thunder/hack/utility/discord/DiscordRichPresence.java b/src/main/java/thunder/hack/utility/discord/DiscordRichPresence.java index dd2cf1a7..2463eae9 100644 --- a/src/main/java/thunder/hack/utility/discord/DiscordRichPresence.java +++ b/src/main/java/thunder/hack/utility/discord/DiscordRichPresence.java @@ -1,5 +1,5 @@ package thunder.hack.utility.discord; - +//todo ??? import java.time.OffsetDateTime; import java.util.Collections; import thunder.hack.utility.discord.helpers.RPCButton; diff --git a/src/main/java/thunder/hack/utility/discord/helpers/RPCButton.java b/src/main/java/thunder/hack/utility/discord/helpers/RPCButton.java index 2291ef21..4821e708 100644 --- a/src/main/java/thunder/hack/utility/discord/helpers/RPCButton.java +++ b/src/main/java/thunder/hack/utility/discord/helpers/RPCButton.java @@ -1,6 +1,5 @@ package thunder.hack.utility.discord.helpers; -import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import java.io.Serializable; @@ -8,11 +7,11 @@ public class RPCButton implements Serializable { private final String url; private final String label; - + public String getLabel() { return this.label; } - + public String getUrl() { return this.url; } @@ -21,7 +20,7 @@ public String getUrl() { substring = substring.substring(0, Math.min(substring.length(), 31)); return new RPCButton(substring, s); } - + protected RPCButton(final String label, final String url) { this.label = label; this.url = url; diff --git a/src/main/java/thunder/hack/utility/interfaces/IEntity.java b/src/main/java/thunder/hack/utility/interfaces/IEntity.java index 4096eb88..0d091dca 100644 --- a/src/main/java/thunder/hack/utility/interfaces/IEntity.java +++ b/src/main/java/thunder/hack/utility/interfaces/IEntity.java @@ -1,7 +1,6 @@ package thunder.hack.utility.interfaces; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; import thunder.hack.features.modules.render.Trails; import java.util.List; diff --git a/src/main/java/thunder/hack/utility/interfaces/IEntityLiving.java b/src/main/java/thunder/hack/utility/interfaces/IEntityLiving.java index 6151a3a5..d42d7818 100644 --- a/src/main/java/thunder/hack/utility/interfaces/IEntityLiving.java +++ b/src/main/java/thunder/hack/utility/interfaces/IEntityLiving.java @@ -1,6 +1,5 @@ package thunder.hack.utility.interfaces; -import net.minecraft.util.math.Vec3d; import thunder.hack.features.modules.combat.Aura; import java.util.List; diff --git a/src/main/java/thunder/hack/utility/math/PredictUtility.java b/src/main/java/thunder/hack/utility/math/PredictUtility.java index c9b9ac6d..3dda8e9c 100644 --- a/src/main/java/thunder/hack/utility/math/PredictUtility.java +++ b/src/main/java/thunder/hack/utility/math/PredictUtility.java @@ -14,20 +14,20 @@ public class PredictUtility { public static PlayerEntity movePlayer(PlayerEntity entity, Vec3d newPos) { - if(entity == null || newPos == null) + if (entity == null || newPos == null) return null; return equipAndReturn(entity, newPos); } public static PlayerEntity predictPlayer(PlayerEntity entity, int ticks) { Vec3d posVec = predictPosition(entity, ticks); - if(posVec == null) + if (posVec == null) return null; return equipAndReturn(entity, posVec); } public static Vec3d predictPosition(PlayerEntity entity, int ticks) { - if(entity == null) + if (entity == null) return null; Vec3d posVec = new Vec3d(entity.getX(), entity.getY(), entity.getZ()); @@ -43,9 +43,7 @@ public static Vec3d predictPosition(PlayerEntity entity, int ticks) { motionX = 0; motionZ = 0; } - posVec = posVec.add(motionX, 0, motionZ); - } return posVec; @@ -53,7 +51,7 @@ public static Vec3d predictPosition(PlayerEntity entity, int ticks) { public static Box predictBox(PlayerEntity entity, int ticks) { Vec3d posVec = predictPosition(entity, ticks); - if(posVec == null) + if (posVec == null) return null; return createBox(posVec, entity); } diff --git a/src/main/java/thunder/hack/utility/player/InteractionUtility.java b/src/main/java/thunder/hack/utility/player/InteractionUtility.java index 736b5f3f..da835cad 100644 --- a/src/main/java/thunder/hack/utility/player/InteractionUtility.java +++ b/src/main/java/thunder/hack/utility/player/InteractionUtility.java @@ -118,12 +118,8 @@ public static boolean placeBlock(BlockPos bp, Rotate rotate, Interact interact, case None -> { } - case Default -> { - mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(angle[0], angle[1], mc.player.isOnGround())); - } - case Grim -> { - mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.Full(mc.player.getX(), mc.player.getY(), mc.player.getZ(), angle[0], angle[1], mc.player.isOnGround())); - } + case Default -> mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(angle[0], angle[1], mc.player.isOnGround())); + case Grim -> mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.Full(mc.player.getX(), mc.player.getY(), mc.player.getZ(), angle[0], angle[1], mc.player.isOnGround())); } if (mode == PlaceMode.Normal) @@ -205,7 +201,6 @@ public static BlockHitResult getPlaceResult(@NotNull BlockPos bp, Interact inter public static @NotNull ArrayList getSupportBlocks(@NotNull BlockPos bp) { - ArrayList list = new ArrayList<>(); if (mc.world.getBlockState(bp.add(0, -1, 0)).isSolid() || awaiting.containsKey(bp.add(0, -1, 0))) @@ -441,7 +436,7 @@ public static boolean isSolid(BlockPos bp) { }; } - private static boolean shouldSkipPoint(Vec3d point, BlockPos bp, Direction dir, float wallRange , float range) { + private static boolean shouldSkipPoint(Vec3d point, BlockPos bp, Direction dir, float wallRange, float range) { RaycastContext context = new RaycastContext(InteractionUtility.getEyesPos(mc.player), point, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.NONE, mc.player); BlockHitResult result = mc.world.raycast(context); diff --git a/src/main/java/thunder/hack/utility/player/MovementUtility.java b/src/main/java/thunder/hack/utility/player/MovementUtility.java index 299cce30..b50b130a 100644 --- a/src/main/java/thunder/hack/utility/player/MovementUtility.java +++ b/src/main/java/thunder/hack/utility/player/MovementUtility.java @@ -2,7 +2,6 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.util.math.MathHelper; -import thunder.hack.ThunderHack; import thunder.hack.core.Managers; import thunder.hack.events.impl.EventMove; import thunder.hack.features.modules.Module; @@ -10,7 +9,6 @@ import static thunder.hack.features.modules.Module.mc; public final class MovementUtility { - public static boolean isMoving() { return mc.player != null && mc.world != null && mc.player.input != null && (mc.player.input.movementForward != 0.0 || mc.player.input.movementSideways != 0.0); } diff --git a/src/main/java/thunder/hack/utility/player/PlayerUtility.java b/src/main/java/thunder/hack/utility/player/PlayerUtility.java index 49698224..a30a8183 100644 --- a/src/main/java/thunder/hack/utility/player/PlayerUtility.java +++ b/src/main/java/thunder/hack/utility/player/PlayerUtility.java @@ -14,7 +14,6 @@ import static thunder.hack.features.modules.Module.mc; public final class PlayerUtility { - public static boolean isInHell() { if (mc.world == null) return false; return Objects.equals(mc.world.getRegistryKey().getValue().getPath(), "the_nether"); diff --git a/src/main/java/thunder/hack/utility/render/Render2DEngine.java b/src/main/java/thunder/hack/utility/render/Render2DEngine.java index 39f52825..747dce47 100644 --- a/src/main/java/thunder/hack/utility/render/Render2DEngine.java +++ b/src/main/java/thunder/hack/utility/render/Render2DEngine.java @@ -14,9 +14,8 @@ import org.joml.Vector4f; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL40C; -import thunder.hack.features.cmd.Command; -import thunder.hack.gui.font.Texture; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.Texture; import thunder.hack.utility.math.MathUtility; import thunder.hack.utility.render.shaders.*; @@ -31,7 +30,6 @@ import static thunder.hack.features.modules.Module.mc; public class Render2DEngine { - public static TextureColorProgram TEXTURE_COLOR_PROGRAM; public static HudShader HUD_SHADER; public static RectangleShader RECTANGLE_SHADER; diff --git a/src/main/java/thunder/hack/utility/render/Render3DEngine.java b/src/main/java/thunder/hack/utility/render/Render3DEngine.java index 793fe71b..8349d72a 100644 --- a/src/main/java/thunder/hack/utility/render/Render3DEngine.java +++ b/src/main/java/thunder/hack/utility/render/Render3DEngine.java @@ -14,9 +14,9 @@ import org.lwjgl.opengl.GL11; import thunder.hack.ThunderHack; import thunder.hack.core.manager.client.ModuleManager; -import thunder.hack.gui.font.FontRenderers; import thunder.hack.features.modules.client.ClientSettings; import thunder.hack.features.modules.client.HudEditor; +import thunder.hack.gui.font.FontRenderers; import java.awt.*; import java.util.ArrayList; @@ -25,7 +25,6 @@ import static thunder.hack.features.modules.Module.mc; public class Render3DEngine { - public static List FILLED_QUEUE = new ArrayList<>(); public static List OUTLINE_QUEUE = new ArrayList<>(); public static List FADE_QUEUE = new ArrayList<>(); diff --git a/src/main/java/thunder/hack/utility/render/TextUtil.java b/src/main/java/thunder/hack/utility/render/TextUtil.java index 0ae0ca52..1a172cef 100644 --- a/src/main/java/thunder/hack/utility/render/TextUtil.java +++ b/src/main/java/thunder/hack/utility/render/TextUtil.java @@ -1,7 +1,5 @@ package thunder.hack.utility.render; -import static thunder.hack.features.modules.Module.mc; - public class TextUtil { private final String[] words; private String currentWord = "_", currentResult = "_"; diff --git a/src/main/java/thunder/hack/utility/render/animation/CaptureMark.java b/src/main/java/thunder/hack/utility/render/animation/CaptureMark.java index 2920e810..940d8e22 100644 --- a/src/main/java/thunder/hack/utility/render/animation/CaptureMark.java +++ b/src/main/java/thunder/hack/utility/render/animation/CaptureMark.java @@ -15,7 +15,6 @@ import static thunder.hack.features.modules.Module.mc; public class CaptureMark { - private static float espValue = 1f, prevEspValue; private static float espSpeed = 1f; private static boolean flipSpeed; diff --git a/src/main/java/thunder/hack/utility/render/animation/EaseOutBack.java b/src/main/java/thunder/hack/utility/render/animation/EaseOutBack.java index ef570949..fa574b2a 100644 --- a/src/main/java/thunder/hack/utility/render/animation/EaseOutBack.java +++ b/src/main/java/thunder/hack/utility/render/animation/EaseOutBack.java @@ -3,9 +3,6 @@ import net.minecraft.util.math.MathHelper; import thunder.hack.utility.render.Render3DEngine; -import static thunder.hack.features.modules.Module.mc; - - public class EaseOutBack { private int prevTick; private int tick; diff --git a/src/main/java/thunder/hack/utility/render/animation/EaseOutCirc.java b/src/main/java/thunder/hack/utility/render/animation/EaseOutCirc.java index f7e4be42..e5a30294 100644 --- a/src/main/java/thunder/hack/utility/render/animation/EaseOutCirc.java +++ b/src/main/java/thunder/hack/utility/render/animation/EaseOutCirc.java @@ -3,8 +3,6 @@ import net.minecraft.util.math.MathHelper; import thunder.hack.utility.render.Render3DEngine; -import static thunder.hack.features.modules.Module.mc; - public class EaseOutCirc { private final int maxTicks; private double value, dstValue; diff --git a/src/main/java/thunder/hack/utility/render/animation/GearAnimation.java b/src/main/java/thunder/hack/utility/render/animation/GearAnimation.java index 6c5657ee..5eab47e7 100644 --- a/src/main/java/thunder/hack/utility/render/animation/GearAnimation.java +++ b/src/main/java/thunder/hack/utility/render/animation/GearAnimation.java @@ -4,8 +4,6 @@ import thunder.hack.utility.render.Render2DEngine; import thunder.hack.utility.render.Render3DEngine; -import static thunder.hack.features.modules.Module.mc; - public class GearAnimation { private float espValue = 1f, prevEspValue; private float espSpeed = 1f; diff --git a/src/main/java/thunder/hack/utility/render/shaders/ArcShader.java b/src/main/java/thunder/hack/utility/render/shaders/ArcShader.java index 6f0032ae..1471bd81 100644 --- a/src/main/java/thunder/hack/utility/render/shaders/ArcShader.java +++ b/src/main/java/thunder/hack/utility/render/shaders/ArcShader.java @@ -3,7 +3,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.render.VertexFormats; import net.minecraft.util.Identifier; -import thunder.hack.features.modules.client.HudEditor; import thunder.hack.utility.render.shaders.satin.api.managed.ManagedCoreShader; import thunder.hack.utility.render.shaders.satin.api.managed.ShaderEffectManager; import thunder.hack.utility.render.shaders.satin.api.managed.uniform.Uniform1f; @@ -15,7 +14,6 @@ import static thunder.hack.features.modules.Module.mc; public class ArcShader { - private Uniform2f uLocation; private Uniform2f uSize; private Uniform1f radius; diff --git a/src/main/java/thunder/hack/utility/render/shaders/BlurProgram.java b/src/main/java/thunder/hack/utility/render/shaders/BlurProgram.java index cbee2d7e..c0d80531 100644 --- a/src/main/java/thunder/hack/utility/render/shaders/BlurProgram.java +++ b/src/main/java/thunder/hack/utility/render/shaders/BlurProgram.java @@ -20,7 +20,6 @@ import static thunder.hack.features.modules.Module.mc; public class BlurProgram { - private Uniform2f uSize; private Uniform2f uLocation; private Uniform1f radius; @@ -60,7 +59,7 @@ public void use() { GL30.glBlitFramebuffer(0, 0, buffer.textureWidth, buffer.textureHeight, 0, 0, buffer.textureWidth, buffer.textureHeight, GL30.GL_COLOR_BUFFER_BIT, GL30.GL_LINEAR); buffer.beginWrite(false); - if (input != null && (input.textureWidth != mc.getWindow().getFramebufferWidth() || input.textureHeight != mc.getWindow().getFramebufferHeight())) + if (input != null && (input.textureWidth != mc.getWindow().getFramebufferWidth() || input.textureHeight != mc.getWindow().getFramebufferHeight())) input.resize(mc.getWindow().getFramebufferWidth(), mc.getWindow().getFramebufferHeight(), MinecraftClient.IS_SYSTEM_MAC); inputResolution.set((float) buffer.textureWidth, (float) buffer.textureHeight); diff --git a/src/main/java/thunder/hack/utility/render/shaders/MainMenuProgram.java b/src/main/java/thunder/hack/utility/render/shaders/MainMenuProgram.java index 2986dc60..f7d699ef 100644 --- a/src/main/java/thunder/hack/utility/render/shaders/MainMenuProgram.java +++ b/src/main/java/thunder/hack/utility/render/shaders/MainMenuProgram.java @@ -13,7 +13,6 @@ import static thunder.hack.features.modules.Module.mc; public class MainMenuProgram { - private Uniform1f Time; private Uniform2f uSize; private Uniform4f color; diff --git a/src/main/java/thunder/hack/utility/render/shaders/RectangleShader.java b/src/main/java/thunder/hack/utility/render/shaders/RectangleShader.java index 7adba9e6..03065374 100644 --- a/src/main/java/thunder/hack/utility/render/shaders/RectangleShader.java +++ b/src/main/java/thunder/hack/utility/render/shaders/RectangleShader.java @@ -15,7 +15,6 @@ import static thunder.hack.features.modules.Module.mc; public class RectangleShader { - private Uniform2f uSize; private Uniform2f uLocation; private Uniform1f radius; @@ -24,7 +23,6 @@ public class RectangleShader { private Uniform4f color3; private Uniform4f color4; - public static final ManagedCoreShader RECTANGLE_SHADER = ShaderEffectManager.getInstance() .manageCoreShader(Identifier.of("thunderhack", "rectangle"), VertexFormats.POSITION); diff --git a/src/main/java/thunder/hack/utility/render/shaders/TextureColorProgram.java b/src/main/java/thunder/hack/utility/render/shaders/TextureColorProgram.java index af3b8e10..43f8fda4 100644 --- a/src/main/java/thunder/hack/utility/render/shaders/TextureColorProgram.java +++ b/src/main/java/thunder/hack/utility/render/shaders/TextureColorProgram.java @@ -3,8 +3,7 @@ import net.minecraft.client.render.VertexFormats; import net.minecraft.util.Identifier; -public class TextureColorProgram { -/* +public class TextureColorProgram {/* public TextureColorProgram() { super(Identifier.of("thunderhack", "position_tex_color2"), VertexFormats.POSITION); } @@ -16,7 +15,5 @@ public void use() { @Override protected void setup() { - } - - */ + }*/ } \ No newline at end of file diff --git a/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniform.java b/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniform.java index 9fbdb7dc..8c2c008f 100644 --- a/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniform.java +++ b/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniform.java @@ -21,10 +21,9 @@ import net.minecraft.client.texture.AbstractTexture; public interface SamplerUniform { - void set(AbstractTexture texture); void set(Framebuffer textureFbo); void set(int textureName); -} +} \ No newline at end of file diff --git a/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniformV2.java b/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniformV2.java index 966a02e6..898a5ee2 100644 --- a/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniformV2.java +++ b/src/main/java/thunder/hack/utility/render/shaders/satin/api/managed/uniform/SamplerUniformV2.java @@ -17,7 +17,6 @@ */ package thunder.hack.utility.render.shaders.satin.api.managed.uniform; - import java.util.function.IntSupplier; public interface SamplerUniformV2 extends SamplerUniform {