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

improve coordlogger

Browse Source
This commit is contained in:
Cloudburst
2021-06-16 10:52:14 +02:00
parent 0e9865e84a
commit 825b1797b5
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,9 @@ import net.minecraft.entity.EntityType;
import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.passive.TameableEntity;
import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket; import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket; import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket;
import net.minecraft.text.BaseText;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Formatting;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
@@ -90,7 +93,7 @@ public class CoordLogger extends Module {
Vec3d packetPosition = new Vec3d(packet.getX(), packet.getY(), packet.getZ()); Vec3d packetPosition = new Vec3d(packet.getX(), packet.getY(), packet.getZ());
Vec3d playerPosition = entity.getPos(); Vec3d playerPosition = entity.getPos();
if (playerPosition.distanceTo(packetPosition) >= minDistance.get()) { if (playerPosition.distanceTo(packetPosition) >= minDistance.get()) {
ChatUtils.info("Player '" + entity.getEntityName() + "' has teleported to " + vecToCoords(packetPosition)); info(formatMessage("Player '" + entity.getEntityName() + "' has teleported to ", packetPosition));
return; return;
} }
} }
@@ -100,7 +103,7 @@ public class CoordLogger extends Module {
Vec3d wolfPosition = entity.getPos(); Vec3d wolfPosition = entity.getPos();
UUID ownerUuid = ((TameableEntity) entity).getOwnerUuid(); UUID ownerUuid = ((TameableEntity) entity).getOwnerUuid();
if (ownerUuid != null && wolfPosition.distanceTo(packetPosition) >= minDistance.get()) { if (ownerUuid != null && wolfPosition.distanceTo(packetPosition) >= minDistance.get()) {
ChatUtils.info("Wolf has teleported to " + vecToCoords(packetPosition)); info(formatMessage("Wolf has teleported to ", packetPosition));
return; return;
} }
} }
@@ -111,27 +114,30 @@ public class CoordLogger extends Module {
System.out.println(worldEventS2CPacket.getEventId()); System.out.println(worldEventS2CPacket.getEventId());
switch (worldEventS2CPacket.getEventId()) { switch (worldEventS2CPacket.getEventId()) {
case 1023: case 1023:
if (withers.get()) ChatUtils.info("Wither spawned at " +vecToCoords(worldEventS2CPacket.getPos())); if (withers.get()) info(formatMessage("Wither spawned at ", worldEventS2CPacket.getPos()));
break; break;
case 1038: case 1038:
if (endPortals.get()) ChatUtils.info("End portal opened at " +vecToCoords(worldEventS2CPacket.getPos())); if (endPortals.get()) info(formatMessage("End portal opened at ", worldEventS2CPacket.getPos()));
break; break;
case 1028: case 1028:
if (enderDragons.get()) ChatUtils.info("Ender dragon killed at " +vecToCoords(worldEventS2CPacket.getPos())); if (enderDragons.get()) info(formatMessage("Ender dragon killed at ", worldEventS2CPacket.getPos()));
break; break;
default: default:
if (otherEvents.get()) ChatUtils.info("Unknown global event at " +vecToCoords(worldEventS2CPacket.getPos())); if (otherEvents.get()) info(formatMessage("Unknown global event at ", worldEventS2CPacket.getPos()));
} }
} }
} }
} }
public String vecToCoords(Vec3d vec) { public BaseText formatMessage(String message, Vec3d coords) {
return "(" + Math.floor(vec.x * 100)/100 + ", " + Math.floor(vec.y * 100)/100 + ", " + Math.floor(vec.z * 100)/100 + ")"; BaseText text = new LiteralText(message);
text.append(ChatUtils.formatCoords(coords));
text.append(Formatting.GRAY.toString()+".");
return text;
} }
public String vecToCoords(BlockPos pos) { public BaseText formatMessage(String message, BlockPos coords) {
return "(" + Math.floor(pos.getX() * 100)/100 + ", " + Math.floor(pos.getY() * 100)/100 + ", " + Math.floor(pos.getZ() * 100)/100 + ")"; return formatMessage(message, new Vec3d(coords.getX(), coords.getY(), coords.getZ()));
} }
} }