chore: move getOnlineUsers() method to server, rename getType() and r…

…emove unused CoreServer methods
MineValley · Jan 31, 2025 · 0884feb · 0884feb
1 parent 5dab05e
commit 0884feb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/src/main/java/minevalley/core/api/Core.java b/src/main/java/minevalley/core/api/Core.java
@@ -1066,11 +1066,6 @@ public static NPC createNPC(String value, String signature, String name, Locatio
         return server.createNPC(value, signature, name, location, focusNearPlayers);
     }
 
-    @Nonnull
-    public static List<OnlineUser> getOnlineUsers() {
-        return server.getOnlineUsers();
-    }
-
     /**
      * Creates a new car barrier with the specific parameters.
      *

diff --git a/src/main/java/minevalley/core/api/CoreServer.java b/src/main/java/minevalley/core/api/CoreServer.java
@@ -255,24 +255,16 @@ public interface CoreServer {
     @Nonnull
     Reminder createReminder(int hours, int minutes, @Nonnull Runnable callback, DayOfWeek... weekdays) throws IllegalArgumentException;
 
-    @Nonnull
-    Reminder createReminder(int hours, int minutes, @Nonnull Runnable callback, List<DayOfWeek> weekdays) throws IllegalArgumentException;
-
     @Nonnull
     Webhook createWebhook(@Nonnull URL url) throws IllegalArgumentException;
 
     @Nonnull
     EmbeddedMessage createEmbeddedMessage();
 
-    boolean isMaintenance();
-
     NPC createNPC(UUID skinUniqueId, String name, Location location, boolean focusNearPlayers);
 
     NPC createNPC(String value, String signature, String name, Location location, boolean focusNearPlayers);
 
-    @Nonnull
-    List<OnlineUser> getOnlineUsers();
-
     @Nonnull
     CarBarrier createCarBarrier(@Nonnull Location loc, int rotation, @Nonnull List<Block> barrierBlocks) throws IllegalArgumentException;
 
@@ -344,8 +336,6 @@ Apartment createApartment(@Nonnull Region region, @Nonnull Registrant landlord,
     @Nullable
     District getDistrict(Chunk chunk);
 
-    void updateDistricts();
-
     @Nonnull
     RadioMast createRadioMast(@Nonnull String name, @Nonnull Block location, int range) throws IllegalArgumentException;
 

diff --git a/src/main/java/minevalley/core/api/server/Server.java b/src/main/java/minevalley/core/api/server/Server.java
@@ -2,19 +2,29 @@
 
 import minevalley.core.api.audio.SoundReceiver;
 import minevalley.core.api.messaging.MessageReceiver;
+import minevalley.core.api.users.OnlineUser;
 
 import javax.annotation.Nonnull;
+import java.util.List;
 
 @SuppressWarnings("unused")
 public interface Server extends MessageReceiver, SoundReceiver {
 
+    /**
+     * Gets a list of all online users.
+     *
+     * @return a list of all online users
+     */
+    @Nonnull
+    List<OnlineUser> onlineUsers();
+
     /**
      * Get the server type.
      *
      * @return the server type
      */
     @Nonnull
-    ServerType getType();
+    ServerType type();
 
     /**
      * Gets whether the server is in development mode.