diff --git a/build.gradle.kts b/build.gradle.kts index 497d174..9330c13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,5 @@ plugins { `java-library` - alias(libs.plugins.lombok) } val group by properties diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7460fd9..0ea4b60 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] # Plugins -lombok = "8.11" # Project tools junit-jupiter = "5.11.3" @@ -15,7 +14,6 @@ paper-api = "1.16.5-R0.1-SNAPSHOT" jsonmessage = "1.3.1" [plugins] -lombok = { id = "io.freefair.lombok", version.ref = "lombok" } [libraries] com-mysql-mysql-connector-j = { module = "com.mysql:mysql-connector-j", version.ref = "com-mysql-mysql-connector-j" } diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java b/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java index f1b1330..111001e 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java @@ -8,7 +8,6 @@ import jp.azisaba.lgw.kdstatus.task.DBConnectionCheckTask; import jp.azisaba.lgw.kdstatus.task.SavePlayerDataTask; import jp.azisaba.lgw.kdstatus.utils.Chat; -import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -16,13 +15,9 @@ public class KDStatusReloaded extends JavaPlugin { - @Getter private KDStatusConfig pluginConfig; - @Getter private KillDeathDataContainer kdDataContainer; - @Getter private static KDStatusReloaded plugin; - @Getter private SavePlayerDataTask saveTask; private DBConnectionCheckTask dbCheckTask; @@ -110,4 +105,20 @@ public PlayerDataMySQLController getKDData() { return kdData; } + public KDStatusConfig getPluginConfig() { + return pluginConfig; + } + + public KillDeathDataContainer getKdDataContainer() { + return kdDataContainer; + } + + public static KDStatusReloaded getPlugin() { + return plugin; + } + + public SavePlayerDataTask getSaveTask() { + return saveTask; + } + } diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/DBAuthConfig.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/DBAuthConfig.java index 3da737f..1784975 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/DBAuthConfig.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/DBAuthConfig.java @@ -1,8 +1,6 @@ package jp.azisaba.lgw.kdstatus.sql; import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import lombok.AccessLevel; -import lombok.Getter; import java.util.logging.Logger; @@ -10,15 +8,31 @@ * Safe auth config loader */ public class DBAuthConfig { - @Getter(AccessLevel.PROTECTED) private static String host; - @Getter(AccessLevel.PROTECTED) private static String port; - @Getter(AccessLevel.PROTECTED) private static String database; - @Getter(AccessLevel.PROTECTED) private static String user; - @Getter(AccessLevel.PROTECTED) + + protected static String getHost() { + return host; + } + + protected static String getPort() { + return port; + } + + protected static String getDatabase() { + return database; + } + + protected static String getUser() { + return user; + } + + protected static String getPassword() { + return password; + } + private static String password; public static void loadAuthConfig() { diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/HikariMySQLDatabase.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/HikariMySQLDatabase.java index 0794d16..703aebf 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/HikariMySQLDatabase.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/HikariMySQLDatabase.java @@ -3,9 +3,7 @@ import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import lombok.Getter; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; +import org.jetbrains.annotations.NotNull; import java.sql.Connection; import java.sql.PreparedStatement; @@ -18,16 +16,28 @@ /** * Wrapper class of HikariDataSource for MySQL */ -@RequiredArgsConstructor public class HikariMySQLDatabase { private final Logger logger; private final int maxPoolSize; private final String host, port, databaseName, user, password; - @Getter private boolean initialized; private HikariDataSource hikari; + public HikariMySQLDatabase(Logger logger, int maxPoolSize, String host, String port, String databaseName, String user, String password) { + this.logger = logger; + this.maxPoolSize = maxPoolSize; + this.host = host; + this.port = port; + this.databaseName = databaseName; + this.user = user; + this.password = password; + } + + public boolean isInitialized() { + return initialized; + } + public boolean isConnected() { if (hikari == null) return false; return hikari.isRunning(); @@ -102,7 +112,7 @@ public Connection getConnectionOrNull() { } - public PreparedStatement preparedStatement(@NonNull String sql) { + public PreparedStatement preparedStatement(@NotNull String sql) { Connection conn = getConnectionOrNull(); if (conn == null) { logger.log(Level.SEVERE, "Failed to create preparedStatement: connection is null"); @@ -124,7 +134,7 @@ public PreparedStatement preparedStatement(@NonNull String sql) { * @return result of execution. If failed, return null */ - public ResultSet executeQuery(@NonNull String sql, Consumer pstmtConsumer) { + public ResultSet executeQuery(@NotNull String sql, Consumer pstmtConsumer) { // get a connection Connection conn = getConnectionOrNull(); if (conn == null) { diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java index 6acb369..df3c095 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java @@ -2,10 +2,9 @@ import jp.azisaba.lgw.kdstatus.KDStatusReloaded; import jp.azisaba.lgw.kdstatus.utils.TimeUnit; -import lombok.Getter; -import lombok.NonNull; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; @@ -14,7 +13,6 @@ public class KDUserData { - @Getter private final UUID uuid; private YamlConfiguration conf; @@ -28,7 +26,6 @@ public class KDUserData { public static final String MONTHLY_KILLS_KEY = "MonthlyKill"; public static final String YEARLY_KILLS_KEY = "YearlyKill"; - @Getter private String name; private int totalKills, dailyKills, monthlyKills, yearlyKills; private int deaths; @@ -135,13 +132,21 @@ public void addKills(TimeUnit unit, int num) { updateLastUpdated(); } + public String getName() { + return name; + } + + public UUID getUuid() { + return uuid; + } + /** * 指定した期間のキル数を取得します * * @param unit 取得したい期間 * @return 取得したキル数。なければ0 */ - public int getKills(@NonNull TimeUnit unit) { + public int getKills(@NotNull TimeUnit unit) { fixCorrectValue(); if (unit == TimeUnit.LIFETIME) { diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java index ee11426..fa2be10 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java @@ -4,10 +4,10 @@ import jp.azisaba.lgw.kdstatus.utils.Chat; import jp.azisaba.lgw.kdstatus.utils.TimeUnit; import jp.azisaba.lgw.kdstatus.utils.UUIDConverter; -import lombok.NonNull; import me.rayzr522.jsonmessage.JSONMessage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.sql.ResultSet; @@ -56,7 +56,7 @@ public KDUserData getPlayerData(Player p, boolean loadIfNotLoaded) { * @return cacheに保存されている戦績か、ファイルから読み込まれたプレイヤーの戦績 * @throws NullPointerException 対象プレイヤーがnullの場合 */ - public KDUserData loadPlayerData(@NonNull Player p) { + public KDUserData loadPlayerData(@NotNull Player p) { if (playerDataCache.containsKey(p.getUniqueId())) { return playerDataCache.get(p.getUniqueId()); } @@ -112,7 +112,7 @@ public boolean removeUserDataFromCache(UUID uuid) { * @param p 対象プレイヤー * @param save ファイルにセーブするかどうか */ - public boolean unloadPlayer(@NonNull Player p, boolean save) { + public boolean unloadPlayer(@NotNull Player p, boolean save) { if (!playerDataCache.containsKey(p.getUniqueId())) { return true; } @@ -128,7 +128,7 @@ public boolean unloadPlayer(@NonNull Player p, boolean save) { return true; } - public boolean savePlayerData(@NonNull KDUserData data) { + public boolean savePlayerData(@NotNull KDUserData data) { if (!isMigrated) { return sqlController.save(data); } else { @@ -136,7 +136,7 @@ public boolean savePlayerData(@NonNull KDUserData data) { } } - public boolean savePlayerData(@NonNull Player p) { + public boolean savePlayerData(@NotNull Player p) { KDUserData userData = getPlayerData(p, false); if (userData == null) return true; return savePlayerData(userData); @@ -240,7 +240,7 @@ public List getTopKillRankingData(TimeUnit unit, int count) thr return null; } - public int getRanking(@NonNull UUID uuid, @NonNull TimeUnit unit) { + public int getRanking(@NotNull UUID uuid, @NotNull TimeUnit unit) { if (!isMigrated) { ResultSet set = sqlController.getHandler().executeQuery( diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java index 82f7e13..b544b68 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java @@ -1,10 +1,7 @@ package jp.azisaba.lgw.kdstatus.sql; -import lombok.Getter; - import java.util.UUID; -@Getter public class KillRankingData { private final UUID uuid; diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/MySQLHandler.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/MySQLHandler.java index d027300..0518c6a 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/MySQLHandler.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/MySQLHandler.java @@ -1,20 +1,21 @@ package jp.azisaba.lgw.kdstatus.sql; -import lombok.Getter; - import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; public class MySQLHandler { - @Getter private Connection connection; public boolean isConnected() { return (connection != null); } + public Connection getConnection() { + return connection; + } + /** * Internal method for connect MySQL * diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataController.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataController.java index 199ab38..7469ae4 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataController.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataController.java @@ -1,7 +1,7 @@ package jp.azisaba.lgw.kdstatus.sql; import jp.azisaba.lgw.kdstatus.utils.TimeUnit; -import lombok.NonNull; +import org.jetbrains.annotations.NotNull; import java.math.BigInteger; import java.sql.ResultSet; @@ -17,15 +17,15 @@ public interface PlayerDataController { boolean update(KDUserData data); - BigInteger getKills(@NonNull UUID uuid, @NonNull TimeUnit unit); + BigInteger getKills(@NotNull UUID uuid, @NotNull TimeUnit unit); - BigInteger getDeaths(@NonNull UUID uuid); + BigInteger getDeaths(@NotNull UUID uuid); String getName(UUID uuid); - long getLastUpdated(@NonNull UUID uuid); + long getLastUpdated(@NotNull UUID uuid); - ResultSet getRawData(@NonNull UUID uuid); + ResultSet getRawData(@NotNull UUID uuid); int getRank(UUID uuid, TimeUnit unit); diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java index c20f9a5..99a5466 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java @@ -1,8 +1,7 @@ package jp.azisaba.lgw.kdstatus.sql; import jp.azisaba.lgw.kdstatus.utils.TimeUnit; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; +import org.jetbrains.annotations.NotNull; import java.math.BigInteger; import java.sql.PreparedStatement; @@ -14,11 +13,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -@RequiredArgsConstructor public class PlayerDataHikariMySQLController implements PlayerDataController { private final Logger logger; private HikariMySQLDatabase db; + public PlayerDataHikariMySQLController(Logger logger) { + this.logger = logger; + } + public void connect() { } @@ -91,12 +93,12 @@ public boolean update(KDUserData data) { } @Override - public BigInteger getKills(@NonNull UUID uuid, @NonNull TimeUnit unit) { + public BigInteger getKills(@NotNull UUID uuid, @NotNull TimeUnit unit) { return null; } @Override - public BigInteger getDeaths(@NonNull UUID uuid) { + public BigInteger getDeaths(@NotNull UUID uuid) { return null; } @@ -106,12 +108,12 @@ public String getName(UUID uuid) { } @Override - public long getLastUpdated(@NonNull UUID uuid) { + public long getLastUpdated(@NotNull UUID uuid) { return 0; } @Override - public ResultSet getRawData(@NonNull UUID uuid) { + public ResultSet getRawData(@NotNull UUID uuid) { return null; } diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java index ce8c08d..277f216 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java @@ -2,8 +2,7 @@ import jp.azisaba.lgw.kdstatus.KDStatusReloaded; import jp.azisaba.lgw.kdstatus.utils.TimeUnit; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; +import org.jetbrains.annotations.NotNull; import org.slf4j.LoggerFactory; import java.math.BigInteger; @@ -17,12 +16,16 @@ import java.util.logging.Level; import java.util.logging.Logger; -@RequiredArgsConstructor public class PlayerDataMySQLController { private static final org.slf4j.Logger log = LoggerFactory.getLogger(PlayerDataMySQLController.class); private final HikariMySQLDatabase sql; private final Logger logger; + public PlayerDataMySQLController(HikariMySQLDatabase sql, Logger logger) { + this.sql = sql; + this.logger = logger; + } + public void init() { if (sql.isConnected()) { logger.info("SQL Testing..."); @@ -137,7 +140,7 @@ public boolean update(KDUserData data) { } - public BigInteger getKills(@NonNull UUID uuid, @NonNull TimeUnit unit) { + public BigInteger getKills(@NotNull UUID uuid, @NotNull TimeUnit unit) { try (Connection conn = sql.getConnection(); PreparedStatement ps = conn.prepareStatement("SELECT " + unit.getSqlColumnName() + " FROM kill_death_data WHERE uuid=?")) { @@ -162,7 +165,7 @@ public BigInteger getKills(@NonNull UUID uuid, @NonNull TimeUnit unit) { } - public BigInteger getDeaths(@NonNull UUID uuid) { + public BigInteger getDeaths(@NotNull UUID uuid) { try { @@ -187,7 +190,7 @@ public BigInteger getDeaths(@NonNull UUID uuid) { } - public String getName(@NonNull UUID uuid) { + public String getName(@NotNull UUID uuid) { try (Connection conn = sql.getConnection(); PreparedStatement ps = conn.prepareStatement("SELECT name FROM kill_death_data WHERE uuid=?")) { @@ -212,7 +215,7 @@ public String getName(@NonNull UUID uuid) { } - public long getLastUpdated(@NonNull UUID uuid) { + public long getLastUpdated(@NotNull UUID uuid) { try { @@ -237,7 +240,7 @@ public long getLastUpdated(@NonNull UUID uuid) { } - public ResultSet getRawData(@NonNull UUID uuid) { + public ResultSet getRawData(@NotNull UUID uuid) { try (Connection conn = sql.getConnection(); PreparedStatement ps = conn.prepareStatement("SELECT * FROM kill_death_data WHERE uuid=?")) { ps.setString(1, uuid.toString()); @@ -253,7 +256,7 @@ public ResultSet getRawData(@NonNull UUID uuid) { * @param name Name of target player * @return returns userdata. If failed, returns null. */ - public KDUserData getUserData(@NonNull UUID uuid, @NonNull String name) { + public KDUserData getUserData(@NotNull UUID uuid, @NotNull String name) { try (Connection conn = sql.getConnection(); PreparedStatement ps = conn.prepareStatement("SELECT * FROM kill_death_data WHERE uuid=?")) { ps.setString(1, uuid.toString()); diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java index 5885ced..0055341 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java @@ -2,9 +2,7 @@ import jp.azisaba.lgw.kdstatus.utils.TimeUnit; import jp.azisaba.lgw.kdstatus.utils.UUIDConverter; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NonNull; +import org.jetbrains.annotations.NotNull; import java.math.BigInteger; import java.sql.ResultSet; @@ -15,16 +13,22 @@ public class PlayerDataSQLController { - @Getter(value = AccessLevel.PROTECTED) private final SQLHandler handler; - @Getter(value = AccessLevel.PROTECTED) private final String tableName = "killdeathdata"; public PlayerDataSQLController(SQLHandler handler) { this.handler = handler; } + protected SQLHandler getHandler() { + return handler; + } + + protected String getTableName() { + return tableName; + } + /** * テーブルの作成など初期に必要な処理を行います * @@ -52,7 +56,7 @@ public PlayerDataSQLController init() { return this; } - public BigInteger getKills(@NonNull UUID uuid, @NonNull TimeUnit unit) { + public BigInteger getKills(@NotNull UUID uuid, @NotNull TimeUnit unit) { try { ResultSet set = handler.executeQuery("select " + unit.getSqlColumnName() + " from \"" + tableName + "\" where uuid='" + UUIDConverter.convert(uuid) + "';"); @@ -66,7 +70,7 @@ public BigInteger getKills(@NonNull UUID uuid, @NonNull TimeUnit unit) { return BigInteger.valueOf(-1); } - public BigInteger getDeaths(@NonNull UUID uuid) { + public BigInteger getDeaths(@NotNull UUID uuid) { try { ResultSet set = handler.executeQuery("select deaths from \"" + tableName + "\" where uuid='" + UUIDConverter.convert(uuid) + "';"); @@ -80,7 +84,7 @@ public BigInteger getDeaths(@NonNull UUID uuid) { return BigInteger.valueOf(-1); } - public String getName(@NonNull UUID uuid) { + public String getName(@NotNull UUID uuid) { try { ResultSet set = handler.executeQuery("select name from \"" + tableName + "\" where uuid='" + UUIDConverter.convert(uuid) + "';"); @@ -94,7 +98,7 @@ public String getName(@NonNull UUID uuid) { return null; } - public long getLastUpdated(@NonNull UUID uuid) { + public long getLastUpdated(@NotNull UUID uuid) { try { ResultSet set = handler.executeQuery("select last_updated from \"" + tableName + "\" where uuid='" + UUIDConverter.convert(uuid) + "';"); @@ -108,7 +112,7 @@ public long getLastUpdated(@NonNull UUID uuid) { return -1; } - public ResultSet getRawData(@NonNull UUID uuid) { + public ResultSet getRawData(@NotNull UUID uuid) { return handler.executeQuery("select * from \"" + tableName + "\" where uuid='" + UUIDConverter.convert(uuid) + "';"); } @@ -139,7 +143,7 @@ public List getAllData() { } - public boolean save(@NonNull KDUserData data) { + public boolean save(@NotNull KDUserData data) { String uuid = UUIDConverter.convert(data.getUuid()); String name = data.getName(); String totalKills = "" + data.getKills(TimeUnit.LIFETIME); @@ -161,7 +165,7 @@ public boolean save(@NonNull KDUserData data) { return changed >= 0; } - public boolean save(@NonNull KDUserData... data2) { + public boolean save(@NotNull KDUserData... data2) { if (data2.length <= 0) { return true; } diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/task/DBConnectionCheckTask.java b/src/main/java/jp/azisaba/lgw/kdstatus/task/DBConnectionCheckTask.java index c78ddc0..e9c81ae 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/task/DBConnectionCheckTask.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/task/DBConnectionCheckTask.java @@ -1,7 +1,6 @@ package jp.azisaba.lgw.kdstatus.task; import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import lombok.RequiredArgsConstructor; import org.bukkit.scheduler.BukkitRunnable; import java.sql.Connection; @@ -9,10 +8,13 @@ import java.sql.SQLException; import java.util.logging.Level; -@RequiredArgsConstructor public class DBConnectionCheckTask extends BukkitRunnable { private final KDStatusReloaded plugin; + public DBConnectionCheckTask(KDStatusReloaded plugin) { + this.plugin = plugin; + } + @Override public void run() { try (Connection conn = plugin.sql.getConnection()) { diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/task/SavePlayerDataTask.java b/src/main/java/jp/azisaba/lgw/kdstatus/task/SavePlayerDataTask.java index dd73d52..6e62487 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/task/SavePlayerDataTask.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/task/SavePlayerDataTask.java @@ -1,7 +1,6 @@ package jp.azisaba.lgw.kdstatus.task; import jp.azisaba.lgw.kdstatus.KDStatusReloaded; -import lombok.Getter; import org.bukkit.scheduler.BukkitRunnable; /** @@ -12,13 +11,16 @@ public class SavePlayerDataTask extends BukkitRunnable { private final KDStatusReloaded plugin; - @Getter private long lastSavedTime = System.currentTimeMillis(); public SavePlayerDataTask(KDStatusReloaded plugin) { this.plugin = plugin; } + public long getLastSavedTime() { + return lastSavedTime; + } + @Override public void run() { // 全プレイヤーのデータをセーブする diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/utils/Chat.java b/src/main/java/jp/azisaba/lgw/kdstatus/utils/Chat.java index 27b1797..93066d1 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/utils/Chat.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/utils/Chat.java @@ -1,11 +1,9 @@ package jp.azisaba.lgw.kdstatus.utils; -import lombok.experimental.UtilityClass; import org.bukkit.ChatColor; import java.text.MessageFormat; -@UtilityClass public class Chat { // メッセージをフォーマットして、&で色をつける diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverter.java b/src/main/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverter.java index 58ae59a..9aef796 100644 --- a/src/main/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverter.java +++ b/src/main/java/jp/azisaba/lgw/kdstatus/utils/UUIDConverter.java @@ -1,12 +1,12 @@ package jp.azisaba.lgw.kdstatus.utils; -import lombok.NonNull; +import org.jetbrains.annotations.NotNull; import java.util.UUID; public class UUIDConverter { - public static String convert(@NonNull UUID uuid) { + public static String convert(@NotNull UUID uuid) { return uuid.toString().replace("-", ""); }