mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2026-04-07 16:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

sql update

Browse Source
This commit is contained in:
RonanCraft
2022-04-18 18:00:40 -04:00
parent 133b27ed06
commit 1ddd053cbd
9 changed files with 173 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java
View File

@@ -171,7 +171,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
case "setup":
return worldPlayer.setup_type == RTP_SETUP_TYPE.LOCATION ? " &7(" + worldPlayer.setup_name + ")" : "";
case "cooldown":
return worldPlayer.getPlayer() != null ? PermissionNode.BYPASS_COOLDOWN.check(worldPlayer.getPlayer()) ? " &8(bypassing)" : "" : "&cN/A";
return worldPlayer.getPlayer() != null ? PermissionNode.BYPASS_COOLDOWN.check(worldPlayer.getPlayer()) ? " &8(bypassing)" : "" : " &cN/A";
}
return "";
}

4
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldownsWorlds.java → src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseCooldowns.java
View File

@@ -14,9 +14,9 @@ import java.util.List;
import java.util.UUID;
import java.util.logging.Level;
public class DatabaseCooldownsWorlds extends SQLite {
public class DatabaseCooldowns extends SQLite {
public DatabaseCooldownsWorlds() {
public DatabaseCooldowns() {
super(DATABASE_TYPE.COOLDOWN);
}

8
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/DatabaseHandler.java
View File

@@ -7,13 +7,13 @@ import org.bukkit.Bukkit;
public class DatabaseHandler {
@Getter private final DatabasePlayers databasePlayers = new DatabasePlayers();
@Getter private final DatabaseCooldownsWorlds databaseCooldownsWorlds = new DatabaseCooldownsWorlds();
@Getter private final DatabaseCooldowns databaseCooldowns = new DatabaseCooldowns();
@Getter private final DatabaseQueue databaseQueue = new DatabaseQueue();
public void load() {
Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> {
databasePlayers.load();
databaseCooldownsWorlds.load();
databaseCooldowns.load();
databaseQueue.load();
});
}
@@ -22,8 +22,8 @@ public class DatabaseHandler {
return BetterRTP.getInstance().getDatabaseHandler().getDatabasePlayers();
}
public static DatabaseCooldownsWorlds getWorldCooldowns() {
return BetterRTP.getInstance().getDatabaseHandler().getDatabaseCooldownsWorlds();
public static DatabaseCooldowns getCooldowns() {
return BetterRTP.getInstance().getDatabaseHandler().getDatabaseCooldowns();
}
public static DatabaseQueue getQueue() {

13
src/main/java/me/SuperRonanCraft/BetterRTP/references/database/SQLite.java
View File

@@ -1,5 +1,6 @@
package me.SuperRonanCraft.BetterRTP.references.database;
import lombok.Getter;
import lombok.NonNull;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import org.bukkit.Bukkit;
@@ -14,7 +15,7 @@ import java.util.logging.Level;
public abstract class SQLite {
private static final String db_file_name = "database";
List<String> tables;
@Getter List<String> tables;
//private String host, database, username, password;
//private int port;
//boolean sqlEnabled;
@@ -142,7 +143,7 @@ public abstract class SQLite {
case PLAYERS: return DatabasePlayers.COLUMNS.values();
case QUEUE: return DatabaseQueue.COLUMNS.values();
case COOLDOWN:
default: return DatabaseCooldownsWorlds.COLUMNS.values();
default: return DatabaseCooldowns.COLUMNS.values();
}
}
@@ -151,7 +152,7 @@ public abstract class SQLite {
case PLAYERS: return ((DatabasePlayers.COLUMNS) column).name;
case QUEUE: return ((DatabaseQueue.COLUMNS) column).name;
case COOLDOWN:
default: return ((DatabaseCooldownsWorlds.COLUMNS) column).name;
default: return ((DatabaseCooldowns.COLUMNS) column).name;
}
}
@@ -160,12 +161,12 @@ public abstract class SQLite {
case PLAYERS: return ((DatabasePlayers.COLUMNS) column).type;
case QUEUE: return ((DatabaseQueue.COLUMNS) column).type;
case COOLDOWN:
default: return ((DatabaseCooldownsWorlds.COLUMNS) column).type;
default: return ((DatabaseCooldowns.COLUMNS) column).type;
}
}
//Processing
boolean sqlUpdate(String statement, @NonNull List<Object> params) {
protected boolean sqlUpdate(String statement, @NonNull List<Object> params) {
Connection conn = null;
PreparedStatement ps = null;
boolean success = true;
@@ -239,7 +240,7 @@ public abstract class SQLite {
}
}
void close(PreparedStatement ps, ResultSet rs, Connection conn) {
protected void close(PreparedStatement ps, ResultSet rs, Connection conn) {
try {
if (ps != null) ps.close();
if (conn != null) conn.close();

8
src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java
View File

@@ -3,7 +3,7 @@ package me.SuperRonanCraft.BetterRTP.references.rtpinfo;
import lombok.Getter;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
import me.SuperRonanCraft.BetterRTP.references.database.DatabaseCooldownsWorlds;
import me.SuperRonanCraft.BetterRTP.references.database.DatabaseCooldowns;
import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler;
import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer;
@@ -43,7 +43,7 @@ public class CooldownHandler {
private void queueDownload() {
Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), () -> {
if (cooldownByWorld && !DatabaseHandler.getWorldCooldowns().isLoaded()) {
if (cooldownByWorld && !DatabaseHandler.getCooldowns().isLoaded()) {
queueDownload();
return;
}
@@ -163,9 +163,9 @@ public class CooldownHandler {
}
@Nullable
private DatabaseCooldownsWorlds getDatabaseWorlds() {
private DatabaseCooldowns getDatabaseWorlds() {
if (cooldownByWorld)
return DatabaseHandler.getWorldCooldowns();
return DatabaseHandler.getCooldowns();
return null;
}