diff --git a/paper/src/main/java/online/mineroo/paper/MinerooCore.java b/paper/src/main/java/online/mineroo/paper/MinerooCore.java index e8ebd60..e936554 100644 --- a/paper/src/main/java/online/mineroo/paper/MinerooCore.java +++ b/paper/src/main/java/online/mineroo/paper/MinerooCore.java @@ -7,7 +7,7 @@ import online.mineroo.common.NetworkServiceInterface; import online.mineroo.common.cache.UserInfoCache; import online.mineroo.common.request.RequestClient; import online.mineroo.paper.commands.MainCommand; -import online.mineroo.paper.expansions.MinerooUserExpansion; +import online.mineroo.paper.expansions.MinerooExpansion; import online.mineroo.paper.listeners.BindListener; import online.mineroo.paper.listeners.PlayerBindListener; import org.bukkit.Bukkit; @@ -47,7 +47,7 @@ public class MinerooCore extends JavaPlugin implements Listener { // regsiter Placeholder if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { - new MinerooUserExpansion(this).register(); + new MinerooExpansion(this).register(); } } diff --git a/paper/src/main/java/online/mineroo/paper/expansions/MinerooUserExpansion.java b/paper/src/main/java/online/mineroo/paper/expansions/MinerooExpansion.java similarity index 56% rename from paper/src/main/java/online/mineroo/paper/expansions/MinerooUserExpansion.java rename to paper/src/main/java/online/mineroo/paper/expansions/MinerooExpansion.java index 39fef64..4ad1917 100644 --- a/paper/src/main/java/online/mineroo/paper/expansions/MinerooUserExpansion.java +++ b/paper/src/main/java/online/mineroo/paper/expansions/MinerooExpansion.java @@ -7,10 +7,10 @@ import online.mineroo.paper.MinerooCore; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -public class MinerooUserExpansion extends PlaceholderExpansion { +public class MinerooExpansion extends PlaceholderExpansion { private final MinerooCore plugin; - public MinerooUserExpansion(MinerooCore plugin) { + public MinerooExpansion(MinerooCore plugin) { this.plugin = plugin; } @@ -42,11 +42,42 @@ public class MinerooUserExpansion extends PlaceholderExpansion { if (player == null) return ""; + String[] parts = params.split("_", 2); + if (parts.length != 2) { + return null; + } + + String type = parts[0]; + String key = parts[1]; + UUID uuid = player.getUniqueId(); - if (params.equals("name")) { + if (type.equals("user")) { SimpleUserInfoResponse info = plugin.getUserInfoCache().get(uuid); - return info.getNickname(); + if (info == null) { + return null; + } + + return switch (key) { + case "username" -> { + yield info.getUsername(); + } + + case "nickname" -> { + yield info.getNickname(); + } + + case "uid" -> { + yield String.valueOf(info.getUserId()); + } + + case "homepage" -> { + String username = info.getUsername(); + yield "https://mineroo.online/u/" + username; + } + + default -> null; + }; } return null; diff --git a/velocity/src/main/java/online/mineroo/velocity/listeners/JsonPrimitive.java b/velocity/src/main/java/online/mineroo/velocity/listeners/JsonPrimitive.java deleted file mode 100644 index e69de29..0000000