Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

/**
* Main API entry point for interacting with the Swofty Anticheat.
*
* <p>
* This API allows you to:
* - Register custom movement modifiers
* - Store and retrieve custom player data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
import net.swofty.anticheat.event.AntiCheatListener;
import net.swofty.anticheat.event.ListenerMethod;
import net.swofty.anticheat.event.events.AnticheatPacketEvent;
import net.swofty.anticheat.event.packet.*;
import net.swofty.anticheat.event.packet.IsOnGroundPacket;
import net.swofty.anticheat.event.packet.PositionAndRotationPacket;
import net.swofty.anticheat.event.packet.PositionPacket;
import net.swofty.anticheat.event.packet.RotationPacket;
import net.swofty.anticheat.event.packet.SwoftyPacket;
import net.swofty.anticheat.math.Pos;

public class MovementEvents extends AntiCheatListener {
@ListenerMethod
public void onPacketReceive(AnticheatPacketEvent event) {
SwoftyPacket packet = event.getPacket();
SwoftyPacket packet = event.packet();
SwoftyPlayer player = packet.getPlayer();

Pos pos = player.getCurrentTick().getPos();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class PingEvents extends AntiCheatListener {
@ListenerMethod
public void onPacketReceive(AnticheatPacketEvent event) {
SwoftyPacket packet = event.getPacket();
SwoftyPacket packet = event.packet();
if (packet instanceof PingResponsePacket pingResponsePacket) {
SwoftyPlayer player = pingResponsePacket.getPlayer();
if (player != null) player.handlePingResponse(pingResponsePacket.getRequestId());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
package net.swofty.anticheat.event.events;

import lombok.Getter;
import net.swofty.anticheat.event.packet.SwoftyPacket;

@Getter
public class AnticheatPacketEvent {
private final SwoftyPacket packet;

public AnticheatPacketEvent(SwoftyPacket packet) {
this.packet = packet;
}
public record AnticheatPacketEvent(SwoftyPacket packet) {

}
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package net.swofty.anticheat.flag.flags;

import net.swofty.anticheat.engine.PlayerTickInformation;
import net.swofty.anticheat.event.ListenerMethod;
import net.swofty.anticheat.event.events.PlayerAttackEvent;
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
import net.swofty.anticheat.flag.Flag;
import net.swofty.anticheat.math.Pos;

import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;

public class AimFlag extends Flag {
// Track rotation changes per player
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
import net.swofty.anticheat.flag.Flag;
import net.swofty.anticheat.math.Pos;
import net.swofty.anticheat.math.Vel;

import java.util.*;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

public class BadPacketsFlag extends Flag {
// Track packet patterns per player
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class FlightFlag extends Flag {

@ListenerMethod
public void onPacket(AnticheatPacketEvent event) {
if (event.getPacket() instanceof AbilitiesPacket abilities) {
if (event.packet() instanceof AbilitiesPacket abilities) {
SwoftyPlayer player = SwoftyPlayer.players.get(abilities.getPlayer().getUuid());
if (player != null) {
player.updateAbilities(abilities.isFlying(), abilities.isAllowFlight(), abilities.isCreativeMode());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import net.swofty.anticheat.event.ListenerMethod;
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
import net.swofty.anticheat.flag.Flag;
import net.swofty.anticheat.math.Pos;
import net.swofty.anticheat.math.Vel;

public class OnGroundSpoofFlag extends Flag {
@ListenerMethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import net.swofty.anticheat.event.ListenerMethod;
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
import net.swofty.anticheat.flag.Flag;
import net.swofty.anticheat.loader.SwoftyAnticheat;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.swofty.anticheat.loader.minestom.packets;

import net.minestom.server.entity.Player;
import net.minestom.server.entity.PlayerHand;
import net.minestom.server.network.packet.client.play.ClientAnimationPacket;
import net.swofty.anticheat.event.packet.AnimationPacket;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.swofty.anticheat.loader.minestom.packets;

import net.minestom.server.entity.Player;
import net.minestom.server.entity.PlayerHand;
import net.minestom.server.network.packet.client.play.ClientPlayerBlockPlacementPacket;
import net.swofty.anticheat.event.packet.BlockPlacePacket;
Expand Down
14 changes: 1 addition & 13 deletions anticheat/src/main/java/net/swofty/anticheat/world/Block.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
package net.swofty.anticheat.world;

import lombok.Getter;

@Getter
public class Block {
private final boolean isWater;
private final boolean isLava;
private final BoundingBox boundingBox;

public Block(boolean isWater, boolean isLava, BoundingBox boundingBox) {
this.isWater = isWater;
this.isLava = isLava;
this.boundingBox = boundingBox;
}
public record Block(boolean isWater, boolean isLava, BoundingBox boundingBox) {

}
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
package net.swofty.anticheat.world;

import lombok.Getter;

@Getter
public class BoundingBox {
private final float minX, minY, minZ;
private final float maxX, maxY, maxZ;

public BoundingBox(float minX, float minY, float minZ, float maxX, float maxY, float maxZ) {
this.minX = minX;
this.minY = minY;
this.minZ = minZ;
this.maxX = maxX;
this.maxY = maxY;
this.maxZ = maxZ;
}
public record BoundingBox(float minX, float minY, float minZ, float maxX, float maxY, float maxZ) {
}
1 change: 0 additions & 1 deletion commons/src/main/java/net/swofty/commons/ServiceType.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ public enum ServiceType {
ORCHESTRATOR,
FRIEND,
PUNISHMENT,
;
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public FriendEvent() {
throw new RuntimeException("Failed to find friend event class: " + className + " in " + Arrays.toString(packageNames));
}

@SuppressWarnings("unchecked")
private static FriendEvent createDummyInstance(Class<?> clazz) throws Exception {
String className = clazz.getSimpleName();

Expand Down
30 changes: 15 additions & 15 deletions commons/src/main/java/net/swofty/commons/party/FullParty.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ public static Serializer<FullParty> getStaticSerializer() {

@Override
public Serializer<FullParty> getSerializer() {
return new Serializer<FullParty>() {
return new Serializer<>() {
@Override
public String serialize(FullParty value) {
JSONObject json = new JSONObject();
json.put("uuid", value.uuid.toString());
json.put("members", value.members.stream()
.map(member -> new JSONObject()
.put("uuid", member.uuid.toString())
.put("role", member.role.name())
.put("joined", member.joined)
).toList());
.map(member -> new JSONObject()
.put("uuid", member.uuid.toString())
.put("role", member.role.name())
.put("joined", member.joined)
).toList());
return json.toString();
}

Expand All @@ -62,15 +62,15 @@ public FullParty deserialize(String json) {
JSONObject jsonObject = new JSONObject(json);
UUID uuid = UUID.fromString(jsonObject.getString("uuid"));
List<Member> members = jsonObject.getJSONArray("members").toList().stream()
.map(member -> {
Map<String, Object> memberObject = (Map<String, Object>) member;

return new Member(
UUID.fromString(memberObject.get("uuid").toString()),
Role.valueOf(memberObject.get("role").toString()),
memberObject.get("joined").toString().equals("true")
);
}).toList();
.map(member -> {
Map<String, Object> memberObject = (Map<String, Object>) member;

return new Member(
UUID.fromString(memberObject.get("uuid").toString()),
Role.valueOf(memberObject.get("role").toString()),
memberObject.get("joined").toString().equals("true")
);
}).toList();
return new FullParty(uuid, members);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public List<UUID> getParticipants() {
throw new RuntimeException("Failed to find party event class: " + className + " in " + Arrays.toString(packageNames));
}

@SuppressWarnings("unchecked")
private static PartyEvent createDummyInstance(Class<?> clazz) throws Exception {
String className = clazz.getSimpleName();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static Serializer<PendingParty> getStaticSerializer() {

@Override
public Serializer<PendingParty> getSerializer() {
return new Serializer<PendingParty>() {
return new Serializer<>() {
@Override
public String serialize(PendingParty value) {
JSONObject json = new JSONObject();
Expand All @@ -49,9 +49,9 @@ public String serialize(PendingParty value) {
public PendingParty deserialize(String json) {
JSONObject jsonObject = new JSONObject(json);
return new PendingParty(
UUID.fromString(jsonObject.getString("resultPartyUUID")),
UUID.fromString(jsonObject.getString("invitee")),
UUID.fromString(jsonObject.getString("leader"))
UUID.fromString(jsonObject.getString("resultPartyUUID")),
UUID.fromString(jsonObject.getString("invitee")),
UUID.fromString(jsonObject.getString("leader"))
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyAcceptInviteEvent> getSerializer() {
return new Serializer<PartyAcceptInviteEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyAcceptInviteEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyChatMessageEvent> getSerializer() {
return new Serializer<PartyChatMessageEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyChatMessageEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyDemoteRequestEvent> getSerializer() {
return new Serializer<PartyDemoteRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyDemoteRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyDisbandRequestEvent> getSerializer() {
return new Serializer<PartyDisbandRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyDisbandRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyHijackRequestEvent> getSerializer() {
return new Serializer<PartyHijackRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyHijackRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public PartyInviteEvent(PendingParty party) {

@Override
public Serializer<PartyInviteEvent> getSerializer() {
return new Serializer<PartyInviteEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyInviteEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyKickRequestEvent> getSerializer() {
return new Serializer<PartyKickRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyKickRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyLeaveRequestEvent> getSerializer() {
return new Serializer<PartyLeaveRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyLeaveRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyPlayerDisconnectEvent> getSerializer() {
return new Serializer<PartyPlayerDisconnectEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyPlayerDisconnectEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyPlayerRejoinEvent> getSerializer() {
return new Serializer<PartyPlayerRejoinEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyPlayerRejoinEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyPlayerSwitchedServerEvent> getSerializer() {
return new Serializer<PartyPlayerSwitchedServerEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyPlayerSwitchedServerEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyPromoteRequestEvent> getSerializer() {
return new Serializer<PartyPromoteRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyPromoteRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyTransferRequestEvent> getSerializer() {
return new Serializer<PartyTransferRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyTransferRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public List<UUID> getParticipants() {

@Override
public Serializer<PartyWarpRequestEvent> getSerializer() {
return new Serializer<PartyWarpRequestEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyWarpRequestEvent value) {
JSONObject json = new JSONObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public PartyChatMessageResponseEvent(FullParty party, UUID player, String messag

@Override
public Serializer<PartyChatMessageResponseEvent> getSerializer() {
return new Serializer<PartyChatMessageResponseEvent>() {
return new Serializer<>() {
@Override
public String serialize(PartyChatMessageResponseEvent value) {
JSONObject json = new JSONObject();
Expand Down
Loading