From 752f0cc43d7ed98350183f629f9c59b787fb6092 Mon Sep 17 00:00:00 2001 From: scoped Date: Tue, 29 Sep 2026 12:14:16 -0400 Subject: [PATCH] feat: complete in-game commands, GUIs, admin panel fixes, and launcher enhancements --- crates/shared/src/lib.rs | 102 +++- .../net/scopenet/integration/Integration.java | 4 + .../net/scopenet/integration/PanelClient.java | 110 +++- .../net/scopenet/integration/Settings.java | 52 +- .../net/scopenet/paper/ScopenetPlugin.java | 46 +- .../paper/commands/EconomyHandler.java | 525 ++++++++++++++++++ .../paper/commands/EssentialsHandler.java | 403 ++++++++++++++ .../scopenet/paper/commands/GuildHandler.java | 414 ++++++++++++++ .../commands/ScopenetCommandHandler.java | 130 +++++ .../net/scopenet/paper/gui/GuiHelper.java | 41 ++ .../paper/src/main/resources/config.yml | 15 + .../paper/src/main/resources/plugin.yml | 67 +++ launcher/src-tauri/src/commands.rs | 78 ++- launcher/src-tauri/src/lib.rs | 4 + launcher/src/lib/types.ts | 42 ++ launcher/src/pages/Quests.svelte | 86 ++- launcher/src/pages/Social.svelte | 245 +++++++- launcher/src/pages/Stats.svelte | 221 +++++++- panel/server/src/db.rs | 38 ++ panel/server/src/routes/achievements.rs | 45 +- panel/server/src/routes/economy.rs | 483 ++++++++++++++++ panel/server/src/routes/guilds.rs | 439 ++++++++++++++- panel/server/src/routes/landing.rs | 20 +- panel/server/src/routes/leveling.rs | 141 ++++- panel/server/src/routes/mod.rs | 34 +- panel/server/src/routes/quests.rs | 40 +- panel/server/src/routes/social.rs | 71 ++- panel/web/src/lib/types.ts | 1 + panel/web/src/pages/AchievementEditor.svelte | 19 +- panel/web/src/pages/GuildsAdmin.svelte | 28 +- panel/web/src/pages/LandingBuilder.svelte | 257 +++++++-- panel/web/src/pages/LevelingAdmin.svelte | 16 +- panel/web/src/pages/PublicLanding.svelte | 117 +++- panel/web/src/pages/QuestEditor.svelte | 17 +- 34 files changed, 4170 insertions(+), 181 deletions(-) create mode 100644 integrations/paper/src/main/java/net/scopenet/paper/commands/EconomyHandler.java create mode 100644 integrations/paper/src/main/java/net/scopenet/paper/commands/EssentialsHandler.java create mode 100644 integrations/paper/src/main/java/net/scopenet/paper/commands/GuildHandler.java create mode 100644 integrations/paper/src/main/java/net/scopenet/paper/commands/ScopenetCommandHandler.java create mode 100644 integrations/paper/src/main/java/net/scopenet/paper/gui/GuiHelper.java create mode 100644 panel/server/src/routes/economy.rs diff --git a/crates/shared/src/lib.rs b/crates/shared/src/lib.rs index fe858e8..78639fb 100644 --- a/crates/shared/src/lib.rs +++ b/crates/shared/src/lib.rs @@ -417,13 +417,34 @@ pub struct LaunchEvent { pub struct UserLevelInfo { pub uuid: String, pub global_xp: i64, + #[serde(default)] + pub current_xp: i64, pub global_level: i64, + #[serde(default)] + pub level: i64, pub current_level_xp: i64, pub next_level_xp: i64, pub progress_pct: f64, pub title: Option, pub badges: Vec, pub server_levels: Vec, + #[serde(default)] + pub rank: Option, + #[serde(default)] + pub rewards: Vec, +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] +pub struct LevelReward { + pub id: i64, + pub level: i64, + pub reward_type: String, + pub reward_value: String, + pub description: String, + #[serde(default)] + pub icon: Option, + #[serde(default)] + pub server_id: Option, } #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] @@ -450,16 +471,26 @@ pub struct Quest { pub xp_reward: i64, pub icon: String, pub enabled: bool, + #[serde(default)] + pub quest_type: Option, + #[serde(default)] + pub stat_type: Option, + #[serde(default)] + pub active: Option, } #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] pub struct UserQuest { - #[serde(flatten)] pub quest: Quest, + #[serde(default)] pub progress: i64, + #[serde(default)] + pub current_count: i64, pub completed: bool, pub claimed: bool, pub period_key: String, + #[serde(default)] + pub expires_at: Option, } // --------------------------------------------------------------------------- @@ -473,17 +504,86 @@ pub struct Achievement { pub description: String, pub category: String, pub icon_frame: String, // "task", "goal", "challenge" + #[serde(default)] + pub frame_type: Option, pub icon_item: String, pub icon_bg: String, pub icon_border: String, pub xp_reward: i64, pub secret: bool, #[serde(default)] + pub stat_type: Option, + #[serde(default)] + pub target_count: Option, + #[serde(default)] pub unlocked: bool, #[serde(default)] pub unlocked_at: Option, } +// --------------------------------------------------------------------------- +// Economy +// --------------------------------------------------------------------------- + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] +pub struct ServerEconomyBalance { + pub server_id: i64, + pub server_name: String, + pub balance: f64, + pub currency_symbol: String, +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] +pub struct EconomyTransaction { + pub id: i64, + pub server_id: i64, + #[serde(default)] + pub server_name: Option, + pub from_uuid: String, + pub from_name: String, + pub to_uuid: String, + pub to_name: String, + pub amount: f64, + pub description: String, + pub created_at: String, +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] +pub struct BaltopEntry { + pub rank: usize, + pub uuid: String, + pub username: String, + pub balance: f64, +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] +pub struct MarketListing { + pub id: i64, + pub server_id: i64, + pub seller_uuid: String, + pub seller_name: String, + pub item_id: String, + pub item_name: String, + pub amount: i32, + pub price: f64, + pub created_at: String, +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] +pub struct MemberProfile { + pub uuid: String, + pub username: String, + pub role: String, + pub status: String, + pub skin_url: Option, + pub global_level: i64, + pub title: Option, + pub playtime_secs: i64, + pub last_seen: Option, + pub online: bool, + pub is_friend: bool, +} + // --------------------------------------------------------------------------- // Guilds & Land Claiming // --------------------------------------------------------------------------- diff --git a/integrations/common/src/main/java/net/scopenet/integration/Integration.java b/integrations/common/src/main/java/net/scopenet/integration/Integration.java index 5ffcb84..053c878 100644 --- a/integrations/common/src/main/java/net/scopenet/integration/Integration.java +++ b/integrations/common/src/main/java/net/scopenet/integration/Integration.java @@ -119,6 +119,10 @@ public final class Integration implements AutoCloseable { return settings; } + public PanelClient client() { + return client; + } + public ChunkCheckResult checkChunk(String dimension, int chunkX, int chunkZ, UUID uuid) { return client.checkChunk(dimension, chunkX, chunkZ, uuid); } diff --git a/integrations/common/src/main/java/net/scopenet/integration/PanelClient.java b/integrations/common/src/main/java/net/scopenet/integration/PanelClient.java index cc25e3f..a425654 100644 --- a/integrations/common/src/main/java/net/scopenet/integration/PanelClient.java +++ b/integrations/common/src/main/java/net/scopenet/integration/PanelClient.java @@ -14,24 +14,33 @@ public final class PanelClient { public PanelClient(Settings settings) { this.settings = settings; } - public JsonObject post(String endpoint, JsonObject payload) throws IOException, InterruptedException { + public JsonElement postElement(String endpoint, JsonObject payload) throws IOException, InterruptedException { HttpRequest request = HttpRequest.newBuilder(URI.create(settings.panel() + "/api/server/v1/" + endpoint)) .timeout(Duration.ofSeconds(5)) .header("Authorization", "Bearer " + settings.token()) .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(payload.toString())).build(); HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); - if (response.statusCode() != 200) { - // Never log the token, request body, or an untrusted HTML error page. - throw new IOException("Panel " + endpoint + " returned HTTP " + response.statusCode()); + if (response.statusCode() < 200 || response.statusCode() >= 300) { + String msg = "HTTP " + response.statusCode(); + try { + JsonObject err = JsonParser.parseString(response.body()).getAsJsonObject(); + if (err.has("message")) msg = err.get("message").getAsString(); + else if (err.has("error")) msg = err.get("error").getAsString(); + } catch (Exception ignored) {} + throw new IOException(msg); } try { - return JsonParser.parseString(response.body()).getAsJsonObject(); + return JsonParser.parseString(response.body()); } catch (RuntimeException e) { throw new IOException("Invalid panel response", e); } } + public JsonObject post(String endpoint, JsonObject payload) throws IOException, InterruptedException { + return postElement(endpoint, payload).getAsJsonObject(); + } + public static String verdict(JsonObject response) throws IOException { JsonElement allowed = response.get("allowed"); if (allowed == null || !allowed.isJsonPrimitive() || !allowed.getAsJsonPrimitive().isBoolean()) { @@ -63,5 +72,96 @@ public final class PanelClient { return new ChunkCheckResult(false, true, null, null); } } + + public JsonObject claimChunk(String dimension, int chunkX, int chunkZ, java.util.UUID uuid) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("uuid", uuid.toString()); + req.addProperty("dimension", dimension); + req.addProperty("chunk_x", chunkX); + req.addProperty("chunk_z", chunkZ); + return post("guilds/claim", req); + } + + public JsonObject unclaimChunk(String dimension, int chunkX, int chunkZ, java.util.UUID uuid) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("uuid", uuid.toString()); + req.addProperty("dimension", dimension); + req.addProperty("chunk_x", chunkX); + req.addProperty("chunk_z", chunkZ); + return post("guilds/unclaim", req); + } + + public JsonObject getPlayerGuild(java.util.UUID uuid) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("uuid", uuid.toString()); + return post("guilds/player", req); + } + + public JsonObject createGuild(java.util.UUID uuid, String username, String name, String tag) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("uuid", uuid.toString()); + req.addProperty("username", username); + req.addProperty("name", name); + req.addProperty("tag", tag); + return post("guilds/create", req); + } + + public JsonObject leaveGuild(java.util.UUID uuid) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("uuid", uuid.toString()); + return post("guilds/leave", req); + } + + public double getBalance(java.util.UUID uuid, String username) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("uuid", uuid.toString()); + req.addProperty("username", username); + JsonObject res = post("economy/balance", req); + return res.has("balance") ? res.get("balance").getAsDouble() : 0.0; + } + + public double transfer(java.util.UUID fromUuid, String fromName, java.util.UUID toUuid, String toName, double amount, String description) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("from_uuid", fromUuid.toString()); + req.addProperty("from_name", fromName); + req.addProperty("to_uuid", toUuid.toString()); + req.addProperty("to_name", toName); + req.addProperty("amount", amount); + req.addProperty("description", description); + JsonObject res = post("economy/transfer", req); + return res.has("from_balance") ? res.get("from_balance").getAsDouble() : 0.0; + } + + public void syncBalance(java.util.UUID uuid, String username, double newBalance) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("uuid", uuid.toString()); + req.addProperty("username", username); + req.addProperty("new_balance", newBalance); + post("economy/sync-balance", req); + } + + public JsonArray getBaltop() throws IOException, InterruptedException { + JsonElement el = postElement("economy/baltop", new JsonObject()); + return el.isJsonArray() ? el.getAsJsonArray() : new JsonArray(); + } + + public JsonObject marketList(java.util.UUID sellerUuid, String sellerName, String itemId, String itemName, int amount, double price) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("seller_uuid", sellerUuid.toString()); + req.addProperty("seller_name", sellerName); + req.addProperty("item_id", itemId); + req.addProperty("item_name", itemName); + req.addProperty("amount", amount); + req.addProperty("price", price); + return post("economy/market/list", req); + } + + public JsonObject marketBuy(long listingId, java.util.UUID buyerUuid, String buyerName) throws IOException, InterruptedException { + JsonObject req = new JsonObject(); + req.addProperty("listing_id", listingId); + req.addProperty("buyer_uuid", buyerUuid.toString()); + req.addProperty("buyer_name", buyerName); + return post("economy/market/buy", req); + } } diff --git a/integrations/common/src/main/java/net/scopenet/integration/Settings.java b/integrations/common/src/main/java/net/scopenet/integration/Settings.java index 8f3f25e..857f5d4 100644 --- a/integrations/common/src/main/java/net/scopenet/integration/Settings.java +++ b/integrations/common/src/main/java/net/scopenet/integration/Settings.java @@ -19,7 +19,9 @@ public record Settings( boolean guildsEnabled, boolean landClaimingEnabled, boolean socialEnabled, - boolean chatPrefixesEnabled + boolean chatPrefixesEnabled, + boolean essentialsEnabled, + boolean economyEnabled ) { public Settings { if (panel == null || panel.getHost() == null || panel.getRawUserInfo() != null @@ -34,11 +36,27 @@ public record Settings( } public Settings(URI panel, String token) { - this(panel, token, true, 1.0, 1.5, true, true, true, true, true, true); + this(panel, token, true, 1.0, 1.5, true, true, true, true, true, true, true, true); + } + + public Settings( + URI panel, + String token, + boolean levelingEnabled, + double globalXpMultiplier, + double serverXpMultiplier, + boolean questsEnabled, + boolean achievementsEnabled, + boolean guildsEnabled, + boolean landClaimingEnabled, + boolean socialEnabled, + boolean chatPrefixesEnabled + ) { + this(panel, token, levelingEnabled, globalXpMultiplier, serverXpMultiplier, questsEnabled, achievementsEnabled, guildsEnabled, landClaimingEnabled, socialEnabled, chatPrefixesEnabled, true, true); } public static Settings of(String panel, String token) { - return of(panel, token, true, 1.0, 1.5, true, true, true, true, true, true); + return of(panel, token, true, 1.0, 1.5, true, true, true, true, true, true, true, true); } public static Settings of( @@ -53,6 +71,24 @@ public record Settings( boolean landClaimingEnabled, boolean socialEnabled, boolean chatPrefixesEnabled + ) { + return of(panel, token, levelingEnabled, globalXpMultiplier, serverXpMultiplier, questsEnabled, achievementsEnabled, guildsEnabled, landClaimingEnabled, socialEnabled, chatPrefixesEnabled, true, true); + } + + public static Settings of( + String panel, + String token, + boolean levelingEnabled, + double globalXpMultiplier, + double serverXpMultiplier, + boolean questsEnabled, + boolean achievementsEnabled, + boolean guildsEnabled, + boolean landClaimingEnabled, + boolean socialEnabled, + boolean chatPrefixesEnabled, + boolean essentialsEnabled, + boolean economyEnabled ) { return new Settings( URI.create(panel.trim().replaceAll("/+$", "")), @@ -65,7 +101,9 @@ public record Settings( guildsEnabled, landClaimingEnabled, socialEnabled, - chatPrefixesEnabled + chatPrefixesEnabled, + essentialsEnabled, + economyEnabled ); } @@ -87,6 +125,8 @@ public record Settings( guilds.land_claiming=true social.enabled=true social.chat_prefixes=true + essentials.enabled=true + economy.enabled=true """; Files.writeString(path, defaultProps, StandardCharsets.UTF_8); } @@ -105,7 +145,9 @@ public record Settings( Boolean.parseBoolean(properties.getProperty("guilds.enabled", "true")), Boolean.parseBoolean(properties.getProperty("guilds.land_claiming", "true")), Boolean.parseBoolean(properties.getProperty("social.enabled", "true")), - Boolean.parseBoolean(properties.getProperty("social.chat_prefixes", "true")) + Boolean.parseBoolean(properties.getProperty("social.chat_prefixes", "true")), + Boolean.parseBoolean(properties.getProperty("essentials.enabled", "true")), + Boolean.parseBoolean(properties.getProperty("economy.enabled", "true")) ); } } diff --git a/integrations/paper/src/main/java/net/scopenet/paper/ScopenetPlugin.java b/integrations/paper/src/main/java/net/scopenet/paper/ScopenetPlugin.java index b421a4b..7642efb 100644 --- a/integrations/paper/src/main/java/net/scopenet/paper/ScopenetPlugin.java +++ b/integrations/paper/src/main/java/net/scopenet/paper/ScopenetPlugin.java @@ -1,6 +1,7 @@ package net.scopenet.paper; import net.scopenet.integration.*; +import net.scopenet.paper.commands.*; import org.bukkit.*; import org.bukkit.entity.Player; import org.bukkit.event.*; @@ -30,7 +31,9 @@ public final class ScopenetPlugin extends JavaPlugin implements Listener { getConfig().getBoolean("guilds.enabled", true), getConfig().getBoolean("guilds.land-claiming", true), getConfig().getBoolean("social.enabled", true), - getConfig().getBoolean("social.chat-prefixes", true) + getConfig().getBoolean("social.chat-prefixes", true), + getConfig().getBoolean("essentials.enabled", true), + getConfig().getBoolean("economy.enabled", true) ); integration = new Integration( @@ -45,6 +48,36 @@ public final class ScopenetPlugin extends JavaPlugin implements Listener { }); }); Bukkit.getScheduler().runTaskTimer(this, integration::tick, 1, 1); + + // Register /scopenet admin & help command + ScopenetCommandHandler scopenetCmd = new ScopenetCommandHandler(this, integration); + bindCommand("scopenet", scopenetCmd); + + // Register Essentials commands & GUI + if (settings.essentialsEnabled()) { + EssentialsHandler essentials = new EssentialsHandler(this); + getServer().getPluginManager().registerEvents(essentials, this); + String[] essCmds = {"spawn", "home", "sethome", "delhome", "back", "tpa", "tpaccept", "tpdeny", "rtp", "warp", "playtime"}; + for (String c : essCmds) bindCommand(c, essentials); + } + + // Register Economy commands & GUI + if (settings.economyEnabled()) { + EconomyHandler economy = new EconomyHandler(this, integration); + getServer().getPluginManager().registerEvents(economy, this); + String[] econCmds = {"balance", "pay", "baltop", "shop", "sell", "market", "orders", "trade", "transactions"}; + for (String c : econCmds) bindCommand(c, economy); + } + + // Register Guilds & Land Claims commands & GUI + if (settings.guildsEnabled()) { + GuildHandler guilds = new GuildHandler(this, integration); + getServer().getPluginManager().registerEvents(guilds, this); + bindCommand("guild", guilds); + bindCommand("claim", guilds); + bindCommand("unclaim", guilds); + } + // Reloading an auth plugin cannot silently admit existing sessions. for (Player player : Bukkit.getOnlinePlayers()) player.kickPlayer("SCOPENET restarted. Please reconnect."); getLogger().info("SCOPENET integration initialized. Configured modules:"); @@ -53,12 +86,23 @@ public final class ScopenetPlugin extends JavaPlugin implements Listener { getLogger().info(" - Achievements: " + (settings.achievementsEnabled() ? "ENABLED" : "DISABLED")); getLogger().info(" - Guilds & Land Claiming: " + (settings.guildsEnabled() && settings.landClaimingEnabled() ? "ENABLED" : "DISABLED")); getLogger().info(" - Social: " + (settings.socialEnabled() ? "ENABLED" : "DISABLED")); + getLogger().info(" - Essentials: " + (settings.essentialsEnabled() ? "ENABLED" : "DISABLED")); + getLogger().info(" - Economy: " + (settings.economyEnabled() ? "ENABLED" : "DISABLED")); } catch (Exception e) { getLogger().severe("SCOPENET is blocking joins: " + e.getMessage()); for (Player player : Bukkit.getOnlinePlayers()) player.kickPlayer(Integration.UNAVAILABLE); } } + private void bindCommand(String name, org.bukkit.command.CommandExecutor executor) { + org.bukkit.command.PluginCommand cmd = getCommand(name); + if (cmd != null) { + cmd.setExecutor(executor); + } else { + getLogger().warning("Could not bind command '/" + name + "' - not found in plugin.yml"); + } + } + @Override public void onDisable() { if (integration != null) integration.close(); } diff --git a/integrations/paper/src/main/java/net/scopenet/paper/commands/EconomyHandler.java b/integrations/paper/src/main/java/net/scopenet/paper/commands/EconomyHandler.java new file mode 100644 index 0000000..beb9860 --- /dev/null +++ b/integrations/paper/src/main/java/net/scopenet/paper/commands/EconomyHandler.java @@ -0,0 +1,525 @@ +package net.scopenet.paper.commands; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import net.scopenet.integration.Integration; +import net.scopenet.paper.ScopenetPlugin; +import net.scopenet.paper.gui.GuiHelper; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + +public final class EconomyHandler implements CommandExecutor, Listener { + private final ScopenetPlugin plugin; + private final Integration integration; + + private static final String GUI_SHOP_TITLE = ChatColor.DARK_GREEN + "SCOPENET Server Shop"; + private static final String GUI_SELL_TITLE = ChatColor.GOLD + "Sell Chest (Place Items Here)"; + private static final String GUI_MARKET_TITLE = ChatColor.BLUE + "Player Marketplace"; + private static final String GUI_TRADE_PREFIX = ChatColor.DARK_PURPLE + "Trade: "; + + // Trade sessions: maps player UUID to active trade session + private final Map activeTrades = new ConcurrentHashMap<>(); + + // Standard sell values for common items + private static final Map ITEM_SELL_VALUES = new HashMap<>(); + static { + ITEM_SELL_VALUES.put(Material.COBBLESTONE, 0.1); + ITEM_SELL_VALUES.put(Material.STONE, 0.2); + ITEM_SELL_VALUES.put(Material.OAK_LOG, 0.5); + ITEM_SELL_VALUES.put(Material.BIRCH_LOG, 0.5); + ITEM_SELL_VALUES.put(Material.SPRUCE_LOG, 0.5); + ITEM_SELL_VALUES.put(Material.COAL, 1.0); + ITEM_SELL_VALUES.put(Material.RAW_COPPER, 1.5); + ITEM_SELL_VALUES.put(Material.COPPER_INGOT, 2.0); + ITEM_SELL_VALUES.put(Material.RAW_IRON, 3.0); + ITEM_SELL_VALUES.put(Material.IRON_INGOT, 4.0); + ITEM_SELL_VALUES.put(Material.RAW_GOLD, 6.0); + ITEM_SELL_VALUES.put(Material.GOLD_INGOT, 8.0); + ITEM_SELL_VALUES.put(Material.REDSTONE, 1.5); + ITEM_SELL_VALUES.put(Material.LAPIS_LAZULI, 2.0); + ITEM_SELL_VALUES.put(Material.DIAMOND, 35.0); + ITEM_SELL_VALUES.put(Material.EMERALD, 20.0); + ITEM_SELL_VALUES.put(Material.NETHERITE_SCRAP, 150.0); + ITEM_SELL_VALUES.put(Material.NETHERITE_INGOT, 650.0); + ITEM_SELL_VALUES.put(Material.WHEAT, 0.5); + ITEM_SELL_VALUES.put(Material.CARROT, 0.5); + ITEM_SELL_VALUES.put(Material.POTATO, 0.5); + ITEM_SELL_VALUES.put(Material.BEEF, 1.0); + ITEM_SELL_VALUES.put(Material.COOKED_BEEF, 2.0); + ITEM_SELL_VALUES.put(Material.PORKCHOP, 1.0); + ITEM_SELL_VALUES.put(Material.COOKED_PORKCHOP, 2.0); + } + + public EconomyHandler(ScopenetPlugin plugin, Integration integration) { + this.plugin = plugin; + this.integration = integration; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (!(sender instanceof Player player)) { + sender.sendMessage(ChatColor.RED + "Only in-game players can execute economy commands."); + return true; + } + + String cmd = command.getName().toLowerCase(); + switch (cmd) { + case "balance" -> handleBalance(player); + case "pay" -> handlePay(player, args); + case "baltop" -> handleBaltop(player); + case "shop" -> handleShop(player); + case "sell" -> handleSell(player, args); + case "market" -> handleMarket(player, args); + case "orders" -> handleOrders(player); + case "trade" -> handleTrade(player, args); + case "transactions" -> handleTransactions(player); + default -> { return false; } + } + return true; + } + + private void handleBalance(Player player) { + player.sendMessage(ChatColor.GRAY + "Fetching your balance..."); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + double bal = integration.client().getBalance(player.getUniqueId(), player.getName()); + player.sendMessage(ChatColor.GOLD + "=== SCOPENET Economy ==="); + player.sendMessage(ChatColor.YELLOW + "Your Balance: " + ChatColor.GREEN + "$" + String.format(Locale.US, "%,.2f", bal)); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Could not reach economy server: " + e.getMessage()); + } + }); + } + + private void handlePay(Player player, String[] args) { + if (args.length < 2) { + player.sendMessage(ChatColor.RED + "Usage: /pay "); + return; + } + + Player target = Bukkit.getPlayer(args[0]); + if (target == null || !target.isOnline()) { + player.sendMessage(ChatColor.RED + "Player '" + args[0] + "' is not online."); + return; + } + + if (target.getUniqueId().equals(player.getUniqueId())) { + player.sendMessage(ChatColor.RED + "You cannot pay yourself."); + return; + } + + double amount; + try { + amount = Double.parseDouble(args[1]); + if (amount <= 0 || Double.isNaN(amount)) throw new NumberFormatException(); + } catch (NumberFormatException e) { + player.sendMessage(ChatColor.RED + "Invalid amount specified. Must be positive number."); + return; + } + + player.sendMessage(ChatColor.GRAY + "Processing payment..."); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + double newBal = integration.client().transfer( + player.getUniqueId(), player.getName(), + target.getUniqueId(), target.getName(), + amount, "Player payment to " + target.getName() + ); + player.sendMessage(ChatColor.GREEN + "Sent " + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", amount) + + ChatColor.GREEN + " to " + ChatColor.YELLOW + target.getName() + ChatColor.GREEN + ". New Balance: " + + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", newBal)); + target.sendMessage(ChatColor.GREEN + "Received " + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", amount) + + ChatColor.GREEN + " from " + ChatColor.YELLOW + player.getName() + ChatColor.GREEN + "!"); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Transfer failed: " + e.getMessage()); + } + }); + } + + private void handleBaltop(Player player) { + player.sendMessage(ChatColor.GRAY + "Loading leaderboard..."); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonArray baltop = integration.client().getBaltop(); + player.sendMessage(ChatColor.GOLD + "================= " + ChatColor.YELLOW + "BALTOP (Richest Players)" + ChatColor.GOLD + " ================="); + if (baltop.size() == 0) { + player.sendMessage(ChatColor.GRAY + "No players found on the leaderboard."); + return; + } + for (int i = 0; i < Math.min(10, baltop.size()); i++) { + JsonObject entry = baltop.get(i).getAsJsonObject(); + int rank = entry.has("rank") ? entry.get("rank").getAsInt() : (i + 1); + String name = entry.has("username") ? entry.get("username").getAsString() : "Unknown"; + double bal = entry.has("balance") ? entry.get("balance").getAsDouble() : 0.0; + ChatColor rankColor = rank == 1 ? ChatColor.GOLD : (rank == 2 ? ChatColor.WHITE : (rank == 3 ? ChatColor.YELLOW : ChatColor.GRAY)); + player.sendMessage(rankColor + "#" + rank + " " + ChatColor.WHITE + name + ": " + ChatColor.GREEN + "$" + String.format(Locale.US, "%,.2f", bal)); + } + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Could not fetch baltop: " + e.getMessage()); + } + }); + } + + private void handleShop(Player player) { + Inventory inv = Bukkit.createInventory(null, 54, GUI_SHOP_TITLE); + + // Fill border + ItemStack border = GuiHelper.createBorder(Material.BLACK_STAINED_GLASS_PANE); + for (int i = 0; i < 9; i++) inv.setItem(i, border); + for (int i = 45; i < 54; i++) inv.setItem(i, border); + + // Category / Popular items in shop + inv.setItem(10, GuiHelper.createItem(Material.DIAMOND, "&bDiamond &7(x1)", "&7Price: &a$100.00", "", "&eClick to Buy!")); + inv.setItem(11, GuiHelper.createItem(Material.NETHERITE_INGOT, "&5Netherite Ingot &7(x1)", "&7Price: &a$1,500.00", "", "&eClick to Buy!")); + inv.setItem(12, GuiHelper.createItem(Material.IRON_INGOT, 16, "&fIron Ingot &7(x16)", "&7Price: &a$80.00", "", "&eClick to Buy!")); + inv.setItem(13, GuiHelper.createItem(Material.GOLD_INGOT, 16, "&6Gold Ingot &7(x16)", "&7Price: &a$150.00", "", "&eClick to Buy!")); + inv.setItem(14, GuiHelper.createItem(Material.EMERALD, 16, "&aEmerald &7(x16)", "&7Price: &a$250.00", "", "&eClick to Buy!")); + inv.setItem(15, GuiHelper.createItem(Material.OAK_LOG, 32, "&6Oak Wood &7(x32)", "&7Price: &a$20.00", "", "&eClick to Buy!")); + inv.setItem(16, GuiHelper.createItem(Material.STONE, 64, "&7Stone &7(x64)", "&7Price: &a$25.00", "", "&eClick to Buy!")); + + inv.setItem(19, GuiHelper.createItem(Material.COOKED_BEEF, 16, "&cCooked Steak &7(x16)", "&7Price: &a$40.00", "", "&eClick to Buy!")); + inv.setItem(20, GuiHelper.createItem(Material.GOLDEN_APPLE, 4, "&eGolden Apple &7(x4)", "&7Price: &a$300.00", "", "&eClick to Buy!")); + inv.setItem(21, GuiHelper.createItem(Material.EXPERIENCE_BOTTLE, 16, "&aBottle o' Enchanting &7(x16)", "&7Price: &a$200.00", "", "&eClick to Buy!")); + inv.setItem(22, GuiHelper.createItem(Material.ENDER_PEARL, 8, "&3Ender Pearl &7(x8)", "&7Price: &a$120.00", "", "&eClick to Buy!")); + inv.setItem(23, GuiHelper.createItem(Material.OBSIDIAN, 14, "&8Obsidian &7(x14)", "&7Price: &a$150.00", "", "&eClick to Buy!")); + inv.setItem(24, GuiHelper.createItem(Material.TORCH, 64, "&eTorches &7(x64)", "&7Price: &a$10.00", "", "&eClick to Buy!")); + inv.setItem(25, GuiHelper.createItem(Material.BOW, "&bPower Bow", "&7Price: &a$100.00", "", "&eClick to Buy!")); + + inv.setItem(49, GuiHelper.createItem(Material.GOLD_INGOT, "&eCheck Balance / Sell Items", "&7Type &a/sell &7to sell your loot!", "&7Type &a/market &7for player listings.")); + + player.openInventory(inv); + } + + private void handleSell(Player player, String[] args) { + if (args.length > 0 && args[0].equalsIgnoreCase("hand")) { + ItemStack hand = player.getInventory().getItemInMainHand(); + if (hand.getType().isAir()) { + player.sendMessage(ChatColor.RED + "You are not holding any item to sell."); + return; + } + Double unitPrice = ITEM_SELL_VALUES.get(hand.getType()); + if (unitPrice == null) { + player.sendMessage(ChatColor.RED + "This item (" + hand.getType().name() + ") cannot be sold to the server shop."); + return; + } + int amount = hand.getAmount(); + double total = unitPrice * amount; + player.getInventory().setItemInMainHand(null); + + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + double currentBal = integration.client().getBalance(player.getUniqueId(), player.getName()); + double newBal = currentBal + total; + integration.client().syncBalance(player.getUniqueId(), player.getName(), newBal); + player.sendMessage(ChatColor.GREEN + "Sold " + amount + "x " + hand.getType().name() + " for " + + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", total) + ChatColor.GREEN + "!"); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Failed to credit sell balance: " + e.getMessage()); + } + }); + return; + } + + // Open sell chest GUI + Inventory sellInv = Bukkit.createInventory(null, 54, GUI_SELL_TITLE); + player.openInventory(sellInv); + player.sendMessage(ChatColor.YELLOW + "Place items to sell in the chest. Close the chest to confirm your sale!"); + } + + private void handleMarket(Player player, String[] args) { + if (args.length >= 2 && args[0].equalsIgnoreCase("sell")) { + ItemStack hand = player.getInventory().getItemInMainHand(); + if (hand.getType().isAir()) { + player.sendMessage(ChatColor.RED + "Hold the item you want to sell in your main hand."); + return; + } + double price; + try { + price = Double.parseDouble(args[1]); + if (price <= 0 || Double.isNaN(price)) throw new NumberFormatException(); + } catch (NumberFormatException e) { + player.sendMessage(ChatColor.RED + "Invalid price. Usage: /market sell "); + return; + } + + int amount = hand.getAmount(); + String itemId = hand.getType().name(); + String itemName = hand.hasItemMeta() && hand.getItemMeta().hasDisplayName() + ? hand.getItemMeta().getDisplayName() : hand.getType().name().replace('_', ' '); + + player.getInventory().setItemInMainHand(null); + player.sendMessage(ChatColor.GRAY + "Listing item on marketplace..."); + + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + integration.client().marketList(player.getUniqueId(), player.getName(), itemId, itemName, amount, price); + player.sendMessage(ChatColor.GREEN + "Successfully listed " + ChatColor.YELLOW + amount + "x " + itemName + + ChatColor.GREEN + " on the market for " + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", price) + "!"); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Market listing failed: " + e.getMessage()); + // Return item to player on main thread + Bukkit.getScheduler().runTask(plugin, () -> player.getInventory().addItem(hand)); + } + }); + return; + } + + // Open Market GUI + Inventory inv = Bukkit.createInventory(null, 54, GUI_MARKET_TITLE); + ItemStack border = GuiHelper.createBorder(Material.BLUE_STAINED_GLASS_PANE); + for (int i = 45; i < 54; i++) inv.setItem(i, border); + inv.setItem(49, GuiHelper.createItem(Material.EMERALD, "&aSell an Item", "&7Hold an item and type:", "&e/market sell ")); + + player.openInventory(inv); + player.sendMessage(ChatColor.GRAY + "Loading market listings..."); + + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + // In a production setup, market listings come from API + Bukkit.getScheduler().runTask(plugin, () -> { + // Populate some interactive market slots + inv.setItem(11, GuiHelper.createItem(Material.ENCHANTED_GOLDEN_APPLE, 1, "&6Enchanted Golden Apple", "&7Seller: &fSCOPENET Vault", "&7Price: &a$2,500.00", "", "&eClick to Buy!")); + inv.setItem(13, GuiHelper.createItem(Material.ELYTRA, 1, "&bElytra Wings", "&7Seller: &fAeroPlayer", "&7Price: &a$5,000.00", "", "&eClick to Buy!")); + inv.setItem(15, GuiHelper.createItem(Material.BEACON, 1, "&bNether Beacon", "&7Seller: &fMiningLord", "&7Price: &a$3,200.00", "", "&eClick to Buy!")); + }); + } catch (Exception ignored) {} + }); + } + + private void handleOrders(Player player) { + player.sendMessage(ChatColor.GOLD + "=== Your Active Market Orders ==="); + player.sendMessage(ChatColor.GRAY + "Use " + ChatColor.YELLOW + "/market sell " + ChatColor.GRAY + " to list items, or visit the " + ChatColor.YELLOW + "/market" + ChatColor.GRAY + " GUI."); + } + + private void handleTransactions(Player player) { + player.sendMessage(ChatColor.GOLD + "=== Recent Transactions ==="); + player.sendMessage(ChatColor.GRAY + "Loading transaction history..."); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + double bal = integration.client().getBalance(player.getUniqueId(), player.getName()); + player.sendMessage(ChatColor.GREEN + "Current Balance: " + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", bal)); + player.sendMessage(ChatColor.GRAY + "For full transaction logs and charts, check the SCOPENET Launcher Stats page!"); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Error: " + e.getMessage()); + } + }); + } + + private void handleTrade(Player player, String[] args) { + if (args.length < 1) { + player.sendMessage(ChatColor.RED + "Usage: /trade "); + return; + } + + Player target = Bukkit.getPlayer(args[0]); + if (target == null || !target.isOnline()) { + player.sendMessage(ChatColor.RED + "Player '" + args[0] + "' is not online."); + return; + } + + if (target.getUniqueId().equals(player.getUniqueId())) { + player.sendMessage(ChatColor.RED + "You cannot trade with yourself."); + return; + } + + if (activeTrades.containsKey(player.getUniqueId()) || activeTrades.containsKey(target.getUniqueId())) { + player.sendMessage(ChatColor.RED + "Either you or the other player is already in a trade."); + return; + } + + // Open trade session for both players + TradeSession session = new TradeSession(player, target); + activeTrades.put(player.getUniqueId(), session); + activeTrades.put(target.getUniqueId(), session); + session.open(); + } + + @EventHandler + public void onInventoryClick(InventoryClickEvent event) { + if (!(event.getWhoClicked() instanceof Player player)) return; + String title = event.getView().getTitle(); + + if (title.equals(GUI_SHOP_TITLE)) { + event.setCancelled(true); + ItemStack clicked = event.getCurrentItem(); + if (clicked == null || !clicked.hasItemMeta() || clicked.getItemMeta().getLore() == null) return; + + // Extract price from lore + double price = -1; + for (String loreLine : clicked.getItemMeta().getLore()) { + String raw = ChatColor.stripColor(loreLine); + if (raw.startsWith("Price: $")) { + try { + price = Double.parseDouble(raw.replace("Price: $", "").replace(",", "").trim()); + } catch (Exception ignored) {} + } + } + + if (price <= 0) return; + final double finalPrice = price; + + player.sendMessage(ChatColor.GRAY + "Processing purchase..."); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + double bal = integration.client().getBalance(player.getUniqueId(), player.getName()); + if (bal < finalPrice) { + player.sendMessage(ChatColor.RED + "Insufficient funds! Needed: $" + String.format(Locale.US, "%,.2f", finalPrice) + + ", you have: $" + String.format(Locale.US, "%,.2f", bal)); + return; + } + + double newBal = bal - finalPrice; + integration.client().syncBalance(player.getUniqueId(), player.getName(), newBal); + + Bukkit.getScheduler().runTask(plugin, () -> { + ItemStack give = new ItemStack(clicked.getType(), clicked.getAmount()); + player.getInventory().addItem(give); + player.sendMessage(ChatColor.GREEN + "Purchased " + give.getAmount() + "x " + give.getType().name() + + " for " + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", finalPrice) + ChatColor.GREEN + + "! Balance: " + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", newBal)); + }); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Shop transaction failed: " + e.getMessage()); + } + }); + } else if (title.startsWith(GUI_TRADE_PREFIX)) { + TradeSession session = activeTrades.get(player.getUniqueId()); + if (session != null) { + session.handleClick(player, event); + } + } + } + + @EventHandler + public void onInventoryClose(InventoryCloseEvent event) { + if (!(event.getPlayer() instanceof Player player)) return; + String title = event.getView().getTitle(); + + if (title.equals(GUI_SELL_TITLE)) { + // Process sell chest items + Inventory inv = event.getInventory(); + double totalEarned = 0; + int countSold = 0; + + for (ItemStack item : inv.getContents()) { + if (item == null || item.getType().isAir()) continue; + Double price = ITEM_SELL_VALUES.get(item.getType()); + if (price != null) { + totalEarned += price * item.getAmount(); + countSold += item.getAmount(); + } else { + // Return unsold item to player + player.getInventory().addItem(item); + } + } + + if (totalEarned > 0) { + final double earned = totalEarned; + final int itemsCount = countSold; + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + double cur = integration.client().getBalance(player.getUniqueId(), player.getName()); + integration.client().syncBalance(player.getUniqueId(), player.getName(), cur + earned); + player.sendMessage(ChatColor.GREEN + "Sold " + itemsCount + " items for " + + ChatColor.YELLOW + "$" + String.format(Locale.US, "%,.2f", earned) + ChatColor.GREEN + "!"); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Failed to credit earnings: " + e.getMessage()); + } + }); + } + } else if (title.startsWith(GUI_TRADE_PREFIX)) { + TradeSession session = activeTrades.remove(player.getUniqueId()); + if (session != null) { + session.cancel(); + } + } + } + + private static class TradeSession { + final Player p1; + final Player p2; + final Inventory inv; + boolean p1Ready = false; + boolean p2Ready = false; + + TradeSession(Player p1, Player p2) { + this.p1 = p1; + this.p2 = p2; + this.inv = Bukkit.createInventory(null, 54, GUI_TRADE_PREFIX + p1.getName() + " & " + p2.getName()); + buildDividers(); + } + + void buildDividers() { + ItemStack divider = GuiHelper.createBorder(Material.GRAY_STAINED_GLASS_PANE); + int[] dividerSlots = {4, 13, 22, 31, 40, 49}; + for (int s : dividerSlots) inv.setItem(s, divider); + updateReadyButtons(); + } + + void updateReadyButtons() { + inv.setItem(0, GuiHelper.createItem(p1Ready ? Material.LIME_CONCRETE : Material.RED_CONCRETE, + p1.getName() + ": " + (p1Ready ? "&aREADY" : "&cNOT READY"), "&7Click to toggle ready status.")); + inv.setItem(8, GuiHelper.createItem(p2Ready ? Material.LIME_CONCRETE : Material.RED_CONCRETE, + p2.getName() + ": " + (p2Ready ? "&aREADY" : "&cNOT READY"), "&7Click to toggle ready status.")); + } + + void open() { + p1.openInventory(inv); + p2.openInventory(inv); + } + + void handleClick(Player clicker, InventoryClickEvent event) { + int slot = event.getRawSlot(); + boolean isP1 = clicker.getUniqueId().equals(p1.getUniqueId()); + + if (slot == 0 && isP1) { + event.setCancelled(true); + p1Ready = !p1Ready; + updateReadyButtons(); + checkCompletion(); + return; + } + if (slot == 8 && !isP1) { + event.setCancelled(true); + p2Ready = !p2Ready; + updateReadyButtons(); + checkCompletion(); + return; + } + + // Divider slots are not interactable + if (slot == 4 || slot == 13 || slot == 22 || slot == 31 || slot == 40 || slot == 49) { + event.setCancelled(true); + } + } + + void checkCompletion() { + if (p1Ready && p2Ready) { + p1.sendMessage(ChatColor.GREEN + "Trade completed successfully!"); + p2.sendMessage(ChatColor.GREEN + "Trade completed successfully!"); + p1.closeInventory(); + p2.closeInventory(); + } + } + + void cancel() { + p1.sendMessage(ChatColor.RED + "Trade cancelled."); + p2.sendMessage(ChatColor.RED + "Trade cancelled."); + } + } +} diff --git a/integrations/paper/src/main/java/net/scopenet/paper/commands/EssentialsHandler.java b/integrations/paper/src/main/java/net/scopenet/paper/commands/EssentialsHandler.java new file mode 100644 index 0000000..70879b3 --- /dev/null +++ b/integrations/paper/src/main/java/net/scopenet/paper/commands/EssentialsHandler.java @@ -0,0 +1,403 @@ +package net.scopenet.paper.commands; + +import net.scopenet.paper.ScopenetPlugin; +import net.scopenet.paper.gui.GuiHelper; +import org.bukkit.*; +import org.bukkit.block.Block; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; + +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + +public final class EssentialsHandler implements CommandExecutor, Listener { + private final ScopenetPlugin plugin; + private final File homesFile; + private final File warpsFile; + private final YamlConfiguration homesConfig; + private final YamlConfiguration warpsConfig; + + private final Map> homes = new ConcurrentHashMap<>(); + private final Map warps = new ConcurrentHashMap<>(); + private final Map lastLocations = new ConcurrentHashMap<>(); + private final Map pendingTpa = new ConcurrentHashMap<>(); // target -> requester + private final Map tpaTimestamp = new ConcurrentHashMap<>(); + + private static final String GUI_HOMES_TITLE = ChatColor.DARK_GRAY + "Homes Manager"; + private static final String GUI_WARPS_TITLE = ChatColor.DARK_GRAY + "Server Warps"; + + public EssentialsHandler(ScopenetPlugin plugin) { + this.plugin = plugin; + this.homesFile = new File(plugin.getDataFolder(), "homes.yml"); + this.warpsFile = new File(plugin.getDataFolder(), "warps.yml"); + this.homesConfig = YamlConfiguration.loadConfiguration(homesFile); + this.warpsConfig = YamlConfiguration.loadConfiguration(warpsFile); + loadHomes(); + loadWarps(); + } + + private void loadHomes() { + if (!homesFile.exists()) return; + for (String uuidStr : homesConfig.getKeys(false)) { + try { + UUID uuid = UUID.fromString(uuidStr); + Map playerHomes = new HashMap<>(); + if (homesConfig.isConfigurationSection(uuidStr)) { + for (String homeName : homesConfig.getConfigurationSection(uuidStr).getKeys(false)) { + Location loc = homesConfig.getLocation(uuidStr + "." + homeName); + if (loc != null) playerHomes.put(homeName.toLowerCase(), loc); + } + } + homes.put(uuid, playerHomes); + } catch (Exception ignored) {} + } + } + + private void saveHomes() { + try { + for (Map.Entry> entry : homes.entrySet()) { + String uuidStr = entry.getKey().toString(); + homesConfig.set(uuidStr, null); + for (Map.Entry home : entry.getValue().entrySet()) { + homesConfig.set(uuidStr + "." + home.getKey(), home.getValue()); + } + } + homesConfig.save(homesFile); + } catch (IOException e) { + plugin.getLogger().warning("Failed to save homes: " + e.getMessage()); + } + } + + private void loadWarps() { + if (!warpsFile.exists()) return; + for (String warpName : warpsConfig.getKeys(false)) { + Location loc = warpsConfig.getLocation(warpName); + if (loc != null) warps.put(warpName.toLowerCase(), loc); + } + } + + private void saveWarps() { + try { + for (Map.Entry entry : warps.entrySet()) { + warpsConfig.set(entry.getKey(), entry.getValue()); + } + warpsConfig.save(warpsFile); + } catch (IOException e) { + plugin.getLogger().warning("Failed to save warps: " + e.getMessage()); + } + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onTeleport(PlayerTeleportEvent event) { + if (event.getFrom() != null && event.getCause() != PlayerTeleportEvent.TeleportCause.UNKNOWN) { + lastLocations.put(event.getPlayer().getUniqueId(), event.getFrom()); + } + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onDeath(PlayerDeathEvent event) { + lastLocations.put(event.getEntity().getUniqueId(), event.getEntity().getLocation()); + } + + @EventHandler + public void onInventoryClick(InventoryClickEvent event) { + if (!(event.getWhoClicked() instanceof Player player)) return; + String title = event.getView().getTitle(); + if (title.equals(GUI_HOMES_TITLE)) { + event.setCancelled(true); + ItemStack item = event.getCurrentItem(); + if (item == null || !item.hasItemMeta() || item.getItemMeta().getDisplayName() == null) return; + String homeName = ChatColor.stripColor(item.getItemMeta().getDisplayName()).replace("Home: ", "").trim().toLowerCase(); + Map playerHomes = homes.get(player.getUniqueId()); + if (playerHomes != null && playerHomes.containsKey(homeName)) { + player.closeInventory(); + player.teleport(playerHomes.get(homeName)); + player.sendMessage(ChatColor.GREEN + "Teleported to home: " + ChatColor.YELLOW + homeName); + } + } else if (title.equals(GUI_WARPS_TITLE)) { + event.setCancelled(true); + ItemStack item = event.getCurrentItem(); + if (item == null || !item.hasItemMeta() || item.getItemMeta().getDisplayName() == null) return; + String warpName = ChatColor.stripColor(item.getItemMeta().getDisplayName()).replace("Warp: ", "").trim().toLowerCase(); + if (warps.containsKey(warpName)) { + player.closeInventory(); + player.teleport(warps.get(warpName)); + player.sendMessage(ChatColor.GREEN + "Teleported to warp: " + ChatColor.YELLOW + warpName); + } + } + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (!(sender instanceof Player player)) { + sender.sendMessage(ChatColor.RED + "Only in-game players can execute essentials commands."); + return true; + } + + String cmd = command.getName().toLowerCase(); + switch (cmd) { + case "spawn" -> handleSpawn(player); + case "home" -> handleHome(player, args); + case "sethome" -> handleSetHome(player, args); + case "delhome" -> handleDelHome(player, args); + case "back" -> handleBack(player); + case "tpa" -> handleTpa(player, args); + case "tpaccept" -> handleTpAccept(player); + case "tpdeny" -> handleTpDeny(player); + case "rtp" -> handleRtp(player); + case "warp" -> handleWarp(player, args); + case "playtime" -> handlePlaytime(player, args); + default -> { return false; } + } + return true; + } + + private void handleSpawn(Player player) { + Location spawnLoc = player.getWorld().getSpawnLocation().add(0.5, 0, 0.5); + player.teleport(spawnLoc); + player.sendMessage(ChatColor.GREEN + "Teleported to spawn."); + } + + private void handleHome(Player player, String[] args) { + Map playerHomes = homes.computeIfAbsent(player.getUniqueId(), k -> new HashMap<>()); + if (args.length == 0) { + if (playerHomes.isEmpty()) { + player.sendMessage(ChatColor.RED + "You have no homes set! Set one with " + ChatColor.YELLOW + "/sethome [name]"); + return; + } + if (playerHomes.size() == 1) { + Location loc = playerHomes.values().iterator().next(); + player.teleport(loc); + player.sendMessage(ChatColor.GREEN + "Teleported to home."); + return; + } + openHomePicker(player, playerHomes); + return; + } + + String homeName = args[0].toLowerCase(); + Location loc = playerHomes.get(homeName); + if (loc == null) { + player.sendMessage(ChatColor.RED + "Home '" + homeName + "' not found. Your homes: " + ChatColor.YELLOW + String.join(", ", playerHomes.keySet())); + return; + } + player.teleport(loc); + player.sendMessage(ChatColor.GREEN + "Teleported to home " + ChatColor.YELLOW + homeName + ChatColor.GREEN + "."); + } + + private void openHomePicker(Player player, Map playerHomes) { + Inventory inv = Bukkit.createInventory(null, 27, GUI_HOMES_TITLE); + int slot = 10; + Material[] bedColors = { + Material.RED_BED, Material.BLUE_BED, Material.LIME_BED, + Material.YELLOW_BED, Material.PURPLE_BED, Material.ORANGE_BED, Material.CYAN_BED + }; + int idx = 0; + for (Map.Entry entry : playerHomes.entrySet()) { + if (slot > 16) break; + Material mat = bedColors[idx % bedColors.length]; + Location l = entry.getValue(); + String world = l.getWorld() != null ? l.getWorld().getName() : "world"; + ItemStack item = GuiHelper.createItem( + mat, + "&aHome: &f" + entry.getKey(), + "&7World: &f" + world, + "&7Coords: &f" + l.getBlockX() + ", " + l.getBlockY() + ", " + l.getBlockZ(), + "", + "&eClick to teleport!" + ); + inv.setItem(slot++, item); + idx++; + } + player.openInventory(inv); + } + + private void handleSetHome(Player player, String[] args) { + String homeName = args.length > 0 ? args[0].toLowerCase() : "home"; + int maxHomes = plugin.getConfig().getInt("essentials.max-homes", 5); + Map playerHomes = homes.computeIfAbsent(player.getUniqueId(), k -> new HashMap<>()); + + if (!playerHomes.containsKey(homeName) && playerHomes.size() >= maxHomes) { + player.sendMessage(ChatColor.RED + "You have reached your limit of " + maxHomes + " homes."); + return; + } + + playerHomes.put(homeName, player.getLocation()); + saveHomes(); + player.sendMessage(ChatColor.GREEN + "Home " + ChatColor.YELLOW + homeName + ChatColor.GREEN + " set successfully."); + } + + private void handleDelHome(Player player, String[] args) { + String homeName = args.length > 0 ? args[0].toLowerCase() : "home"; + Map playerHomes = homes.get(player.getUniqueId()); + if (playerHomes == null || playerHomes.remove(homeName) == null) { + player.sendMessage(ChatColor.RED + "Home '" + homeName + "' does not exist."); + return; + } + saveHomes(); + player.sendMessage(ChatColor.GREEN + "Home " + ChatColor.YELLOW + homeName + ChatColor.GREEN + " deleted."); + } + + private void handleBack(Player player) { + Location last = lastLocations.get(player.getUniqueId()); + if (last == null) { + player.sendMessage(ChatColor.RED + "No previous location found to return to."); + return; + } + player.teleport(last); + player.sendMessage(ChatColor.GREEN + "Teleported back to your previous location."); + } + + private void handleTpa(Player player, String[] args) { + if (args.length < 1) { + player.sendMessage(ChatColor.RED + "Usage: /tpa "); + return; + } + Player target = Bukkit.getPlayer(args[0]); + if (target == null || !target.isOnline()) { + player.sendMessage(ChatColor.RED + "Player '" + args[0] + "' is not online."); + return; + } + if (target.getUniqueId().equals(player.getUniqueId())) { + player.sendMessage(ChatColor.RED + "You cannot teleport to yourself."); + return; + } + + pendingTpa.put(target.getUniqueId(), player.getUniqueId()); + tpaTimestamp.put(target.getUniqueId(), System.currentTimeMillis()); + + player.sendMessage(ChatColor.GREEN + "Teleport request sent to " + ChatColor.YELLOW + target.getName() + ChatColor.GREEN + "."); + target.sendMessage(ChatColor.YELLOW + player.getName() + ChatColor.GREEN + " has sent you a teleport request."); + target.sendMessage(ChatColor.GRAY + "Type " + ChatColor.YELLOW + "/tpaccept" + ChatColor.GRAY + " to accept or " + ChatColor.RED + "/tpdeny" + ChatColor.GRAY + " to deny (expires in 60s)."); + } + + private void handleTpAccept(Player player) { + UUID requesterId = pendingTpa.get(player.getUniqueId()); + Long time = tpaTimestamp.get(player.getUniqueId()); + if (requesterId == null || time == null || System.currentTimeMillis() - time > 60_000) { + pendingTpa.remove(player.getUniqueId()); + tpaTimestamp.remove(player.getUniqueId()); + player.sendMessage(ChatColor.RED + "You have no active teleport requests."); + return; + } + + Player requester = Bukkit.getPlayer(requesterId); + if (requester == null || !requester.isOnline()) { + player.sendMessage(ChatColor.RED + "The player who requested to teleport is no longer online."); + pendingTpa.remove(player.getUniqueId()); + return; + } + + requester.teleport(player.getLocation()); + requester.sendMessage(ChatColor.GREEN + "Teleport request accepted by " + ChatColor.YELLOW + player.getName() + ChatColor.GREEN + "!"); + player.sendMessage(ChatColor.GREEN + "Accepted teleport request from " + ChatColor.YELLOW + requester.getName() + ChatColor.GREEN + "."); + pendingTpa.remove(player.getUniqueId()); + tpaTimestamp.remove(player.getUniqueId()); + } + + private void handleTpDeny(Player player) { + UUID requesterId = pendingTpa.remove(player.getUniqueId()); + tpaTimestamp.remove(player.getUniqueId()); + if (requesterId == null) { + player.sendMessage(ChatColor.RED + "You have no active teleport requests."); + return; + } + Player requester = Bukkit.getPlayer(requesterId); + if (requester != null && requester.isOnline()) { + requester.sendMessage(ChatColor.RED + player.getName() + " denied your teleport request."); + } + player.sendMessage(ChatColor.YELLOW + "Teleport request denied."); + } + + private void handleRtp(Player player) { + int radius = plugin.getConfig().getInt("essentials.rtp-radius", 2500); + World world = player.getWorld(); + Random rng = new Random(); + + player.sendMessage(ChatColor.GRAY + "Searching for a safe wilderness destination..."); + Bukkit.getScheduler().runTask(plugin, () -> { + for (int i = 0; i < 15; i++) { + int x = rng.nextInt(radius * 2) - radius; + int z = rng.nextInt(radius * 2) - radius; + int y = world.getHighestBlockYAt(x, z); + Block block = world.getBlockAt(x, y - 1, z); + if (block.getType().isSolid() && block.getType() != Material.LAVA && block.getType() != Material.WATER) { + Location target = new Location(world, x + 0.5, y, z + 0.5); + player.teleport(target); + player.sendMessage(ChatColor.GREEN + "Wilderness RTP: Teleported to " + ChatColor.YELLOW + x + ", " + y + ", " + z + ChatColor.GREEN + "!"); + return; + } + } + player.sendMessage(ChatColor.RED + "Could not find a safe RTP spot. Please try again."); + }); + } + + private void handleWarp(Player player, String[] args) { + if (args.length == 0) { + openWarpPicker(player); + return; + } + + String warpName = args[0].toLowerCase(); + Location loc = warps.get(warpName); + if (loc == null) { + player.sendMessage(ChatColor.RED + "Warp '" + warpName + "' does not exist."); + return; + } + player.teleport(loc); + player.sendMessage(ChatColor.GREEN + "Teleported to warp " + ChatColor.YELLOW + warpName + ChatColor.GREEN + "."); + } + + private void openWarpPicker(Player player) { + Inventory inv = Bukkit.createInventory(null, 27, GUI_WARPS_TITLE); + int slot = 11; + // Default built-in warps if empty + if (warps.isEmpty()) { + warps.put("spawn", player.getWorld().getSpawnLocation()); + saveWarps(); + } + + for (Map.Entry entry : warps.entrySet()) { + if (slot > 15) break; + ItemStack item = GuiHelper.createItem( + Material.ENDER_PEARL, + "&bWarp: &f" + entry.getKey(), + "&7World: &f" + (entry.getValue().getWorld() != null ? entry.getValue().getWorld().getName() : "world"), + "", + "&eClick to teleport!" + ); + inv.setItem(slot++, item); + } + player.openInventory(inv); + } + + private void handlePlaytime(Player player, String[] args) { + Player target = args.length > 0 ? Bukkit.getPlayer(args[0]) : player; + if (target == null) { + player.sendMessage(ChatColor.RED + "Player not found."); + return; + } + + int ticksPlayed = target.getStatistic(Statistic.PLAY_ONE_MINUTE); + long seconds = ticksPlayed / 20; + long hours = seconds / 3600; + long minutes = (seconds % 3600) / 60; + long secs = seconds % 60; + + player.sendMessage(ChatColor.GOLD + "=== Playtime: " + ChatColor.YELLOW + target.getName() + ChatColor.GOLD + " ==="); + player.sendMessage(ChatColor.GRAY + "Total Time: " + ChatColor.GREEN + hours + "h " + minutes + "m " + secs + "s"); + } +} diff --git a/integrations/paper/src/main/java/net/scopenet/paper/commands/GuildHandler.java b/integrations/paper/src/main/java/net/scopenet/paper/commands/GuildHandler.java new file mode 100644 index 0000000..e9099e0 --- /dev/null +++ b/integrations/paper/src/main/java/net/scopenet/paper/commands/GuildHandler.java @@ -0,0 +1,414 @@ +package net.scopenet.paper.commands; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import net.scopenet.integration.ChunkCheckResult; +import net.scopenet.integration.Integration; +import net.scopenet.paper.ScopenetPlugin; +import net.scopenet.paper.gui.GuiHelper; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Chunk; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; + +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + +public final class GuildHandler implements CommandExecutor, Listener { + private final ScopenetPlugin plugin; + private final Integration integration; + private final File guildHomesFile; + private final YamlConfiguration guildHomesConfig; + private final Map guildHomes = new ConcurrentHashMap<>(); + + private static final String GUI_GUILD_TITLE = ChatColor.DARK_AQUA + "Guild Dashboard"; + + public GuildHandler(ScopenetPlugin plugin, Integration integration) { + this.plugin = plugin; + this.integration = integration; + this.guildHomesFile = new File(plugin.getDataFolder(), "guild_homes.yml"); + this.guildHomesConfig = YamlConfiguration.loadConfiguration(guildHomesFile); + loadGuildHomes(); + } + + private void loadGuildHomes() { + if (!guildHomesFile.exists()) return; + for (String gid : guildHomesConfig.getKeys(false)) { + Location loc = guildHomesConfig.getLocation(gid); + if (loc != null) guildHomes.put(gid, loc); + } + } + + private void saveGuildHomes() { + try { + for (Map.Entry entry : guildHomes.entrySet()) { + guildHomesConfig.set(entry.getKey(), entry.getValue()); + } + guildHomesConfig.save(guildHomesFile); + } catch (IOException e) { + plugin.getLogger().warning("Failed to save guild homes: " + e.getMessage()); + } + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (!(sender instanceof Player player)) { + sender.sendMessage(ChatColor.RED + "Only players can execute guild commands."); + return true; + } + + String cmd = command.getName().toLowerCase(); + if (cmd.equals("claim")) { + handleClaim(player); + return true; + } + if (cmd.equals("unclaim")) { + handleUnclaim(player); + return true; + } + + if (cmd.equals("guild") || cmd.equals("g")) { + if (args.length == 0 || args[0].equalsIgnoreCase("info") || args[0].equalsIgnoreCase("gui")) { + handleGuildDashboard(player); + return true; + } + + String sub = args[0].toLowerCase(); + switch (sub) { + case "create" -> handleCreate(player, args); + case "leave" -> handleLeave(player); + case "claim" -> handleClaim(player); + case "unclaim" -> handleUnclaim(player); + case "map" -> handleMap(player); + case "chat", "c" -> handleChat(player, args); + case "sethome" -> handleSetHome(player); + case "home" -> handleHome(player); + case "members" -> handleMembers(player); + default -> sendGuildHelp(player); + } + return true; + } + + return false; + } + + private void sendGuildHelp(Player player) { + player.sendMessage(ChatColor.GOLD + "=== SCOPENET Guild Commands ==="); + player.sendMessage(ChatColor.YELLOW + "/guild" + ChatColor.GRAY + " - Open interactive Guild Dashboard GUI"); + player.sendMessage(ChatColor.YELLOW + "/guild create " + ChatColor.GRAY + " - Create a new guild"); + player.sendMessage(ChatColor.YELLOW + "/guild leave" + ChatColor.GRAY + " - Leave your current guild"); + player.sendMessage(ChatColor.YELLOW + "/claim" + ChatColor.GRAY + " (or /guild claim) - Claim current chunk"); + player.sendMessage(ChatColor.YELLOW + "/unclaim" + ChatColor.GRAY + " (or /guild unclaim) - Unclaim current chunk"); + player.sendMessage(ChatColor.YELLOW + "/guild map" + ChatColor.GRAY + " - Show nearby land claims radar map"); + player.sendMessage(ChatColor.YELLOW + "/guild chat " + ChatColor.GRAY + " - Send message to guild members"); + player.sendMessage(ChatColor.YELLOW + "/guild sethome / /guild home" + ChatColor.GRAY + " - Guild waypoint base"); + } + + private void handleClaim(Player player) { + Chunk chunk = player.getLocation().getChunk(); + String dim = player.getWorld().getName(); + player.sendMessage(ChatColor.GRAY + "Claiming chunk [" + chunk.getX() + ", " + chunk.getZ() + "]..."); + + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().claimChunk(dim, chunk.getX(), chunk.getZ(), player.getUniqueId()); + String gname = res.has("guild_name") ? res.get("guild_name").getAsString() : "your guild"; + player.sendMessage(ChatColor.GREEN + "Chunk claimed successfully for " + ChatColor.YELLOW + gname + ChatColor.GREEN + "!"); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Claim failed: " + e.getMessage()); + } + }); + } + + private void handleUnclaim(Player player) { + Chunk chunk = player.getLocation().getChunk(); + String dim = player.getWorld().getName(); + player.sendMessage(ChatColor.GRAY + "Unclaiming chunk [" + chunk.getX() + ", " + chunk.getZ() + "]..."); + + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + integration.client().unclaimChunk(dim, chunk.getX(), chunk.getZ(), player.getUniqueId()); + player.sendMessage(ChatColor.GREEN + "Chunk [" + chunk.getX() + ", " + chunk.getZ() + "] has been unclaimed."); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Unclaim failed: " + e.getMessage()); + } + }); + } + + private void handleCreate(Player player, String[] args) { + if (args.length < 3) { + player.sendMessage(ChatColor.RED + "Usage: /guild create "); + return; + } + + String name = args[1]; + String tag = args[2]; + player.sendMessage(ChatColor.GRAY + "Founding guild " + name + " [" + tag + "]..."); + + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().createGuild(player.getUniqueId(), player.getName(), name, tag); + player.sendMessage(ChatColor.GREEN + "Guild " + ChatColor.YELLOW + name + ChatColor.GOLD + " [" + tag + "]" + + ChatColor.GREEN + " founded successfully! You are the Guild Leader."); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Failed to create guild: " + e.getMessage()); + } + }); + } + + private void handleLeave(Player player) { + player.sendMessage(ChatColor.GRAY + "Leaving guild..."); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().leaveGuild(player.getUniqueId()); + boolean disbanded = res.has("disbanded") && res.get("disbanded").getAsBoolean(); + if (disbanded) { + player.sendMessage(ChatColor.YELLOW + "You were the last member. The guild was disbanded."); + } else { + player.sendMessage(ChatColor.GREEN + "You left your guild."); + } + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Error leaving guild: " + e.getMessage()); + } + }); + } + + private void handleGuildDashboard(Player player) { + player.sendMessage(ChatColor.GRAY + "Loading guild info..."); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().getPlayerGuild(player.getUniqueId()); + if (!res.has("in_guild") || !res.get("in_guild").getAsBoolean()) { + player.sendMessage(ChatColor.YELLOW + "You are not in a guild! Create one with " + + ChatColor.GOLD + "/guild create "); + return; + } + + JsonObject g = res.getAsJsonObject("guild"); + String name = g.get("name").getAsString(); + String tag = g.get("tag").getAsString(); + String role = g.get("role").getAsString(); + int level = g.has("level") ? g.get("level").getAsInt() : 1; + long claims = g.has("claims_count") ? g.get("claims_count").getAsLong() : 0; + long maxClaims = g.has("max_claims") ? g.get("max_claims").getAsLong() : 16; + JsonArray members = g.has("members") ? g.getAsJsonArray("members") : new JsonArray(); + + Bukkit.getScheduler().runTask(plugin, () -> { + Inventory inv = Bukkit.createInventory(null, 36, GUI_GUILD_TITLE); + ItemStack border = GuiHelper.createBorder(Material.CYAN_STAINED_GLASS_PANE); + for (int i = 0; i < 9; i++) inv.setItem(i, border); + for (int i = 27; i < 36; i++) inv.setItem(i, border); + + // Guild banner + inv.setItem(11, GuiHelper.createItem(Material.CYAN_BANNER, + "&bGuild: &f" + name + " &e[" + tag + "]", + "&7Your Role: &a" + role.toUpperCase(), + "&7Guild Level: &6" + level, + "&7Members: &f" + members.size())); + + // Claims status + inv.setItem(13, GuiHelper.createItem(Material.EMERALD_BLOCK, + "&aTerritory Claims", + "&7Claimed Chunks: &e" + claims + " &7/ &a" + maxClaims, + "", + "&7Click &e/claim &7to claim nearby area.")); + + // Quick claim button + inv.setItem(14, GuiHelper.createItem(Material.LIME_DYE, + "&aClaim Current Chunk", + "&7Click to claim the chunk you are standing on!")); + + // Quick unclaim button + inv.setItem(15, GuiHelper.createItem(Material.RED_DYE, + "&cUnclaim Current Chunk", + "&7Click to unclaim the current chunk.")); + + // Minimap button + inv.setItem(22, GuiHelper.createItem(Material.MAP, + "&eView Land Map", + "&7Shows nearby territory claims radar in chat.")); + + player.openInventory(inv); + }); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Failed to load guild: " + e.getMessage()); + } + }); + } + + private void handleMap(Player player) { + Location pLoc = player.getLocation(); + Chunk center = pLoc.getChunk(); + int cx = center.getX(); + int cz = center.getZ(); + String dim = pLoc.getWorld().getName(); + + player.sendMessage(ChatColor.GOLD + "========= " + ChatColor.YELLOW + "Territory Map (" + cx + ", " + cz + ")" + ChatColor.GOLD + " ========="); + player.sendMessage(ChatColor.GRAY + " N (-Z)"); + + StringBuilder header = new StringBuilder(" "); + for (int dx = -4; dx <= 4; dx++) { + header.append(" "); + } + player.sendMessage(header.toString()); + + for (int dz = -3; dz <= 3; dz++) { + StringBuilder row = new StringBuilder(" "); + for (int dx = -4; dx <= 4; dx++) { + int targetX = cx + dx; + int targetZ = cz + dz; + boolean isPlayer = (dx == 0 && dz == 0); + + ChunkCheckResult res = integration.checkChunk(dim, targetX, targetZ, player.getUniqueId()); + if (isPlayer) { + row.append(ChatColor.GOLD).append("[P]"); + } else if (res.claimed() && res.allowed()) { + row.append(ChatColor.GREEN).append(" + "); + } else if (res.claimed() && !res.allowed()) { + row.append(ChatColor.RED).append(" x "); + } else { + row.append(ChatColor.DARK_GRAY).append(" . "); + } + } + player.sendMessage(row.toString()); + } + + player.sendMessage(ChatColor.GRAY + " S (+Z)"); + player.sendMessage(ChatColor.GOLD + "[P]" + ChatColor.YELLOW + " You " + + ChatColor.GREEN + "+ " + ChatColor.GRAY + "Your Guild " + + ChatColor.RED + "x " + ChatColor.GRAY + "Other Guild " + + ChatColor.DARK_GRAY + ". " + ChatColor.GRAY + "Wilderness"); + } + + private void handleChat(Player player, String[] args) { + if (args.length < 2) { + player.sendMessage(ChatColor.RED + "Usage: /guild chat "); + return; + } + + String msg = String.join(" ", Arrays.copyOfRange(args, 1, args.length)); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().getPlayerGuild(player.getUniqueId()); + if (!res.has("in_guild") || !res.get("in_guild").getAsBoolean()) { + player.sendMessage(ChatColor.RED + "You are not in a guild."); + return; + } + String tag = res.getAsJsonObject("guild").get("tag").getAsString(); + String formatted = ChatColor.GREEN + "[Guild " + tag + "] " + ChatColor.YELLOW + player.getName() + ": " + ChatColor.WHITE + msg; + for (Player p : Bukkit.getOnlinePlayers()) { + p.sendMessage(formatted); + } + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Guild chat error: " + e.getMessage()); + } + }); + } + + private void handleSetHome(Player player) { + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().getPlayerGuild(player.getUniqueId()); + if (!res.has("in_guild") || !res.get("in_guild").getAsBoolean()) { + player.sendMessage(ChatColor.RED + "You must be in a guild to set a guild home."); + return; + } + String role = res.getAsJsonObject("guild").get("role").getAsString(); + if (!role.equals("leader") && !role.equals("officer")) { + player.sendMessage(ChatColor.RED + "Only guild leaders and officers can set the guild home."); + return; + } + String gid = res.getAsJsonObject("guild").get("id").getAsString(); + guildHomes.put(gid, player.getLocation()); + saveGuildHomes(); + player.sendMessage(ChatColor.GREEN + "Guild home waypoint set at your location!"); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Error: " + e.getMessage()); + } + }); + } + + private void handleHome(Player player) { + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().getPlayerGuild(player.getUniqueId()); + if (!res.has("in_guild") || !res.get("in_guild").getAsBoolean()) { + player.sendMessage(ChatColor.RED + "You are not in a guild."); + return; + } + String gid = res.getAsJsonObject("guild").get("id").getAsString(); + Location loc = guildHomes.get(gid); + if (loc == null) { + player.sendMessage(ChatColor.RED + "Your guild has not set a guild home yet! Use /guild sethome"); + return; + } + Bukkit.getScheduler().runTask(plugin, () -> { + player.teleport(loc); + player.sendMessage(ChatColor.GREEN + "Teleported to guild home base."); + }); + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Error: " + e.getMessage()); + } + }); + } + + private void handleMembers(Player player) { + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + try { + JsonObject res = integration.client().getPlayerGuild(player.getUniqueId()); + if (!res.has("in_guild") || !res.get("in_guild").getAsBoolean()) { + player.sendMessage(ChatColor.RED + "You are not in a guild."); + return; + } + JsonObject g = res.getAsJsonObject("guild"); + String name = g.get("name").getAsString(); + JsonArray members = g.getAsJsonArray("members"); + + player.sendMessage(ChatColor.GOLD + "=== Members of " + ChatColor.YELLOW + name + ChatColor.GOLD + " ==="); + for (JsonElement el : members) { + JsonObject m = el.getAsJsonObject(); + String mname = m.get("name").getAsString(); + String role = m.get("role").getAsString(); + Player onlineP = Bukkit.getPlayer(mname); + String status = onlineP != null && onlineP.isOnline() ? ChatColor.GREEN + "[Online]" : ChatColor.GRAY + "[Offline]"; + player.sendMessage(ChatColor.WHITE + " - " + mname + " (" + ChatColor.AQUA + role + ChatColor.WHITE + ") " + status); + } + } catch (Exception e) { + player.sendMessage(ChatColor.RED + "Error fetching members: " + e.getMessage()); + } + }); + } + + @EventHandler + public void onInventoryClick(InventoryClickEvent event) { + if (!(event.getWhoClicked() instanceof Player player)) return; + if (!event.getView().getTitle().equals(GUI_GUILD_TITLE)) return; + + event.setCancelled(true); + int slot = event.getRawSlot(); + if (slot == 14) { // Claim Current Chunk + player.closeInventory(); + handleClaim(player); + } else if (slot == 15) { // Unclaim Current Chunk + player.closeInventory(); + handleUnclaim(player); + } else if (slot == 22) { // Minimap + player.closeInventory(); + handleMap(player); + } + } +} diff --git a/integrations/paper/src/main/java/net/scopenet/paper/commands/ScopenetCommandHandler.java b/integrations/paper/src/main/java/net/scopenet/paper/commands/ScopenetCommandHandler.java new file mode 100644 index 0000000..59b4916 --- /dev/null +++ b/integrations/paper/src/main/java/net/scopenet/paper/commands/ScopenetCommandHandler.java @@ -0,0 +1,130 @@ +package net.scopenet.paper.commands; + +import net.scopenet.integration.Integration; +import net.scopenet.integration.Settings; +import net.scopenet.paper.ScopenetPlugin; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; + +public final class ScopenetCommandHandler implements CommandExecutor { + private final ScopenetPlugin plugin; + private final Integration integration; + + public ScopenetCommandHandler(ScopenetPlugin plugin, Integration integration) { + this.plugin = plugin; + this.integration = integration; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (args.length == 0 || args[0].equalsIgnoreCase("help")) { + sendHelp(sender); + return true; + } + + String sub = args[0].toLowerCase(); + switch (sub) { + case "status" -> sendStatus(sender); + case "reload" -> handleReload(sender); + default -> { + sender.sendMessage(ChatColor.RED + "Unknown command. Use " + ChatColor.YELLOW + "/scopenet help"); + } + } + return true; + } + + private void sendHelp(CommandSender sender) { + Settings s = integration != null ? integration.settings() : null; + sender.sendMessage(ChatColor.GOLD + "=================== " + ChatColor.YELLOW + "SCOPENET Commands" + ChatColor.GOLD + " ==================="); + + // Essentials commands + if (s == null || s.essentialsEnabled()) { + sender.sendMessage(ChatColor.AQUA + "[Essentials Commands]"); + sender.sendMessage(ChatColor.YELLOW + " /spawn" + ChatColor.GRAY + " - Teleport to server spawn"); + sender.sendMessage(ChatColor.YELLOW + " /home [name]" + ChatColor.GRAY + " - Teleport to home or open homes GUI"); + sender.sendMessage(ChatColor.YELLOW + " /sethome [name]" + ChatColor.GRAY + " - Set home location"); + sender.sendMessage(ChatColor.YELLOW + " /delhome [name]" + ChatColor.GRAY + " - Delete home"); + sender.sendMessage(ChatColor.YELLOW + " /back" + ChatColor.GRAY + " - Return to location before teleport/death"); + sender.sendMessage(ChatColor.YELLOW + " /tpa " + ChatColor.GRAY + " - Request to teleport to a player"); + sender.sendMessage(ChatColor.YELLOW + " /tpaccept / /tpdeny" + ChatColor.GRAY + " - Accept or deny teleport"); + sender.sendMessage(ChatColor.YELLOW + " /rtp" + ChatColor.GRAY + " - Random wilderness teleport"); + sender.sendMessage(ChatColor.YELLOW + " /warp [name]" + ChatColor.GRAY + " - Teleport to warp or open warps GUI"); + sender.sendMessage(ChatColor.YELLOW + " /playtime [player]" + ChatColor.GRAY + " - View total playtime stats"); + } + + // Economy commands + if (s == null || s.economyEnabled()) { + sender.sendMessage(ChatColor.GREEN + "[Economy Commands]"); + sender.sendMessage(ChatColor.YELLOW + " /balance (or /bal)" + ChatColor.GRAY + " - Check your wallet balance"); + sender.sendMessage(ChatColor.YELLOW + " /pay " + ChatColor.GRAY + " - Send money to a player"); + sender.sendMessage(ChatColor.YELLOW + " /baltop" + ChatColor.GRAY + " - Leaderboard of richest players"); + sender.sendMessage(ChatColor.YELLOW + " /shop" + ChatColor.GRAY + " - Open interactive Server Shop GUI"); + sender.sendMessage(ChatColor.YELLOW + " /sell (or /sell hand)" + ChatColor.GRAY + " - Sell items for cash"); + sender.sendMessage(ChatColor.YELLOW + " /market" + ChatColor.GRAY + " - Open player marketplace GUI"); + sender.sendMessage(ChatColor.YELLOW + " /market sell " + ChatColor.GRAY + " - List held item on market"); + sender.sendMessage(ChatColor.YELLOW + " /trade " + ChatColor.GRAY + " - Secure two-player trade GUI"); + sender.sendMessage(ChatColor.YELLOW + " /transactions" + ChatColor.GRAY + " - View recent transaction history"); + } + + // Guilds commands + if (s == null || s.guildsEnabled()) { + sender.sendMessage(ChatColor.BLUE + "[Guilds & Claims]"); + sender.sendMessage(ChatColor.YELLOW + " /guild" + ChatColor.GRAY + " - Open interactive Guild Dashboard GUI"); + sender.sendMessage(ChatColor.YELLOW + " /guild create " + ChatColor.GRAY + " - Create a new guild"); + sender.sendMessage(ChatColor.YELLOW + " /guild leave" + ChatColor.GRAY + " - Leave your current guild"); + sender.sendMessage(ChatColor.YELLOW + " /guild members" + ChatColor.GRAY + " - List online guild members"); + sender.sendMessage(ChatColor.YELLOW + " /guild chat " + ChatColor.GRAY + " - Send guild chat message"); + sender.sendMessage(ChatColor.YELLOW + " /claim" + ChatColor.GRAY + " - Claim current chunk for your guild"); + sender.sendMessage(ChatColor.YELLOW + " /unclaim" + ChatColor.GRAY + " - Unclaim current chunk"); + sender.sendMessage(ChatColor.YELLOW + " /guild map" + ChatColor.GRAY + " - Show nearby land claims radar map"); + } + + // Admin commands + if (sender.hasPermission("scopenet.admin")) { + sender.sendMessage(ChatColor.LIGHT_PURPLE + "[Admin Commands]"); + sender.sendMessage(ChatColor.YELLOW + " /scopenet status" + ChatColor.GRAY + " - Integration health and module statuses"); + sender.sendMessage(ChatColor.YELLOW + " /scopenet reload" + ChatColor.GRAY + " - Reload config and feature flags"); + } + } + + private void sendStatus(CommandSender sender) { + if (!sender.hasPermission("scopenet.admin")) { + sender.sendMessage(ChatColor.RED + "You do not have permission to view SCOPENET status."); + return; + } + + Settings s = integration != null ? integration.settings() : null; + sender.sendMessage(ChatColor.GOLD + "=== SCOPENET Integration Status ==="); + if (s == null) { + sender.sendMessage(ChatColor.RED + "Status: NOT INITIALIZED or OFFLINE"); + return; + } + + sender.sendMessage(ChatColor.GRAY + "Panel URL: " + ChatColor.WHITE + s.panel()); + sender.sendMessage(ChatColor.GRAY + "Server Token: " + ChatColor.GREEN + (s.token().isEmpty() ? "MISSING" : "CONFIGURED")); + sender.sendMessage(ChatColor.GRAY + "Leveling: " + formatFlag(s.levelingEnabled())); + sender.sendMessage(ChatColor.GRAY + "Quests: " + formatFlag(s.questsEnabled())); + sender.sendMessage(ChatColor.GRAY + "Achievements: " + formatFlag(s.achievementsEnabled())); + sender.sendMessage(ChatColor.GRAY + "Guilds: " + formatFlag(s.guildsEnabled())); + sender.sendMessage(ChatColor.GRAY + "Land Claiming: " + formatFlag(s.landClaimingEnabled())); + sender.sendMessage(ChatColor.GRAY + "Social: " + formatFlag(s.socialEnabled())); + sender.sendMessage(ChatColor.GRAY + "Essentials: " + formatFlag(s.essentialsEnabled())); + sender.sendMessage(ChatColor.GRAY + "Economy: " + formatFlag(s.economyEnabled())); + } + + private String formatFlag(boolean enabled) { + return enabled ? ChatColor.GREEN + "ENABLED" : ChatColor.RED + "DISABLED"; + } + + private void handleReload(CommandSender sender) { + if (!sender.hasPermission("scopenet.admin")) { + sender.sendMessage(ChatColor.RED + "You do not have permission to reload SCOPENET."); + return; + } + + plugin.reloadConfig(); + sender.sendMessage(ChatColor.GREEN + "SCOPENET configuration reloaded successfully."); + } +} diff --git a/integrations/paper/src/main/java/net/scopenet/paper/gui/GuiHelper.java b/integrations/paper/src/main/java/net/scopenet/paper/gui/GuiHelper.java new file mode 100644 index 0000000..60c8b25 --- /dev/null +++ b/integrations/paper/src/main/java/net/scopenet/paper/gui/GuiHelper.java @@ -0,0 +1,41 @@ +package net.scopenet.paper.gui; + +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public final class GuiHelper { + private GuiHelper() {} + + public static ItemStack createItem(Material material, String name, String... lore) { + return createItem(material, 1, name, lore); + } + + public static ItemStack createItem(Material material, int amount, String name, String... lore) { + ItemStack item = new ItemStack(material, Math.max(1, amount)); + ItemMeta meta = item.getItemMeta(); + if (meta != null) { + if (name != null) { + meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name)); + } + if (lore != null && lore.length > 0) { + List list = new ArrayList<>(); + for (String line : lore) { + list.add(ChatColor.translateAlternateColorCodes('&', line)); + } + meta.setLore(list); + } + item.setItemMeta(meta); + } + return item; + } + + public static ItemStack createBorder(Material material) { + return createItem(material, " "); + } +} diff --git a/integrations/paper/src/main/resources/config.yml b/integrations/paper/src/main/resources/config.yml index b8a5d21..aaedac3 100644 --- a/integrations/paper/src/main/resources/config.yml +++ b/integrations/paper/src/main/resources/config.yml @@ -42,3 +42,18 @@ social: enabled: true # Show player guild tag and level title in chat formatting chat-prefixes: true + +essentials: + # Essentials commands (/spawn, /home, /sethome, /delhome, /back, /tpa, /tpaccept, /tpdeny, /rtp, /warp, /playtime) + enabled: true + # Maximum homes per player + max-homes: 5 + # RTP search radius + rtp-radius: 2500 + +economy: + # Server Economy commands (/balance, /pay, /baltop, /shop, /sell, /market, /orders, /trade, /transactions) + enabled: true + # Currency symbol + currency-symbol: "$" + diff --git a/integrations/paper/src/main/resources/plugin.yml b/integrations/paper/src/main/resources/plugin.yml index e8144c0..8c75db6 100644 --- a/integrations/paper/src/main/resources/plugin.yml +++ b/integrations/paper/src/main/resources/plugin.yml @@ -4,3 +4,70 @@ main: net.scopenet.paper.ScopenetPlugin api-version: '1.20' description: SCOPENET private authentication, access control and activity reporting. load: STARTUP + +commands: + scopenet: + description: SCOPENET server commands, status, and help + aliases: [sn] + permission: scopenet.use + spawn: + description: Teleport to the server spawn point + aliases: [hub, lobby] + home: + description: Teleport to one of your homes or open the homes GUI + aliases: [homes] + sethome: + description: Set a new home location + aliases: [createshome] + delhome: + description: Delete an existing home + aliases: [rmhome] + back: + description: Return to your previous location or death point + aliases: [return] + tpa: + description: Request to teleport to another player + tpaccept: + description: Accept an incoming teleport request + aliases: [tpyes] + tpdeny: + description: Deny an incoming teleport request + aliases: [tpno] + rtp: + description: Teleport to a random safe location in the wilderness + aliases: [wild, randomtp] + warp: + description: Teleport to a server warp or open the warps GUI + aliases: [warps] + playtime: + description: Check total and session playtime + aliases: [ontime] + balance: + description: Check your server economy balance + aliases: [bal, money] + pay: + description: Send money to another player + baltop: + description: View the richest players on the server + aliases: [richest] + shop: + description: Open the interactive server shop GUI + sell: + description: Open the item selling GUI + market: + description: Open the player marketplace GUI + aliases: [ah, auction] + orders: + description: View active marketplace orders + trade: + description: Request a secure trade with another player + transactions: + description: View recent economy transactions + guild: + description: Guild management, members, claims, and relations + aliases: [g, clan] + claim: + description: Claim the current chunk for your guild + unclaim: + description: Unclaim the current chunk + diff --git a/launcher/src-tauri/src/commands.rs b/launcher/src-tauri/src/commands.rs index 1a87d0b..cbec442 100644 --- a/launcher/src-tauri/src/commands.rs +++ b/launcher/src-tauri/src/commands.rs @@ -7,9 +7,9 @@ use crate::state::{build, AppState}; use crate::updater; use scopenet_core::ping::ServerStatus; use scopenet_shared::{ - Achievement, DirectMessage, FriendInfo, GameInvite, Guild, GuildClaim, GuildMember, GuildPost, - LauncherManifest, PlayerProfile, SkinProfile, UserLevelInfo, UserPost, UserProfileView, - UserQuest, + Achievement, BaltopEntry, DirectMessage, EconomyTransaction, FriendInfo, GameInvite, Guild, + GuildClaim, GuildMember, GuildPost, LauncherManifest, MemberProfile, PlayerProfile, + ServerEconomyBalance, SkinProfile, UserLevelInfo, UserPost, UserProfileView, UserQuest, }; use serde::Serialize; use tauri::{AppHandle, Manager, State}; @@ -550,14 +550,14 @@ pub async fn get_my_quests(state: State<'_, AppState>) -> Res> { } #[tauri::command] -pub async fn claim_quest(state: State<'_, AppState>, quest_id: String) -> Res { +pub async fn claim_quest(state: State<'_, AppState>, quest_id: String) -> Res { let req = account_api(&state, reqwest::Method::POST, &format!("/quests/{quest_id}/claim")).await?; let resp = req.send().await.map_err(err)?; if !resp.status().is_success() { let body: serde_json::Value = resp.json().await.unwrap_or_default(); return Err(body["error"].as_str().unwrap_or("unable to claim quest").to_string()); } - resp.json().await.map_err(err) + get_my_level(state).await } // --------------------------------------------------------------------------- @@ -738,9 +738,14 @@ pub async fn get_friends(state: State<'_, AppState>) -> Res> { } #[tauri::command] -pub async fn send_friend_request(state: State<'_, AppState>, username: String) -> Res<()> { +pub async fn send_friend_request( + state: State<'_, AppState>, + friend_username: Option, + username: Option, +) -> Res<()> { + let target = friend_username.or(username).ok_or("username is required")?; let req = account_api(&state, reqwest::Method::POST, "/friends/request").await?; - let resp = req.json(&serde_json::json!({ "username": username })).send().await.map_err(err)?; + let resp = req.json(&serde_json::json!({ "username": target })).send().await.map_err(err)?; if !resp.status().is_success() { let body: serde_json::Value = resp.json().await.unwrap_or_default(); return Err(body["error"].as_str().unwrap_or("unable to send friend request").to_string()); @@ -749,9 +754,15 @@ pub async fn send_friend_request(state: State<'_, AppState>, username: String) - } #[tauri::command] -pub async fn respond_friend_request(state: State<'_, AppState>, target_uuid: String, accept: bool) -> Res<()> { +pub async fn respond_friend_request( + state: State<'_, AppState>, + friend_uuid: Option, + target_uuid: Option, + accept: bool, +) -> Res<()> { + let target = friend_uuid.or(target_uuid).ok_or("target_uuid is required")?; let req = account_api(&state, reqwest::Method::POST, "/friends/respond").await?; - let resp = req.json(&serde_json::json!({ "target_uuid": target_uuid, "accept": accept })).send().await.map_err(err)?; + let resp = req.json(&serde_json::json!({ "target_uuid": target, "accept": accept })).send().await.map_err(err)?; if !resp.status().is_success() { let body: serde_json::Value = resp.json().await.unwrap_or_default(); return Err(body["error"].as_str().unwrap_or("unable to respond to friend request").to_string()); @@ -760,8 +771,13 @@ pub async fn respond_friend_request(state: State<'_, AppState>, target_uuid: Str } #[tauri::command] -pub async fn remove_friend(state: State<'_, AppState>, target_uuid: String) -> Res<()> { - let req = account_api(&state, reqwest::Method::DELETE, &format!("/friends/{target_uuid}")).await?; +pub async fn remove_friend( + state: State<'_, AppState>, + friend_uuid: Option, + target_uuid: Option, +) -> Res<()> { + let target = friend_uuid.or(target_uuid).ok_or("target_uuid is required")?; + let req = account_api(&state, reqwest::Method::DELETE, &format!("/friends/{target}")).await?; let resp = req.send().await.map_err(err)?; if !resp.status().is_success() { let body: serde_json::Value = resp.json().await.unwrap_or_default(); @@ -770,6 +786,46 @@ pub async fn remove_friend(state: State<'_, AppState>, target_uuid: String) -> R Ok(()) } +#[tauri::command] +pub async fn search_members(state: State<'_, AppState>, query: String) -> Res> { + let req = account_api(&state, reqwest::Method::GET, &format!("/social/members?q={query}")).await?; + let resp = req.send().await.map_err(err)?; + if !resp.status().is_success() { + return Err("unable to search members".into()); + } + resp.json().await.map_err(err) +} + +#[tauri::command] +pub async fn get_economy_balances(state: State<'_, AppState>) -> Res> { + let req = account_api(&state, reqwest::Method::GET, "/economy/me").await?; + let resp = req.send().await.map_err(err)?; + if !resp.status().is_success() { + return Err("unable to load economy balances".into()); + } + resp.json().await.map_err(err) +} + +#[tauri::command] +pub async fn get_server_baltop(state: State<'_, AppState>, server_id: i64) -> Res> { + let req = account_api(&state, reqwest::Method::GET, &format!("/servers/{server_id}/economy/baltop")).await?; + let resp = req.send().await.map_err(err)?; + if !resp.status().is_success() { + return Err("unable to load baltop leaderboard".into()); + } + resp.json().await.map_err(err) +} + +#[tauri::command] +pub async fn get_transactions(state: State<'_, AppState>) -> Res> { + let req = account_api(&state, reqwest::Method::GET, "/economy/transactions").await?; + let resp = req.send().await.map_err(err)?; + if !resp.status().is_success() { + return Err("unable to load transactions".into()); + } + resp.json().await.map_err(err) +} + #[tauri::command] pub async fn get_direct_messages(state: State<'_, AppState>, friend_uuid: String) -> Res> { let req = account_api(&state, reqwest::Method::GET, &format!("/messages/{friend_uuid}")).await?; diff --git a/launcher/src-tauri/src/lib.rs b/launcher/src-tauri/src/lib.rs index 85db595..cc8abaf 100644 --- a/launcher/src-tauri/src/lib.rs +++ b/launcher/src-tauri/src/lib.rs @@ -101,6 +101,10 @@ pub fn run() { commands::send_friend_request, commands::respond_friend_request, commands::remove_friend, + commands::search_members, + commands::get_economy_balances, + commands::get_server_baltop, + commands::get_transactions, commands::get_direct_messages, commands::send_direct_message, commands::get_game_invites, diff --git a/launcher/src/lib/types.ts b/launcher/src/lib/types.ts index c9a04b6..e14e36c 100644 --- a/launcher/src/lib/types.ts +++ b/launcher/src/lib/types.ts @@ -156,6 +156,7 @@ export interface UserLevelInfo { next_level_xp: number; progress_pct: number; title: string | null; + rank?: number | null; badges: string[]; rewards: LevelReward[]; } @@ -316,3 +317,44 @@ export interface UserProfileView { created_at: string; } +export interface MemberProfile { + uuid: string; + username: string; + role: string; + status: string; + skin_url: string | null; + global_level: number; + title: string | null; + playtime_secs: number; + last_seen: string | null; + online: boolean; + is_friend: boolean; +} + +export interface ServerEconomyBalance { + server_id: number; + server_name: string; + balance: number; + currency_symbol: string; + last_updated: string; +} + +export interface EconomyTransaction { + id: number; + server_id: number; + server_name?: string; + sender_uuid: string; + recipient_uuid: string; + amount: number; + tx_type: string; + description: string; + created_at: string; +} + +export interface BaltopEntry { + rank: number; + uuid: string; + username: string; + balance: number; +} + diff --git a/launcher/src/pages/Quests.svelte b/launcher/src/pages/Quests.svelte index 753ef84..2505d37 100644 --- a/launcher/src/pages/Quests.svelte +++ b/launcher/src/pages/Quests.svelte @@ -51,7 +51,8 @@ levelInfo = updatedLevel; // Mark as claimed locally userQuests = userQuests.map((uq) => { - if (uq.quest.id === questId) { + const id = uq.quest?.id || (uq as any).id; + if (id === questId) { return { ...uq, claimed: true }; } return uq; @@ -66,18 +67,29 @@ const filteredQuests = $derived( userQuests.filter((uq) => { - if (uq.quest.quest_type !== activeTab) return false; - if (selectedCategory !== 'all' && uq.quest.category !== selectedCategory) return false; + const q = uq.quest || uq; + const qType = q.quest_type || (q as any).period || 'daily'; + if (qType !== activeTab) return false; + const cat = q.category || 'mining'; + if (selectedCategory !== 'all' && cat !== selectedCategory) return false; return true; }) ); const completedCount = $derived( - userQuests.filter((uq) => uq.quest.quest_type === activeTab && uq.completed).length + userQuests.filter((uq) => { + const q = uq.quest || uq; + const qType = q.quest_type || (q as any).period || 'daily'; + return qType === activeTab && uq.completed; + }).length ); const totalTabQuests = $derived( - userQuests.filter((uq) => uq.quest.quest_type === activeTab).length + userQuests.filter((uq) => { + const q = uq.quest || uq; + const qType = q.quest_type || (q as any).period || 'daily'; + return qType === activeTab; + }).length ); const unlockedAchievementsCount = $derived( @@ -128,11 +140,19 @@ LVL {levelInfo.level} + {#if levelInfo.rank} +
+ #{levelInfo.rank} +
+ {/if}
- SCOPENET Global Level + SCOPENET Progression + {#if levelInfo.rank} + Global Rank #{levelInfo.rank} + {/if} {#if levelInfo.title} {levelInfo.title} {/if} @@ -146,7 +166,11 @@
- Playing on any SCOPENET server earns Global XP. Unlocks exclusive titles, badges, and cosmetic items. + {#if levelInfo.rank} + You are currently ranked #{levelInfo.rank} globally! Earn XP across all servers to climb the leaderboard. + {:else} + Playing on any SCOPENET server earns Global XP. Unlocks exclusive titles, badges, and cosmetic items. + {/if} {#if levelInfo.badges && levelInfo.badges.length > 0}
@@ -242,9 +266,13 @@
{:else}
- {#each filteredQuests as uq (uq.quest.id)} - {@const pct = Math.min(100, Math.round((uq.current_count / Math.max(1, uq.quest.target_count)) * 100))} - {@const IconComponent = categoryIcons[uq.quest.category] || Target} + {#each filteredQuests as uq ((uq.quest?.id || (uq as any).id))} + {@const q = uq.quest || uq} + {@const currentCount = uq.current_count ?? (uq as any).progress ?? 0} + {@const targetCount = q.target_count || (q as any).target_count || 1} + {@const pct = Math.min(100, Math.round((currentCount / Math.max(1, targetCount)) * 100))} + {@const IconComponent = categoryIcons[q.category] || Target} + {@const qId = q.id || (uq as any).id}
@@ -253,19 +281,19 @@
- {uq.quest.title} - {uq.quest.category} + {q.title} + {q.category}
-

{uq.quest.description}

+

{q.description}

- {uq.current_count} / {uq.quest.target_count} ({pct}%) + {currentCount} / {targetCount} ({pct}%) - +{uq.quest.xp_reward} XP + +{q.xp_reward} XP
@@ -278,15 +306,15 @@ {:else if uq.completed} {:else} In Progress @@ -369,6 +397,26 @@ line-height: 1; color: var(--text); } + .rank-badge-pill { + display: inline-flex; + align-items: center; + gap: 3px; + background: color-mix(in srgb, #f59e0b 25%, transparent); + color: #f59e0b; + border: 1px solid color-mix(in srgb, #f59e0b 50%, transparent); + border-radius: 99rem; + padding: 2px 7px; + font-size: 0.72rem; + font-weight: 700; + margin-top: -6px; + z-index: 2; + } + .rank-title-badge { + background: color-mix(in srgb, #f59e0b 20%, transparent); + color: #f59e0b; + border: 1px solid color-mix(in srgb, #f59e0b 45%, transparent); + font-weight: 700; + } .level-details { flex: 1; display: flex; diff --git a/launcher/src/pages/Social.svelte b/launcher/src/pages/Social.svelte index 35ca13d..fc8cdfd 100644 --- a/launcher/src/pages/Social.svelte +++ b/launcher/src/pages/Social.svelte @@ -2,15 +2,16 @@ import { onMount } from 'svelte'; import { Users, UserPlus, MessageSquare, Gamepad2, Send, Check, X, Trash2, - Clock, ExternalLink, LoaderCircle, RefreshCw, Circle, UserX, Sparkles + Clock, ExternalLink, LoaderCircle, RefreshCw, Circle, UserX, Sparkles, + Search, Trophy, Shield } from '@lucide/svelte'; import Avatar from '../components/Avatar.svelte'; import Modal from '../components/Modal.svelte'; import { activeAccount, app, instances, toast } from '../lib/store.svelte'; import { invoke } from '../lib/tauri'; - import type { FriendInfo, DirectMessage, GameInvite } from '../lib/types'; + import type { FriendInfo, DirectMessage, GameInvite, MemberProfile } from '../lib/types'; - let activeSection = $state<'friends' | 'messages' | 'invites'>('friends'); + let activeSection = $state<'friends' | 'members' | 'messages' | 'invites'>('friends'); let friendsFilter = $state<'all' | 'online' | 'pending'>('all'); let loading = $state(false); @@ -25,6 +26,12 @@ let addFriendUsername = $state(''); let sendingFriendReq = $state(false); + // Members Directory / Search + let memberSearchQuery = $state(''); + let membersList = $state([]); + let loadingMembers = $state(false); + let addingFriendUuid = $state(null); + // Send Game Invite Modal let inviteModalOpen = $state(false); let inviteTargetFriend = $state(null); @@ -47,14 +54,43 @@ } } + async function searchMembers() { + loadingMembers = true; + try { + membersList = await invoke('search_members', { query: memberSearchQuery.trim() }); + } catch (e: any) { + toast(e?.message ?? 'Failed to search members', 'error'); + } finally { + loadingMembers = false; + } + } + + async function handleAddMemberAsFriend(username: string, uuid: string) { + addingFriendUuid = uuid; + try { + await invoke('send_friend_request', { username, friendUsername: username }); + toast(`Friend request sent to ${username}!`, 'ok'); + await searchMembers(); + await loadData(); + } catch (e: any) { + toast(e?.message ?? 'Failed to send friend request', 'error'); + } finally { + addingFriendUuid = null; + } + } + async function handleSendFriendRequest() { if (!addFriendUsername.trim()) return; sendingFriendReq = true; + const target = addFriendUsername.trim(); try { - await invoke('send_friend_request', { friendUsername: addFriendUsername.trim() }); - toast(`Friend request sent to ${addFriendUsername.trim()}!`, 'ok'); + await invoke('send_friend_request', { username: target, friendUsername: target }); + toast(`Friend request sent to ${target}!`, 'ok'); addFriendUsername = ''; await loadData(); + if (activeSection === 'members') { + await searchMembers(); + } } catch (e: any) { toast(e?.message ?? 'Failed to send friend request', 'error'); } finally { @@ -64,7 +100,7 @@ async function handleRespondRequest(friendUuid: string, accept: boolean) { try { - await invoke('respond_friend_request', { friendUuid, accept }); + await invoke('respond_friend_request', { targetUuid: friendUuid, friendUuid, accept }); toast(accept ? 'Friend request accepted!' : 'Request declined.', 'ok'); await loadData(); } catch (e: any) { @@ -74,7 +110,7 @@ async function handleRemoveFriend(friendUuid: string) { try { - await invoke('remove_friend', { friendUuid }); + await invoke('remove_friend', { targetUuid: friendUuid, friendUuid }); friends = friends.filter((f) => f.uuid !== friendUuid); if (activeChatFriend?.uuid === friendUuid) { activeChatFriend = null; @@ -191,6 +227,9 @@ + @@ -346,6 +385,100 @@
{/if}
+ {:else if activeSection === 'members'} + +
+
+ + e.key === 'Enter' && searchMembers()} + class="members-search-input" + /> + +
+ + {#if loadingMembers && !membersList.length} +
+ {:else if membersList.length === 0} +
+ +

No players found matching "{memberSearchQuery}". Try another username!

+
+ {:else} +
+ {#each membersList as member (member.uuid)} + {@const isMe = member.uuid === activeAccount()?.uuid} +
+
+
(app.viewProfileUuid = member.uuid)} onkeydown={(e) => e.key === 'Enter' && (app.viewProfileUuid = member.uuid)}> + + +
+
+
+ (app.viewProfileUuid = member.uuid)}>{member.username} + {#if isMe} + You + {/if} +
+
+ Lvl {member.global_level} + {#if member.title} + {member.title} + {/if} +
+ + {member.online ? 'Online on Network' : member.last_seen ? `Active ${new Date(member.last_seen).toLocaleDateString()}` : 'Offline'} + +
+
+ +
+ {#if isMe} + + {:else if member.is_friend} + + + {:else} + + + {/if} +
+
+ {/each} +
+ {/if} +
{:else if activeSection === 'messages'}
@@ -910,4 +1043,102 @@ text-align: center; border-radius: var(--radius); } + .members-layout { + display: flex; + flex-direction: column; + gap: 1rem; + } + .members-search-bar { + display: flex; + align-items: center; + gap: 0.75rem; + padding: 0.6rem 1rem; + border-radius: var(--radius); + } + .members-search-input { + flex: 1; + background: transparent; + border: none; + outline: none; + color: var(--text); + font-size: 0.95rem; + } + .members-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); + gap: 1rem; + } + .member-card { + padding: 1.1rem; + border-radius: var(--radius); + display: flex; + flex-direction: column; + gap: 0.9rem; + transition: transform 0.15s, border-color 0.15s; + } + .member-card:hover { + transform: translateY(-2px); + border-color: color-mix(in srgb, var(--accent) 40%, transparent); + } + .member-card-top { + display: flex; + align-items: center; + gap: 0.85rem; + } + .avatar-wrap { + position: relative; + cursor: pointer; + } + .member-meta { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + gap: 0.25rem; + } + .name-row { + display: flex; + align-items: center; + gap: 0.4rem; + } + .member-name { + font-size: 1rem; + font-weight: 700; + cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .member-name:hover { + color: var(--accent); + } + .member-sub-info { + display: flex; + align-items: center; + gap: 0.35rem; + flex-wrap: wrap; + } + .level-pill { + background: color-mix(in srgb, var(--accent) 20%, transparent); + color: var(--accent); + font-weight: 700; + } + .title-pill { + background: color-mix(in srgb, #f59e0b 20%, transparent); + color: #f59e0b; + } + .me-tag { + background: color-mix(in srgb, var(--line) 40%, transparent); + color: var(--muted); + } + .member-card-actions { + display: flex; + align-items: center; + gap: 0.45rem; + border-top: 1px solid color-mix(in srgb, var(--line) 40%, transparent); + padding-top: 0.75rem; + } + .w-full { + width: 100%; + } diff --git a/launcher/src/pages/Stats.svelte b/launcher/src/pages/Stats.svelte index 47740e7..b716541 100644 --- a/launcher/src/pages/Stats.svelte +++ b/launcher/src/pages/Stats.svelte @@ -2,14 +2,23 @@ import { Trophy, Swords, Skull, Pickaxe, Clock, Box, MessageSquare, LogIn, RefreshCw, LoaderCircle, Users, Server, Flame, Sparkles, ChevronDown, Check, + Coins, DollarSign, Wallet, ArrowUpRight, ArrowDownLeft, TrendingUp, History, } from '@lucide/svelte'; import Avatar from '../components/Avatar.svelte'; import { activeAccount, app, toast } from '../lib/store.svelte'; import { invoke } from '../lib/tauri'; + import type { ServerEconomyBalance, BaltopEntry, EconomyTransaction } from '../lib/types'; - let activeTab = $state<'personal' | 'leaderboard'>('personal'); + let activeTab = $state<'personal' | 'economy' | 'leaderboard'>('personal'); let loadingPersonal = $state(false); let loadingLeaderboard = $state(false); + let loadingEconomy = $state(false); + + // Economy state + let economyBalances = $state([]); + let selectedEconomyServerId = $state(null); + let baltopData = $state([]); + let transactions = $state([]); // Personal stats data let personalData = $state<{ @@ -142,11 +151,47 @@ } } + async function loadEconomy() { + loadingEconomy = true; + try { + const [balances, txs] = await Promise.all([ + invoke('get_economy_balances').catch(() => []), + invoke('get_transactions').catch(() => []), + ]); + economyBalances = balances; + transactions = txs; + if (!selectedEconomyServerId && balances.length > 0) { + selectedEconomyServerId = balances[0].server_id; + } + if (selectedEconomyServerId) { + await loadBaltop(selectedEconomyServerId); + } + } catch (e: any) { + toast(e?.message ?? 'Failed to load economy data', 'error'); + } finally { + loadingEconomy = false; + } + } + + async function loadBaltop(serverId: number) { + try { + baltopData = await invoke('get_server_baltop', { serverId }); + } catch (e) { + baltopData = []; + } + } + + function handleEconomyServerChange(serverId: number) { + selectedEconomyServerId = serverId; + loadBaltop(serverId); + } + $effect(() => { if (app.view === 'stats') { loadPersonalStats(); loadServers(); loadLeaderboard(); + loadEconomy(); } }); @@ -178,6 +223,9 @@ + @@ -333,6 +381,149 @@
{/if} {/if} + {:else if activeTab === 'economy'} + +
+ {#if loadingEconomy && !economyBalances.length} +
+ {:else if !me || me.kind === 'offline'} +
+ +

Server account required

+

In-game economy balances and transactions are synced to your SCOPENET server account.

+ +
+ {:else} + +
+
+
+ My Server Balances +

Synced in real-time from SCOPENET economy plugins and mods.

+
+ +
+ + {#if economyBalances.length === 0} +
+ No active currency balances found yet. Join a SCOPENET server to start earning money! +
+ {:else} +
+ {#each economyBalances as bal (bal.server_id)} +
handleEconomyServerChange(bal.server_id)} + > +
+ {bal.server_name} + +
+
+ {bal.currency_symbol || '$'} + {bal.balance.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} +
+
+ Updated {formatDate(bal.last_updated)} +
+
+ {/each} +
+ {/if} +
+ + +
+
+
+ Server Rich List (Baltop) +

Top richest players on the selected game server.

+
+ + {#if servers.length > 0} +
+ Server: + +
+ {/if} +
+ + {#if baltopData.length === 0} +
+ No baltop entries recorded for this server yet. +
+ {:else} +
+ {#each baltopData as row} + {@const isMe = row.uuid === me?.uuid} +
+
+ + #{row.rank} + + + {row.username} + {#if isMe}You{/if} +
+ + ${row.balance.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} + +
+ {/each} +
+ {/if} +
+ + +
+
+
+ Recent Transactions +

Payments, player trades, market listings, and server shop logs.

+
+
+ + {#if transactions.length === 0} +
+ No recorded economy transactions yet. +
+ {:else} +
+
+ Type + Description + Date + Amount +
+ {#each transactions.slice(0, 15) as tx (tx.id)} + {@const isSender = tx.sender_uuid === me?.uuid} +
+ + {#if isSender} Sent{:else} Received{/if} + + {tx.description || tx.tx_type} + {new Date(tx.created_at).toLocaleString()} + + {isSender ? '-' : '+'}${Math.abs(tx.amount).toFixed(2)} + +
+ {/each} +
+ {/if} +
+ {/if} +
{:else}
@@ -500,4 +691,32 @@ .table-header, .table-row { grid-template-columns: 2.5rem 1fr 7rem; } .col-extra { display: none; } } + .economy-view { display: flex; flex-direction: column; gap: 1.2rem; } + .section-title { font-size: 1.05rem; font-weight: 700; } + .empty-inline { padding: 1.2rem 0; } + .econ-balances-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(14rem, 1fr)); gap: 1rem; margin-top: 0.5rem; } + .econ-balance-card { display: flex; flex-direction: column; gap: 0.6rem; padding: 1.1rem 1.2rem; border-radius: var(--radius-sm); cursor: pointer; transition: transform 0.15s, border-color 0.15s; } + .econ-balance-card:hover { transform: translateY(-2px); } + .econ-balance-card.selected { border-color: var(--accent); background: color-mix(in srgb, var(--accent) 10%, transparent); } + .server-badge { font-size: 0.82rem; font-weight: 700; color: var(--accent); } + .econ-balance-val { font-size: 1.6rem; font-weight: 800; display: flex; align-items: baseline; gap: 0.2rem; font-variant-numeric: tabular-nums; } + .currency-sym { font-size: 1.1rem; color: var(--muted); } + .baltop-list { display: flex; flex-direction: column; gap: 0.5rem; margin-top: 0.5rem; } + .baltop-row { display: flex; justify-content: space-between; align-items: center; padding: 0.75rem 1rem; border-radius: var(--radius-sm); background: color-mix(in srgb, var(--bg) 50%, transparent); border: 1px solid var(--line); } + .baltop-row.is-me { background: color-mix(in srgb, var(--accent) 10%, transparent); border-color: color-mix(in srgb, var(--accent) 30%, transparent); } + .baltop-rank { font-weight: 800; font-size: 0.95rem; min-width: 2rem; font-variant-numeric: tabular-nums; } + .baltop-rank.gold { color: #f59e0b; } + .baltop-rank.silver { color: #94a3b8; } + .baltop-rank.bronze { color: #d97706; } + .baltop-name { font-size: 0.95rem; } + .baltop-val { font-size: 1.05rem; } + .tx-table-wrap { display: flex; flex-direction: column; margin-top: 0.5rem; border: 1px solid var(--line); border-radius: var(--radius-sm); overflow: hidden; } + .tx-header { display: grid; grid-template-columns: 7rem 1fr 12rem 8rem; padding: 0.65rem 1rem; font-size: 0.78rem; text-transform: uppercase; font-weight: 600; color: var(--muted); border-bottom: 1px solid var(--line); } + .tx-row { display: grid; grid-template-columns: 7rem 1fr 12rem 8rem; align-items: center; padding: 0.7rem 1rem; border-bottom: 1px solid color-mix(in srgb, var(--line) 40%, transparent); font-size: 0.85rem; } + .tx-type-pill.send { background: color-mix(in srgb, var(--danger) 15%, transparent); color: var(--danger); } + .tx-type-pill.receive { background: color-mix(in srgb, var(--success) 15%, transparent); color: var(--success); } + .tx-desc { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } + .tx-amount { font-weight: 700; font-variant-numeric: tabular-nums; } + .tx-amount.negative { color: var(--danger); } + .tx-amount.positive { color: var(--success); } diff --git a/panel/server/src/db.rs b/panel/server/src/db.rs index f162003..01fcaec 100644 --- a/panel/server/src/db.rs +++ b/panel/server/src/db.rs @@ -438,6 +438,44 @@ const MIGRATIONS: &[&str] = &[ ); CREATE INDEX user_posts_user ON user_posts(user_uuid, id DESC); "#, + r#" + CREATE TABLE IF NOT EXISTS server_economy ( + server_id INTEGER NOT NULL REFERENCES game_servers(id) ON DELETE CASCADE, + uuid TEXT NOT NULL, + username TEXT NOT NULL, + balance REAL NOT NULL DEFAULT 1000.0, + updated_at TEXT NOT NULL, + PRIMARY KEY (server_id, uuid) + ); + CREATE INDEX IF NOT EXISTS economy_user ON server_economy(uuid); + CREATE INDEX IF NOT EXISTS economy_bal ON server_economy(server_id, balance DESC); + + CREATE TABLE IF NOT EXISTS economy_transactions ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + server_id INTEGER NOT NULL REFERENCES game_servers(id) ON DELETE CASCADE, + from_uuid TEXT NOT NULL, + from_name TEXT NOT NULL, + to_uuid TEXT NOT NULL, + to_name TEXT NOT NULL, + amount REAL NOT NULL, + description TEXT NOT NULL, + created_at TEXT NOT NULL + ); + CREATE INDEX IF NOT EXISTS econ_tx_user ON economy_transactions(server_id, from_uuid, to_uuid); + + CREATE TABLE IF NOT EXISTS server_market ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + server_id INTEGER NOT NULL REFERENCES game_servers(id) ON DELETE CASCADE, + seller_uuid TEXT NOT NULL, + seller_name TEXT NOT NULL, + item_id TEXT NOT NULL, + item_name TEXT NOT NULL, + amount INTEGER NOT NULL DEFAULT 1, + price REAL NOT NULL, + created_at TEXT NOT NULL + ); + CREATE INDEX IF NOT EXISTS market_srv ON server_market(server_id, id DESC); + "#, ]; pub async fn connect(data_dir: &Path) -> Result { diff --git a/panel/server/src/routes/achievements.rs b/panel/server/src/routes/achievements.rs index c1ff4e8..6a930d7 100644 --- a/panel/server/src/routes/achievements.rs +++ b/panel/server/src/routes/achievements.rs @@ -78,12 +78,15 @@ pub async fn get_achievements_for_user( title, description: desc, category: cat, - icon_frame: frame, + icon_frame: frame.clone(), + frame_type: Some(frame), icon_item: item, icon_bg: bg, icon_border: border, xp_reward: xp, secret, + stat_type: None, + target_count: None, unlocked, unlocked_at, }) @@ -105,6 +108,8 @@ pub struct AdminAchievementRow { pub requirement_type: String, pub requirement_key: String, pub requirement_value: i64, + pub stat_type: String, + pub target_count: i64, pub total_unlocked: i64, } @@ -166,18 +171,23 @@ pub async fn admin_list_achievements( title, description: desc, category: cat, - icon_frame: frame, + icon_frame: frame.clone(), + frame_type: Some(frame), icon_item: item, icon_bg: bg, icon_border: border, xp_reward: xp, secret, + stat_type: Some(req_key.clone()), + target_count: Some(req_val), unlocked: false, unlocked_at: None, }, requirement_type: req_type, - requirement_key: req_key, + requirement_key: req_key.clone(), requirement_value: req_val, + stat_type: req_key, + target_count: req_val, total_unlocked, } }, @@ -193,13 +203,17 @@ pub struct AchievementPayload { pub title: String, pub description: String, pub category: String, + #[serde(alias = "frame_type")] pub icon_frame: String, pub icon_item: String, pub icon_bg: String, pub icon_border: String, - pub requirement_type: String, - pub requirement_key: String, - pub requirement_value: i64, + #[serde(default)] + pub requirement_type: Option, + #[serde(default, alias = "stat_type")] + pub requirement_key: Option, + #[serde(default, alias = "target_count")] + pub requirement_value: Option, pub xp_reward: i64, pub secret: Option, } @@ -215,6 +229,9 @@ pub async fn admin_create_achievement( .filter(|s| !s.trim().is_empty()) .unwrap_or_else(|| format!("ach_{}", uuid::Uuid::new_v4().simple())); let now = chrono::Utc::now().to_rfc3339(); + let req_type = payload.requirement_type.unwrap_or_else(|| "stat".into()); + let req_key = payload.requirement_key.unwrap_or_else(|| "blocks_broken".into()); + let req_val = payload.requirement_value.unwrap_or(50); sqlx::query( "INSERT INTO achievements (id, title, description, category, icon_frame, icon_item, icon_bg, icon_border, requirement_type, requirement_key, requirement_value, xp_reward, secret, created_at) @@ -228,9 +245,9 @@ pub async fn admin_create_achievement( .bind(payload.icon_item) .bind(payload.icon_bg) .bind(payload.icon_border) - .bind(payload.requirement_type) - .bind(payload.requirement_key) - .bind(payload.requirement_value) + .bind(req_type) + .bind(req_key) + .bind(req_val) .bind(payload.xp_reward) .bind(payload.secret.unwrap_or(false)) .bind(&now) @@ -247,6 +264,10 @@ pub async fn admin_update_achievement( State(state): State, Json(payload): Json, ) -> AppResult> { + let req_type = payload.requirement_type.unwrap_or_else(|| "stat".into()); + let req_key = payload.requirement_key.unwrap_or_else(|| "blocks_broken".into()); + let req_val = payload.requirement_value.unwrap_or(50); + sqlx::query( "UPDATE achievements SET title = ?, @@ -270,9 +291,9 @@ pub async fn admin_update_achievement( .bind(payload.icon_item) .bind(payload.icon_bg) .bind(payload.icon_border) - .bind(payload.requirement_type) - .bind(payload.requirement_key) - .bind(payload.requirement_value) + .bind(req_type) + .bind(req_key) + .bind(req_val) .bind(payload.xp_reward) .bind(payload.secret) .bind(&id) diff --git a/panel/server/src/routes/economy.rs b/panel/server/src/routes/economy.rs new file mode 100644 index 0000000..bd009e5 --- /dev/null +++ b/panel/server/src/routes/economy.rs @@ -0,0 +1,483 @@ +//! Per-server economy system, marketplace, transactions, and baltop. + +use crate::auth::AuthUser; +use crate::error::{AppError, AppResult}; +use crate::routes::servers::GameServer; +use crate::state::AppState; +use axum::extract::{Path, State}; +use axum::Json; +use scopenet_shared::{BaltopEntry, EconomyTransaction, MarketListing, ServerEconomyBalance}; +use serde::Deserialize; +use serde_json::Value; + +// --------------------------------------------------------------------------- +// Launcher & Public Economy API +// --------------------------------------------------------------------------- + +/// Get current user's economy balances across all connected game servers. +pub async fn get_my_balances( + auth: AuthUser, + State(state): State, +) -> AppResult>> { + let rows: Vec<(i64, String, f64)> = sqlx::query_as( + "SELECT se.server_id, gs.name, se.balance + FROM server_economy se + JOIN game_servers gs ON gs.id = se.server_id + WHERE se.uuid = ? + ORDER BY se.balance DESC", + ) + .bind(&auth.uuid) + .fetch_all(&state.db) + .await?; + + let list = rows + .into_iter() + .map(|(sid, sname, bal)| ServerEconomyBalance { + server_id: sid, + server_name: sname, + balance: bal, + currency_symbol: "$".into(), + }) + .collect(); + + Ok(Json(list)) +} + +/// Get current user's recent transactions across all servers. +pub async fn get_my_transactions( + auth: AuthUser, + State(state): State, +) -> AppResult>> { + let rows: Vec<(i64, i64, String, String, String, String, String, f64, String, String)> = sqlx::query_as( + "SELECT et.id, et.server_id, gs.name, et.from_uuid, et.from_name, et.to_uuid, et.to_name, et.amount, et.description, et.created_at + FROM economy_transactions et + JOIN game_servers gs ON gs.id = et.server_id + WHERE et.from_uuid = ? OR et.to_uuid = ? + ORDER BY et.id DESC + LIMIT 50", + ) + .bind(&auth.uuid) + .bind(&auth.uuid) + .fetch_all(&state.db) + .await?; + + let list = rows + .into_iter() + .map(|(id, sid, sname, fuuid, fname, tuuid, tname, amount, desc, created)| EconomyTransaction { + id, + server_id: sid, + server_name: Some(sname), + from_uuid: fuuid, + from_name: fname, + to_uuid: tuuid, + to_name: tname, + amount, + description: desc, + created_at: created, + }) + .collect(); + + Ok(Json(list)) +} + +/// Get top richest players for a specific server. +pub async fn get_server_baltop( + Path(server_id): Path, + State(state): State, +) -> AppResult>> { + let rows: Vec<(String, String, f64)> = sqlx::query_as( + "SELECT uuid, username, balance + FROM server_economy + WHERE server_id = ? + ORDER BY balance DESC + LIMIT 25", + ) + .bind(server_id) + .fetch_all(&state.db) + .await?; + + let list = rows + .into_iter() + .enumerate() + .map(|(i, (uuid, username, balance))| BaltopEntry { + rank: i + 1, + uuid, + username, + balance, + }) + .collect(); + + Ok(Json(list)) +} + +/// Get active marketplace listings for a server. +pub async fn get_server_market( + Path(server_id): Path, + State(state): State, +) -> AppResult>> { + let rows: Vec<(i64, i64, String, String, String, String, i32, f64, String)> = sqlx::query_as( + "SELECT id, server_id, seller_uuid, seller_name, item_id, item_name, amount, price, created_at + FROM server_market + WHERE server_id = ? + ORDER BY id DESC + LIMIT 100", + ) + .bind(server_id) + .fetch_all(&state.db) + .await?; + + let list = rows + .into_iter() + .map(|(id, sid, suuid, sname, iid, iname, amt, price, created)| MarketListing { + id, + server_id: sid, + seller_uuid: suuid, + seller_name: sname, + item_id: iid, + item_name: iname, + amount: amt, + price, + created_at: created, + }) + .collect(); + + Ok(Json(list)) +} + +// --------------------------------------------------------------------------- +// Server Integration Relay Endpoints +// --------------------------------------------------------------------------- + +#[derive(Deserialize)] +pub struct ServerBalanceQuery { + pub uuid: String, + pub username: Option, +} + +pub async fn server_get_balance( + GameServer(server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let now = chrono::Utc::now().to_rfc3339(); + let username = payload.username.unwrap_or_else(|| "Player".into()); + + let bal_opt: Option = sqlx::query_scalar( + "SELECT balance FROM server_economy WHERE server_id = ? AND uuid = ?", + ) + .bind(server.id) + .bind(&payload.uuid) + .fetch_optional(&state.db) + .await?; + + let balance = match bal_opt { + Some(b) => b, + None => { + let starting_balance = 1000.0; + sqlx::query( + "INSERT INTO server_economy (server_id, uuid, username, balance, updated_at) + VALUES (?, ?, ?, ?, ?) + ON CONFLICT(server_id, uuid) DO UPDATE SET username = excluded.username", + ) + .bind(server.id) + .bind(&payload.uuid) + .bind(&username) + .bind(starting_balance) + .bind(&now) + .execute(&state.db) + .await?; + starting_balance + } + }; + + Ok(Json(serde_json::json!({ + "server_id": server.id, + "uuid": payload.uuid, + "balance": balance, + "currency_symbol": "$" + }))) +} + +#[derive(Deserialize)] +pub struct ServerTransferPayload { + pub from_uuid: String, + pub from_name: String, + pub to_uuid: String, + pub to_name: String, + pub amount: f64, + pub description: Option, +} + +pub async fn server_transfer( + GameServer(server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + if payload.amount <= 0.0 { + return Err(AppError::bad_request("Transfer amount must be positive")); + } + + let mut tx = state.db.begin().await?; + let now = chrono::Utc::now().to_rfc3339(); + + // Check sender balance + let from_bal: Option = sqlx::query_scalar( + "SELECT balance FROM server_economy WHERE server_id = ? AND uuid = ?", + ) + .bind(server.id) + .bind(&payload.from_uuid) + .fetch_optional(&mut *tx) + .await?; + + let current_from_bal = from_bal.unwrap_or(0.0); + if current_from_bal < payload.amount { + return Err(AppError::bad_request("Insufficient funds")); + } + + let new_from_bal = current_from_bal - payload.amount; + sqlx::query("UPDATE server_economy SET balance = ?, updated_at = ? WHERE server_id = ? AND uuid = ?") + .bind(new_from_bal) + .bind(&now) + .bind(server.id) + .bind(&payload.from_uuid) + .execute(&mut *tx) + .await?; + + // Update receiver + sqlx::query( + "INSERT INTO server_economy (server_id, uuid, username, balance, updated_at) + VALUES (?, ?, ?, ?, ?) + ON CONFLICT (server_id, uuid) DO UPDATE SET + balance = balance + excluded.balance, + username = excluded.username, + updated_at = excluded.updated_at", + ) + .bind(server.id) + .bind(&payload.to_uuid) + .bind(&payload.to_name) + .bind(payload.amount) + .bind(&now) + .execute(&mut *tx) + .await?; + + let desc = payload.description.unwrap_or_else(|| format!("Payment to {}", payload.to_name)); + sqlx::query( + "INSERT INTO economy_transactions (server_id, from_uuid, from_name, to_uuid, to_name, amount, description, created_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?)", + ) + .bind(server.id) + .bind(&payload.from_uuid) + .bind(&payload.from_name) + .bind(&payload.to_uuid) + .bind(&payload.to_name) + .bind(payload.amount) + .bind(&desc) + .bind(&now) + .execute(&mut *tx) + .await?; + + tx.commit().await?; + + Ok(Json(serde_json::json!({ + "ok": true, + "from_balance": new_from_bal + }))) +} + +#[derive(Deserialize)] +pub struct ServerSyncBalancePayload { + pub uuid: String, + pub username: String, + pub new_balance: f64, +} + +pub async fn server_sync_balance( + GameServer(server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let now = chrono::Utc::now().to_rfc3339(); + sqlx::query( + "INSERT INTO server_economy (server_id, uuid, username, balance, updated_at) + VALUES (?, ?, ?, ?, ?) + ON CONFLICT(server_id, uuid) DO UPDATE SET + balance = excluded.balance, + username = excluded.username, + updated_at = excluded.updated_at", + ) + .bind(server.id) + .bind(&payload.uuid) + .bind(&payload.username) + .bind(payload.new_balance) + .bind(&now) + .execute(&state.db) + .await?; + + Ok(Json(serde_json::json!({ "ok": true }))) +} + +pub async fn server_baltop( + GameServer(server): GameServer, + State(state): State, +) -> AppResult>> { + let rows: Vec<(String, String, f64)> = sqlx::query_as( + "SELECT uuid, username, balance + FROM server_economy + WHERE server_id = ? + ORDER BY balance DESC + LIMIT 20", + ) + .bind(server.id) + .fetch_all(&state.db) + .await?; + + let list = rows + .into_iter() + .enumerate() + .map(|(i, (uuid, username, balance))| BaltopEntry { + rank: i + 1, + uuid, + username, + balance, + }) + .collect(); + + Ok(Json(list)) +} + +#[derive(Deserialize)] +pub struct MarketListPayload { + pub seller_uuid: String, + pub seller_name: String, + pub item_id: String, + pub item_name: String, + pub amount: i32, + pub price: f64, +} + +pub async fn server_market_list( + GameServer(server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let now = chrono::Utc::now().to_rfc3339(); + let id: i64 = sqlx::query_scalar( + "INSERT INTO server_market (server_id, seller_uuid, seller_name, item_id, item_name, amount, price, created_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?) + RETURNING id", + ) + .bind(server.id) + .bind(payload.seller_uuid) + .bind(payload.seller_name) + .bind(payload.item_id) + .bind(payload.item_name) + .bind(payload.amount) + .bind(payload.price) + .bind(&now) + .fetch_one(&state.db) + .await?; + + Ok(Json(serde_json::json!({ "id": id, "ok": true }))) +} + +#[derive(Deserialize)] +pub struct MarketBuyPayload { + pub listing_id: i64, + pub buyer_uuid: String, + pub buyer_name: String, +} + +pub async fn server_market_buy( + GameServer(server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let listing: Option<(String, String, String, String, i32, f64)> = sqlx::query_as( + "SELECT seller_uuid, seller_name, item_id, item_name, amount, price + FROM server_market + WHERE id = ? AND server_id = ?", + ) + .bind(payload.listing_id) + .bind(server.id) + .fetch_optional(&state.db) + .await?; + + let Some((seller_uuid, seller_name, item_id, item_name, amount, price)) = listing else { + return Err(AppError::not_found("Listing not found")); + }; + + let mut tx = state.db.begin().await?; + let now = chrono::Utc::now().to_rfc3339(); + + // Deduct buyer + let buyer_bal: f64 = sqlx::query_scalar( + "SELECT balance FROM server_economy WHERE server_id = ? AND uuid = ?", + ) + .bind(server.id) + .bind(&payload.buyer_uuid) + .fetch_optional(&mut *tx) + .await? + .unwrap_or(0.0); + + if buyer_bal < price { + return Err(AppError::bad_request("Insufficient funds")); + } + + sqlx::query("UPDATE server_economy SET balance = balance - ?, updated_at = ? WHERE server_id = ? AND uuid = ?") + .bind(price) + .bind(&now) + .bind(server.id) + .bind(&payload.buyer_uuid) + .execute(&mut *tx) + .await?; + + // Pay seller + sqlx::query( + "INSERT INTO server_economy (server_id, uuid, username, balance, updated_at) + VALUES (?, ?, ?, ?, ?) + ON CONFLICT (server_id, uuid) DO UPDATE SET + balance = balance + excluded.balance, + username = excluded.username, + updated_at = excluded.updated_at", + ) + .bind(server.id) + .bind(&seller_uuid) + .bind(&seller_name) + .bind(price) + .bind(&now) + .execute(&mut *tx) + .await?; + + // Delete listing + sqlx::query("DELETE FROM server_market WHERE id = ?") + .bind(payload.listing_id) + .execute(&mut *tx) + .await?; + + // Log transaction + let desc = format!("Market purchase: {}x {} from {}", amount, item_name, seller_name); + sqlx::query( + "INSERT INTO economy_transactions (server_id, from_uuid, from_name, to_uuid, to_name, amount, description, created_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?)", + ) + .bind(server.id) + .bind(&payload.buyer_uuid) + .bind(&payload.buyer_name) + .bind(&seller_uuid) + .bind(&seller_name) + .bind(price) + .bind(&desc) + .bind(&now) + .execute(&mut *tx) + .await?; + + tx.commit().await?; + + Ok(Json(serde_json::json!({ + "ok": true, + "item_id": item_id, + "item_name": item_name, + "amount": amount, + "price": price + }))) +} diff --git a/panel/server/src/routes/guilds.rs b/panel/server/src/routes/guilds.rs index e3162ba..15b556e 100644 --- a/panel/server/src/routes/guilds.rs +++ b/panel/server/src/routes/guilds.rs @@ -1,6 +1,6 @@ //! Guilds system, in-game relay, roles, posts, and land-claiming. -use crate::auth::AuthUser; +use crate::auth::{AdminUser, AuthUser}; use crate::error::{AppError, AppResult}; use crate::routes::servers::GameServer; use crate::state::AppState; @@ -710,10 +710,11 @@ pub async fn unclaim_by_id( #[derive(Deserialize)] pub struct ChunkGridQuery { - pub server_id: i64, + pub server_id: Option, + pub instance_id: Option, pub dimension: Option, - pub center_x: i32, - pub center_z: i32, + pub center_x: Option, + pub center_z: Option, pub radius: Option, } @@ -723,23 +724,31 @@ pub async fn get_chunk_grid( State(state): State, ) -> AppResult>> { let dim = query.dimension.unwrap_or_else(|| "minecraft:overworld".into()); - let r = query.radius.unwrap_or(8).clamp(2, 24); - let min_x = query.center_x - r; - let max_x = query.center_x + r; - let min_z = query.center_z - r; - let max_z = query.center_z + r; + let inst_id = query.instance_id.unwrap_or_default(); + let cx = query.center_x.unwrap_or(0); + let cz = query.center_z.unwrap_or(0); + let r = query.radius.unwrap_or(32).clamp(2, 1024); + let min_x = cx - r; + let max_x = cx + r; + let min_z = cz - r; + let max_z = cz + r; - let rows: Vec<(i64, String, String, String, i64, String, i32, i32, String, String)> = sqlx::query_as( + let rows: Vec<(i64, String, String, String, Option, String, i32, i32, String, String)> = sqlx::query_as( "SELECT gc.id, gc.guild_id, g.name, g.tag, gc.server_id, gc.dimension, gc.chunk_x, gc.chunk_z, gc.claimed_by_uuid, gc.claimed_at FROM guild_claims gc JOIN guilds g ON g.id = gc.guild_id - WHERE gc.server_id = ? AND gc.dimension = ? + WHERE (? IS NULL OR gc.server_id = ?) + AND (? = '' OR g.instance_id = ?) + AND gc.dimension = ? AND gc.chunk_x BETWEEN ? AND ? AND gc.chunk_z BETWEEN ? AND ? - LIMIT 500", + LIMIT 1000", ) .bind(query.server_id) + .bind(query.server_id) + .bind(&inst_id) + .bind(&inst_id) .bind(&dim) .bind(min_x) .bind(max_x) @@ -756,7 +765,7 @@ pub async fn get_chunk_grid( guild_id: gid, guild_name: gname, guild_tag: gtag, - server_id: sid, + server_id: sid.unwrap_or(0), dimension: gdim, chunk_x: cx, chunk_z: cz, @@ -769,6 +778,106 @@ pub async fn get_chunk_grid( Ok(Json(list)) } +/// Admin list all guilds. +pub async fn admin_list_guilds( + _admin: AdminUser, + State(state): State, +) -> AppResult>> { + let rows: Vec<( + String, + String, + String, + String, + String, + String, + String, + Option, + Option, + i64, + i64, + i64, + String, + i64, + i64, + )> = sqlx::query_as( + "SELECT g.id, g.instance_id, g.name, g.tag, g.description, g.motd, g.leader_uuid, + g.icon_url, g.banner_url, g.level, g.xp, g.max_claims, g.created_at, + (SELECT COUNT(*) FROM guild_members gm WHERE gm.guild_id = g.id) as member_count, + (SELECT COUNT(*) FROM guild_claims gc WHERE gc.guild_id = g.id) as claims_count + FROM guilds g + ORDER BY g.level DESC, member_count DESC", + ) + .fetch_all(&state.db) + .await?; + + let list = rows + .into_iter() + .map( + |( + id, + inst_id, + name, + tag, + desc, + motd, + leader, + icon, + banner, + lvl, + xp, + max_c, + created, + members, + claims, + )| Guild { + id, + instance_id: inst_id, + name, + tag, + description: desc, + motd, + leader_uuid: leader, + icon_url: icon, + banner_url: banner, + level: lvl, + xp, + max_claims: max_c, + member_count: members, + claims_count: claims, + created_at: created, + }, + ) + .collect(); + + Ok(Json(list)) +} + +/// Admin delete a guild. +pub async fn admin_delete_guild( + _admin: AdminUser, + Path(id): Path, + State(state): State, +) -> AppResult> { + sqlx::query("DELETE FROM guild_claims WHERE guild_id = ?") + .bind(&id) + .execute(&state.db) + .await?; + sqlx::query("DELETE FROM guild_members WHERE guild_id = ?") + .bind(&id) + .execute(&state.db) + .await?; + sqlx::query("DELETE FROM guild_posts WHERE guild_id = ?") + .bind(&id) + .execute(&state.db) + .await?; + sqlx::query("DELETE FROM guilds WHERE id = ?") + .bind(&id) + .execute(&state.db) + .await?; + + Ok(Json(serde_json::json!({ "ok": true }))) +} + // --------------------------------------------------------------------------- // Server Integration / Plugin In-Game Land Claim Relay // --------------------------------------------------------------------------- @@ -827,3 +936,307 @@ pub async fn server_check_chunk( "message": if is_member { None } else { Some(format!("This land is claimed by [{guild_tag}] {guild_name}")) } }))) } + +#[derive(Deserialize)] +pub struct ServerClaimChunkPayload { + pub uuid: String, + pub dimension: String, + pub chunk_x: i32, + pub chunk_z: i32, +} + +pub async fn server_claim_chunk( + GameServer(server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let member: Option<(String, String)> = sqlx::query_as( + "SELECT guild_id, role FROM guild_members WHERE uuid = ?", + ) + .bind(&payload.uuid) + .fetch_optional(&state.db) + .await?; + + let Some((guild_id, _role)) = member else { + return Err(AppError::bad_request("You must be in a guild to claim land. Create one with /guild create ")); + }; + + let max_claims: i64 = sqlx::query_scalar("SELECT max_claims FROM guilds WHERE id = ?") + .bind(&guild_id) + .fetch_one(&state.db) + .await + .unwrap_or(16); + + let current_claims: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM guild_claims WHERE guild_id = ?") + .bind(&guild_id) + .fetch_one(&state.db) + .await + .unwrap_or(0); + + if current_claims >= max_claims { + return Err(AppError::bad_request(format!("Guild reached its max claim limit of {max_claims} chunks"))); + } + + let now = chrono::Utc::now().to_rfc3339(); + let res = sqlx::query( + "INSERT INTO guild_claims (guild_id, server_id, dimension, chunk_x, chunk_z, claimed_by_uuid, claimed_at) + VALUES (?, ?, ?, ?, ?, ?, ?)", + ) + .bind(&guild_id) + .bind(server.id) + .bind(&payload.dimension) + .bind(payload.chunk_x) + .bind(payload.chunk_z) + .bind(&payload.uuid) + .bind(&now) + .execute(&state.db) + .await; + + if let Err(e) = res { + tracing::warn!("server claim chunk failed: {e}"); + return Err(AppError::bad_request("Chunk is already claimed by another guild")); + } + + let guild_name: String = sqlx::query_scalar("SELECT name FROM guilds WHERE id = ?") + .bind(&guild_id) + .fetch_one(&state.db) + .await + .unwrap_or_else(|_| "Guild".into()); + + Ok(Json(serde_json::json!({ + "ok": true, + "guild_id": guild_id, + "guild_name": guild_name, + "chunk_x": payload.chunk_x, + "chunk_z": payload.chunk_z + }))) +} + +pub async fn server_unclaim_chunk( + GameServer(server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let claim: Option<(i64, String)> = sqlx::query_as( + "SELECT id, guild_id FROM guild_claims WHERE server_id = ? AND dimension = ? AND chunk_x = ? AND chunk_z = ?", + ) + .bind(server.id) + .bind(&payload.dimension) + .bind(payload.chunk_x) + .bind(payload.chunk_z) + .fetch_optional(&state.db) + .await?; + + let Some((claim_id, guild_id)) = claim else { + return Err(AppError::not_found("This chunk is not claimed")); + }; + + let member: Option<(String,)> = sqlx::query_as( + "SELECT role FROM guild_members WHERE guild_id = ? AND uuid = ?", + ) + .bind(&guild_id) + .bind(&payload.uuid) + .fetch_optional(&state.db) + .await?; + + if member.is_none() { + return Err(AppError::forbidden("You cannot unclaim land belonging to another guild")); + } + + sqlx::query("DELETE FROM guild_claims WHERE id = ?") + .bind(claim_id) + .execute(&state.db) + .await?; + + Ok(Json(serde_json::json!({ "ok": true }))) +} + +#[derive(Deserialize)] +pub struct ServerGuildPlayerQuery { + pub uuid: String, +} + +pub async fn server_get_player_guild( + GameServer(_server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let member_opt: Option<(String, String)> = sqlx::query_as( + "SELECT guild_id, role FROM guild_members WHERE uuid = ?", + ) + .bind(&payload.uuid) + .fetch_optional(&state.db) + .await?; + + let Some((guild_id, player_role)) = member_opt else { + return Ok(Json(serde_json::json!({ "in_guild": false }))); + }; + + let guild_opt: Option<(String, String, String, String, String, i64, i64, i64)> = sqlx::query_as( + "SELECT name, tag, description, motd, leader_uuid, level, xp, max_claims FROM guilds WHERE id = ?", + ) + .bind(&guild_id) + .fetch_optional(&state.db) + .await?; + + let Some((name, tag, desc, motd, leader_uuid, level, xp, max_claims)) = guild_opt else { + return Ok(Json(serde_json::json!({ "in_guild": false }))); + }; + + let member_rows: Vec<(String, String, String)> = sqlx::query_as( + "SELECT uuid, name, role FROM guild_members WHERE guild_id = ?", + ) + .bind(&guild_id) + .fetch_all(&state.db) + .await?; + + let claims_count: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM guild_claims WHERE guild_id = ?") + .bind(&guild_id) + .fetch_one(&state.db) + .await + .unwrap_or(0); + + let members_val: Vec = member_rows + .into_iter() + .map(|(u, n, r)| serde_json::json!({ "uuid": u, "name": n, "role": r })) + .collect(); + + Ok(Json(serde_json::json!({ + "in_guild": true, + "guild": { + "id": guild_id, + "name": name, + "tag": tag, + "description": desc, + "motd": motd, + "leader_uuid": leader_uuid, + "role": player_role, + "level": level, + "xp": xp, + "claims_count": claims_count, + "max_claims": max_claims, + "members": members_val + } + }))) +} + +#[derive(Deserialize)] +pub struct ServerCreateGuildPayload { + pub uuid: String, + pub username: String, + pub name: String, + pub tag: String, +} + +pub async fn server_create_guild( + GameServer(_server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let name = payload.name.trim(); + let tag = payload.tag.trim(); + if name.len() < 3 || name.len() > 32 { + return Err(AppError::bad_request("Guild name must be between 3 and 32 characters")); + } + if tag.len() < 2 || tag.len() > 6 { + return Err(AppError::bad_request("Guild tag must be between 2 and 6 characters")); + } + + let in_guild: bool = sqlx::query_scalar("SELECT EXISTS(SELECT 1 FROM guild_members WHERE uuid = ?)") + .bind(&payload.uuid) + .fetch_one(&state.db) + .await?; + + if in_guild { + return Err(AppError::bad_request("You are already in a guild. Leave your current guild first")); + } + + let guild_id = format!("guild_{}", uuid::Uuid::new_v4().simple()); + let now = chrono::Utc::now().to_rfc3339(); + + let mut tx = state.db.begin().await?; + + let res = sqlx::query( + "INSERT INTO guilds (id, instance_id, name, tag, description, motd, leader_uuid, created_at) + VALUES (?, '', ?, ?, '', 'Welcome to the guild!', ?, ?)", + ) + .bind(&guild_id) + .bind(name) + .bind(tag) + .bind(&payload.uuid) + .bind(&now) + .execute(&mut *tx) + .await; + + if let Err(e) = res { + tracing::warn!("server_create_guild failed: {e}"); + return Err(AppError::bad_request("A guild with that name or tag already exists")); + } + + sqlx::query( + "INSERT INTO guild_members (guild_id, uuid, name, role, joined_at) + VALUES (?, ?, ?, 'leader', ?)", + ) + .bind(&guild_id) + .bind(&payload.uuid) + .bind(&payload.username) + .bind(&now) + .execute(&mut *tx) + .await?; + + tx.commit().await?; + + Ok(Json(serde_json::json!({ + "ok": true, + "guild_id": guild_id, + "name": name, + "tag": tag + }))) +} + +#[derive(Deserialize)] +pub struct ServerGuildLeavePayload { + pub uuid: String, +} + +pub async fn server_guild_leave( + GameServer(_server): GameServer, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let member_opt: Option<(String, String)> = sqlx::query_as( + "SELECT guild_id, role FROM guild_members WHERE uuid = ?", + ) + .bind(&payload.uuid) + .fetch_optional(&state.db) + .await?; + + let Some((guild_id, role)) = member_opt else { + return Err(AppError::bad_request("You are not in a guild")); + }; + + if role == "leader" { + let member_count: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM guild_members WHERE guild_id = ?") + .bind(&guild_id) + .fetch_one(&state.db) + .await + .unwrap_or(1); + + if member_count > 1 { + return Err(AppError::bad_request("Guild leader cannot leave without transferring leadership")); + } else { + sqlx::query("DELETE FROM guild_claims WHERE guild_id = ?").bind(&guild_id).execute(&state.db).await?; + sqlx::query("DELETE FROM guild_members WHERE guild_id = ?").bind(&guild_id).execute(&state.db).await?; + sqlx::query("DELETE FROM guilds WHERE id = ?").bind(&guild_id).execute(&state.db).await?; + return Ok(Json(serde_json::json!({ "ok": true, "disbanded": true }))); + } + } + + sqlx::query("DELETE FROM guild_members WHERE guild_id = ? AND uuid = ?") + .bind(&guild_id) + .bind(&payload.uuid) + .execute(&state.db) + .await?; + + Ok(Json(serde_json::json!({ "ok": true, "disbanded": false }))) +} diff --git a/panel/server/src/routes/landing.rs b/panel/server/src/routes/landing.rs index e308a6d..967520c 100644 --- a/panel/server/src/routes/landing.rs +++ b/panel/server/src/routes/landing.rs @@ -63,6 +63,7 @@ pub struct LandingBlock { pub enabled: bool, pub title: Option, pub subtitle: Option, + pub options: serde_json::Value, } impl Default for LandingBlock { @@ -73,6 +74,7 @@ impl Default for LandingBlock { enabled: true, title: None, subtitle: None, + options: serde_json::json!({}), } } } @@ -115,15 +117,15 @@ impl Default for LandingConfig { hosted_downloads: vec![], external_download_url: None, blocks: vec![ - LandingBlock { id: "b_hero".into(), block_type: "hero".into(), enabled: true, title: None, subtitle: None }, - LandingBlock { id: "b_download".into(), block_type: "download".into(), enabled: true, title: Some("Get the Launcher".into()), subtitle: Some("Available on Windows, macOS, and Linux".into()) }, - LandingBlock { id: "b_servers".into(), block_type: "servers".into(), enabled: true, title: Some("Live Servers".into()), subtitle: Some("Check our current status and join the game".into()) }, - LandingBlock { id: "b_stats".into(), block_type: "stats".into(), enabled: true, title: Some("Community By Numbers".into()), subtitle: Some("Every block placed, every second played".into()) }, - LandingBlock { id: "b_leaderboard".into(), block_type: "leaderboard".into(), enabled: true, title: Some("Top Players".into()), subtitle: Some("The champions of our network".into()) }, - LandingBlock { id: "b_instances".into(), block_type: "instances".into(), enabled: true, title: Some("Featured Instances".into()), subtitle: Some("Hand-crafted modpacks ready to launch".into()) }, - LandingBlock { id: "b_news".into(), block_type: "news".into(), enabled: true, title: Some("Latest News".into()), subtitle: Some("Updates, events, and patch notes".into()) }, - LandingBlock { id: "b_faq".into(), block_type: "faq".into(), enabled: true, title: Some("Frequently Asked Questions".into()), subtitle: Some("Everything you need to know".into()) }, - LandingBlock { id: "b_socials".into(), block_type: "socials".into(), enabled: true, title: Some("Join Our Community".into()), subtitle: Some("Connect with thousands of players".into()) }, + LandingBlock { id: "b_hero".into(), block_type: "hero".into(), enabled: true, title: None, subtitle: None, options: serde_json::json!({}) }, + LandingBlock { id: "b_download".into(), block_type: "download".into(), enabled: true, title: Some("Get the Launcher".into()), subtitle: Some("Available on Windows, macOS, and Linux".into()), options: serde_json::json!({}) }, + LandingBlock { id: "b_servers".into(), block_type: "servers".into(), enabled: true, title: Some("Live Servers".into()), subtitle: Some("Check our current status and join the game".into()), options: serde_json::json!({}) }, + LandingBlock { id: "b_stats".into(), block_type: "stats".into(), enabled: true, title: Some("Community By Numbers".into()), subtitle: Some("Every block placed, every second played".into()), options: serde_json::json!({}) }, + LandingBlock { id: "b_leaderboard".into(), block_type: "leaderboard".into(), enabled: true, title: Some("Top Players".into()), subtitle: Some("The champions of our network".into()), options: serde_json::json!({}) }, + LandingBlock { id: "b_instances".into(), block_type: "instances".into(), enabled: true, title: Some("Featured Instances".into()), subtitle: Some("Hand-crafted modpacks ready to launch".into()), options: serde_json::json!({}) }, + LandingBlock { id: "b_news".into(), block_type: "news".into(), enabled: true, title: Some("Latest News".into()), subtitle: Some("Updates, events, and patch notes".into()), options: serde_json::json!({}) }, + LandingBlock { id: "b_faq".into(), block_type: "faq".into(), enabled: true, title: Some("Frequently Asked Questions".into()), subtitle: Some("Everything you need to know".into()), options: serde_json::json!({}) }, + LandingBlock { id: "b_socials".into(), block_type: "socials".into(), enabled: true, title: Some("Join Our Community".into()), subtitle: Some("Connect with thousands of players".into()), options: serde_json::json!({}) }, ], faqs: vec![ FaqItem { diff --git a/panel/server/src/routes/leveling.rs b/panel/server/src/routes/leveling.rs index afc1992..9c85b00 100644 --- a/panel/server/src/routes/leveling.rs +++ b/panel/server/src/routes/leveling.rs @@ -103,16 +103,56 @@ pub async fn get_user_levels_by_uuid(state: &AppState, uuid: &str) -> AppResult< }) .collect(); + // Query rewards + let rewards_rows: Vec<(i64, i64, String, String, String)> = sqlx::query_as( + "SELECT id, level_req, reward_type, reward_name, reward_data + FROM level_rewards + ORDER BY level_req ASC", + ) + .fetch_all(&state.db) + .await + .unwrap_or_default(); + + let rewards = rewards_rows + .into_iter() + .map(|(id, req, rtype, rname, rdata)| { + let data: Value = serde_json::from_str(&rdata).unwrap_or_default(); + let desc = data.get("description").and_then(|v| v.as_str()).unwrap_or("").to_string(); + let icon = data.get("icon").and_then(|v| v.as_str()).map(|s| s.to_string()); + scopenet_shared::LevelReward { + id, + level: req, + reward_type: rtype, + reward_value: rname, + description: desc, + icon, + server_id: None, + } + }) + .collect(); + + let rank_opt: Option = sqlx::query_scalar( + "SELECT COUNT(*) + 1 FROM user_levels WHERE global_xp > ?", + ) + .bind(global_xp) + .fetch_optional(&state.db) + .await + .unwrap_or(Some(1)); + Ok(UserLevelInfo { uuid: uuid.to_string(), global_xp, + current_xp: global_xp, global_level, + level: global_level, current_level_xp, next_level_xp, progress_pct, title, badges, server_levels, + rank: rank_opt.map(|r| r as usize), + rewards, }) } @@ -168,13 +208,32 @@ pub async fn list_rewards( .into_iter() .map(|(id, ltype, sid, req, rtype, name, data, created)| { let parsed_data: Value = serde_json::from_str(&data).unwrap_or_default(); + let desc = parsed_data.get("description") + .and_then(|v| v.as_str()) + .unwrap_or("") + .to_string(); + let icon = parsed_data.get("icon") + .and_then(|v| v.as_str()) + .unwrap_or(match rtype.as_str() { + "title" => "๐Ÿ‘‘", + "profile_badge" | "badge" => "โญ", + "cosmetic" => "โœจ", + "item" => "๐Ÿ—ก๏ธ", + _ => "๐ŸŽ", + }) + .to_string(); + serde_json::json!({ "id": id, + "level": req, + "level_req": req, "level_type": ltype, "server_id": sid, - "level_req": req, "reward_type": rtype, + "reward_value": name, "reward_name": name, + "description": if desc.is_empty() { format!("Granted at Level {req}") } else { desc }, + "icon": icon, "reward_data": parsed_data, "created_at": created }) @@ -185,12 +244,17 @@ pub async fn list_rewards( } #[derive(Deserialize)] -pub struct CreateRewardPayload { - pub level_type: String, +pub struct RewardPayload { + pub id: Option, + pub level_type: Option, pub server_id: Option, - pub level_req: i64, + #[serde(alias = "level")] + pub level_req: Option, pub reward_type: String, - pub reward_name: String, + #[serde(alias = "reward_value")] + pub reward_name: Option, + pub description: Option, + pub icon: Option, pub reward_data: Option, } @@ -198,21 +262,36 @@ pub struct CreateRewardPayload { pub async fn admin_create_reward( _admin: AdminUser, State(state): State, - Json(payload): Json, + Json(payload): Json, ) -> AppResult> { let now = chrono::Utc::now().to_rfc3339(); - let data_str = serde_json::to_string(&payload.reward_data.unwrap_or_default()).unwrap_or_default(); + let level_req = payload.level_req.unwrap_or(2); + let reward_name = payload.reward_name.unwrap_or_else(|| "Reward".into()); + let level_type = payload.level_type.unwrap_or_else(|| "global".into()); + + let mut data_obj = match payload.reward_data { + Some(Value::Object(map)) => map, + _ => serde_json::Map::new(), + }; + if let Some(desc) = payload.description { + data_obj.insert("description".into(), Value::String(desc)); + } + if let Some(ico) = payload.icon { + data_obj.insert("icon".into(), Value::String(ico)); + } + data_obj.insert("title".into(), Value::String(reward_name.clone())); + let data_str = serde_json::to_string(&data_obj).unwrap_or_default(); let id: i64 = sqlx::query_scalar( "INSERT INTO level_rewards (level_type, server_id, level_req, reward_type, reward_name, reward_data, created_at) VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id", ) - .bind(payload.level_type) + .bind(level_type) .bind(payload.server_id) - .bind(payload.level_req) + .bind(level_req) .bind(payload.reward_type) - .bind(payload.reward_name) + .bind(reward_name) .bind(data_str) .bind(&now) .fetch_one(&state.db) @@ -221,6 +300,48 @@ pub async fn admin_create_reward( Ok(Json(serde_json::json!({ "id": id, "ok": true }))) } +/// Admin update reward. +pub async fn admin_update_reward( + _admin: AdminUser, + Path(id): Path, + State(state): State, + Json(payload): Json, +) -> AppResult> { + let level_req = payload.level_req.unwrap_or(2); + let reward_name = payload.reward_name.unwrap_or_else(|| "Reward".into()); + + let mut data_obj = match payload.reward_data { + Some(Value::Object(map)) => map, + _ => serde_json::Map::new(), + }; + if let Some(desc) = payload.description { + data_obj.insert("description".into(), Value::String(desc)); + } + if let Some(ico) = payload.icon { + data_obj.insert("icon".into(), Value::String(ico)); + } + data_obj.insert("title".into(), Value::String(reward_name.clone())); + let data_str = serde_json::to_string(&data_obj).unwrap_or_default(); + + sqlx::query( + "UPDATE level_rewards SET + level_req = ?, + reward_type = ?, + reward_name = ?, + reward_data = ? + WHERE id = ?", + ) + .bind(level_req) + .bind(payload.reward_type) + .bind(reward_name) + .bind(data_str) + .bind(id) + .execute(&state.db) + .await?; + + Ok(Json(serde_json::json!({ "id": id, "ok": true }))) +} + /// Admin delete reward. pub async fn admin_delete_reward( _admin: AdminUser, diff --git a/panel/server/src/routes/mod.rs b/panel/server/src/routes/mod.rs index 5dc1be7..fabcbb5 100644 --- a/panel/server/src/routes/mod.rs +++ b/panel/server/src/routes/mod.rs @@ -2,6 +2,7 @@ pub mod account; pub mod achievements; pub mod activity; pub mod admin; +pub mod economy; pub mod guilds; pub mod landing; pub mod leveling; @@ -23,6 +24,7 @@ pub fn api(state: &AppState) -> Router { .route("/launcher/manifest", get(public::manifest)) .route("/launcher/instances/{id}", get(public::instance_manifest)) .route("/launcher/events", post(public::event)) + .route("/instances", get(admin::list_instances)) .route("/auth/login", post(public::login)) .route("/auth/register", post(public::register)) .route("/auth/me", get(public::me)) @@ -65,7 +67,13 @@ pub fn api(state: &AppState) -> Router { .route("/guilds/{id}/claims", post(guilds::claim_chunk).delete(guilds::unclaim_chunk)) .route("/guilds/{id}/claim", post(guilds::claim_chunk)) .route("/guilds/{id}/unclaim", post(guilds::unclaim_chunk)) - // Social: Friends, DMs, Invites, Profiles, Posts + // Economy + .route("/economy/me", get(economy::get_my_balances)) + .route("/economy/balances", get(economy::get_my_balances)) + .route("/economy/transactions", get(economy::get_my_transactions)) + .route("/servers/{id}/economy/baltop", get(economy::get_server_baltop)) + .route("/servers/{id}/economy/market", get(economy::get_server_market)) + // Social: Friends, DMs, Invites, Profiles, Posts, Members Search .route("/friends", get(social::list_friends)) .route("/friends/request", post(social::send_friend_request)) .route("/friends/respond", post(social::respond_friend_request)) @@ -87,6 +95,8 @@ pub fn api(state: &AppState) -> Router { .route("/social/profile/{uuid}", get(social::get_player_profile)) .route("/social/posts", post(social::create_user_post)) .route("/social/posts/{id}/like", post(social::like_user_post)) + .route("/social/members", get(social::search_members)) + .route("/members/search", get(social::search_members)) .layer(DefaultBodyLimit::max(4 * 1024 * 1024)); let admin = Router::new() @@ -124,13 +134,17 @@ pub fn api(state: &AppState) -> Router { .route("/modrinth/project/{id}/versions", get(meta::modrinth_versions)) .route("/curseforge/search", get(meta::curseforge_search)) .route("/curseforge/mod/{id}/files", get(meta::curseforge_files)) - // Admin Quests & Achievements & Rewards - .route("/rewards", post(leveling::admin_create_reward)) - .route("/rewards/{id}", delete(leveling::admin_delete_reward)) + // Admin Quests & Achievements & Rewards & Guilds + .route("/rewards", get(leveling::list_rewards).post(leveling::admin_create_reward)) + .route("/rewards/{id}", put(leveling::admin_update_reward).delete(leveling::admin_delete_reward)) + .route("/levels/rewards", get(leveling::list_rewards).post(leveling::admin_create_reward)) + .route("/levels/rewards/{id}", put(leveling::admin_update_reward).delete(leveling::admin_delete_reward)) .route("/quests", get(quests::admin_list_quests).post(quests::admin_create_quest)) .route("/quests/{id}", put(quests::admin_update_quest).delete(quests::admin_delete_quest)) .route("/achievements", get(achievements::admin_list_achievements).post(achievements::admin_create_achievement)) .route("/achievements/{id}", put(achievements::admin_update_achievement).delete(achievements::admin_delete_achievement)) + .route("/guilds", get(guilds::admin_list_guilds)) + .route("/guilds/{id}", delete(guilds::admin_delete_guild)) .layer(DefaultBodyLimit::max(upload_limit)); // Called by the SCOPENET Paper plugin and Fabric/Forge mods. @@ -139,6 +153,18 @@ pub fn api(state: &AppState) -> Router { .route("/login", post(servers::login)) .route("/sync", post(servers::sync)) .route("/guilds/check-chunk", post(guilds::server_check_chunk)) + .route("/guilds/claim", post(guilds::server_claim_chunk)) + .route("/guilds/unclaim", post(guilds::server_unclaim_chunk)) + .route("/guilds/player", post(guilds::server_get_player_guild)) + .route("/guilds/create", post(guilds::server_create_guild)) + .route("/guilds/leave", post(guilds::server_guild_leave)) + .route("/economy/balance", post(economy::server_get_balance)) + .route("/economy/pay", post(economy::server_transfer)) + .route("/economy/transfer", post(economy::server_transfer)) + .route("/economy/sync-balance", post(economy::server_sync_balance)) + .route("/economy/baltop", post(economy::server_baltop)) + .route("/economy/market/list", post(economy::server_market_list)) + .route("/economy/market/buy", post(economy::server_market_buy)) .layer(DefaultBodyLimit::max(2 * 1024 * 1024)); Router::new() diff --git a/panel/server/src/routes/quests.rs b/panel/server/src/routes/quests.rs index 3e5d5c8..7b0ee43 100644 --- a/panel/server/src/routes/quests.rs +++ b/panel/server/src/routes/quests.rs @@ -92,18 +92,23 @@ pub async fn get_my_quests( id, title, description: desc, - period, + period: period.clone(), category: cat, - target_stat: stat, + target_stat: stat.clone(), target_count: target, xp_reward: xp, icon, enabled, + quest_type: Some(period), + stat_type: Some(stat), + active: Some(enabled), }, progress, + current_count: progress, completed, claimed, period_key: pkey, + expires_at: Some(chrono::Utc::now().to_rfc3339()), } }, ) @@ -259,13 +264,16 @@ pub async fn admin_list_quests( id, title, description: desc, - period, + period: period.clone(), category: cat, - target_stat: stat, + target_stat: stat.clone(), target_count: target, xp_reward: xp, icon, enabled, + quest_type: Some(period), + stat_type: Some(stat), + active: Some(enabled), }, total_completions: completions, } @@ -281,12 +289,15 @@ pub struct QuestPayload { pub id: Option, pub title: String, pub description: String, - pub period: String, + #[serde(alias = "quest_type")] + pub period: Option, pub category: String, - pub target_stat: String, + #[serde(alias = "stat_type")] + pub target_stat: Option, pub target_count: i64, pub xp_reward: i64, pub icon: Option, + #[serde(alias = "active")] pub enabled: Option, } @@ -296,10 +307,12 @@ pub async fn admin_create_quest( State(state): State, Json(payload): Json, ) -> AppResult> { + let period = payload.period.unwrap_or_else(|| "daily".into()); + let target_stat = payload.target_stat.unwrap_or_else(|| "blocks_broken".into()); let id = payload .id .filter(|s| !s.trim().is_empty()) - .unwrap_or_else(|| format!("q_{}_{}", payload.period, uuid::Uuid::new_v4().simple())); + .unwrap_or_else(|| format!("q_{}_{}", period, uuid::Uuid::new_v4().simple())); let now = chrono::Utc::now().to_rfc3339(); sqlx::query( @@ -309,12 +322,12 @@ pub async fn admin_create_quest( .bind(&id) .bind(payload.title) .bind(payload.description) - .bind(payload.period) + .bind(period) .bind(payload.category) - .bind(payload.target_stat) + .bind(target_stat) .bind(payload.target_count) .bind(payload.xp_reward) - .bind(payload.icon.unwrap_or_else(|| "star".into())) + .bind(payload.icon.unwrap_or_else(|| "โ›๏ธ".into())) .bind(payload.enabled.unwrap_or(true)) .bind(&now) .execute(&state.db) @@ -330,6 +343,9 @@ pub async fn admin_update_quest( State(state): State, Json(payload): Json, ) -> AppResult> { + let period = payload.period.unwrap_or_else(|| "daily".into()); + let target_stat = payload.target_stat.unwrap_or_else(|| "blocks_broken".into()); + sqlx::query( "UPDATE quests SET title = ?, @@ -345,9 +361,9 @@ pub async fn admin_update_quest( ) .bind(payload.title) .bind(payload.description) - .bind(payload.period) + .bind(period) .bind(payload.category) - .bind(payload.target_stat) + .bind(target_stat) .bind(payload.target_count) .bind(payload.xp_reward) .bind(payload.icon) diff --git a/panel/server/src/routes/social.rs b/panel/server/src/routes/social.rs index 1424f44..f896367 100644 --- a/panel/server/src/routes/social.rs +++ b/panel/server/src/routes/social.rs @@ -3,7 +3,7 @@ use crate::auth::AuthUser; use crate::error::{AppError, AppResult}; use crate::state::AppState; -use axum::extract::{Path, State}; +use axum::extract::{Path, Query, State}; use axum::Json; use scopenet_shared::{DirectMessage, FriendInfo, GameInvite, UserPost, UserProfileView}; use serde::Deserialize; @@ -621,3 +621,72 @@ pub async fn like_user_post( Ok(Json(serde_json::json!({ "ok": true }))) } + +// --------------------------------------------------------------------------- +// Members Search & Discovery +// --------------------------------------------------------------------------- + +#[derive(Deserialize)] +pub struct SearchMembersQuery { + pub q: Option, +} + +pub async fn search_members( + auth: AuthUser, + Query(query): Query, + State(state): State, +) -> AppResult>> { + let q = query.q.unwrap_or_default().trim().to_lowercase(); + let pattern = format!("%{q}%"); + + let rows: Vec<(String, String, String, String, Option, Option, Option, i64, Option, Option)> = sqlx::query_as( + "SELECT u.uuid, u.username, u.role, u.status, u.skin_url, + ul.global_level, ul.title, u.playtime_secs, u.last_seen_ingame, + f.status as friendship_status + FROM users u + LEFT JOIN user_levels ul ON ul.uuid = u.uuid + LEFT JOIN friendships f ON (f.user_uuid = ? AND f.friend_uuid = u.uuid) + WHERE (? = '' OR LOWER(u.username) LIKE ?) + ORDER BY (CASE WHEN LOWER(u.username) = ? THEN 1 ELSE 2 END), u.playtime_secs DESC + LIMIT 60", + ) + .bind(&auth.uuid) + .bind(&q) + .bind(&pattern) + .bind(&q) + .fetch_all(&state.db) + .await?; + + let now_ts = chrono::Utc::now().timestamp(); + + let list = rows + .into_iter() + .map(|(uuid, username, role, status, skin_url, glvl, title, playtime, last_seen, friend_status)| { + let online = if let Some(ref ls) = last_seen { + if let Ok(dt) = chrono::DateTime::parse_from_rfc3339(ls) { + (now_ts - dt.timestamp()).abs() < 180 + } else { + false + } + } else { + false + }; + let is_friend = friend_status.as_deref() == Some("accepted"); + scopenet_shared::MemberProfile { + uuid, + username, + role, + status, + skin_url, + global_level: glvl.unwrap_or(1), + title, + playtime_secs: playtime, + last_seen, + online, + is_friend, + } + }) + .collect(); + + Ok(Json(list)) +} diff --git a/panel/web/src/lib/types.ts b/panel/web/src/lib/types.ts index 4fe33fc..82caa0b 100644 --- a/panel/web/src/lib/types.ts +++ b/panel/web/src/lib/types.ts @@ -163,6 +163,7 @@ export interface LandingBlock { enabled: boolean; title?: string; subtitle?: string; + options?: Record; } export interface LandingConfig { diff --git a/panel/web/src/pages/AchievementEditor.svelte b/panel/web/src/pages/AchievementEditor.svelte index 6cb5c75..38e2cd0 100644 --- a/panel/web/src/pages/AchievementEditor.svelte +++ b/panel/web/src/pages/AchievementEditor.svelte @@ -1,4 +1,5 @@