morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Applied minDistance to other CoordLogger events

Browse Source
This commit is contained in:
stormybytes
2021-10-24 09:28:27 +07:00
parent 82aba0ddd2
commit 4d1c60b6f0
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/cloudburst/rejects/modules/CoordLogger.java
View File

@@ -8,6 +8,7 @@ import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.settings.SettingGroup; import meteordevelopment.meteorclient.settings.SettingGroup;
import meteordevelopment.meteorclient.systems.modules.Module; import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.meteorclient.utils.player.ChatUtils;
import meteordevelopment.meteorclient.utils.player.PlayerUtils;
import meteordevelopment.orbit.EventHandler; import meteordevelopment.orbit.EventHandler;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
@@ -25,9 +26,21 @@ import net.minecraft.util.math.Vec3d;
import java.util.UUID; import java.util.UUID;
public class CoordLogger extends Module { public class CoordLogger extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();
private final SettingGroup sgTeleports = settings.createGroup("Teleports"); private final SettingGroup sgTeleports = settings.createGroup("Teleports");
private final SettingGroup sgWorldEvents = settings.createGroup("World Events"); private final SettingGroup sgWorldEvents = settings.createGroup("World Events");
private final Setting<Double> minDistance = sgGeneral.add(new DoubleSetting.Builder()
.name("minimum-distance")
.description("Minimum distance to log event.")
.min(5)
.max(100)
.sliderMin(5)
.sliderMax(100)
.defaultValue(10)
.build()
);
private final Setting<Boolean> players = sgTeleports.add(new BoolSetting.Builder() private final Setting<Boolean> players = sgTeleports.add(new BoolSetting.Builder()
.name("players") .name("players")
.description("Logs player teleports.") .description("Logs player teleports.")
@@ -42,16 +55,6 @@ public class CoordLogger extends Module {
.build() .build()
); );
private final Setting<Double> minDistance = sgTeleports.add(new DoubleSetting.Builder()
.name("minimum-distance")
.description("Minimum movement distance to log as teleport.")
.min(5)
.max(100)
.sliderMin(5)
.sliderMax(100)
.defaultValue(10)
.build()
);
private final Setting<Boolean> enderDragons = sgWorldEvents.add(new BoolSetting.Builder() private final Setting<Boolean> enderDragons = sgWorldEvents.add(new BoolSetting.Builder()
.name("ender-dragons") .name("ender-dragons")
@@ -121,6 +124,7 @@ public class CoordLogger extends Module {
WorldEventS2CPacket worldEventS2CPacket = (WorldEventS2CPacket) event.packet; WorldEventS2CPacket worldEventS2CPacket = (WorldEventS2CPacket) event.packet;
if (worldEventS2CPacket.isGlobal()) { if (worldEventS2CPacket.isGlobal()) {
System.out.println(worldEventS2CPacket.getEventId()); System.out.println(worldEventS2CPacket.getEventId());
if (PlayerUtils.distanceTo(worldEventS2CPacket.getPos()) <= minDistance.get()) return;
switch (worldEventS2CPacket.getEventId()) { switch (worldEventS2CPacket.getEventId()) {
case 1023: case 1023:
if (withers.get()) info(formatMessage("Wither spawned at ", worldEventS2CPacket.getPos())); if (withers.get()) info(formatMessage("Wither spawned at ", worldEventS2CPacket.getPos()));
@@ -135,12 +139,13 @@ public class CoordLogger extends Module {
if (otherEvents.get()) info(formatMessage("Unknown global event at ", worldEventS2CPacket.getPos())); if (otherEvents.get()) info(formatMessage("Unknown global event at ", worldEventS2CPacket.getPos()));
} }
} }
} else if (thunder.get() && event.packet instanceof PlaySoundS2CPacket) { } else if (thunder.get() && event.packet instanceof PlaySoundS2CPacket playSoundS2CPacket) {
PlaySoundS2CPacket playSoundS2CPacket = (PlaySoundS2CPacket) event.packet;
// Check for thunder sound // Check for thunder sound
if (playSoundS2CPacket.getSound() != SoundEvents.ENTITY_LIGHTNING_BOLT_IMPACT) return; if (playSoundS2CPacket.getSound() != SoundEvents.ENTITY_LIGHTNING_BOLT_IMPACT) return;
// Min distance
if (PlayerUtils.distanceTo(playSoundS2CPacket.getX(), playSoundS2CPacket.getY(), playSoundS2CPacket.getZ()) <= minDistance.get()) return;
info("Thunder noise at %d %d %d", playSoundS2CPacket.getX(), playSoundS2CPacket.getY(), playSoundS2CPacket.getZ()); info("Thunder noise at %d %d %d", playSoundS2CPacket.getX(), playSoundS2CPacket.getY(), playSoundS2CPacket.getZ());
} }
} }