Merge pull request #665 from ItzKatze/master

chore: moved teleport command to generic

Author: ItzKatze

…ockgeneric/commands/TeleportCommand.java …ic/command/commands/TeleportCommand.javatype.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/commands/TeleportCommand.java renamed to type.generic/src/main/java/net/swofty/type/generic/command/commands/TeleportCommand.java type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/commands/TeleportCommand.java renamed to type.generic/src/main/java/net/swofty/type/generic/command/commands/TeleportCommand.java

@@ -1,15 +1,12 @@
-package net.swofty.type.skyblockgeneric.commands;
+package net.swofty.type.generic.command.commands;
 
 import net.minestom.server.command.builder.arguments.ArgumentType;
 import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity;
 import net.minestom.server.command.builder.arguments.number.ArgumentInteger;
-import net.minestom.server.command.builder.arguments.relative.ArgumentRelativeBlockPosition;
-import net.minestom.server.command.builder.arguments.relative.ArgumentRelativeVec3;
 import net.minestom.server.entity.Player;
-import net.minestom.server.utils.location.RelativeVec;
 import net.swofty.type.generic.command.CommandParameters;
 import net.swofty.type.generic.command.HypixelCommand;
-import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
+import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.user.categories.Rank;
 
 @CommandParameters(aliases = "tp",
@@ -22,7 +19,7 @@ public class TeleportCommand extends HypixelCommand {
     public void registerUsage(MinestomCommand command) {
         ArgumentEntity entityArgument = ArgumentType.Entity("player").onlyPlayers(true).singleEntity(true);
         command.addSyntax((sender, context) -> {
-            SkyBlockPlayer player = (SkyBlockPlayer) sender;
+            HypixelPlayer player = (HypixelPlayer) sender;
             final Player target = context.get(entityArgument).findFirstPlayer(sender);
 
             if (target == null) {
@@ -36,7 +33,7 @@ public void registerUsage(MinestomCommand command) {
         ArgumentInteger yArgument = ArgumentType.Integer("y");
         ArgumentInteger zArgument = ArgumentType.Integer("z");
         command.addSyntax((sender, context) -> {
-            SkyBlockPlayer player = (SkyBlockPlayer) sender;
+            HypixelPlayer player = (HypixelPlayer) sender;
             int x = context.get(xArgument);
             int y = context.get(yArgument);
             int z = context.get(zArgument);

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/darkauction/DarkAuctionHandler.java

@@ -1,6 +1,7 @@
 package net.swofty.type.skyblockgeneric.darkauction;
 
 import lombok.Getter;
+import lombok.Setter;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.timer.TaskSchedule;
@@ -43,15 +44,13 @@ public class DarkAuctionHandler {
     @Getter
     private static boolean biddingOpen = false;
     private static boolean serviceHealthCheckRunning = false;
-    private static Runnable onStateChangeCallback = null;
-
     /**
-     * Sets a callback to be invoked when the Dark Auction state changes.
-     * Used to refresh NPCs when the auction phase changes.
+     * -- SETTER --
+     *  Sets a callback to be invoked when the Dark Auction state changes.
+     *  Used to refresh NPCs when the auction phase changes.
      */
-    public static void setOnStateChangeCallback(Runnable callback) {
-        onStateChangeCallback = callback;
-    }
+    @Setter
+    private static Runnable onStateChangeCallback = null;
 
     private static void notifyStateChange() {
         if (onStateChangeCallback != null) {