From a5b4e3a1db1ff41890662d7627accd2f9dcc9c51 Mon Sep 17 00:00:00 2001 From: Dominika Date: Mon, 20 Apr 2020 09:09:37 -0400 Subject: [PATCH] Revert "Added Search module." --- .../kami/gui/kami/RenderHelper.java | 32 ---- .../kami/module/modules/render/Search.java | 160 ------------------ 2 files changed, 192 deletions(-) delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/render/Search.java diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/RenderHelper.java b/src/main/java/me/zeroeightsix/kami/gui/kami/RenderHelper.java index 1bb0f06b..14887f3b 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/RenderHelper.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/RenderHelper.java @@ -51,38 +51,6 @@ public class RenderHelper { drawArc(x, y, radius, start, end, segments); } - public static void verticalLine(int x, int y, int height) { - glBegin(GL_LINE_LOOP); - { - glVertex2d(0, 0); - glVertex2d(0, height); - } - } - - public static void horizontalLine(int x, int y, int width) { - glBegin(GL_LINE_LOOP); - { - glVertex2d(width, 0); - glVertex2d(0, 0); - } - } - - public static void drawLine(int x, int y, int height, int width, float r, float g, float b, float lineWidth, boolean vertical) { - glPushMatrix(); - glTranslatef(x, y, 0.0F); - GL11.glColor3f(r, g, b); - GL11.glLineWidth(lineWidth); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - if (vertical) { - horizontalLine(x, y, width); - } else { - verticalLine(x, y, height); - } - glEnd(); - glPopMatrix(); - } - public static void drawOutlinedRoundedRectangle(int x, int y, int width, int height, float radius, float dR, float dG, float dB, float dA, float outlineWidth) { drawRoundedRectangle(x, y, width, height, radius); glColor4f(dR, dG, dB, dA); diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/Search.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/Search.java deleted file mode 100644 index 679a2366..00000000 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/Search.java +++ /dev/null @@ -1,160 +0,0 @@ -package me.zeroeightsix.kami.module.modules.render; - -import me.zeroeightsix.kami.event.events.RenderEvent; -import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.setting.Setting; -import me.zeroeightsix.kami.setting.Settings; -import me.zeroeightsix.kami.util.GeometryMasks; -import me.zeroeightsix.kami.util.KamiTessellator; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.math.BlockPos; -import org.lwjgl.opengl.GL11; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import static me.zeroeightsix.kami.util.ColourUtils.toRGBA; -import static me.zeroeightsix.kami.util.LogUtil.getCurrentCoord; - -@Module.Info(name = "Search", description = "Highlights blocks in the world", category = Module.Category.RENDER) -public class Search extends Module { - private static final String DEFAULT_BLOCK_ESP_CONFIG = "minecraft:portal,minecraft:end_portal_frame,minecraft:bed,"; - private Setting espBlockNames = register(Settings.stringBuilder("blocks").withValue(DEFAULT_BLOCK_ESP_CONFIG).withConsumer((old, value) -> refreshESPBlocksSet(value)).build()); - private Setting espBlockNamesAdd = register(Settings.stringBuilder("add").withValue("").withConsumer((old, value) -> addBlockToSearch(value)).build()); - private Setting espBlockNamesDel = register(Settings.stringBuilder("del").withValue("").withConsumer((old, value) -> removeBlockFromSearch(value)).build()); - - public void addBlockToSearch(String block) { - espBlockNames.setValue(espBlockNames.getValue() + block + ","); - refreshESPBlocksSet(espBlockNames.getValue()); - } - - public void removeBlockFromSearch(String block) { - espBlockNames.setValue(espBlockNames.getValue().replace(block + ",", "")); - refreshESPBlocksSet(espBlockNames.getValue()); - } - - Minecraft mc = Minecraft.getMinecraft(); - private Set espBlocks; - - @Override - public void onUpdate() { - if (espBlocks == null) { - refreshESPBlocksSet(espBlockNames.getValue()); - } - if (mc.player == null) return; - if (shouldRun()) new Thread(this::makeChunks).start(); - } - - public void onEnable() { - refreshESPBlocksSet(espBlockNames.getValue()); - } - - private void refreshESPBlocksSet(String v) { - espBlocks = Collections.synchronizedSet(new HashSet<>()); - for (String s : v.split(",")) { - String s2 = s.trim(); - if (!s2.equals("minecraft:air")) { - Block block = Block.getBlockFromName(s2); - if (block != null) - espBlocks.add(block); - } - } - } - - private long startTime = 0; - private ArrayList>> a; - - private boolean shouldRun() { - if (startTime == 0) - startTime = System.currentTimeMillis(); - if (startTime + 500 <= System.currentTimeMillis()) { // 1 timeout = 1 second = 1000 ms - startTime = System.currentTimeMillis(); - return true; - } - return false; - } - - boolean doneList = false; - - private void makeChunks() { - doneList = false; - int[] pcoords = getCurrentCoord(false); - int renderdist = mc.gameSettings.renderDistanceChunks * 16; - if (renderdist > 80) { - renderdist = 80; - } - BlockPos pos1 = new BlockPos(pcoords[0] - renderdist, 0, pcoords[2] - renderdist); - BlockPos pos2 = new BlockPos(pcoords[0] + renderdist, 256, pcoords[2] + renderdist); - ArrayList>> foundBlocks = new ArrayList<>(); - foundBlocks.add(findBlocksInCoords(pos1, pos2, espBlocks)); - a = foundBlocks; - doneList = true; - } - - private ArrayList> findBlocksInCoords(BlockPos pos1, BlockPos pos2, Set blocksToFind) { - Iterable blocks = BlockPos.getAllInBox(pos1, pos2); - ArrayList> foundBlocks = new ArrayList<>(); - for (BlockPos blockPos : blocks) { - int side = GeometryMasks.Quad.ALL; - Block block = mc.world.getBlockState(blockPos).getBlock(); - for (Block b : blocksToFind) { - if (block == b) { - int c = block.blockMapColor.colorValue; - int[] cia = {c>>16,c>>8&255,c&255}; - int blockColor = toRGBA(cia[0], cia[1], cia[2], 100); - foundBlocks.add(new Triplet<>(blockPos, blockColor, side)); - } - } - } - return foundBlocks; - } - - ArrayList>> blocksToShow; - @Override - public void onWorldRender(RenderEvent event) { - if (doneList && a != null) { - blocksToShow = a; - } - if (blocksToShow != null) { - GlStateManager.pushMatrix(); - KamiTessellator.prepare(GL11.GL_QUADS); - for (ArrayList> blockList : blocksToShow) { - for (Triplet pair : blockList) - KamiTessellator.drawBox(pair.getFirst(), pair.getSecond(), pair.getThird()); - } - KamiTessellator.release(); - GlStateManager.popMatrix(); - GlStateManager.enableTexture2D(); - } - } - - public static class Triplet { - - private final T first; - private final U second; - private final V third; - - public Triplet(T first, U second, V third) { - this.first = first; - this.second = second; - this.third = third; - } - - public T getFirst() { - return first; - } - - public U getSecond() { - return second; - } - - public V getThird() { - return third; - } - } -} -