From 82aba0ddd2aecbbca78d9a9ab58cd4bc434652ba Mon Sep 17 00:00:00 2001 From: stormybytes Date: Sun, 24 Oct 2021 09:21:47 +0700 Subject: [PATCH] Added thunder to CoordLogger (ForgeHax port) https://github.com/MeteorDevelopment/meteor-client/issues/1607 --- README.md | 3 ++- .../rejects/modules/CoordLogger.java | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c4d333..19224ad 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,8 @@ An addon to Meteor Client that adds modules and commands that were too useless t - Boost (Ported from [Cornos](https://github.com/cornos/Cornos/blob/master/src/main/java/me/zeroX150/cornos/features/module/impl/movement/Boost.java)) - ColorSigns - Confuse -- Coord Logger (World events from [JexClient](https://github.com/DustinRepo/JexClient-main/blob/main/src/main/java/me/dustin/jex/feature/mod/impl/misc/CoordFinder.java)) +- Coord Logger (World events from [JexClient](https://github.com/DustinRepo/JexClient-main/blob/main/src/main/java/me/dustin/jex/feature/mod/impl/misc/CoordFinder.java), +Thunder from [ForgeHax](https://github.com/fr1kin/ForgeHax/blob/1.16/src/main/java/dev/fiki/forgehax/main/mods/exploit/CoordsFinder.java#L119)) - Custom Packets - InteractionMenu (Ported from [BleachHack](https://github.com/BleachDrinker420/BleachHack/pull/211)) - Lavacast diff --git a/src/main/java/cloudburst/rejects/modules/CoordLogger.java b/src/main/java/cloudburst/rejects/modules/CoordLogger.java index 6721d24..f832e68 100644 --- a/src/main/java/cloudburst/rejects/modules/CoordLogger.java +++ b/src/main/java/cloudburst/rejects/modules/CoordLogger.java @@ -13,7 +13,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket; +import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket; +import net.minecraft.sound.SoundEvents; import net.minecraft.text.BaseText; import net.minecraft.text.LiteralText; import net.minecraft.util.Formatting; @@ -71,6 +73,13 @@ public class CoordLogger extends Module { .defaultValue(false) .build() ); + + private final Setting thunder = sgWorldEvents.add(new BoolSetting.Builder() + .name("thunder") + .description("Logs thunder sounds.") + .defaultValue(false) + .build() + ); private final Setting otherEvents = sgWorldEvents.add(new BoolSetting.Builder() .name("other-global-events") @@ -80,7 +89,7 @@ public class CoordLogger extends Module { ); public CoordLogger() { - super(MeteorRejectsAddon.CATEGORY,"coord-logger", "Logs coordinates of various events. Doesn't work on Spigot/Paper servers."); + super(MeteorRejectsAddon.CATEGORY,"coord-logger", "Logs coordinates of various events. Might not work on Spigot/Paper servers."); } @EventHandler @@ -126,8 +135,14 @@ public class CoordLogger extends Module { if (otherEvents.get()) info(formatMessage("Unknown global event at ", worldEventS2CPacket.getPos())); } } + } else if (thunder.get() && event.packet instanceof PlaySoundS2CPacket) { + PlaySoundS2CPacket playSoundS2CPacket = (PlaySoundS2CPacket) event.packet; + + // Check for thunder sound + if (playSoundS2CPacket.getSound() != SoundEvents.ENTITY_LIGHTNING_BOLT_IMPACT) return; + + info("Thunder noise at %d %d %d", playSoundS2CPacket.getX(), playSoundS2CPacket.getY(), playSoundS2CPacket.getZ()); } - } public BaseText formatMessage(String message, Vec3d coords) {