Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change to use defined methods instead of using Logger.log

Browse Source
This commit is contained in:
D3v1s0m 2023-10-15 20:30:52 +05:30
parent d7071cef47
commit eb414ce3f7
No known key found for this signature in database
GPG Key ID: FA1F770C7B1D40C1
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLiteStorage.java
View File

@ -22,7 +22,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -63,19 +62,19 @@ public class SQLiteStorage implements NpcStorage {
private void validateTables() { private void validateTables() {
if (!database.tableExists(TABLE_NPCS)) { if (!database.tableExists(TABLE_NPCS)) {
logger.log(java.util.logging.Level.INFO, "Creating table " + TABLE_NPCS + "..."); logger.info("Creating table " + TABLE_NPCS + "...");
createNpcsTable(); createNpcsTable();
} }
if (!database.tableExists(TABLE_NPCS_PROPERTIES)) { if (!database.tableExists(TABLE_NPCS_PROPERTIES)) {
logger.log(java.util.logging.Level.INFO, "Creating table " + TABLE_NPCS_PROPERTIES + "..."); logger.info("Creating table " + TABLE_NPCS_PROPERTIES + "...");
createNpcsPropertiesTable(); createNpcsPropertiesTable();
} }
if (!database.tableExists(TABLE_NPCS_HOLOGRAMS)) { if (!database.tableExists(TABLE_NPCS_HOLOGRAMS)) {
logger.log(java.util.logging.Level.INFO, "Creating table " + TABLE_NPCS_HOLOGRAMS + "..."); logger.info("Creating table " + TABLE_NPCS_HOLOGRAMS + "...");
createNpcsHologramsTable(); createNpcsHologramsTable();
} }
if (!database.tableExists(TABLE_NPCS_ACTIONS)) { if (!database.tableExists(TABLE_NPCS_ACTIONS)) {
logger.log(java.util.logging.Level.INFO, "Creating table " + TABLE_NPCS_ACTIONS + "..."); logger.info("Creating table " + TABLE_NPCS_ACTIONS + "...");
createNpcsActionsTable(); createNpcsActionsTable();
} }
updateTables(); updateTables();
@ -85,36 +84,36 @@ public class SQLiteStorage implements NpcStorage {
if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS + " " + if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS + " " +
"(id TEXT PRIMARY KEY, isProcessed BOOLEAN, allowCommands BOOLEAN, enabled BOOLEAN, " + "(id TEXT PRIMARY KEY, isProcessed BOOLEAN, allowCommands BOOLEAN, enabled BOOLEAN, " +
"uuid TEXT, world TEXT, x REAL, y REAL, z REAL, yaw REAL, pitch REAL, type TEXT, hologramOffset REAL, hologramRefreshDelay INTEGER)") != -1) { "uuid TEXT, world TEXT, x REAL, y REAL, z REAL, yaw REAL, pitch REAL, type TEXT, hologramOffset REAL, hologramRefreshDelay INTEGER)") != -1) {
logger.log(java.util.logging.Level.INFO, "Table " + TABLE_NPCS + " created."); logger.info("Table " + TABLE_NPCS + " created.");
} else { } else {
logger.log(java.util.logging.Level.SEVERE, "Failed to create table " + TABLE_NPCS + "."); logger.severe("Failed to create table " + TABLE_NPCS + ".");
} }
} }
private void createNpcsPropertiesTable() { private void createNpcsPropertiesTable() {
if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS_PROPERTIES + " " + if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS_PROPERTIES + " " +
"(npc_id TEXT, property TEXT, value TEXT, PRIMARY KEY (npc_id, property))") != -1) { "(npc_id TEXT, property TEXT, value TEXT, PRIMARY KEY (npc_id, property))") != -1) {
logger.log(java.util.logging.Level.INFO, "Table " + TABLE_NPCS_PROPERTIES + " created."); logger.info("Table " + TABLE_NPCS_PROPERTIES + " created.");
} else { } else {
logger.log(java.util.logging.Level.SEVERE, "Failed to create table " + TABLE_NPCS_PROPERTIES + "."); logger.severe("Failed to create table " + TABLE_NPCS_PROPERTIES + ".");
} }
} }
private void createNpcsHologramsTable() { private void createNpcsHologramsTable() {
if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS_HOLOGRAMS + " " + if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS_HOLOGRAMS + " " +
"(npc_id TEXT, line INTEGER, text TEXT, PRIMARY KEY (npc_id, line))") != -1) { "(npc_id TEXT, line INTEGER, text TEXT, PRIMARY KEY (npc_id, line))") != -1) {
logger.log(java.util.logging.Level.INFO, "Table " + TABLE_NPCS_HOLOGRAMS + " created."); logger.info("Table " + TABLE_NPCS_HOLOGRAMS + " created.");
} else { } else {
logger.log(java.util.logging.Level.SEVERE, "Failed to create table " + TABLE_NPCS_HOLOGRAMS + "."); logger.severe("Failed to create table " + TABLE_NPCS_HOLOGRAMS + ".");
} }
} }
private void createNpcsActionsTable() { private void createNpcsActionsTable() {
if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS_ACTIONS + " " + if (database.executeUpdate("CREATE TABLE " + TABLE_NPCS_ACTIONS + " " +
"(npc_id TEXT, action_id INTEGER, action_data TEXT, PRIMARY KEY (npc_id, action_id))") != -1) { "(npc_id TEXT, action_id INTEGER, action_data TEXT, PRIMARY KEY (npc_id, action_id))") != -1) {
logger.log(java.util.logging.Level.INFO, "Table " + TABLE_NPCS_ACTIONS + " created."); logger.info("Table " + TABLE_NPCS_ACTIONS + " created.");
} else { } else {
logger.log(java.util.logging.Level.SEVERE, "Failed to create table " + TABLE_NPCS_ACTIONS + "."); logger.severe("Failed to create table " + TABLE_NPCS_ACTIONS + ".");
} }
} }
@ -157,17 +156,17 @@ public class SQLiteStorage implements NpcStorage {
if (entry != null) { if (entry != null) {
EntityPropertyImpl<?> property = propertyRegistry.getByName(key); EntityPropertyImpl<?> property = propertyRegistry.getByName(key);
if (property == null) { if (property == null) {
logger.log(Level.WARNING, "Unknown property '" + key + "' for npc '" + rs.getString("npc_id") + "'. skipping ..."); logger.warning("Unknown property '" + key + "' for npc '" + rs.getString("npc_id") + "'. skipping ...");
continue; continue;
} }
PropertySerializer<?> serializer = propertyRegistry.getSerializer(property.getType()); PropertySerializer<?> serializer = propertyRegistry.getSerializer(property.getType());
if (serializer == null) { if (serializer == null) {
logger.log(Level.WARNING, "Unknown serializer for property '" + key + "' for npc '" + rs.getString("npc_id") + "'. skipping ..."); logger.warning("Unknown serializer for property '" + key + "' for npc '" + rs.getString("npc_id") + "'. skipping ...");
continue; continue;
} }
Object value = serializer.deserialize(rs.getString("value")); Object value = serializer.deserialize(rs.getString("value"));
if (value == null) { if (value == null) {
logger.log(Level.WARNING, "Failed to deserialize property '" + key + "' for npc '" + rs.getString("npc_id") + "'. Resetting to default ..."); logger.warning("Failed to deserialize property '" + key + "' for npc '" + rs.getString("npc_id") + "'. Resetting to default ...");
value = property.getDefaultValue(); value = property.getDefaultValue();
} }
entry.getNpc().UNSAFE_setProperty(property, value); entry.getNpc().UNSAFE_setProperty(property, value);
@ -241,7 +240,7 @@ public class SQLiteStorage implements NpcStorage {
for (EntityProperty<?> property : npc.getAllProperties()) try { for (EntityProperty<?> property : npc.getAllProperties()) try {
PropertySerializer<?> serializer = propertyRegistry.getSerializer(((EntityPropertyImpl<?>) property).getType()); PropertySerializer<?> serializer = propertyRegistry.getSerializer(((EntityPropertyImpl<?>) property).getType());
if (serializer == null) { if (serializer == null) {
logger.log(Level.WARNING, "Unknown serializer for property '" + property.getName() + "' for npc '" + entry.getId() + "'. skipping ..."); logger.warning("Unknown serializer for property '" + property.getName() + "' for npc '" + entry.getId() + "'. skipping ...");
continue; continue;
} }
ps = database.getSQLConnection().prepareStatement("REPLACE INTO " + TABLE_NPCS_PROPERTIES + " (npc_id, property, value) VALUES(?,?,?)"); ps = database.getSQLConnection().prepareStatement("REPLACE INTO " + TABLE_NPCS_PROPERTIES + " (npc_id, property, value) VALUES(?,?,?)");