Skip to content

Commit 45cd3bd

Browse files
BiplonBiplon
committed
cleaned code
removed unused stuff
1 parent 69ac8d0 commit 45cd3bd

File tree

11 files changed

+64
-127
lines changed

11 files changed

+64
-127
lines changed

‎plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PlayertoSql
22
author: Vestri
33
description: Plugin Player to Sql
4-
version: 0.31
4+
version: 1.0
55
api-version: 1.15
66
main: pts.java.PlayertoSql
77
depend: [ProtocolLib]

‎src/pts/java/ConfigManager.java

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -36,51 +36,9 @@ protected static void loadConfig()
3636
}
3737

3838
//get values
39-
joinLoadDelay = getConfigValueInt("general.loaddelay");
40-
playerFile = getConfigValueBool("general.playerfile");
41-
autosaveInterval = getConfigValueInt("general.autosaveinterval");
42-
playercreate = getConfigValueBool("general.playercreate");
43-
}
44-
45-
//try to get String value
46-
public static String getConfigValueString(String value)
47-
{
48-
if (!PlayertoSql.getInstance().getConfig().contains(value))
49-
{
50-
PlayertoSql.getInstance().getLogger().severe("Value: " + value + " not found in config.yml of" + PlayertoSql.getInstance().getName());
51-
return "ValueNotFound";
52-
}
53-
else
54-
{
55-
return PlayertoSql.getInstance().getConfig().getString(value);
56-
}
57-
}
58-
59-
//try to get Int value
60-
public static int getConfigValueInt(String value)
61-
{
62-
if (!PlayertoSql.getInstance().getConfig().contains(value))
63-
{
64-
PlayertoSql.getInstance().getLogger().severe("Value: " + value + " not found in config.yml of" + PlayertoSql.getInstance().getName());
65-
return 0;
66-
}
67-
else
68-
{
69-
return PlayertoSql.getInstance().getConfig().getInt(value);
70-
}
71-
}
72-
73-
//try to get Boolean
74-
public static Boolean getConfigValueBool(String value)
75-
{
76-
if (!PlayertoSql.getInstance().getConfig().contains(value))
77-
{
78-
PlayertoSql.getInstance().getLogger().severe("Value: " + value + " not found in config.yml of" + PlayertoSql.getInstance().getName());
79-
return false;
80-
}
81-
else
82-
{
83-
return PlayertoSql.getInstance().getConfig().getBoolean(value);
84-
}
39+
joinLoadDelay = PlayertoSql.getInstance().getConfig().getInt("general.loaddelay");
40+
playerFile = PlayertoSql.getInstance().getConfig().getBoolean("general.playerfile");
41+
autosaveInterval = PlayertoSql.getInstance().getConfig().getInt("general.autosaveinterval");
42+
playercreate = PlayertoSql.getInstance().getConfig().getBoolean("general.playercreate");
8543
}
8644
}

‎src/pts/java/PlayertoSql.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ public class PlayertoSql extends JavaPlugin
2222

2323
static PlayerManager playerManager;
2424

25+
public static PlayertoSql getInstance()
26+
{
27+
return instance;
28+
}
29+
30+
public PlayerManager getPlayerManager()
31+
{
32+
return playerManager;
33+
}
34+
2535
//on enable plugin load config reg events and commands check if autosave an start it
2636
public void onEnable()
2737
{
@@ -34,7 +44,7 @@ public void onEnable()
3444
new PlayerManagement();
3545
regEvents();
3646
regCommands();
37-
if (ConfigManager.getConfigValueBool("general.autosave"))
47+
if (getConfig().getBoolean("general.autosave"))
3848
{
3949
autosaveManager = new AutosaveManager();
4050
}
@@ -77,13 +87,4 @@ public void onDisable()
7787
Bukkit.getLogger().info("[PlayertoSql] has been disabled!");
7888
}
7989

80-
public static PlayertoSql getInstance()
81-
{
82-
return instance;
83-
}
84-
85-
public PlayerManager getPlayerManager()
86-
{
87-
return playerManager;
88-
}
8990
}

