Merge pull request #73 from AzisabaNetwork/sysnote8main/support-new-kdstatus

Author: sysnote8main

pom.xml

@@ -18,7 +18,7 @@
   </organization>
 
   <properties>
-    <java.version>1.8</java.version>
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -36,14 +36,14 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.9.0</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>17</source>
+          <target>17</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -145,7 +145,7 @@
     <dependency>
       <groupId>com.github.AzisabaNetwork</groupId>
       <artifactId>KDStatusReloaded</artifactId>
-      <version>1.3.1</version>
+      <version>2.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

src/main/java/net/azisaba/lgw/core/commands/LSyogoCommand.java

@@ -2,18 +2,15 @@
 
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
-import jp.azisaba.lgw.kdstatus.KDStatusReloaded;
 import net.azisaba.lgw.core.LeonGunWar;
 import net.azisaba.lgw.core.util.SyogoData;
 import net.azisaba.lgw.core.utils.Chat;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.entity.Player;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/net/azisaba/lgw/core/distributors/KDTeamDistributor.java

@@ -4,6 +4,8 @@
 import java.util.Comparator;
 import java.util.List;
 
+import net.azisaba.kdstatusreloaded.KDStatusReloaded;
+import net.azisaba.kdstatusreloaded.playerkd.model.KDUserData;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -14,10 +16,6 @@
 
 import lombok.RequiredArgsConstructor;
 
-import jp.azisaba.lgw.kdstatus.KDStatusReloaded;
-import jp.azisaba.lgw.kdstatus.sql.KDUserData;
-import jp.azisaba.lgw.kdstatus.utils.TimeUnit;
-
 /**
  *
  * KD依存のチーム振り分けクラス
@@ -47,9 +45,9 @@ public static boolean isACE(Player p) {
         }
 
         // プレイヤーの戦績取得
-        KDUserData pd = kdsPlugin.getKdDataContainer().getPlayerData(p, true);
-        int kills = pd.getKills(TimeUnit.LIFETIME);
-        int deaths = pd.getDeaths();
+        KDUserData pd = kdsPlugin.getPlayerKd().getPlayerData(p.getUniqueId());
+        int kills = pd.totalKills;
+        int deaths = pd.deaths;
 
         // デス数が0以下の場合は1に変更
         if ( deaths <= 0 ) {
@@ -60,12 +58,12 @@ public static boolean isACE(Player p) {
         double kd = (double) kills / (double) deaths;
 
         // 累計キル数が1000未満の人は除外
-        if ( pd.getKills(TimeUnit.LIFETIME) < 1000 ) {
+        if ( pd.totalKills < 1000 ) {
             return false;
         }
 
         // 月のキル数が3000以上 or KD1.2以上ならtrue それ以外ならfalse
-        return kd >= 1.2 || pd.getKills(TimeUnit.MONTHLY) >= 3000;
+        return kd >= 1.2 || pd.monthlyKills >= 3000;
     }
 
     /**
@@ -86,9 +84,9 @@ public static int getPlayerPowerLevel(Player p) {
 
         int pl;
         // プレイヤーの戦績取得
-        KDUserData pd = kdsPlugin.getKdDataContainer().getPlayerData(p, true);
-        int kills = pd.getKills(TimeUnit.LIFETIME);
-        int deaths = pd.getDeaths();
+        KDUserData pd = kdsPlugin.getPlayerKd().getPlayerData(p.getUniqueId());
+        int kills = pd.totalKills;
+        int deaths = pd.deaths;
 
         // デス数が0以下の場合は1に変更
         if ( deaths <= 0 ) {
@@ -97,13 +95,13 @@ public static int getPlayerPowerLevel(Player p) {
 
         // KD計算
         double kd = (double) kills / (double) deaths;
-        if ( pd.getKills(TimeUnit.LIFETIME) < 100 ) {
+        if ( pd.totalKills < 100 ) {
             kd = 0.8;
         }
         // 代入
         pl = (int) (kd * 1000);
         // 今月のキル数を代入
-        pl += pd.getKills(TimeUnit.MONTHLY) / 10;
+        pl += pd.totalKills / 10;
         return pl;
     }