2x2 vanilla crafting

.gitignore

@@ -42,6 +42,7 @@ build/
 /configuration/hypixel_bedwars_lobby/
 /configuration/hypixel_murder_mystery_lobby/
 /configuration/hypixel_skywars_lobby/
+/configuration/skyblock/garden/
 *.polar
 
 ### Logs ###
@@ -52,7 +53,6 @@ build/
 .gradle/
 /server/proxy/logs/
 /server/proxy/lang/
-/server/proxy/ViaLoader/
 /server/proxy/plugins/
 /server/proxy/forwarding.secret
 /server/proxy/velocity.toml

README.md

@@ -2,7 +2,7 @@
 
 [<img src="https://discordapp.com/assets/e4923594e694a21542a489471ecffa50.svg" alt="Discord" height="55" />](https://discord.swofty.net)
 
-A 1.21.11 Minestom-based recreation of Hypixel SkyBlock with a properly abstracted, scalable microservices architecture.
+A 26.1.2 Minestom-based recreation of Hypixel SkyBlock with a properly abstracted, scalable microservices architecture.
 
 > **Note**: This implementation is under active development and is not yet production-ready.
 

anticheat/README.md

@@ -2,14 +2,14 @@
 
 [<img src="https://discordapp.com/assets/e4923594e694a21542a489471ecffa50.svg" alt="" height="55" />](https://discord.gg/atlasmc)
 
-An advanced prediction-based anticheat for both Minestom and Spigot/Bukkit servers. Features comprehensive packet tracking, movement prediction with physics simulation, and lag compensation.
+An advanced prediction-based anticheat for Minestom servers. Features comprehensive packet tracking, movement prediction
+with physics simulation, and lag compensation.
 
 ## Table of contents
 
 * [Features](#features)
 * [Getting Started](#getting-started)
 * [Minestom Loader](#minestom-loader)
-* [Spigot Loader](#spigot-loader)
 * [API Usage](#api-usage)
   * [Custom Modifiers](#custom-modifiers)
   * [Player Data Storage](#player-data-storage)
@@ -47,12 +47,12 @@ An advanced prediction-based anticheat for both Minestom and Spigot/Bukkit serve
 
 ### Cross-Platform Support
 - Full Minestom support with native packet API
-- Full Spigot/Bukkit support via ProtocolLib
 - Unified packet abstraction layer
 - Platform-specific scheduler managers
 
 ## Getting Started
-SwoftyAnticheat requires Java 17+ and either Minestom or Spigot/Bukkit with ProtocolLib. 
+
+SwoftyAnticheat requires Java 25+ and Minestom.
 
 ## Minestom Loader
 To use SwoftyAnticheat with Minestom, create a new instance of the MinestomLoader and initialize the anticheat:
@@ -67,24 +67,6 @@ SwoftyAnticheat.start(); // Do this after MinecraftServer#init()
 
 The MinestomLoader automatically registers all packet listeners using Minestom's native packet API.
 
-## Spigot Loader
-To use SwoftyAnticheat with Spigot/Bukkit, you need ProtocolLib installed. Then create a SpigotLoader instance:
-
-```java
-public class YourPlugin extends JavaPlugin {
-    @Override
-    public void onEnable() {
-        SpigotLoader spigotLoader = new SpigotLoader(this);
-
-        SwoftyAnticheat.loader(spigotLoader);
-        SwoftyAnticheat.values(new SwoftyValues());
-        SwoftyAnticheat.start();
-    }
-}
-```
-
-The SpigotLoader uses ProtocolLib to intercept and process all relevant packets.
-
 ## API Usage
 
 SwoftyAnticheat provides a comprehensive API for extending the anticheat with custom functionality.

anticheat/build.gradle.kts

@@ -34,8 +34,6 @@ dependencies {
     implementation(libs.tinylog.api)
     implementation(libs.tinylog.impl)
 
-    compileOnly(libs.spigot.api)
-
     compileOnly(libs.protocollib)
 }
 

anticheat/src/main/java/net/swofty/anticheat/event/packet/UseEntityPacket.java

@@ -1,34 +1,21 @@
 package net.swofty.anticheat.event.packet;
 
 import lombok.Getter;
+import net.minestom.server.entity.PlayerHand;
 import net.swofty.anticheat.math.Pos;
 
 import java.util.UUID;
 
 @Getter
 public class UseEntityPacket extends SwoftyPacket {
     private final int entityId;
-    private final Type type;
     private final Pos targetPosition;
-    private final Hand hand;
-    private final boolean sneaking;
+    private final PlayerHand hand;
 
-    public UseEntityPacket(UUID uuid, int entityId, Type type, Pos targetPosition, Hand hand, boolean sneaking) {
+    public UseEntityPacket(UUID uuid, int entityId, Pos targetPosition, PlayerHand hand) {
         super(uuid);
         this.entityId = entityId;
-        this.type = type;
         this.targetPosition = targetPosition;
         this.hand = hand;
-        this.sneaking = sneaking;
-    }
-
-    public enum Type {
-        INTERACT,
-        ATTACK,
-        INTERACT_AT
-    }
-
-    public enum Hand {
-        MAIN_HAND, OFF_HAND
     }
 }

anticheat/src/main/java/net/swofty/anticheat/loader/minestom/packets/MinestomHandlerPingResponsePacket.java

@@ -2,6 +2,7 @@
 
 import net.minestom.server.network.packet.client.common.ClientPongPacket;
 import net.swofty.anticheat.engine.SwoftyPlayer;
+import net.swofty.anticheat.event.packet.PingResponsePacket;
 import net.swofty.anticheat.event.packet.RequestPingPacket;
 import net.swofty.anticheat.event.packet.SwoftyPacket;
 import net.swofty.anticheat.loader.LoaderPacketHandler;
@@ -13,7 +14,7 @@ public class MinestomHandlerPingResponsePacket
 
     @Override
     public SwoftyPacket buildSwoftyPacket(UUID uuid, ClientPongPacket packet) {
-        return new net.swofty.anticheat.event.packet.PingResponsePacket(
+        return new PingResponsePacket(
                 SwoftyPlayer.players.get(uuid),
                 packet.id()
         );

anticheat/src/main/java/net/swofty/anticheat/loader/minestom/packets/MinestomHandlerUseEntityPacket.java

@@ -1,6 +1,5 @@
 package net.swofty.anticheat.loader.minestom.packets;
 
-import net.minestom.server.entity.PlayerHand;
 import net.minestom.server.network.packet.client.play.ClientInteractEntityPacket;
 import net.swofty.anticheat.event.packet.SwoftyPacket;
 import net.swofty.anticheat.event.packet.UseEntityPacket;
@@ -14,43 +13,11 @@ public class MinestomHandlerUseEntityPacket
 
     @Override
     public SwoftyPacket buildSwoftyPacket(UUID uuid, ClientInteractEntityPacket packet) {
-        ClientInteractEntityPacket.Type type = packet.type();
-
-        UseEntityPacket.Type swoftyType;
-        UseEntityPacket.Hand hand = null;
-        Pos targetPos = null;
-
-        switch (type) {
-            case ClientInteractEntityPacket.Interact(PlayerHand playerHand) -> {
-                swoftyType = UseEntityPacket.Type.INTERACT;
-                hand = playerHand == PlayerHand.MAIN
-                        ? UseEntityPacket.Hand.MAIN_HAND
-                        : UseEntityPacket.Hand.OFF_HAND;
-            }
-            case ClientInteractEntityPacket.Attack attack -> swoftyType = UseEntityPacket.Type.ATTACK;
-            case ClientInteractEntityPacket.InteractAt interactAt -> {
-                swoftyType = UseEntityPacket.Type.INTERACT_AT;
-
-                targetPos = new Pos(
-                        interactAt.targetX(),
-                        interactAt.targetY(),
-                        interactAt.targetZ()
-                );
-
-                hand = interactAt.hand() == PlayerHand.MAIN
-                        ? UseEntityPacket.Hand.MAIN_HAND
-                        : UseEntityPacket.Hand.OFF_HAND;
-            }
-            default -> throw new IllegalStateException("Unknown interact type: " + type.getClass());
-        }
-
         return new UseEntityPacket(
                 uuid,
                 packet.targetId(),
-                swoftyType,
-                targetPos,
-                hand,
-                packet.sneaking()
+            Pos.fromVec(packet.location()),
+            packet.hand()
         );
     }