‎src/pts/java/api/PlayerManagement.java

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,28 @@ public static PlayerManagement getInstance()
1717
{
1818
return instance;
1919
}
20+
2021
//check if player is not on disabledPlayerSaved list
2122
//if not then start a task with 1 tick delay to save player
2223
@SuppressWarnings("unused")
2324
public boolean savePlayerSync(Player p)
2425
{
2526
if (!PlayertoSql.getInstance().getPlayerManager().disabledPlayerSaved.contains(p.getUniqueId()))
2627
{
27-
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), ()-> PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(),false,"api async"));
28+
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), () -> PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), false, "api async"));
2829
return true;
2930
}
3031
return false;
3132
}
33+
3234
//start a task with 1 tick delay to save player
3335
@SuppressWarnings("unused")
3436
public boolean savePlayerIgnoreDisableSync(Player p)
3537
{
36-
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), ()-> PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(),true,"api async"));
38+
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), () -> PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), true, "api async"));
3739
return true;
3840
}
41+
3942
//check if player is not on disabledPlayerSaved list
4043
//if not then start a async task to save player
4144
@SuppressWarnings("unused")
@@ -44,76 +47,85 @@ public boolean savePlayerAsync(Player p)
4447
if (!PlayertoSql.getInstance().getPlayerManager().disabledPlayerSaved.contains(p.getUniqueId()))
4548
{
4649
Bukkit.getScheduler().runTaskAsynchronously(PlayertoSql.getInstance(), () ->
47-
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(),false,"api sync"));
50+
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), false, "api sync"));
4851
return true;
4952
}
5053
return false;
5154
}
55+
5256
//start a async task to save player
5357
@SuppressWarnings("unused")
5458
public boolean savePlayerIgnoreDisableAsync(Player p)
5559
{
5660
Bukkit.getScheduler().runTaskAsynchronously(PlayertoSql.getInstance(), () ->
57-
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(),true,"api sync"));
61+
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), true, "api sync"));
5862
return true;
5963
}
64+
6065
//add player to DisablePlayerSave list
6166
@SuppressWarnings("unused")
6267
public boolean disablePlayerSave(Player p)
6368
{
6469
PlayertoSql.getInstance().getPlayerManager().addDisablePlayerSave(p.getUniqueId());
6570
return true;
6671
}
72+
6773
//remove player to DisablePlayerSave list
6874
@SuppressWarnings("unused")
6975
public boolean enablePlayerSave(Player p)
7076
{
7177
PlayertoSql.getInstance().getPlayerManager().removeDisablePlayerSave(p.getUniqueId());
7278
return true;
7379
}
80+
7481
//check if player is not on disabledPlayerLoaded list
7582
//if not then start a task with 1 tick delay to load player
7683
@SuppressWarnings("unused")
7784
public boolean loadPlayerSync(Player p)
7885
{
7986
if (!PlayertoSql.getInstance().getPlayerManager().disabledPlayerLoaded.contains(p.getUniqueId()))
8087
{
81-
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), ()-> PlayertoSql.getInstance().getPlayerManager().loadPlayer(p,false));
88+
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), () -> PlayertoSql.getInstance().getPlayerManager().loadPlayer(p, false));
8289
return true;
8390
}
8491
return false;
8592
}
93+
8694
//start a task with 1 tick delay to load player
8795
@SuppressWarnings("unused")
8896
public boolean loadPlayerIgnoreDisableSync(Player p)
8997
{
90-
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), ()-> PlayertoSql.getInstance().getPlayerManager().loadPlayer(p,true));
98+
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), () -> PlayertoSql.getInstance().getPlayerManager().loadPlayer(p, true));
9199
return true;
92100
}
101+
93102
//check if player is not on disabledPlayerLoaded list
94103
//if not then start a async task to load player
95104
@SuppressWarnings("unused")
96105
public boolean loadPlayerAsync(Player p)
97106
{
98107
Bukkit.getScheduler().runTaskAsynchronously(PlayertoSql.getInstance(), () ->
99-
PlayertoSql.getInstance().getPlayerManager().loadPlayer(p,false));
108+
PlayertoSql.getInstance().getPlayerManager().loadPlayer(p, false));
100109
return true;
101110
}
111+
102112
//start a async task to load player
103113
@SuppressWarnings("unused")
104114
public boolean loadPlayerIgnoreDisableAsync(Player p)
105115
{
106116
Bukkit.getScheduler().runTaskAsynchronously(PlayertoSql.getInstance(), () ->
107-
PlayertoSql.getInstance().getPlayerManager().loadPlayer(p,true));
117+
PlayertoSql.getInstance().getPlayerManager().loadPlayer(p, true));
108118
return true;
109119
}
120+
110121
//add player to DisablePlayerLoad list
111122
@SuppressWarnings("unused")
112123
public boolean disablePlayerLoad(Player p)
113124
{
114125
PlayertoSql.getInstance().getPlayerManager().addDisablePlayerLoad(p.getUniqueId());
115126
return true;
116127
}
128+
117129
//remove player to DisablePlayerLoad list
118130
@SuppressWarnings("unused")
119131
public boolean enablePlayerLoad(Player p)

