Skip to content

Commit 8daa33b

Browse files
committed
Merge remote-tracking branch 'origin/master' into feat/mayors
# Conflicts: # commons/src/main/java/net/swofty/commons/ServiceType.java # type.galatea/src/main/java/net/swofty/type/galatea/npcs/NPCVaeri.java # type.generic/src/main/java/net/swofty/type/generic/user/HypixelPlayer.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/GUIConsumeSoulflow.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUICrafting.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUIYourBags.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/calendar/GUICalendar.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/profiles/GUIProfileSelectMode.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIMissionLog.java # type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/SkywarsLobbyScoreboard.java
2 parents 0b9d44a + 355c3e5 commit 8daa33b

417 files changed

Lines changed: 2968 additions & 1851 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

anticheat/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ repositories {
2828
}
2929

3030
dependencies {
31-
compileOnly("net.minestom:minestom:2025.12.20c-1.21.11") {
31+
compileOnly(libs.minestom) {
3232
exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
3333
}
34-
implementation("org.tinylog:tinylog-api:2.7.0")
35-
implementation("org.tinylog:tinylog-impl:2.7.0")
34+
implementation(libs.tinylog.api)
35+
implementation(libs.tinylog.impl)
3636

37-
compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
37+
compileOnly(libs.spigot.api)
3838

39-
compileOnly("net.dmulloy2:ProtocolLib:5.4.0")
39+
compileOnly(libs.protocollib)
4040
}
4141

4242
tasks.test {

anticheat/src/main/java/net/swofty/anticheat/api/AnticheatAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
/**
1414
* Main API entry point for interacting with the Swofty Anticheat.
15-
*
15+
* <p>
1616
* This API allows you to:
1717
* - Register custom movement modifiers
1818
* - Store and retrieve custom player data

anticheat/src/main/java/net/swofty/anticheat/engine/MovementEvents.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
import net.swofty.anticheat.event.AntiCheatListener;
44
import net.swofty.anticheat.event.ListenerMethod;
55
import net.swofty.anticheat.event.events.AnticheatPacketEvent;
6-
import net.swofty.anticheat.event.packet.*;
6+
import net.swofty.anticheat.event.packet.IsOnGroundPacket;
7+
import net.swofty.anticheat.event.packet.PositionAndRotationPacket;
8+
import net.swofty.anticheat.event.packet.PositionPacket;
9+
import net.swofty.anticheat.event.packet.RotationPacket;
10+
import net.swofty.anticheat.event.packet.SwoftyPacket;
711
import net.swofty.anticheat.math.Pos;
812

913
public class MovementEvents extends AntiCheatListener {
1014
@ListenerMethod
1115
public void onPacketReceive(AnticheatPacketEvent event) {
12-
SwoftyPacket packet = event.getPacket();
16+
SwoftyPacket packet = event.packet();
1317
SwoftyPlayer player = packet.getPlayer();
1418

1519
Pos pos = player.getCurrentTick().getPos();

anticheat/src/main/java/net/swofty/anticheat/engine/PingEvents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class PingEvents extends AntiCheatListener {
1010
@ListenerMethod
1111
public void onPacketReceive(AnticheatPacketEvent event) {
12-
SwoftyPacket packet = event.getPacket();
12+
SwoftyPacket packet = event.packet();
1313
if (packet instanceof PingResponsePacket pingResponsePacket) {
1414
SwoftyPlayer player = pingResponsePacket.getPlayer();
1515
if (player != null) player.handlePingResponse(pingResponsePacket.getRequestId());
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
package net.swofty.anticheat.event.events;
22

3-
import lombok.Getter;
43
import net.swofty.anticheat.event.packet.SwoftyPacket;
54

6-
@Getter
7-
public class AnticheatPacketEvent {
8-
private final SwoftyPacket packet;
9-
10-
public AnticheatPacketEvent(SwoftyPacket packet) {
11-
this.packet = packet;
12-
}
5+
public record AnticheatPacketEvent(SwoftyPacket packet) {
136

147
}

anticheat/src/main/java/net/swofty/anticheat/flag/flags/AimFlag.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package net.swofty.anticheat.flag.flags;
22

3-
import net.swofty.anticheat.engine.PlayerTickInformation;
43
import net.swofty.anticheat.event.ListenerMethod;
54
import net.swofty.anticheat.event.events.PlayerAttackEvent;
65
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
76
import net.swofty.anticheat.flag.Flag;
8-
import net.swofty.anticheat.math.Pos;
97

10-
import java.util.*;
8+
import java.util.ArrayList;
9+
import java.util.HashMap;
10+
import java.util.List;
11+
import java.util.Map;
12+
import java.util.UUID;
1113

1214
public class AimFlag extends Flag {
1315
// Track rotation changes per player

anticheat/src/main/java/net/swofty/anticheat/flag/flags/BadPacketsFlag.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
66
import net.swofty.anticheat.flag.Flag;
77
import net.swofty.anticheat.math.Pos;
8-
import net.swofty.anticheat.math.Vel;
98

10-
import java.util.*;
9+
import java.util.HashMap;
10+
import java.util.Map;
11+
import java.util.UUID;
1112

1213
public class BadPacketsFlag extends Flag {
1314
// Track packet patterns per player

anticheat/src/main/java/net/swofty/anticheat/flag/flags/FlightFlag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class FlightFlag extends Flag {
1818

1919
@ListenerMethod
2020
public void onPacket(AnticheatPacketEvent event) {
21-
if (event.getPacket() instanceof AbilitiesPacket abilities) {
21+
if (event.packet() instanceof AbilitiesPacket abilities) {
2222
SwoftyPlayer player = SwoftyPlayer.players.get(abilities.getPlayer().getUuid());
2323
if (player != null) {
2424
player.updateAbilities(abilities.isFlying(), abilities.isAllowFlight(), abilities.isCreativeMode());

anticheat/src/main/java/net/swofty/anticheat/flag/flags/OnGroundSpoofFlag.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import net.swofty.anticheat.event.ListenerMethod;
44
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
55
import net.swofty.anticheat.flag.Flag;
6-
import net.swofty.anticheat.math.Pos;
7-
import net.swofty.anticheat.math.Vel;
86

97
public class OnGroundSpoofFlag extends Flag {
108
@ListenerMethod

anticheat/src/main/java/net/swofty/anticheat/flag/flags/TimerFlag.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.swofty.anticheat.event.ListenerMethod;
66
import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
77
import net.swofty.anticheat.flag.Flag;
8-
import net.swofty.anticheat.loader.SwoftyAnticheat;
98

109
import java.util.HashMap;
1110
import java.util.Map;

0 commit comments

Comments
 (0)