From d025dd44d5dc51a11e65149439005b481d5961e1 Mon Sep 17 00:00:00 2001 From: S-B99 Date: Tue, 29 Oct 2019 21:23:14 -0400 Subject: [PATCH] remove carpenter and portal tracer files for issue --- .../kami/module/modules/misc/Carpenter.java | 176 ------------------ .../module/modules/render/PortalTracers.java | 57 ------ 2 files changed, 233 deletions(-) delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/misc/Carpenter.java delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/misc/Carpenter.java b/src/main/java/me/zeroeightsix/kami/module/modules/misc/Carpenter.java deleted file mode 100644 index 122311f21..000000000 --- a/src/main/java/me/zeroeightsix/kami/module/modules/misc/Carpenter.java +++ /dev/null @@ -1,176 +0,0 @@ -package me.zeroeightsix.kami.module.modules.misc; - -import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.util.ColourUtils; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; - -import java.util.List; - -/** - * Created by 086 on 20/05/2018. - */ -// @Module.Info(name = "Carpenter", category = Module.Category.MISC) -public class Carpenter extends Module { - - private int displayList = -1; - - public static class ShapeBuilder { - private static BlockPos from(double x, double y, double z) { - return new BlockPos(Math.floor(x), Math.floor(y), Math.floor(z)); - } - - public static Shape oval(BlockPos origin, double width, double length) { - return null; - } - } - - public static class Selection { - private BlockPos first; - private BlockPos second; - - public Selection(BlockPos pos1, BlockPos pos2) { - this.first = pos1; - this.second = pos2; - } - - public BlockPos getFirst() { - return first; - } - - public BlockPos getSecond() { - return second; - } - - public void setFirst(BlockPos first) { - this.first = first; - } - - public void setSecond(BlockPos second) { - this.second = second; - } - - public boolean isInvalid(){ - return first == null || second == null; - } - - public int getWidth(){ - int x1 = Math.min(first.getX(), second.getX()); - int x2 = Math.max(first.getX(), second.getX())+1; - return Math.abs(x1 - x2); - } - - public int getLength(){ - int z1 = Math.min(first.getZ(), second.getZ()); - int z2 = Math.max(first.getZ(), second.getZ())+1; - return Math.abs(z1 - z2); - } - - public int getHeight(){ - int y1 = Math.min(first.getY(), second.getY())+1; - int y2 = Math.max(first.getY(), second.getY()); - return Math.abs(y1 - y2); - } - - public int getSize(){ - return getWidth() * getLength() * getHeight(); - } - - public BlockPos getMinimum(){ - int x1 = Math.min(first.getX(), second.getX()); - int y1 = Math.min(first.getY(), second.getY()); - int z1 = Math.min(first.getZ(), second.getZ()); - return new BlockPos(x1, y1, z1); - } - - public BlockPos getMaximum(){ - int x1 = Math.min(first.getX(), second.getX())+1; - int y1 = Math.min(first.getY(), second.getY()); - int z1 = Math.min(first.getZ(), second.getZ())+1; - return new BlockPos(x1, y1, z1); - } - - public BlockPos getFurthest(int x, int y, int z){ - if (x > 0){ - if (first.getX() > second.getX()) - return first; - else - return second; - }else if (x < 0){ - if (first.getX() < second.getX()) - return first; - else - return second; - }else if (y > 0){ - if (first.getX() > second.getX()) - return first; - else - return second; - }else if (y < 0){ - if (first.getY() < second.getY()) - return first; - else - return second; - }else if (z > 0){ - if (first.getZ() > second.getZ()) - return first; - else - return second; - }else if (z < 0){ - if (first.getZ() < second.getZ()) - return first; - else - return second; - } - return null; - } - - public void moveSelection(int x, int y, int z){ - first = first.add(x, y, z); - second = second.add(x, y, z); - } - - public void expand(int amount, EnumFacing facing){ - BlockPos affect = second; - switch (facing){ - case DOWN: - affect = second.getY() < first.getY() ? second = (second.add(0, -amount, 0)) : (first = first.add(0, -amount, 0)); - break; - case UP: - affect = second.getY() > first.getY() ? second = (second.add(0, amount, 0)) : (first = first.add(0, amount, 0)); - break; - case NORTH: - affect = second.getZ() < first.getZ() ? second = (second.add(0, 0, -amount)) : (first = first.add(0, 0, -amount)); - break; - case SOUTH: - affect = second.getZ() > first.getZ() ? second = (second.add(0, 0, amount)) : (first = first.add(0, 0, amount)); - break; - case WEST: - affect = second.getX() < first.getX() ? second = (second.add(-amount, 0, 0)) : (first = first.add(-amount, 0, 0)); - break; - case EAST: - affect = second.getX() > first.getX() ? second = (second.add(amount, 0, 0)) : (first = first.add(amount, 0, 0)); - break; - } - } - } - - public class Shape { - final BlockPos[] blocks; - private final int colour; - - Shape (List blocks) { - this.blocks = blocks.toArray(new BlockPos[0]); - this.colour = ColourUtils.toRGBA(.5f+Math.random()*.5f,.5f+Math.random()*.5f,.5f+Math.random()*.5f,1); - } - - public BlockPos[] getBlocks() { - return blocks; - } - - public int getColour() { - return colour; - } - } - -} diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java deleted file mode 100644 index 6863467bd..000000000 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java +++ /dev/null @@ -1,57 +0,0 @@ -package me.zeroeightsix.kami.module.modules.render; - -import me.zero.alpine.listener.EventHandler; -import me.zero.alpine.listener.Listener; -import me.zeroeightsix.kami.event.events.ChunkEvent; -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 net.minecraft.block.BlockPortal; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.storage.ExtendedBlockStorage; - -import java.util.ArrayList; - -/** - * Created by 086 on 15/12/2017. - */ -// @Module.Info(name = "PortalTracers", category = Module.Category.RENDER) -public class PortalTracers extends Module { - - private Setting range = register(Settings.i("Range", 5000)); - private ArrayList portals = new ArrayList<>(); - - @EventHandler - private Listener loadListener = new Listener<>(event -> { - Chunk chunk = event.getChunk(); - // Remove already registered portals from this chunk, allowing removed portals to vanish from tracers and no duplicates to be made - portals.removeIf(blockPos -> blockPos.getX() / 16 == chunk.x && blockPos.getZ() / 16 == chunk.z); - - for (ExtendedBlockStorage storage : chunk.getBlockStorageArray()) { - if (storage != null) { - for (int x = 0; x < 16; x++) { - for (int y = 0; y < 16; y++) { - for (int z = 0; z < 16; z++) { - if (storage.get(x, y, z).getBlock() instanceof BlockPortal) { - int px = chunk.x * 16 + x; - int py = storage.yBase + y; - int pz = chunk.z * 16 + z; - portals.add(new BlockPos(px, py, pz)); - y += 6; - } - } - } - } - } - } - }); - - - @Override - public void onWorldRender(RenderEvent event) { - portals.stream().filter(blockPos -> mc.player.getDistance(blockPos.x, blockPos.y, blockPos.z) <= range.getValue()) - .forEach(blockPos -> Tracers.drawLine(blockPos.x - mc.getRenderManager().renderPosX, blockPos.y - mc.getRenderManager().renderPosY, blockPos.z - mc.getRenderManager().renderPosZ, 0, 0.6f, 0.3f, 0.8f, 1)); - } -}