Skip to content

Commit de2db41

Browse files
NxyiNxyi
committed
small fixes
1 parent 26abc6c commit de2db41

File tree

4 files changed

+128
-16
lines changed

4 files changed

+128
-16
lines changed

‎src/main/java/com/dark/zewo2/Addon.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public void onInitialize() {
5555
Modules.get().add(new AntiBorder());
5656
Modules.get().add(new Bookchat());
5757
Modules.get().add(new StrongholdFinder());
58+
Modules.get().add(new Fling());
5859

5960

6061
// Commands

‎src/main/java/com/dark/zewo2/Utils/Utils.java‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
package com.dark.zewo2.Utils;
2+
3+
import net.minecraft.block.Block;
4+
import net.minecraft.block.Blocks;
5+
import net.minecraft.client.MinecraftClient;
6+
import net.minecraft.item.Item;
7+
import net.minecraft.item.ItemStack;
8+
import net.minecraft.nbt.StringNbtReader;
9+
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
10+
import net.minecraft.util.hit.BlockHitResult;
11+
import net.minecraft.util.hit.HitResult;
12+
import net.minecraft.util.math.BlockPos;
13+
import net.minecraft.util.math.MathHelper;
14+
import net.minecraft.util.math.Vec3d;
15+
import net.minecraft.world.RaycastContext;
16+
import oshi.SystemInfo;
17+
import oshi.hardware.GraphicsCard;
18+
import oshi.hardware.HardwareAbstractionLayer;
19+
20+
import java.security.MessageDigest;
21+
import java.util.ArrayList;
22+
23+
public class Utils {
24+
static MinecraftClient mc = MinecraftClient.getInstance();
25+
public static String getHWID() {
26+
try {
27+
SystemInfo si = new SystemInfo();
28+
HardwareAbstractionLayer hal = si.getHardware();
29+
StringBuilder toEncrypt = new StringBuilder();
30+
for (GraphicsCard graphicsCard : hal.getGraphicsCards()) {
31+
toEncrypt.append(graphicsCard.getVendor()).append(graphicsCard.getName());
32+
}
33+
toEncrypt.append(hal.getComputerSystem().getBaseboard().getModel());
34+
toEncrypt.append(hal.getComputerSystem().getHardwareUUID());
35+
MessageDigest md = MessageDigest.getInstance("MD5");
36+
md.update(toEncrypt.toString().getBytes());
37+
StringBuilder hexString = new StringBuilder();
38+
39+
byte[] byteData = md.digest();
40+
41+
for (byte aByteData : byteData) {
42+
String hex = Integer.toHexString(0xff & aByteData);
43+
if (hex.length() == 1) hexString.append('0');
44+
hexString.append(hex);
45+
}
46+
47+
return hexString.toString();
48+
} catch (Exception e) {
49+
e.printStackTrace();
50+
return "Error";
51+
}
52+
}
53+
54+
public static boolean isABFree(Vec3d a, Vec3d b) {
55+
assert mc.player != null;
56+
assert mc.world != null;
57+
RaycastContext rc = new RaycastContext(a, b, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.NONE, mc.player);
58+
BlockHitResult raycast = mc.world.raycast(rc);
59+
return raycast.getType() == HitResult.Type.MISS;
60+
}
61+
62+
public static ItemStack generateItemStackWithMeta(String nbt, Item item) {
63+
try {
64+
ItemStack stack = new ItemStack(item);
65+
stack.setNbt(StringNbtReader.parse(nbt));
66+
return stack;
67+
} catch (Exception ignored) {
68+
return new ItemStack(item);
69+
}
70+
}
71+
72+
public static Vec3d getRotationVector(float pitch, float yaw) {
73+
float f = pitch * 0.017453292F;
74+
float g = -yaw * 0.017453292F;
75+
float h = MathHelper.cos(g);
76+
float i = MathHelper.sin(g);
77+
float j = MathHelper.cos(f);
78+
float k = MathHelper.sin(f);
79+
return new Vec3d(i * j, -k, h * j);
80+
}
81+
82+
public static Block getBlock(BlockPos pos) {
83+
return mc.world.getBlockState(pos).getBlock();
84+
}
85+
86+
public static BlockPos getBlockPos(Vec3d vec) {
87+
return new BlockPos((int) vec.getX(), (int) vec.getY(), (int) vec.getZ());
88+
}
89+
90+
public static Vec3d getVec3(BlockPos blockPos) {
91+
return new Vec3d(blockPos.getX(), blockPos.getY(), blockPos.getZ());
92+
}
93+
}

‎src/main/java/com/dark/zewo2/modules/BetterAutoSign.java‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
import meteordevelopment.meteorclient.settings.*;
1313
import meteordevelopment.meteorclient.systems.modules.Module;
1414
import meteordevelopment.orbit.EventHandler;
15+
import net.minecraft.block.SignBlock;
1516
import net.minecraft.block.entity.SignBlockEntity;
1617
import net.minecraft.client.gui.screen.ingame.SignEditScreen;
18+
import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket;
1719
import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
1820
import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
1921
import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
@@ -25,6 +27,7 @@
2527
import org.reflections.vfs.Vfs;
2628

2729
public class BetterAutoSign extends Module {
30+
BlockPos last = new BlockPos(0,-500,0);
2831

2932
private final SettingGroup sgGeneral = this.settings.createGroup("Front");
3033

@@ -51,21 +54,34 @@ public BetterAutoSign() {
5154
}
5255

5356
@EventHandler
54-
private void onOpenScreen(OpenScreenEvent event) {
55-
if (!(event.screen instanceof SignEditScreen)) return;
56-
57-
SignBlockEntity sign = ((AbstractSignEditScreenAccessor) event.screen).getSign();
58-
59-
if (mode.get().equals(sides.front)) mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), true, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
60-
if (mode.get().equals(sides.back)) mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), false, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
61-
62-
if (mode.get().equals(sides.both)){
63-
mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), true, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
64-
mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND ,new BlockHitResult(new Vec3d(sign.getPos().getX(), sign.getPos().getY(), sign.getPos().getZ()), getop(mc.player.getHorizontalFacing()), sign.getPos(), false), 0));
65-
mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), false, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
57+
private void packet(PacketEvent.Receive event){
58+
if (event.packet instanceof SignEditorOpenS2CPacket packet){
59+
event.cancel();
60+
if (packet.getPos().equals(last)) return;
61+
62+
BlockPos sign = new BlockPos(packet.getPos());
63+
64+
if (mode.get().equals(sides.front)) mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign, true, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
65+
if (mode.get().equals(sides.back)) mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign, false, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
66+
67+
if (mode.get().equals(sides.both)){
68+
mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign, true, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
69+
mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND ,new BlockHitResult(new Vec3d(sign.getX(), sign.getY(), sign.getZ()), getop(mc.player.getHorizontalFacing()), sign, false), 0));
70+
mc.player.networkHandler.sendPacket(new UpdateSignC2SPacket(sign, false, isempty(line1.get()), isempty(line2.get()), isempty(line3.get()), isempty(line4.get())));
71+
}
72+
73+
//this is to stop the packet spam loop when using 'both' mode
74+
last = sign;
75+
new Thread(() -> {
76+
try {
77+
Thread.sleep(500);
78+
} catch (InterruptedException e) {
79+
throw new RuntimeException(e);
80+
}
81+
82+
last = null;
83+
}).start();
6684
}
67-
68-
event.cancel();
6985
}
7086

