Merge pull request #7 from JavaJava19/develop

最高連続キル数、最高レート追加

Author: Elic0de

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

@@ -141,7 +141,7 @@ public Optional<PitPlayer> getPitPlayer(Player player) {
     public Optional<PitPlayer> getPitPlayer(UUID uuid) {
         try (PreparedStatement statement = getConnection().prepareStatement(
             formatStatementTables("""
-                    SELECT `kills`, `streaks`, `deaths`, `rating`, `xp`
+                    SELECT `kills`, `streaks`, `bestStreaks`, `deaths`, `rating`, `bestRating`, `xp`
                     FROM `%players_table%`
                     WHERE `uuid`=?"""))) {
 
@@ -152,8 +152,10 @@ public Optional<PitPlayer> getPitPlayer(UUID uuid) {
                 return Optional.of(new PitPlayer(Bukkit.getPlayer(uuid),
                     resultSet.getLong("kills"),
                     resultSet.getLong("streaks"),
+                    resultSet.getLong("bestStreaks"),
                     resultSet.getLong("deaths"),
                     resultSet.getDouble("rating"),
+                    resultSet.getDouble("bestRating"),
                     resultSet.getDouble("xp")
                 ));
             }
@@ -168,7 +170,7 @@ public Optional<PitPlayer> getPitPlayer(UUID uuid) {
     public Optional<OfflinePitPlayer> getOfflinePitPlayer(UUID uuid) {
         try (PreparedStatement statement = getConnection().prepareStatement(
             formatStatementTables("""
-                    SELECT `kills`, `streaks`, `deaths`, `rating`, `xp`
+                    SELECT `kills`, `streaks`, `bestStreaks`, `deaths`, `rating`, `bestRating`, `xp`
                     FROM `%players_table%`
                     WHERE `uuid`=?"""))) {
 
@@ -179,8 +181,10 @@ public Optional<OfflinePitPlayer> getOfflinePitPlayer(UUID uuid) {
                 return Optional.of(new OfflinePitPlayer(uuid,
                     resultSet.getLong("kills"),
                     resultSet.getLong("streaks"),
+                    resultSet.getLong("bestStreaks"),
                     resultSet.getLong("deaths"),
                     resultSet.getDouble("rating"),
+                    resultSet.getDouble("bestRating"),
                     resultSet.getDouble("xp")
                 ));
             }

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

@@ -11,16 +11,20 @@ public class OfflinePitPlayer {
     private long kills;
 
     private long streaks;
+    private long bestStreaks;
     private long deaths;
     private double rating;
-    private double xp;
+    private double bestRating;
+    private final double xp;
 
-    public OfflinePitPlayer(UUID uuid,long kills, long streaks, long deaths, double rating, double xp) {
+    public OfflinePitPlayer(UUID uuid,long kills, long streaks, long bestStreaks, long deaths, double rating, double bestRating, double xp) {
         this.uuid = uuid;
         this.kills = kills;
         this.streaks = streaks;
+        this.bestStreaks = bestStreaks;
         this.deaths = deaths;
         this.rating = rating;
+        this.bestRating = bestRating;
         this.xp = xp;
     }
 
@@ -36,6 +40,10 @@ public long getStreaks() {
         return streaks;
     }
 
+    public long getBestStreaks() {
+        return bestStreaks;
+    }
+
     public long getDeaths() {
         return deaths;
     }
@@ -48,8 +56,15 @@ public double getRating() {
         return rating;
     }
 
+    public double getBestRating() {
+        return bestRating;
+    }
+
     public void setRating(double rating) {
         this.rating = rating;
+        if (bestRating > rating) {
+            this.bestRating = rating;
+        }
     }
 
     public void increaseKills() {
@@ -58,6 +73,9 @@ public void increaseKills() {
 
     public void increaseStreaks() {
         this.streaks ++;
+        if (bestStreaks > streaks) {
+            this.bestStreaks = streaks;
+        }
     }
     public void increaseDeaths() {
         this.deaths++;

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

@@ -36,32 +36,38 @@ public class PitPlayer {
     private long kills;
 
     private long streaks;
+    private long bestStreaks;
     private long deaths;
     private double rating;
+    private double bestRating;
     private double xp;
-    private FastBoard board;
+    private final FastBoard board;
 
     public PitPlayer(Player player) {
         this.player = player;
         this.name = player.getName();
         this.uuid = player.getUniqueId();
-        this.kills = 8;
-        this.streaks= 0;
-        this.deaths = 7;
+        this.kills = 0;
+        this.streaks = 0;
+        this.bestStreaks = 0;
+        this.deaths = 0;
         this.rating = 0;
+        this.bestRating = 0;
         this.xp = 0;
         this.board = new FastBoard(player);
         this.board.updateTitle(ChatColor.translateAlternateColorCodes('&', "&eTHE JPS PIT"));
     }
 
-    public PitPlayer(Player player, long kills, long streaks, long deaths, double rating, double xp) {
+    public PitPlayer(Player player, long kills, long streaks, long bestStreaks, long deaths, double rating, double bestRating, double xp) {
         this.player = player;
         this.name = player.getName();
         this.uuid = player.getUniqueId();
         this.kills = kills;
         this.streaks = streaks;
+        this.bestStreaks = bestStreaks;
         this.deaths = deaths;
         this.rating = rating;
+        this.bestRating = bestRating;
         this.xp = xp;
         this.board = new FastBoard(player);
         this.board.updateTitle(ChatColor.translateAlternateColorCodes('&', "&eTHE JPS PIT"));
@@ -163,6 +169,10 @@ public long getStreaks() {
         return streaks;
     }
 
+    public long getBestStreaks() {
+        return bestStreaks;
+    }
+
     public long getDeaths() {
         return deaths;
     }
@@ -171,8 +181,15 @@ public double getRating() {
         return rating;
     }
 
+    public double getBestRating() {
+        return bestRating;
+    }
+
     public void setRating(double rating) {
         this.rating = rating;
+        if (bestRating > rating) {
+            this.bestRating = rating;
+        }
     }
 
     public double getXp() {
@@ -189,6 +206,9 @@ public void increaseKills() {
 
     public void increaseStreaks() {
         this.streaks ++;
+        if (bestStreaks > streaks) {
+            this.bestStreaks = streaks;
+        }
     }
     public void increaseDeaths() {
         this.deaths++;

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

@@ -25,18 +25,22 @@ public List<String> boardLines(PitPlayer player) {
         return Stream.of(
             "",
             "レベル:[%level%]",
+            "最高レート: &b%bestRating%",
             "",
             "K/Dレート: &c%rating%",
             "次のレベルまで：&a%neededXp%",
             "",
             "連続キル数: &a%streaks%",
+            "最高連続キル数: &a%bestStreaks%",
             "",
             "&ejapanpvpserver.net"
         ).map(s ->
             s.replaceAll("%level%", Levels.getPlayerLevel(player) + "")
                 .replaceAll("%neededXp%", Levels.getPlayerNeededXP(player) + "")
                 .replaceAll("%rating%", player.getRating() + "%")
+                .replaceAll("%bestRating%", player.getBestRating() + "%")
                 .replaceAll("%streaks%", player.getStreaks() + "")
+                .replaceAll("%bestStreaks%", player.getBestStreaks() + "")
         ).collect(Collectors.toList());
     }
 

src/main/resources/database/sqlite_schema.sql

@@ -4,8 +4,10 @@ CREATE TABLE IF NOT EXISTS `%players_table%`
     `username`          varchar(16) NOT NULL,
     `kills`             integer     NOT NULL DEFAULT 0,
     `streaks`           integer     NOT NULL DEFAULT 0,
+    `bestStreaks`       integer     NOT NULL DEFAULT 0,
     `deaths`            integer     NOT NULL DEFAULT 0,
     `rating`            integer     NOT NULL DEFAULT 0,
+    `bestRating`        integer     NOT NULL DEFAULT 0,
     `xp`                integer     NOT NULL DEFAULT 0,
 
     PRIMARY KEY (`uuid`)