utils

tyap-lyap · Mar 29, 2023 · 87a33b0 · 87a33b0
1 parent 24478bd
commit 87a33b0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/main/java/skylands/api/SkylandsAPI.java b/src/main/java/skylands/api/SkylandsAPI.java
@@ -13,7 +13,6 @@
 import java.util.UUID;
 
 public class SkylandsAPI {
-	static Skylands skylands = Skylands.getInstance();
 
 	public static final Event<HubVisitEvent> ON_HUB_VISIT = EventFactory.createArrayBacked(HubVisitEvent.class, callbacks -> (player, world) -> {
 		for (HubVisitEvent callback : callbacks) {
@@ -43,15 +42,15 @@ public class SkylandsAPI {
 	@FunctionalInterface public interface NetherFirstLoad {void onLoad(World world, Island island);}
 
 	public static Optional<Island> getIsland(PlayerEntity player) {
-		return skylands.islands.get(player);
+		return Skylands.getIslands().get(player);
 	}
 
 	public static Optional<Island> getIsland(String playerName) {
-		return skylands.islands.get(playerName);
+		return Skylands.getIslands().get(playerName);
 	}
 
 	public static Optional<Island> getIsland(UUID playerUuid) {
-		return skylands.islands.get(playerUuid);
+		return Skylands.getIslands().get(playerUuid);
 	}
 
 	public static boolean isIsland(World world) {
@@ -66,7 +65,7 @@ public static boolean isIsland(RegistryKey<World> registryKey) {
 	public static Optional<Island> getIsland(World world) {
 		if (isIsland(world)) {
 			try {
-				return Skylands.instance.islands.get(UUID.fromString(world.getRegistryKey().getValue().getPath()));
+				return Skylands.getIslands().get(UUID.fromString(world.getRegistryKey().getValue().getPath()));
 			}
 			catch (Exception e) {
 				return Optional.empty();

diff --git a/src/main/java/skylands/command/SkylandsCommands.java b/src/main/java/skylands/command/SkylandsCommands.java
@@ -13,8 +13,6 @@
 import static net.minecraft.server.command.CommandManager.argument;
 
 import static com.mojang.brigadier.arguments.StringArgumentType.word;
-import static net.minecraft.command.argument.BlockPosArgumentType.blockPos;
-import static net.minecraft.command.argument.EntityArgumentType.player;
 
 public class SkylandsCommands {
 

diff --git a/src/main/java/skylands/logic/Island.java b/src/main/java/skylands/logic/Island.java
@@ -6,6 +6,7 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntryList;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructurePlacementData;
 import net.minecraft.structure.StructureTemplate;
@@ -184,6 +185,22 @@ public long getSeed() {
 		return this.seed;
 	}
 
+	/**
+	 * @return list of players currently on this island
+	 */
+	public List<ServerPlayerEntity> getPlayers() {
+		return server.getPlayerManager().getPlayerList().stream().filter(player -> {
+			var island = SkylandsAPI.getIsland(player);
+			return island.isPresent() && island.get().equals(this);
+		}).toList();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if(obj instanceof Island isl) return isl.owner.uuid.equals(this.owner.uuid);
+		return super.equals(obj);
+	}
+
 	public RuntimeWorldHandle getHandler() {
 		if(this.islandConfig == null) {
 			this.islandConfig = createIslandConfig();

diff --git a/src/main/java/skylands/util/Texts.java b/src/main/java/skylands/util/Texts.java
@@ -9,6 +9,7 @@
 import java.util.function.Consumer;
 
 public class Texts {
+	public static String prefixTranslationKey = "message.skylands.prefix";
 
 	public static Text prefixed(String key, Consumer<Map<String, String>> builder) {
 		String prefix = getPrefix();
@@ -44,7 +45,11 @@ public static Text of(String key) {
 		return of(key, (m) -> {});
 	}
 
+	public static void setPrefix(String key) {
+		prefixTranslationKey = key;
+	}
+
 	public static String getPrefix() {
-		return Language.getInstance().get("message.skylands.prefix");
+		return Language.getInstance().get(prefixTranslationKey);
 	}
 }