‎src/pts/java/command/CommandSavePlayer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
3232
if (args.length == 1)
3333
{
3434
Bukkit.getScheduler().runTaskAsynchronously(PlayertoSql.getInstance(), () ->
35-
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), false,"Command"));
35+
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), false, "Command"));
3636
return true;
3737
}
3838
//2 args save player sync 1 tick delay
3939
else if (args.length == 2)
4040
{
41-
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), () -> PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), false,"Command"));
41+
Bukkit.getScheduler().runTask(PlayertoSql.getInstance(), () -> PlayertoSql.getInstance().getPlayerManager().savePlayer(p, p.getInventory().getStorageContents(), p.getInventory().getArmorContents(), p.getInventory().getExtraContents(), p.getEnderChest().getContents(), false, "Command"));
4242
return true;
4343
}
4444
}

‎src/pts/java/database/DatabaseManager.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package pts.java.database;
22

3-
import pts.java.ConfigManager;
43
import pts.java.PlayertoSql;
54
import pts.java.player.ItemManager;
65
import org.bukkit.entity.Player;
@@ -24,9 +23,9 @@ public class DatabaseManager
2423

2524
static String date;
2625

27-
static String updateInventoryStatement = "";
28-
static String updateArmorStatement = "";
29-
static String updateEnderChestStatement = "";
26+
static String updateInventoryStatement;
27+
static String updateArmorStatement;
28+
static String updateEnderChestStatement;
3029

