diff --git a/src/main/java/me/somepineaple/pineapleclient/PineapleClient.java b/src/main/java/me/somepineaple/pineapleclient/PineapleClient.java index a864f7a..2b9887a 100644 --- a/src/main/java/me/somepineaple/pineapleclient/PineapleClient.java +++ b/src/main/java/me/somepineaple/pineapleclient/PineapleClient.java @@ -23,8 +23,8 @@ public class PineapleClient { private static PineapleClient MASTER; public static final String NAME = "PineapleClient"; - public static final String VERSION = "1.4"; - public static final String SIGN = " ⚔ "; + public static final String VERSION = "1.5"; + public static final String SIGN = " | "; public static final int KEY_GUI = Keyboard.KEY_RSHIFT; public static final int KEY_DELETE = Keyboard.KEY_DELETE; diff --git a/src/main/java/me/somepineaple/pineapleclient/main/event/PineapleEventBus.java b/src/main/java/me/somepineaple/pineapleclient/main/event/PineapleEventBus.java index 5c44370..d3e1d02 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/event/PineapleEventBus.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/event/PineapleEventBus.java @@ -1,6 +1,5 @@ package me.somepineaple.pineapleclient.main.event; -import me.zero.alpine.fork.bus.EventBus; import me.zero.alpine.fork.bus.EventManager; public class PineapleEventBus { diff --git a/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventEntity.java b/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventEntity.java index 83fe01b..cc12255 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventEntity.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventEntity.java @@ -36,7 +36,7 @@ public void set_y(double y) { this.y = y; } - public void set_z(double x) { + public void set_z(double z) { this.z = z; } diff --git a/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventPacket.java b/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventPacket.java index 860f34a..3634876 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventPacket.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/event/events/EventPacket.java @@ -5,7 +5,7 @@ // External. - +@SuppressWarnings("rawtypes") public class EventPacket extends EventCancellable { private final Packet packet; diff --git a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/GUI.java b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/GUI.java index 36c5db9..da3f9d3 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/GUI.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/GUI.java @@ -19,9 +19,6 @@ public class GUI extends GuiScreen { private Frame current; - private boolean event_start; - private boolean event_finish; - // Frame. public int theme_frame_name_r = 0; public int theme_frame_name_g = 0; @@ -59,9 +56,6 @@ public GUI() { this.frame = new ArrayList<>(); this.frame_x = 10; - this.event_start = true; - this.event_finish = false; - for (Category categorys : Category.values()) { if (categorys.is_hidden()) { continue; diff --git a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/HUD.java b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/HUD.java index a90b291..366adf7 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/HUD.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/HUD.java @@ -9,8 +9,6 @@ public class HUD extends GuiScreen { private final Frame frame; - private int frame_height; - public boolean on_gui; public boolean back; diff --git a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/EnemyInfo.java b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/EnemyInfo.java index 51f38f5..bfa4c7c 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/EnemyInfo.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/EnemyInfo.java @@ -192,8 +192,6 @@ private void update_pops () { if (player.isDead || player.getHealth() <= 0) { - int count = totem_pop_counter.get(player.getName()); - totem_pop_counter.remove(player.getName()); } } diff --git a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/FPS.java b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/FPS.java index dd521c3..71aaaf4 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/FPS.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/guiscreen/hud/FPS.java @@ -3,6 +3,7 @@ import me.somepineaple.pineapleclient.PineapleClient; import me.somepineaple.pineapleclient.main.guiscreen.render.pinnables.Pinnable; +import net.minecraft.client.Minecraft; public class FPS extends Pinnable { @@ -26,7 +27,7 @@ public void render() { } public String get_fps() { - int fps = mc.getDebugFPS(); + int fps = Minecraft.getDebugFPS(); if (fps >= 60) { return "\u00A7a"+Integer.toString(fps); } else if (fps >= 30) { diff --git a/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/PacketMine.java b/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/PacketMine.java index bf767d2..efaf780 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/PacketMine.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/PacketMine.java @@ -22,7 +22,7 @@ public PacketMine() { } @EventHandler - private Listener on_damage_block = new Listener<>(event -> { + private final Listener on_damage_block = new Listener<>(event -> { if (!can_break(event.getPos())) return; @@ -45,5 +45,4 @@ private boolean can_break(BlockPos pos) return block.getBlockHardness(blockState, mc.world, pos) != -1; } - } \ No newline at end of file diff --git a/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/Speedmine.java b/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/Speedmine.java index c9e43ce..f1ed789 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/Speedmine.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/hacks/exploit/Speedmine.java @@ -74,7 +74,7 @@ public void update() { } @EventHandler - private Listener send_listener = new Listener<>(event -> { + private final Listener send_listener = new Listener<>(event -> { if (no_swing.get_value(true) && event.get_packet() instanceof CPacketAnimation) { event.cancel(); } @@ -101,7 +101,7 @@ public void update() { }); @EventHandler - private Listener block_event = new Listener<>(event -> { + private final Listener block_event = new Listener<>(event -> { if (event.get_stage() == 3 && reset.get_value(true) && mc.playerController.curBlockDamageMP > 0.1f) { mc.playerController.isHittingBlock = true; } diff --git a/src/main/java/me/somepineaple/pineapleclient/main/hacks/dev/BreakHighlight.java b/src/main/java/me/somepineaple/pineapleclient/main/hacks/render/BreakHighlight.java similarity index 92% rename from src/main/java/me/somepineaple/pineapleclient/main/hacks/dev/BreakHighlight.java rename to src/main/java/me/somepineaple/pineapleclient/main/hacks/render/BreakHighlight.java index 6f8559f..db15e6e 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/hacks/dev/BreakHighlight.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/hacks/render/BreakHighlight.java @@ -1,4 +1,4 @@ -package me.somepineaple.pineapleclient.main.hacks.dev; +package me.somepineaple.pineapleclient.main.hacks.render; import com.mojang.realmsclient.gui.ChatFormatting; import me.somepineaple.pineapleclient.PineapleClient; @@ -24,7 +24,6 @@ public class BreakHighlight extends Hack { private final ArrayList BlocksBeingBroken = new ArrayList<>(); - private final HashMap BlocksHashMap = new HashMap<>(); public BreakHighlight() { super(Category.RENDER); @@ -129,8 +128,6 @@ public void render(EventRender event) { RenderHelp.draw_cube_line(block, color_r, color_g, color_b, l_a.get_value(1), "all"); RenderHelp.release(); } - - RenderUtil.drawText(block, String.valueOf(BlocksHashMap.get(block))); } } } @@ -161,11 +158,8 @@ private boolean IsFootBeingMined () { try { if (!BlocksBeingBroken.contains(l_Packet.getPosition()) && (l_Packet.getProgress() > 0 && l_Packet.getProgress() <= 10)) { BlocksBeingBroken.add(l_Packet.getPosition()); - BlocksHashMap.remove(l_Packet.getPosition()); - BlocksHashMap.put(l_Packet.getPosition(), l_Packet.getProgress()); } else if (l_Packet.getProgress() <= 0 || l_Packet.getProgress() > 10) { BlocksBeingBroken.remove(l_Packet.getPosition()); - BlocksHashMap.remove(l_Packet.getPosition()); } } catch (Exception ignored){} } diff --git a/src/main/java/me/somepineaple/pineapleclient/main/hacks/render/HoleESP.java b/src/main/java/me/somepineaple/pineapleclient/main/hacks/render/HoleESP.java index 71009dc..f2bdbf2 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/hacks/render/HoleESP.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/hacks/render/HoleESP.java @@ -1,5 +1,6 @@ package me.somepineaple.pineapleclient.main.hacks.render; +import java.awt.Color; import me.somepineaple.pineapleclient.main.event.events.EventRender; import me.somepineaple.pineapleclient.main.guiscreen.settings.Setting; import me.somepineaple.turok.draw.RenderHelp; @@ -10,7 +11,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -24,7 +24,7 @@ public HoleESP() { this.description = "lets you know where holes are"; } - Setting mode = create("Mode", "HoleESPMode", "Pretty", combobox("Pretty", "Solid", "Outline", "Glow")); + Setting mode = create("Mode", "HoleESPMode", "Pretty", combobox("Pretty", "Solid", "Outline", "Glow", "Glow 2")); Setting off_set = create("Height", "HoleESPOffSetSide", 0.2, 0.0, 1.0); Setting range = create("Range", "HoleESPRange", 6, 1, 12); Setting hide_own = create("Hide Own", "HoleESPHideOwn", true); @@ -50,6 +50,7 @@ public HoleESP() { boolean outline = false; boolean solid = false; boolean glow = false; + boolean glowOutline = false; int color_r_o; int color_g_o; @@ -83,24 +84,35 @@ public void update() { outline = true; solid = true; glow = false; + glowOutline = false; } if (mode.in("Solid")) { outline = false; solid = true; glow = false; + glowOutline = false; } if (mode.in("Outline")) { outline = true; solid = false; glow = false; + glowOutline = false; } if (mode.in("Glow")) { outline = false; solid = false; glow = true; + glowOutline = false; + } + + if (mode.in("Glow 2")) { + outline = false; + solid = false; + glow = true; + glowOutline = true; } int colapso_range = (int) Math.ceil(range.get_value(1)); @@ -216,13 +228,22 @@ public void render(EventRender event) { RenderHelp.release(); - RenderHelp.prepare("triangles"); - RenderHelp.draw_gradiant_rect(RenderHelp.get_buffer_build(), + RenderHelp.prepare("quads"); + RenderHelp.draw_gradiant_cube(RenderHelp.get_buffer_build(), hole.getKey().getX(), hole.getKey().getY(), hole.getKey().getZ(), - (double)hole.getKey().getX() + 1, (double)hole.getKey().getY() + (double)off_set_h, - hole.getKey().getZ() + 1, new Color(color_r, color_g, color_b, color_a), - new Color(0, 0, 0, 0)); + 1, off_set_h * 2, 1, + new Color(color_r, color_g, color_b, color_a), new Color(0, 0, 0, 0), + "all"); + + RenderHelp.release(); + } + if (glowOutline) { + RenderHelp.prepare("lines"); + RenderHelp.draw_gradiant_outline(RenderHelp.get_buffer_build(), hole.getKey().getX(), + hole.getKey().getY(), hole.getKey().getZ(), off_set_h, + new Color(color_r, color_g, color_b, line_a.get_value(1)), + new Color(0, 0, 0, 0)); RenderHelp.release(); } } diff --git a/src/main/java/me/somepineaple/pineapleclient/main/manager/ModuleManager.java b/src/main/java/me/somepineaple/pineapleclient/main/manager/ModuleManager.java index 6c65d93..de853bb 100644 --- a/src/main/java/me/somepineaple/pineapleclient/main/manager/ModuleManager.java +++ b/src/main/java/me/somepineaple/pineapleclient/main/manager/ModuleManager.java @@ -5,7 +5,7 @@ import me.somepineaple.pineapleclient.main.util.NotificationUtil; import me.somepineaple.turok.draw.RenderHelp; import me.somepineaple.pineapleclient.main.event.events.EventRender; -import me.somepineaple.pineapleclient.main.hacks.dev.BreakHighlight; +import me.somepineaple.pineapleclient.main.hacks.render.BreakHighlight; import me.somepineaple.pineapleclient.main.hacks.*; import me.somepineaple.pineapleclient.main.hacks.chat.*; import me.somepineaple.pineapleclient.main.hacks.combat.*; diff --git a/src/main/java/me/somepineaple/turok/draw/RenderHelp.java b/src/main/java/me/somepineaple/turok/draw/RenderHelp.java index 8214998..38236bf 100644 --- a/src/main/java/me/somepineaple/turok/draw/RenderHelp.java +++ b/src/main/java/me/somepineaple/turok/draw/RenderHelp.java @@ -130,22 +130,57 @@ public static void draw_cube(final BufferBuilder buffer, float x, float y, float buffer.pos(x + w, y + h, z + d).color(r, g, b, a).endVertex(); } } + + public static void draw_gradiant_cube(final BufferBuilder buffer, float x, float y, float z, float w, float h, float d, Color startColor, Color endColor, String sides) { + int r1 = startColor.getRed(); + int g1 = startColor.getGreen(); + int b1 = startColor.getBlue(); + int a1 = startColor.getAlpha(); + + int r2 = endColor.getRed(); + int g2 = endColor.getGreen(); + int b2 = endColor.getBlue(); + int a2 = endColor.getAlpha(); - public static void draw_gradiant_rect(final BufferBuilder buffer, double x1, double y1, double z1, double x2, double y2, double z2, Color startColor, Color endColor) { - draw_gradiant_quad(buffer, x1, y1, z1, x1, y2, z1, x2, y2, z1, x2, y1, z1, startColor, endColor); // Front - draw_gradiant_quad(buffer, x1, y1, z2, x1, y2, z2, x2, y2, z2, x2, y1, z2, startColor, endColor); // Back - draw_gradiant_quad(buffer, x1, y1, z1, x1, y2, z1, x1, y2, z2, x1, y1, z2, startColor, endColor); // Left - draw_gradiant_quad(buffer, x2, y1, z1, x2, y2, z1, x2, y2, z2, x2, y1, z2, startColor, endColor); // Right + if (Arrays.asList(sides.split("-")).contains("north") || sides.equalsIgnoreCase("all")) { + buffer.pos(x + w, y, z).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x, y, z).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x, y + h, z).color(r2, g2, b2, a2).endVertex(); + buffer.pos(x + w, y + h, z).color(r2, g2, b2, a2).endVertex(); + } + + if (Arrays.asList(sides.split("-")).contains("south") || sides.equalsIgnoreCase("all")) { + buffer.pos(x, y, z + d).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x + w, y, z + d).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x + w, y + h, z + d).color(r2, g2, b2, a2).endVertex(); + buffer.pos(x, y + h, z + d).color(r2, g2, b2, a2).endVertex(); + } + + if (Arrays.asList(sides.split("-")).contains("south") || sides.equalsIgnoreCase("all")) { + buffer.pos(x, y, z).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x, y, z + d).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x, y + h, z + d).color(r2, g2, b2, a2).endVertex(); + buffer.pos(x, y + h, z).color(r2, g2, b2, a2).endVertex(); + } + + if (Arrays.asList(sides.split("-")).contains("south") || sides.equalsIgnoreCase("all")) { + buffer.pos(x + w, y, z + d).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x + w, y, z).color(r1, g1, b1, a1).endVertex(); + buffer.pos(x + w, y + h, z).color(r2, g2, b2, a2).endVertex(); + buffer.pos(x + w, y + h, z + d).color(r2, g2, b2, a2).endVertex(); + } } - public static void draw_gradiant_quad(final BufferBuilder buffer, double x1, double y1, double z1, double x2, double y2, double z2, double x3, double y3, double z3, double x4, double y4, double z4, Color startColor, Color endColor) { - buffer.pos(x1, y1, z1).color(startColor.getRed(), startColor.getGreen(), startColor.getBlue(), startColor.getAlpha()).endVertex(); - buffer.pos(x2, y2, z2).color(endColor.getRed(), endColor.getGreen(), endColor.getBlue(), endColor.getAlpha()).endVertex(); - buffer.pos(x3, y3, z3).color(endColor.getRed(), endColor.getGreen(), endColor.getBlue(), endColor.getAlpha()).endVertex(); + public static void draw_gradiant_outline(final BufferBuilder buffer, double x, double y, double z, double height, Color startColor, Color endColor) { + draw_gradiant_line(buffer, x, y, z, x, y + height, z, startColor, endColor); + draw_gradiant_line(buffer, x + 1, y, z, x + 1, y + height, z, startColor, endColor); + draw_gradiant_line(buffer, x, y, z + 1, x, y + height, z + 1, startColor, endColor); + draw_gradiant_line(buffer, x + 1, y, z + 1, x + 1, y + height, z + 1, startColor, endColor); + } + public static void draw_gradiant_line(final BufferBuilder buffer, double x1, double y1, double z1, double x2, double y2, double z2, Color startColor, Color endColor) { buffer.pos(x1, y1, z1).color(startColor.getRed(), startColor.getGreen(), startColor.getBlue(), startColor.getAlpha()).endVertex(); - buffer.pos(x3, y3, z3).color(endColor.getRed(), endColor.getGreen(), endColor.getBlue(), endColor.getAlpha()).endVertex(); - buffer.pos(x4, y4, z4).color(startColor.getRed(), startColor.getGreen(), startColor.getBlue(), startColor.getAlpha()).endVertex(); + buffer.pos(x2, y2, z2).color(endColor.getRed(), endColor.getGreen(), endColor.getBlue(), endColor.getAlpha()).endVertex(); } public static void draw_cube_line(final BufferBuilder buffer, float x, float y, float z, float w, float h, float d, int r, int g, int b, int a, String sides) {