Skip to content

Commit

Permalink
More data for ServerScraper
Browse files Browse the repository at this point in the history
  • Loading branch information
@tanishisherewithhh
tanishisherewithhh committed Nov 4, 2024
1 parent c91c63c commit 0a715f7
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/main/java/dev/heliosclient/module/modules/movement/AutoSneak.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class AutoSneak extends Module_ {
);
public BooleanSetting packet = sgGeneral.add(new BooleanSetting.Builder()
.name("Packet")
.description("Packet mode for sneaking instead of regular vanilla")
.description("Packet mode for sneaking instead of the more vanilla way")
.onSettingChange(this)
.value(false)
.build()
Expand Down
93 changes: 80 additions & 13 deletions src/main/java/dev/heliosclient/module/modules/world/ServerScraper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,92 @@
import dev.heliosclient.event.events.player.PlayerJoinEvent;
import dev.heliosclient.module.Categories;
import dev.heliosclient.module.Module_;
import dev.heliosclient.module.settings.BooleanSetting;
import dev.heliosclient.module.settings.SettingGroup;
import dev.heliosclient.util.ChatUtils;
import net.minecraft.client.network.ServerInfo;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket;
import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.GlobalPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;

public class ServerScraper extends Module_ {
SettingGroup sgGeneral = new SettingGroup("AutoFill");
MutableText separator = Text.of("=======================================================").copy().formatted(Formatting.DARK_GREEN);

This comment has been minimized.

Sign in to view

Copy link
@RacoonDog

RacoonDog Nov 4, 2024

instead of doing Text.of(string).copy() to get a MutableText, you can get one directly with Text.literal(string)

This comment has been minimized.

Sign in to view

Copy link
@tanishisherewithhh

tanishisherewithhh Nov 4, 2024

Author Contributor

Oh yes, thanks

BooleanSetting obfuscatePlayerInfo = sgGeneral.add(new BooleanSetting.Builder()
.name("Obfuscate player info")
.description("It will obfuscate player info like its spawn pos, yaw, pitch, and facing direction. WARNING: This wont stop the text from being visible in your log files!!!")
.onSettingChange(this)
.defaultValue(false)
.build()
);
boolean resourcePackURLSent = false;
String lastURL = "";

public ServerScraper() {
super("ServerScraper", "Gathers information about the server and world on join.", Categories.WORLD);
addSettingGroup(sgGeneral);
}

@SubscribeEvent
public void onPacketSend(PacketEvent.SEND event) {
public void onPacketReceive(PacketEvent.RECEIVE event) {
if (event.getPacket() instanceof ResourcePackSendS2CPacket rsPack) {
MutableText text = Text.literal("ResourcePack URL:")
if(!rsPack.url().equals(lastURL)){
resourcePackURLSent = false;
}

if(resourcePackURLSent) return;

Text text = Text.literal("ResourcePack URL:")
.formatted(Formatting.BOLD, Formatting.BLUE)
.append(Text.literal(" " + rsPack.url())
.formatted(Formatting.ITALIC, Formatting.GOLD)
);

mc.inGameHud.getChatHud().addMessage(text);
ChatUtils.sendHeliosMsg(text);
resourcePackURLSent = true;
lastURL = rsPack.url();
}
}
public void sendGameJoinInfoMessage(GameJoinS2CPacket joinPacket){
ChatUtils.sendHeliosMsg(separator);

String lastDeathPos = String.valueOf(joinPacket.commonPlayerSpawnInfo().lastDeathLocation().orElse(GlobalPos.create(World.OVERWORLD,new BlockPos(0,0,0))));
String playerEntityID = String.valueOf(joinPacket.playerEntityId());
String seed = String.valueOf(joinPacket.commonPlayerSpawnInfo().seed());
boolean reducedDebugInfo = joinPacket.reducedDebugInfo();
boolean isHardCore = joinPacket.hardcore();
String maxPlayers = String.valueOf(joinPacket.maxPlayers());

Text joinPacketInfo = Text.literal("Join Info:")
.formatted(Formatting.BOLD, Formatting.GREEN)
.append(Text.literal("\nLast Death Pos: ").formatted(Formatting.WHITE).append(Text.literal(lastDeathPos).formatted(Formatting.YELLOW)))
.append(Text.literal("\nIs HardCore: ").formatted(Formatting.WHITE).append(Text.literal(isHardCore ? "Yes" : "No").formatted(isHardCore ? Formatting.GREEN : Formatting.RED)))
.append(Text.literal("\nHas Reduced Debug Info: ").formatted(Formatting.WHITE).append(Text.literal(reducedDebugInfo ? "Yes" : "No").formatted(reducedDebugInfo ? Formatting.GREEN : Formatting.RED)))
.append(Text.literal("\nMax Players: ").formatted(Formatting.WHITE).append(Text.literal(maxPlayers).formatted(Formatting.GREEN)))
.append(Text.literal("\nSeed: ").formatted(Formatting.WHITE).append(Text.literal(seed).formatted(Formatting.GREEN)))
.append(Text.literal("\nPlayer Entity ID: ").formatted(Formatting.WHITE).append(Text.literal(playerEntityID).formatted(Formatting.YELLOW)));

ChatUtils.sendHeliosMsg(joinPacketInfo);
}

@SubscribeEvent
public void onPlayerJoin(PlayerJoinEvent event) {
// Get the current world
ClientWorld world = mc.world;

if (world != null) {
sendGameJoinInfoMessage(event.getPacket());

ChatUtils.sendHeliosMsg(separator);

// Gather world information
long worldAge = world.getTime();
long dayTime = world.getTimeOfDay();
Expand All @@ -49,12 +104,20 @@ public void onPlayerJoin(PlayerJoinEvent event) {
Vec3d worldBorderCenter = new Vec3d(world.getWorldBorder().getCenterX(),0, world.getWorldBorder().getCenterZ());

// Gather biome information
String biomeName = world.getBiome(mc.player.getBlockPos()).value().toString();
MutableText separator = Text.of("=======================================================").copy().formatted(Formatting.DARK_GREEN);
mc.inGameHud.getChatHud().addMessage(separator);
String biomeName = world.getBiome(mc.player.getBlockPos()).getKey().orElseThrow().getValue().toString();
Formatting obfuscated = obfuscatePlayerInfo.value ? Formatting.OBFUSCATED : Formatting.RESET ;

Text yawAndPitch = Text.literal("\nPlayer Yaw And Pitch: ")
.formatted(Formatting.WHITE)
.append(Text.literal("Yaw: ").formatted(Formatting.YELLOW))
.append(Text.literal(String.valueOf(mc.player.getYaw())).formatted(Formatting.GREEN))
.append(Text.literal(" Pitch: ").formatted(Formatting.YELLOW))
.append(Text.literal(String.valueOf(mc.player.getPitch())).formatted(Formatting.GREEN))
.formatted(obfuscated);


// Constructing the information message
MutableText worldInfoMessage = Text.literal("World Info:")
Text worldInfoMessage = Text.literal("World Info:")
.formatted(Formatting.BOLD, Formatting.GREEN)
.append(Text.literal("\nWorld Age: ").formatted(Formatting.WHITE).append(Text.literal(worldAge + " ticks").formatted(Formatting.YELLOW)))
.append(Text.literal("\nDay Time: ").formatted(Formatting.WHITE).append(Text.literal(dayTime + " ticks").formatted(Formatting.YELLOW)))
Expand All @@ -66,11 +129,16 @@ public void onPlayerJoin(PlayerJoinEvent event) {
.append(Text.literal("\nDifficulty: ").formatted(Formatting.WHITE).append(Text.literal(mc.world.getDifficulty().name()).formatted(Formatting.YELLOW)))
.append(Text.literal("\nPermissionLevel: ").formatted(Formatting.WHITE).append(Text.literal(String.valueOf(mc.player.getPermissionLevel())).formatted(Formatting.YELLOW)))
.append(Text.literal("\nCurrent Biome: ").formatted(Formatting.WHITE).append(Text.literal(biomeName).formatted(Formatting.YELLOW)))
.append(Text.literal("\nWorld Spawn Pos: ").formatted(Formatting.WHITE).append(Text.literal(mc.world.getSpawnPos().toString()).formatted(Formatting.YELLOW)));
.append(Text.literal("\nWorld Spawn Pos: ").formatted(Formatting.WHITE).append(Text.literal(mc.world.getSpawnPos().toString()).formatted(Formatting.YELLOW)))
.append(Text.literal("\nPlayer Spawn Pos: ").formatted(Formatting.WHITE).append(Text.literal(mc.player.getBlockPos().toString()).formatted(Formatting.YELLOW,obfuscated)))
.append(Text.literal("\nPlayer Facing Direction: ").formatted(Formatting.WHITE).append(Text.literal(mc.player.getHorizontalFacing().name()).formatted(Formatting.YELLOW, obfuscated)))
.append(yawAndPitch);

// Display the message in chat
mc.inGameHud.getChatHud().addMessage(worldInfoMessage);
mc.inGameHud.getChatHud().addMessage(Text.of("------------------------------------------------------"));
ChatUtils.sendHeliosMsg(worldInfoMessage);
ChatUtils.sendHeliosMsg(Text.of("------------------------------------------------------"));
//mc.inGameHud.getChatHud().addMessage(worldInfoMessage);
// mc.inGameHud.getChatHud().addMessage(Text.of("------------------------------------------------------"));


ServerInfo info = mc.getCurrentServerEntry();
Expand Down Expand Up @@ -98,11 +166,10 @@ public void onPlayerJoin(PlayerJoinEvent event) {
.append(Text.literal("\nIs Chat Secure: ").formatted(Formatting.WHITE).append(Text.literal(hasSecureChat ? "Yes" : "No").formatted(hasSecureChat ? Formatting.GREEN : Formatting.RED)))
.append(Text.literal("\nServer Type: ").formatted(Formatting.WHITE).append(Text.literal(info.getServerType().name()).formatted(Formatting.YELLOW)));

// Display the server info message in chat
mc.inGameHud.getChatHud().addMessage(serverInfoMessage);
ChatUtils.sendHeliosMsg(serverInfoMessage);
}

mc.inGameHud.getChatHud().addMessage(separator);
ChatUtils.sendHeliosMsg(separator);
}
}
}

0 comments on commit 0a715f7

Please sign in to comment.