Merge pull request #11 from JavaJava19/develop

Develop

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/command/PitCommand.java

@@ -3,7 +3,9 @@
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Optional;
 import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import com.github.elic0de.thejpspit.TheJpsPit;
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import com.github.elic0de.thejpspit.player.PitPlayerManager;
@@ -16,10 +18,15 @@ public class PitCommand extends BaseCommand {
 
     @Subcommand("data")
     @CommandPermission("tjp.data")
-    public void onCommand(Player player) {
+    public void onCommand(Player player, @Optional OnlinePlayer onlinePlayer) {
         final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(player);
 
-        pitPlayer.sendStatus();
+        if (onlinePlayer == null) {
+            pitPlayer.sendStatus();
+            return;
+        }
+
+        pitPlayer.sendStatus(PitPlayerManager.getPitPlayer(onlinePlayer.getPlayer()));
     }
 
     @Subcommand("reset")

src/main/java/com/github/elic0de/thejpspit/database/SqLiteDatabase.java

@@ -201,10 +201,12 @@ public CompletableFuture<Optional<Integer>> getPlayerRanking(PitPlayer player, R
             try {
                 try (PreparedStatement statement = getConnection().prepareStatement(
                     formatStatementTables("""
-                        SELECT RANK() OVER(ORDER BY ? DESC)
-                        AS rank
-                        FROM `%players_table%`
-                        WHERE `uuid`=?"""))) {
+                        SELECT uuid, rank 
+                        FROM(SELECT `uuid`, 
+                        RANK() 
+                        OVER(ORDER BY ? DESC) 
+                        AS rank FROM `%players_table%`) 
+                        WHERE uuid=?;"""))) {
 
                     statement.setString(1, type.name().toLowerCase(Locale.ROOT));
                     statement.setString(2, player.getUniqueId().toString());

src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java

@@ -108,20 +108,30 @@ public void sendMessage(String message) {
     }
 
     public void sendStatus() {
+        sendStatus(this);
+    }
+
+    public void sendStatus(PitPlayer player) {
         final TheJpsPit pit = TheJpsPit.getInstance();
         Stream.of(
             "+ -----< %playerName% >----- +",
             "Kills >> &e%kills% (#%kills_ranking%)",
+            "Best Kill Streaks >> &e%best_streaks%",
             "Deaths >> &c%deaths% (#%deaths_ranking%)",
-            "Rating >> &a%rating% (#%rating_ranking%)"
+            "Rating >> &a%rating% (#%rating_ranking%)",
+            "Best Rating >> &e%best_rating%"
         ).map(s ->
             s.replaceAll("%playerName%", getName())
                 .replaceAll("%kills%",
                     kills + "")
+                .replaceAll("%best_streaks%",
+                    bestStreaks + "")
                 .replaceAll("%deaths%",
                     deaths + "")
                 .replaceAll("%rating%",
                     rating + "%")
+                .replaceAll("%best_rating%",
+                    bestRating + "")
                 .replaceAll("%kills_ranking%",
                     pit.getDatabase().getPlayerRanking(this, Database.RankType.KILLS).join()
                         .orElse(0)
@@ -134,7 +144,7 @@ public void sendStatus() {
                     pit.getDatabase().getPlayerRanking(this, Database.RankType.RATING).join()
                         .orElse(0)
                         + "")
-        ).forEach(this::sendMessage);
+        ).forEach(player::sendMessage);
     }
 
     private void updateXpBar() {
@@ -224,7 +234,7 @@ public void increaseXP() {
 
     public void increaseHealth() {
         player.setHealth(Math.min(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(),
-            player.getHealth() + 4));
+            player.getHealth() + 2));
     }
 
     public void resetStreaks() {

src/main/java/com/github/elic0de/thejpspit/scoreboard/GameScoreboard.java

@@ -1,5 +1,6 @@
 package com.github.elic0de.thejpspit.scoreboard;
 
+import com.github.elic0de.thejpspit.TheJpsPit;
 import com.github.elic0de.thejpspit.leveler.Levels;
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import com.github.elic0de.thejpspit.player.PitPlayerManager;
@@ -24,10 +25,12 @@ public List<String> boardLines(PitPlayer player) {
 
         return Stream.of(
             "",
-            "レベル:[%level%]",
-            "最高レート: &b%bestRating%",
+            "レベル: [%level%]",
+            "JP: [%coins%]",
             "",
             "K/Dレート: &c%rating%",
+            "最高レート: &b%bestRating%",
+            "",
             "次のレベルまで：&a%neededXp%",
             "",
             "連続キル数: &a%streaks%",
@@ -41,6 +44,7 @@ public List<String> boardLines(PitPlayer player) {
                 .replaceAll("%bestRating%", player.getBestRating() + "%")
                 .replaceAll("%streaks%", player.getStreaks() + "")
                 .replaceAll("%bestStreaks%", player.getBestStreaks() + "")
+                .replaceAll("%coins%", "0")
         ).collect(Collectors.toList());
     }
 

src/main/java/com/github/elic0de/thejpspit/task/GameTask.java

@@ -20,7 +20,7 @@ public GameTask() {
             public void run() {
                 pit.getGame().getScoreboard().update();
                 repeats.getAndIncrement();
-                if (repeats.get() >= 10) {
+                if (repeats.get() >= 5) {
                     pit.getGame().getPitPlayers().forEach(PitPlayer::increaseHealth);
                     repeats.set(0);
                 }