3130
public static byte inventoryLength = 36;
3231
public static byte enderChestLength = 27;
@@ -92,11 +91,11 @@ private void createStatementStrings()
9291
//load all config values
9392
private void loadConfigValues()
9493
{
95-
dbname = ConfigManager.getConfigValueString("database.mysql.databaseName");
96-
playerTableName = ConfigManager.getConfigValueString("database.mysql.tableNameplayer");
97-
playerInventoryTableName = ConfigManager.getConfigValueString("database.mysql.tableNameinventory");
98-
playerInventoryArmorTableName = ConfigManager.getConfigValueString("database.mysql.tableNamearmor");
99-
playerEnderChestTableName = ConfigManager.getConfigValueString("database.mysql.tableNameenderchest");
94+
dbname = PlayertoSql.getInstance().getConfig().getString("database.mysql.databaseName");
95+
playerTableName = PlayertoSql.getInstance().getConfig().getString("database.mysql.tableNameplayer");
96+
playerInventoryTableName = PlayertoSql.getInstance().getConfig().getString("database.mysql.tableNameinventory");
97+
playerInventoryArmorTableName = PlayertoSql.getInstance().getConfig().getString("database.mysql.tableNamearmor");
98+
playerEnderChestTableName = PlayertoSql.getInstance().getConfig().getString("database.mysql.tableNameenderchest");
10099

101100
Date dt = new Date();
102101
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd");
@@ -106,15 +105,14 @@ private void loadConfigValues()
106105
//create connection with db
107106
private void createConnection(boolean reconnect)
108107
{
109-
110108
String ssl = "";
111-
String username = ConfigManager.getConfigValueString("database.mysql.user");
112-
String password = ConfigManager.getConfigValueString("database.mysql.password");
113-
if (ConfigManager.getConfigValueBool("database.mysql.host"))
109+
String username = PlayertoSql.getInstance().getConfig().getString("database.mysql.user");
110+
String password = PlayertoSql.getInstance().getConfig().getString("database.mysql.password");
111+
if (PlayertoSql.getInstance().getConfig().getBoolean("database.mysql.host"))
114112
{
115113
ssl = "&sslMode=REQUIRED";
116114
}
117-
String server = "jdbc:mysql://" + ConfigManager.getConfigValueString("database.mysql.host") + ":" + ConfigManager.getConfigValueString("database.mysql.port") + "/" + dbname + "?autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true" + ssl;
115+
String server = "jdbc:mysql://" + PlayertoSql.getInstance().getConfig().getString("database.mysql.host") + ":" + PlayertoSql.getInstance().getConfig().getString("database.mysql.port") + "/" + dbname + "?autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true" + ssl;
118116
try
119117
{
120118
connection = DriverManager.getConnection(server, username, password);
@@ -196,15 +194,17 @@ private void setupTables()
196194
" (`uuid_player` CHAR(128) NOT NULL," +
197195
"`name` CHAR(128) NOT NULL," +
198196
"`last_login` DATE NOT NULL," +
199-
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8;";
197+
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8" +
198+
" ROW_FORMAT = DYNAMIC ;";
200199

201200
query = connection.prepareStatement(data);
202201
query.execute();
203202

204203
data = "CREATE TABLE IF NOT EXISTS " + dbname + "." + playerInventoryTableName + " " +
205204
"(`uuid_player` CHAR(128) NOT NULL," +
206205
"" + createInventoryQueryString() + "" +
207-
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8;";
206+
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8 " +
207+
" ROW_FORMAT = DYNAMIC;";
208208

209209
query = connection.prepareStatement(data);
210210
query.execute();
@@ -216,15 +216,17 @@ private void setupTables()
216216
"`slot_02_id` LONGTEXT NULL," +
217217
"`slot_03_id` LONGTEXT NULL," +
218218
"`slot_04_id` LONGTEXT NULL," + //offhand
219-
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8;";
219+
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8" +
220+
" ROW_FORMAT = DYNAMIC;";
220221

221222
query = connection.prepareStatement(data);
222223
query.execute();
223224

224225
data = "CREATE TABLE IF NOT EXISTS " + dbname + "." + playerEnderChestTableName + " " +
225226
"(`uuid_player` CHAR(128) NOT NULL," +
226227
"" + createEnderQuery() + "" +
227-
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8;";
228+
" PRIMARY KEY (`uuid_player`)) ENGINE = InnoDB DEFAULT CHARSET=utf8" +
229+
" ROW_FORMAT = DYNAMIC;";
228230

229231
query = connection.prepareStatement(data);
230232
query.execute();

‎src/pts/java/event/PlayerJoin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.bukkit.event.EventHandler;
99
import org.bukkit.event.Listener;
1010
import org.bukkit.event.player.PlayerJoinEvent;
11-
import pts.java.player.PlayerManager;
1211

1312
public class PlayerJoin implements Listener
1413
{

‎src/pts/java/event/PlayerQuit.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public void onDisconnect(final PlayerQuitEvent event)
1717
Player p = event.getPlayer();
1818
//start async player save
1919
ItemStack[] inv = p.getInventory().getStorageContents();
20-
ItemStack[] inva = p.getInventory().getArmorContents();
20+
ItemStack[] inva = p.getInventory().getArmorContents();
2121
ItemStack[] invae = p.getInventory().getExtraContents();
2222
ItemStack[] inven = p.getEnderChest().getContents();
2323
Bukkit.getScheduler().runTaskAsynchronously(PlayertoSql.getInstance(), () ->
24-
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, inv,inva,invae ,inven ,false,"quitsave"));
24+
PlayertoSql.getInstance().getPlayerManager().savePlayer(p, inv, inva, invae, inven, false, "quitsave"));
2525
p.getInventory().clear();
2626
}
2727
}

0 commit comments

Comments
 (0)