Skip to content

Commit 4eda8b4

Browse files
author
nxyi
committed
improve magnet and update gradle.properties
1 parent 6b169b4 commit 4eda8b4

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.7
66
loader_version=0.16.9
77

88
# Mod Properties
9-
mod_version=1.1.0
9+
mod_version=1.1.1
1010
maven_group=com.dark
1111
archives_base_name=zewo2
1212

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
/*
2-
* This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
3-
* Copyright (c) Meteor Development.
4-
*/
5-
61
package com.dark.zewo2.modules;
72

83
import com.dark.zewo2.Addon;
9-
import com.dark.zewo2.Utils.JinxUtils;
104
import com.dark.zewo2.Utils.Utils;
115
import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent;
126
import meteordevelopment.meteorclient.events.game.GameLeftEvent;
@@ -20,8 +14,10 @@
2014
import net.minecraft.entity.ItemEntity;
2115
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
2216
import net.minecraft.util.math.BlockPos;
17+
import net.minecraft.util.math.Vec3d;
2318

24-
import java.util.Objects;
19+
import java.util.*;
20+
import java.util.stream.StreamSupport;
2521

2622
public class Magnet extends Module {
2723
private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -54,13 +50,17 @@ public void onMove(PlayerMoveEvent event) {
5450

5551
@EventHandler
5652
private void onTick(TickEvent.Pre event) {
57-
for (Entity entity : mc.world.getEntities()) {
58-
if (entity instanceof ItemEntity){
59-
if (mc.player.distanceTo(entity) > range.get()) return;
53+
List<Entity> entities = new ArrayList<>(StreamSupport.stream(mc.world.getEntities().spliterator(), true)
54+
.filter(entity -> entity instanceof ItemEntity)
55+
.filter(entity -> entity.distanceTo(mc.player) <= range.get())
56+
.filter(entity -> Utils.isABFree(mc.player.getPos(), entity.getPos()))
57+
.toList());
58+
59+
if (entities.isEmpty()) return;
60+
61+
entities.sort(Comparator.comparingDouble(entity -> entity.distanceTo(mc.player)));
62+
Entity closest = entities.get(0);
6063

61-
if (!Utils.isABFree(mc.player.getPos(), entity.getPos())) return;
62-
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(entity.getX(), entity.getY(), entity.getZ(), true, false));
63-
}
64-
}
64+
if (closest.distanceTo(mc.player) > 1) mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(closest.getX(), closest.getY(), closest.getZ(), mc.player.isOnGround(), false));
6565
}
6666
}

0 commit comments

Comments
 (0)