Skip to content

Commit 367d1a9

Browse files
authored
chore: move getOnlineUsers() method to server, rename getType() and remove unused CoreServer methods (#294)
1 parent 5dab05e commit 367d1a9

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

src/main/java/minevalley/core/api/Core.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,11 +1066,6 @@ public static NPC createNPC(String value, String signature, String name, Locatio
10661066
return server.createNPC(value, signature, name, location, focusNearPlayers);
10671067
}
10681068

1069-
@Nonnull
1070-
public static List<OnlineUser> getOnlineUsers() {
1071-
return server.getOnlineUsers();
1072-
}
1073-
10741069
/**
10751070
* Creates a new car barrier with the specific parameters.
10761071
*

src/main/java/minevalley/core/api/CoreServer.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -255,24 +255,16 @@ public interface CoreServer {
255255
@Nonnull
256256
Reminder createReminder(int hours, int minutes, @Nonnull Runnable callback, DayOfWeek... weekdays) throws IllegalArgumentException;
257257

258-
@Nonnull
259-
Reminder createReminder(int hours, int minutes, @Nonnull Runnable callback, List<DayOfWeek> weekdays) throws IllegalArgumentException;
260-
261258
@Nonnull
262259
Webhook createWebhook(@Nonnull URL url) throws IllegalArgumentException;
263260

264261
@Nonnull
265262
EmbeddedMessage createEmbeddedMessage();
266263

267-
boolean isMaintenance();
268-
269264
NPC createNPC(UUID skinUniqueId, String name, Location location, boolean focusNearPlayers);
270265

271266
NPC createNPC(String value, String signature, String name, Location location, boolean focusNearPlayers);
272267

273-
@Nonnull
274-
List<OnlineUser> getOnlineUsers();
275-
276268
@Nonnull
277269
CarBarrier createCarBarrier(@Nonnull Location loc, int rotation, @Nonnull List<Block> barrierBlocks) throws IllegalArgumentException;
278270

@@ -344,8 +336,6 @@ Apartment createApartment(@Nonnull Region region, @Nonnull Registrant landlord,
344336
@Nullable
345337
District getDistrict(Chunk chunk);
346338

347-
void updateDistricts();
348-
349339
@Nonnull
350340
RadioMast createRadioMast(@Nonnull String name, @Nonnull Block location, int range) throws IllegalArgumentException;
351341

src/main/java/minevalley/core/api/server/Server.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,29 @@
22

33
import minevalley.core.api.audio.SoundReceiver;
44
import minevalley.core.api.messaging.MessageReceiver;
5+
import minevalley.core.api.users.OnlineUser;
56

67
import javax.annotation.Nonnull;
8+
import java.util.List;
79

810
@SuppressWarnings("unused")
911
public interface Server extends MessageReceiver, SoundReceiver {
1012

13+
/**
14+
* Gets a list of all online users.
15+
*
16+
* @return a list of all online users
17+
*/
18+
@Nonnull
19+
List<OnlineUser> onlineUsers();
20+
1121
/**
1222
* Get the server type.
1323
*
1424
* @return the server type
1525
*/
1626
@Nonnull
17-
ServerType getType();
27+
ServerType type();
1828

1929
/**
2030
* Gets whether the server is in development mode.

0 commit comments

Comments
 (0)