Skip to content

Commit 6b904fd

Browse files
sysnote8mainsysnote8main
authored
Merge pull request #24 from AzisabaNetwork/feat/remove-unused
Remove unused code & imports
2 parents cd10cd0 + 945385c commit 6b904fd

21 files changed

+354
-379
lines changed

‎src/main/java/jp/azisaba/lgw/kdstatus/KDStatusConfig.java‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package jp.azisaba.lgw.kdstatus;
22

3+
import jp.azisaba.lgw.kdstatus.utils.Chat;
4+
import org.bukkit.Bukkit;
5+
import org.bukkit.Location;
6+
import org.bukkit.Sound;
7+
import org.bukkit.configuration.file.FileConfiguration;
8+
39
import java.lang.annotation.ElementType;
410
import java.lang.annotation.Retention;
511
import java.lang.annotation.RetentionPolicy;
@@ -8,13 +14,6 @@
814
import java.util.ArrayList;
915
import java.util.List;
1016

11-
import org.bukkit.Bukkit;
12-
import org.bukkit.Location;
13-
import org.bukkit.Sound;
14-
import org.bukkit.configuration.file.FileConfiguration;
15-
16-
import jp.azisaba.lgw.kdstatus.utils.Chat;
17-
1817
public class KDStatusConfig {
1918

2019
private final KDStatusReloaded plugin;
@@ -37,44 +36,44 @@ public KDStatusConfig(KDStatusReloaded plugin) {
3736
}
3837

3938
public void loadConfig() {
40-
for ( Field field : getClass().getFields() ) {
39+
for (Field field : getClass().getFields()) {
4140
ConfigOptions anno = field.getAnnotation(ConfigOptions.class);
4241

43-
if ( anno == null ) {
42+
if (anno == null) {
4443
continue;
4544
}
4645

4746
String path = anno.path();
4847

49-
if ( conf.get(path) == null ) {
48+
if (conf.get(path) == null) {
5049

5150
try {
5251

53-
if ( anno.type() == OptionType.NONE ) {
52+
if (anno.type() == OptionType.NONE) {
5453
conf.set(path, field.get(this));
55-
} else if ( anno.type() == OptionType.LOCATION ) {
54+
} else if (anno.type() == OptionType.LOCATION) {
5655
Location loc = (Location) field.get(this);
5756

5857
conf.set(path, loc.getWorld().getName() + "," + loc.getX() + "," + loc.getY() + "," + loc.getZ()
5958
+ "," + loc.getYaw() + "," + loc.getPitch());
60-
} else if ( anno.type() == OptionType.CHAT_FORMAT ) {
59+
} else if (anno.type() == OptionType.CHAT_FORMAT) {
6160

6261
String msg = (String) field.get(this);
6362
conf.set(path, msg);
6463

6564
msg = Chat.f(msg);
6665
field.set(this, msg);
67-
} else if ( anno.type() == OptionType.SOUND ) {
66+
} else if (anno.type() == OptionType.SOUND) {
6867
conf.set(path, field.get(this).toString());
69-
} else if ( anno.type() == OptionType.LOCATION_LIST ) {
68+
} else if (anno.type() == OptionType.LOCATION_LIST) {
7069
@SuppressWarnings("unchecked")
7170
List<Location> locations = (List<Location>) field.get(this);
7271

7372
List<String> strs = new ArrayList<>();
7473

75-
if ( !locations.isEmpty() ) {
74+
if (!locations.isEmpty()) {
7675

77-
for ( Location loc : locations ) {
76+
for (Location loc : locations) {
7877
strs.add(loc.getWorld().getName() + "," + loc.getX() + "," + loc.getY() + ","
7978
+ loc.getZ()
8079
+ "," + loc.getYaw() + "," + loc.getPitch());
@@ -87,16 +86,16 @@ public void loadConfig() {
8786
}
8887

8988
plugin.saveConfig();
90-
} catch ( Exception e ) {
89+
} catch (Exception e) {
9190
Bukkit.getLogger().warning("Error: " + e.getMessage());
9291
e.printStackTrace();
9392
}
9493
} else {
9594

9695
try {
97-
if ( anno.type() == OptionType.NONE ) {
96+
if (anno.type() == OptionType.NONE) {
9897
field.set(this, conf.get(path));
99-
} else if ( anno.type() == OptionType.LOCATION ) {
98+
} else if (anno.type() == OptionType.LOCATION) {
10099

101100
String[] strings = conf.getString(path).split(",");
102101
Location loc = null;
@@ -105,43 +104,43 @@ public void loadConfig() {
105104
Double.parseDouble(strings[2]), Double.parseDouble(strings[3]));
106105
loc.setYaw(Float.parseFloat(strings[4]));
107106
loc.setPitch(Float.parseFloat(strings[5]));
108-
} catch ( Exception e ) {
107+
} catch (Exception e) {
109108
// None
110109
}
111110

112-
if ( loc == null ) {
111+
if (loc == null) {
113112
Bukkit.getLogger().warning("Error. " + path + " の値がロードできませんでした。");
114113
continue;
115114
}
116115

117116
field.set(this, loc);
118-
} else if ( anno.type() == OptionType.SOUND ) {
117+
} else if (anno.type() == OptionType.SOUND) {
119118

120119
String name = conf.getString(path);
121120
Sound sound;
122121

123122
try {
124123
sound = Sound.valueOf(name.toUpperCase());
125-
} catch ( Exception e ) {
124+
} catch (Exception e) {
126125
Bukkit.getLogger().warning("Error. " + path + " の値がロードできませんでした。");
127126
continue;
128127
}
129128

130129
field.set(this, sound);
131-
} else if ( anno.type() == OptionType.CHAT_FORMAT ) {
130+
} else if (anno.type() == OptionType.CHAT_FORMAT) {
132131

133132
String unformatMessage = conf.getString(path);
134133

135134
unformatMessage = Chat.f(unformatMessage);
136135

137136
field.set(this, unformatMessage);
138-
} else if ( anno.type() == OptionType.LOCATION_LIST ) {
137+
} else if (anno.type() == OptionType.LOCATION_LIST) {
139138

140139
List<String> strList = conf.getStringList(path);
141140

142141
List<Location> locList = new ArrayList<>();
143142

144-
for ( String str : strList ) {
143+
for (String str : strList) {
145144

146145
String[] strings = str.split(",");
147146
Location loc = null;
@@ -150,11 +149,11 @@ public void loadConfig() {
150149
Double.parseDouble(strings[2]), Double.parseDouble(strings[3]));
151150
loc.setYaw(Float.parseFloat(strings[4]));
152151
loc.setPitch(Float.parseFloat(strings[5]));
153-
} catch ( Exception e ) {
152+
} catch (Exception e) {
154153
// None
155154
}
156155

157-
if ( loc == null ) {
156+
if (loc == null) {
158157
Bukkit.getLogger().warning("Error. " + path + " の " + str + "がロードできませんでした。");
159158
continue;
160159
}
@@ -164,7 +163,7 @@ public void loadConfig() {
164163

165164
field.set(this, locList);
166165
}
167-
} catch ( Exception e ) {
166+
} catch (Exception e) {
168167
Bukkit.getLogger().warning("Error. " + e.getMessage());
169168
}
170169
}

‎src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package jp.azisaba.lgw.kdstatus;
22

3-
import java.io.File;
4-
5-
import jp.azisaba.lgw.kdstatus.sql.*;
6-
import jp.azisaba.lgw.kdstatus.task.DBConnectionCheckTask;
7-
import org.bukkit.Bukkit;
8-
import org.bukkit.plugin.java.JavaPlugin;
9-
10-
import lombok.Getter;
11-
123
import jp.azisaba.lgw.kdstatus.commands.KDStatusCommand;
134
import jp.azisaba.lgw.kdstatus.commands.MyStatusCommand;
145
import jp.azisaba.lgw.kdstatus.listeners.JoinQuitListener;
156
import jp.azisaba.lgw.kdstatus.listeners.KillDeathListener;
7+
import jp.azisaba.lgw.kdstatus.sql.*;
8+
import jp.azisaba.lgw.kdstatus.task.DBConnectionCheckTask;
169
import jp.azisaba.lgw.kdstatus.task.SavePlayerDataTask;
1710
import jp.azisaba.lgw.kdstatus.utils.Chat;
11+
import lombok.Getter;
12+
import org.bukkit.Bukkit;
13+
import org.bukkit.plugin.java.JavaPlugin;
14+
15+
import java.io.File;
1816

1917
public class KDStatusReloaded extends JavaPlugin {
2018

@@ -39,12 +37,12 @@ public void onEnable() {
3937

4038
plugin = this;
4139

42-
getConfig().addDefault("migrated",false);
43-
getConfig().addDefault("host","localhost");
44-
getConfig().addDefault("port",3306);
45-
getConfig().addDefault("database","kdstatusreloaded");
46-
getConfig().addDefault("username","root");
47-
getConfig().addDefault("password","password");
40+
getConfig().addDefault("migrated", false);
41+
getConfig().addDefault("host", "localhost");
42+
getConfig().addDefault("port", 3306);
43+
getConfig().addDefault("database", "kdstatusreloaded");
44+
getConfig().addDefault("username", "root");
45+
getConfig().addDefault("password", "password");
4846
getConfig().options().copyDefaults(true);
4947
saveConfig();
5048

@@ -77,7 +75,7 @@ public void onEnable() {
7775
Bukkit.getPluginCommand("kdstatus").setExecutor(new KDStatusCommand(this));
7876
Bukkit.getPluginCommand("kdstatus").setPermissionMessage(Chat.f("&cこのコマンドを実行する権限がありません！"));
7977

80-
if ( Bukkit.getOnlinePlayers().size() > 0 ) {
78+
if (Bukkit.getOnlinePlayers().size() > 0) {
8179

8280
Bukkit.getOnlinePlayers().forEach(player -> {
8381
kdDataContainer.loadPlayerData(player);
@@ -91,14 +89,14 @@ public void onEnable() {
9189
public void onDisable() {
9290
kdDataContainer.saveAllPlayerData(false, true);
9391

94-
if ( sqlHandler != null ) {
92+
if (sqlHandler != null) {
9593
sqlHandler.closeConnection();
9694
}
97-
if(sql.isConnected()){
95+
if (sql.isConnected()) {
9896
sql.close();
9997
}
100-
if(saveTask!=null) saveTask.cancel();
101-
if(dbCheckTask!=null) dbCheckTask.cancel();
98+
if (saveTask != null) saveTask.cancel();
99+
if (dbCheckTask != null) dbCheckTask.cancel();
102100
Bukkit.getLogger().info(getName() + " disabled.");
103101
}
104102

@@ -108,7 +106,7 @@ public void reloadPluginConfig() {
108106
this.pluginConfig.loadConfig();
109107
}
110108

111-
public PlayerDataMySQLController getKDData(){
109+
public PlayerDataMySQLController getKDData() {
112110
return kdData;
113111
}
114112

‎src/main/java/jp/azisaba/lgw/kdstatus/commands/KDStatusCommand.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package jp.azisaba.lgw.kdstatus.commands;
22

3+
import jp.azisaba.lgw.kdstatus.KDStatusReloaded;
4+
import jp.azisaba.lgw.kdstatus.utils.Chat;
35
import org.bukkit.ChatColor;
46
import org.bukkit.command.Command;
57
import org.bukkit.command.CommandExecutor;
68
import org.bukkit.command.CommandSender;
79
import org.bukkit.command.TabCompleter;
810
import org.bukkit.entity.Player;
911

10-
import jp.azisaba.lgw.kdstatus.KDStatusReloaded;
11-
import jp.azisaba.lgw.kdstatus.utils.Chat;
12-
1312
import java.util.Arrays;
1413
import java.util.Collections;
1514
import java.util.List;
@@ -30,7 +29,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
3029
return true;
3130
}
3231

33-
if ( args[0].equalsIgnoreCase("reload") ) {
32+
if (args[0].equalsIgnoreCase("reload")) {
3433
long start = System.currentTimeMillis();
3534
plugin.reloadPluginConfig();
3635
long finish = System.currentTimeMillis();
@@ -39,12 +38,12 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
3938
return true;
4039
}
4140

42-
if ( args[0].equalsIgnoreCase("migration") ) {
41+
if (args[0].equalsIgnoreCase("migration")) {
4342
plugin.getKdDataContainer().migrationToMySQL((Player) sender);
4443
return true;
4544
}
4645

47-
if ( args[0].equalsIgnoreCase("reconnect-db") ) {
46+
if (args[0].equalsIgnoreCase("reconnect-db")) {
4847
sender.sendMessage("Reconnecting database...");
4948
plugin.sql.reconnect();
5049
sender.sendMessage("Reconnect was finished.");
@@ -60,7 +59,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
6059

6160
@Override
6261
public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] args) {
63-
if(args.length == 1) {
62+
if (args.length == 1) {
6463
return modes;
6564
}
6665
return Collections.emptyList();

‎src/main/java/jp/azisaba/lgw/kdstatus/commands/MyStatusCommand.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package jp.azisaba.lgw.kdstatus.commands;
22

3-
import org.bukkit.command.Command;
4-
import org.bukkit.command.CommandExecutor;
5-
import org.bukkit.command.CommandSender;
6-
import org.bukkit.entity.Player;
7-
83
import com.google.common.base.Strings;
9-
104
import jp.azisaba.lgw.kdstatus.sql.KDUserData;
115
import jp.azisaba.lgw.kdstatus.sql.KillDeathDataContainer;
126
import jp.azisaba.lgw.kdstatus.utils.Chat;
137
import jp.azisaba.lgw.kdstatus.utils.TimeUnit;
8+
import org.bukkit.command.Command;
9+
import org.bukkit.command.CommandExecutor;
10+
import org.bukkit.command.CommandSender;
11+
import org.bukkit.entity.Player;
1412

1513
public class MyStatusCommand implements CommandExecutor {
1614

@@ -25,7 +23,7 @@ public MyStatusCommand(KillDeathDataContainer dataContainer) {
2523
@Override
2624
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
2725

28-
if ( !(sender instanceof Player) ) {
26+
if (!(sender instanceof Player)) {
2927
sender.sendMessage(Chat.f("&cこのコマンドはプレイヤーのみ有効です！"));
3028
return true;
3129
}
@@ -36,7 +34,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
3634
int kills = data.getKills(TimeUnit.LIFETIME);
3735
int deaths = data.getDeaths();
3836
double kdRaito;
39-
if ( deaths > 0 ) {
37+
if (deaths > 0) {
4038
kdRaito = (double) kills / (double) deaths;
4139
} else {
4240
kdRaito = (double) kills;

‎src/main/java/jp/azisaba/lgw/kdstatus/listeners/JoinQuitListener.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package jp.azisaba.lgw.kdstatus.listeners;
22

3+
import jp.azisaba.lgw.kdstatus.sql.KillDeathDataContainer;
34
import org.bukkit.entity.Player;
45
import org.bukkit.event.EventHandler;
56
import org.bukkit.event.Listener;
67
import org.bukkit.event.player.PlayerJoinEvent;
7-
8-
import jp.azisaba.lgw.kdstatus.sql.KillDeathDataContainer;
98
import org.bukkit.event.player.PlayerQuitEvent;
109

1110
public class JoinQuitListener implements Listener {

0 commit comments

Comments
 (0)