7187
private String isempty(String text){
@@ -81,8 +97,8 @@ private Direction getop(Direction dir){
8197
}
8298

8399
public enum sides{
84-
back,
85100
front,
101+
back,
86102
both
87103
}
88104
}

‎src/main/java/com/dark/zewo2/modules/Magnet.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package com.dark.zewo2.modules;
77

88
import com.dark.zewo2.Addon;
9+
import com.dark.zewo2.Utils.JinxUtils;
10+
import com.dark.zewo2.Utils.Utils;
911
import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent;
1012
import meteordevelopment.meteorclient.events.game.GameLeftEvent;
1113
import meteordevelopment.meteorclient.events.world.TickEvent;
@@ -49,12 +51,12 @@ public void onMove(PlayerMoveEvent event) {
4951

5052
}
5153

52-
//Bad system and gets stuck ALOT will fix
5354
@EventHandler
5455
private void onTick(TickEvent.Pre event) {
5556
for (Entity entity : mc.world.getEntities()) {
5657
if (Objects.equals(entity.getType().toString(), "entity.minecraft.item") && mc.player.distanceTo(entity) <= range.get()) {
5758
if (mc.player == null || mc.world == null) return;
59+
if (!Utils.isABFree(mc.player.getPos(), entity.getPos())) return;
5860
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(entity.getX(), entity.getY(), entity.getZ(), true));
5961
}
6062
}

0 commit comments

Comments
 (0)