EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-02 01:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Made SQLDatabaseManager work with list of skill types so new ones can be

Browse Source 
added without changing the file
This commit is contained in:
ile123ile 2014-08-27 18:28:29 -07:00
parent 21fcc83f56
commit 481038fdbf
8 changed files with 154 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
View File

@ -356,12 +356,12 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
// Add the player to the end // Add the player to the end
out.append("Player,").append(playerName).append(":"); out.append("Player,").append(playerName).append(":");
for(String skill : SkillType.getSkillNames()) { for(SkillType skill : SkillType.getNonChildSkills()) {
out.append(skill).append("LVL,0:"); //Skill Levels out.append(skill.getName()).append("LVL,0:"); //Skill Levels
out.append(skill).append("XP,0:"); //Skill XP out.append(skill.getName()).append("XP,0:"); //Skill XP
} }
for(AbilityType ability : AbilityType.getAbilities()) { for(String ability : AbilityType.getAbilitieNames()) {
out.append(ability.getUnprettyName()).append(",0:"); //DATS out.append(ability).append(",0:"); //DATS
} }
out.append("LastLogin,").append(String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)).append(":"); // LastLogin out.append("LastLogin,").append(String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)).append(":"); // LastLogin
out.append("MobHealthBar,").append(Config.getInstance().getMobHealthbarDefault().toString()).append(":"); // Mob Healthbar HUD out.append("MobHealthBar,").append(Config.getInstance().getMobHealthbarDefault().toString()).append(":"); // Mob Healthbar HUD
@ -468,61 +468,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
return new PlayerProfile(playerName, uuid); return new PlayerProfile(playerName, uuid);
} }
/*private static String[] addNameToUser(String playerName, String uuid) {
String[] characterToRet = null;
BufferedReader in = null;
FileWriter out = null;
String usersFilePath = mcMMO.getUsersFilePath();
synchronized (fileWritingLock) {
try {
in = new BufferedReader(new FileReader(usersFilePath));
StringBuilder writer = new StringBuilder();
String line;
while ((line = in.readLine()) != null) {
String[] character = line.split(":");
int uuidIndex = getUUIDIndexFromLine(character);
if(uuidIndex != -1) {
if (characterToRet == null && character[uuidIndex].equalsIgnoreCase(uuid)) {
line = line + "Player," + playerName + ":";
characterToRet = line.split(":");
}
}
writer.append(line).append("\r\n");
}
out = new FileWriter(usersFilePath); // Write out the new file
out.write(writer.toString());
}
catch (Exception e) {
mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
}
finally {
if (in != null) {
try {
in.close();
}
catch (IOException e) {
// Ignore
}
}
if (out != null) {
try {
out.close();
}
catch (IOException e) {
// Ignore
}
}
}
}
return characterToRet;
}*/
public void convertUsers(DatabaseManager destination) { public void convertUsers(DatabaseManager destination) {
BufferedReader in = null; BufferedReader in = null;
String usersFilePath = mcMMO.getUsersFilePath(); String usersFilePath = mcMMO.getUsersFilePath();
@ -1006,7 +951,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SQL_PARTY_NAMES); mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SQL_PARTY_NAMES);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SPOUT); mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SPOUT);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_ALCHEMY); mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_ALCHEMY);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_INDEX_NAMES); mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_FLATFILE_INDEX_NAMES);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.CHANGE_SQL_COOLDOWN_NAMES);
return; return;
} }

264
src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
View File

@ -7,7 +7,6 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -29,12 +28,9 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask; import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import snaq.db.CacheConnection;
import snaq.db.ConnectionPool; import snaq.db.ConnectionPool;
import snaq.db.ConnectionValidator;
public final class SQLDatabaseManager implements DatabaseManager { public final class SQLDatabaseManager implements DatabaseManager {
private static final String ALL_QUERY_VERSION = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing+alchemy";
private String tablePrefix = Config.getInstance().getMySQLTablePrefix(); private String tablePrefix = Config.getInstance().getMySQLTablePrefix();
private final int POOL_FETCH_TIMEOUT = 360000; private final int POOL_FETCH_TIMEOUT = 360000;
@ -72,26 +68,23 @@ public final class SQLDatabaseManager implements DatabaseManager {
0 /*No Minimum really needed*/, 0 /*No Minimum really needed*/,
Config.getInstance().getMySQLMaxPoolSize(PoolIdentifier.MISC) /*max pool size */, Config.getInstance().getMySQLMaxPoolSize(PoolIdentifier.MISC) /*max pool size */,
Config.getInstance().getMySQLMaxConnections(PoolIdentifier.MISC) /*max num connections*/, Config.getInstance().getMySQLMaxConnections(PoolIdentifier.MISC) /*max num connections*/,
0 /* idle timeout of connections */, 400 /* idle timeout of connections */,
connectionString, connectionString,
connectionProperties); connectionProperties);
miscPool.setValidator(new mcMMOValidator());
loadPool = new ConnectionPool("mcMMO-Load-Pool", loadPool = new ConnectionPool("mcMMO-Load-Pool",
1 /*Minimum of one*/, 1 /*Minimum of one*/,
Config.getInstance().getMySQLMaxPoolSize(PoolIdentifier.LOAD) /*max pool size */, Config.getInstance().getMySQLMaxPoolSize(PoolIdentifier.LOAD) /*max pool size */,
Config.getInstance().getMySQLMaxConnections(PoolIdentifier.LOAD) /*max num connections*/, Config.getInstance().getMySQLMaxConnections(PoolIdentifier.LOAD) /*max num connections*/,
0 /* idle timeout of connections */, 400 /* idle timeout of connections */,
connectionString, connectionString,
connectionProperties); connectionProperties);
loadPool.setValidator(new mcMMOValidator());
savePool = new ConnectionPool("mcMMO-Save-Pool", savePool = new ConnectionPool("mcMMO-Save-Pool",
1 /*Minimum of one*/, 1 /*Minimum of one*/,
Config.getInstance().getMySQLMaxPoolSize(PoolIdentifier.SAVE) /*max pool size */, Config.getInstance().getMySQLMaxPoolSize(PoolIdentifier.SAVE) /*max pool size */,
Config.getInstance().getMySQLMaxConnections(PoolIdentifier.SAVE) /*max num connections*/, Config.getInstance().getMySQLMaxConnections(PoolIdentifier.SAVE) /*max num connections*/,
0 /* idle timeout of connections */, 400 /* idle timeout of connections */,
connectionString, connectionString,
connectionProperties); connectionProperties);
savePool.setValidator(new mcMMOValidator());
miscPool.init(); // Init first connection miscPool.init(); // Init first connection
miscPool.registerShutdownHook(); // Auto release on jvm exit just in case miscPool.registerShutdownHook(); // Auto release on jvm exit just in case
loadPool.init(); loadPool.init();
@ -115,11 +108,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
connection = getConnection(PoolIdentifier.MISC); connection = getConnection(PoolIdentifier.MISC);
statement = connection.createStatement(); statement = connection.createStatement();
purged = statement.executeUpdate("DELETE FROM " + tablePrefix + "skills WHERE " String deleteFrom = "DELETE FROM " + tablePrefix + "skills WHERE ";
+ "taming = 0 AND mining = 0 AND woodcutting = 0 AND repair = 0 " deleteFrom += com.gmail.nossr50.util.StringUtils.createStringFromListWithNoPrefixBeforeFirst(SkillType.getLowerSkillNames(), " AND ", " = 0");
+ "AND unarmed = 0 AND herbalism = 0 AND excavation = 0 AND " deleteFrom += ";";
+ "archery = 0 AND swords = 0 AND axes = 0 AND acrobatics = 0 " purged = statement.executeUpdate(deleteFrom);
+ "AND fishing = 0 AND alchemy = 0;");
statement.executeUpdate("DELETE FROM `" + tablePrefix + "experience` WHERE NOT EXISTS (SELECT * FROM `" + tablePrefix + "skills` `s` WHERE `" + tablePrefix + "experience`.`user_id` = `s`.`user_id`)"); statement.executeUpdate("DELETE FROM `" + tablePrefix + "experience` WHERE NOT EXISTS (SELECT * FROM `" + tablePrefix + "skills` `s` WHERE `" + tablePrefix + "experience`.`user_id` = `s`.`user_id`)");
statement.executeUpdate("DELETE FROM `" + tablePrefix + "huds` WHERE NOT EXISTS (SELECT * FROM `" + tablePrefix + "skills` `s` WHERE `" + tablePrefix + "huds`.`user_id` = `s`.`user_id`)"); statement.executeUpdate("DELETE FROM `" + tablePrefix + "huds` WHERE NOT EXISTS (SELECT * FROM `" + tablePrefix + "skills` `s` WHERE `" + tablePrefix + "huds`.`user_id` = `s`.`user_id`)");
@ -267,63 +259,33 @@ public final class SQLDatabaseManager implements DatabaseManager {
success &= (statement.executeUpdate() != 0); success &= (statement.executeUpdate() != 0);
statement.close(); statement.close();
statement = connection.prepareStatement("UPDATE " + tablePrefix + "skills SET " statement = connection.prepareStatement("UPDATE " + tablePrefix + "skills SET "
+ " taming = ?, mining = ?, repair = ?, woodcutting = ?" + com.gmail.nossr50.util.StringUtils.createStringFromListWithNoPrefixBeforeFirst(SkillType.getLowerSkillNames(), ", ", " = ?")
+ ", unarmed = ?, herbalism = ?, excavation = ?" + " WHERE user_id = ?");
+ ", archery = ?, swords = ?, axes = ?, acrobatics = ?" for(int i = 0; i < SkillType.getNonChildSkills().size(); i++) {
+ ", fishing = ?, alchemy = ? WHERE user_id = ?"); statement.setInt(i + 1, profile.getSkillLevel(SkillType.getNonChildSkills().get(i)));
statement.setInt(1, profile.getSkillLevel(SkillType.taming)); }
statement.setInt(2, profile.getSkillLevel(SkillType.mining)); statement.setInt(SkillType.getNonChildSkills().size() + 1, id);
statement.setInt(3, profile.getSkillLevel(SkillType.repair));
statement.setInt(4, profile.getSkillLevel(SkillType.woodcutting));
statement.setInt(5, profile.getSkillLevel(SkillType.unarmed));
statement.setInt(6, profile.getSkillLevel(SkillType.herbalism));
statement.setInt(7, profile.getSkillLevel(SkillType.excavation));
statement.setInt(8, profile.getSkillLevel(SkillType.archery));
statement.setInt(9, profile.getSkillLevel(SkillType.swords));
statement.setInt(10, profile.getSkillLevel(SkillType.axes));
statement.setInt(11, profile.getSkillLevel(SkillType.acrobatics));
statement.setInt(12, profile.getSkillLevel(SkillType.fishing));
statement.setInt(13, profile.getSkillLevel(SkillType.alchemy));
statement.setInt(14, id);
success &= (statement.executeUpdate() != 0); success &= (statement.executeUpdate() != 0);
statement.close(); statement.close();
statement = connection.prepareStatement("UPDATE " + tablePrefix + "experience SET " statement = connection.prepareStatement("UPDATE " + tablePrefix + "experience SET "
+ " taming = ?, mining = ?, repair = ?, woodcutting = ?" + com.gmail.nossr50.util.StringUtils.createStringFromListWithNoPrefixBeforeFirst(SkillType.getLowerSkillNames(), ", ", " = ?")
+ ", unarmed = ?, herbalism = ?, excavation = ?" + " WHERE user_id = ?");
+ ", archery = ?, swords = ?, axes = ?, acrobatics = ?" for(int i = 0; i < SkillType.getNonChildSkills().size(); i++) {
+ ", fishing = ?, alchemy = ? WHERE user_id = ?"); statement.setInt(i + 1, profile.getSkillXpLevel(SkillType.getNonChildSkills().get(i)));
statement.setInt(1, profile.getSkillXpLevel(SkillType.taming)); }
statement.setInt(2, profile.getSkillXpLevel(SkillType.mining)); statement.setInt(SkillType.getNonChildSkills().size() + 1, id);
statement.setInt(3, profile.getSkillXpLevel(SkillType.repair));
statement.setInt(4, profile.getSkillXpLevel(SkillType.woodcutting));
statement.setInt(5, profile.getSkillXpLevel(SkillType.unarmed));
statement.setInt(6, profile.getSkillXpLevel(SkillType.herbalism));
statement.setInt(7, profile.getSkillXpLevel(SkillType.excavation));
statement.setInt(8, profile.getSkillXpLevel(SkillType.archery));
statement.setInt(9, profile.getSkillXpLevel(SkillType.swords));
statement.setInt(10, profile.getSkillXpLevel(SkillType.axes));
statement.setInt(11, profile.getSkillXpLevel(SkillType.acrobatics));
statement.setInt(12, profile.getSkillXpLevel(SkillType.fishing));
statement.setInt(13, profile.getSkillXpLevel(SkillType.alchemy));
statement.setInt(14, id);
success &= (statement.executeUpdate() != 0); success &= (statement.executeUpdate() != 0);
statement.close(); statement.close();
statement = connection.prepareStatement("UPDATE " + tablePrefix + "cooldowns SET " statement = connection.prepareStatement("UPDATE " + tablePrefix + "cooldowns SET "
+ " mining = ?, woodcutting = ?, unarmed = ?" + com.gmail.nossr50.util.StringUtils.createStringFromListWithNoPrefixBeforeFirst(AbilityType.getLowerAbilitieNames(), ", ", " = ?")
+ ", herbalism = ?, excavation = ?, swords = ?" + " WHERE user_id = ?");
+ ", axes = ?, blast_mining = ? WHERE user_id = ?"); for(int i = 0; i < AbilityType.getAbilities().size(); i++) {
statement.setLong(1, profile.getAbilityDATS(AbilityType.superBreaker)); statement.setLong(i + 1, profile.getAbilityDATS(AbilityType.getAbilities().get(i)));
statement.setLong(2, profile.getAbilityDATS(AbilityType.treeFeller)); }
statement.setLong(3, profile.getAbilityDATS(AbilityType.berserk)); statement.setInt(AbilityType.getAbilities().size() + 1, id);
statement.setLong(4, profile.getAbilityDATS(AbilityType.greenTerra));
statement.setLong(5, profile.getAbilityDATS(AbilityType.gigaDrillBreaker));
statement.setLong(6, profile.getAbilityDATS(AbilityType.serratedStrikes));
statement.setLong(7, profile.getAbilityDATS(AbilityType.skullSplitter));
statement.setLong(8, profile.getAbilityDATS(AbilityType.blastMining));
statement.setInt(9, id);
success = (statement.executeUpdate() != 0); success = (statement.executeUpdate() != 0);
statement.close(); statement.close();
@ -361,7 +323,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
public List<PlayerStat> readLeaderboard(SkillType skill, int pageNumber, int statsPerPage) { public List<PlayerStat> readLeaderboard(SkillType skill, int pageNumber, int statsPerPage) {
List<PlayerStat> stats = new ArrayList<PlayerStat>(); List<PlayerStat> stats = new ArrayList<PlayerStat>();
String query = skill == null ? ALL_QUERY_VERSION : skill.getName().toLowerCase(); String query = skill == null ? getAllQueryVersion() : skill.getName().toLowerCase();
ResultSet resultSet = null; ResultSet resultSet = null;
PreparedStatement statement = null; PreparedStatement statement = null;
Connection connection = null; Connection connection = null;
@ -461,9 +423,9 @@ public final class SQLDatabaseManager implements DatabaseManager {
} }
String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " + String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " +
"WHERE " + ALL_QUERY_VERSION + " > 0 " + "WHERE " + getAllQueryVersion() + " > 0 " +
"AND " + ALL_QUERY_VERSION + " > " + "AND " + getAllQueryVersion() + " > " +
"(SELECT " + ALL_QUERY_VERSION + " " + "(SELECT " + getAllQueryVersion() + " " +
"FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = ?)"; "FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = ?)";
statement = connection.prepareStatement(sql); statement = connection.prepareStatement(sql);
@ -477,11 +439,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
resultSet.close(); resultSet.close();
statement.close(); statement.close();
sql = "SELECT user, " + ALL_QUERY_VERSION + " " + sql = "SELECT user, " + getAllQueryVersion() + " " +
"FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " + "FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " +
"WHERE " + ALL_QUERY_VERSION + " > 0 " + "WHERE " + getAllQueryVersion() + " > 0 " +
"AND " + ALL_QUERY_VERSION + " = " + "AND " + getAllQueryVersion() + " = " +
"(SELECT " + ALL_QUERY_VERSION + " " + "(SELECT " + getAllQueryVersion() + " " +
"FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = ?) ORDER BY user"; "FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = ?) ORDER BY user";
statement = connection.prepareStatement(sql); statement = connection.prepareStatement(sql);
@ -635,9 +597,9 @@ public final class SQLDatabaseManager implements DatabaseManager {
statement = connection.prepareStatement( statement = connection.prepareStatement(
"SELECT " "SELECT "
+ "s.taming, s.mining, s.repair, s.woodcutting, s.unarmed, s.herbalism, s.excavation, s.archery, s.swords, s.axes, s.acrobatics, s.fishing, s.alchemy, " + com.gmail.nossr50.util.StringUtils.createStringFromList(SkillType.getLowerSkillNames(), "s.", ", ")
+ "e.taming, e.mining, e.repair, e.woodcutting, e.unarmed, e.herbalism, e.excavation, e.archery, e.swords, e.axes, e.acrobatics, e.fishing, e.alchemy, " + com.gmail.nossr50.util.StringUtils.createStringFromList(SkillType.getLowerSkillNames(), "e.", ", ")
+ "c.taming, c.mining, c.repair, c.woodcutting, c.unarmed, c.herbalism, c.excavation, c.archery, c.swords, c.axes, c.acrobatics, c.blast_mining, " + com.gmail.nossr50.util.StringUtils.createStringFromList(AbilityType.getLowerAbilitieNames(), "c.", ", ")
+ "h.mobhealthbar, u.uuid " + "h.mobhealthbar, u.uuid "
+ "FROM " + tablePrefix + "users u " + "FROM " + tablePrefix + "users u "
+ "JOIN " + tablePrefix + "skills s ON (u.id = s.user_id) " + "JOIN " + tablePrefix + "skills s ON (u.id = s.user_id) "
@ -724,9 +686,9 @@ public final class SQLDatabaseManager implements DatabaseManager {
connection = getConnection(PoolIdentifier.MISC); connection = getConnection(PoolIdentifier.MISC);
statement = connection.prepareStatement( statement = connection.prepareStatement(
"SELECT " "SELECT "
+ "s.taming, s.mining, s.repair, s.woodcutting, s.unarmed, s.herbalism, s.excavation, s.archery, s.swords, s.axes, s.acrobatics, s.fishing, s.alchemy, " + com.gmail.nossr50.util.StringUtils.createStringFromList(SkillType.getLowerSkillNames(), "s.", ", ")
+ "e.taming, e.mining, e.repair, e.woodcutting, e.unarmed, e.herbalism, e.excavation, e.archery, e.swords, e.axes, e.acrobatics, e.fishing, e.alchemy, " + com.gmail.nossr50.util.StringUtils.createStringFromList(SkillType.getLowerSkillNames(), "e.", ", ")
+ "c.taming, c.mining, c.repair, c.woodcutting, c.unarmed, c.herbalism, c.excavation, c.archery, c.swords, c.axes, c.acrobatics, c.blast_mining, " + com.gmail.nossr50.util.StringUtils.createStringFromList(AbilityType.getLowerAbilitieNames(), "c.", ", ")
+ "h.mobhealthbar, u.uuid " + "h.mobhealthbar, u.uuid "
+ "FROM " + tablePrefix + "users u " + "FROM " + tablePrefix + "users u "
+ "JOIN " + tablePrefix + "skills s ON (u.id = s.user_id) " + "JOIN " + tablePrefix + "skills s ON (u.id = s.user_id) "
@ -975,18 +937,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
createStatement = connection.createStatement(); createStatement = connection.createStatement();
createStatement.executeUpdate("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "cooldowns` (" createStatement.executeUpdate("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "cooldowns` ("
+ "`user_id` int(10) unsigned NOT NULL," + "`user_id` int(10) unsigned NOT NULL,"
+ "`taming` int(32) unsigned NOT NULL DEFAULT '0'," + com.gmail.nossr50.util.StringUtils.createStringFromList(AbilityType.getLowerAbilitieNames(), "`", "` int(32) unsigned NOT NULL DEFAULT '0',")
+ "`mining` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`woodcutting` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`repair` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`unarmed` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`herbalism` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`excavation` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`archery` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`swords` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`axes` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`acrobatics` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`blast_mining` int(32) unsigned NOT NULL DEFAULT '0',"
+ "PRIMARY KEY (`user_id`)) " + "PRIMARY KEY (`user_id`)) "
+ "DEFAULT CHARSET=latin1;"); + "DEFAULT CHARSET=latin1;");
createStatement.close(); createStatement.close();
@ -999,19 +950,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
createStatement = connection.createStatement(); createStatement = connection.createStatement();
createStatement.executeUpdate("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "skills` (" createStatement.executeUpdate("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "skills` ("
+ "`user_id` int(10) unsigned NOT NULL," + "`user_id` int(10) unsigned NOT NULL,"
+ "`taming` int(10) unsigned NOT NULL DEFAULT '0'," + com.gmail.nossr50.util.StringUtils.createStringFromList(SkillType.getLowerSkillNames(), "`", "` int(10) unsigned NOT NULL DEFAULT '0',")
+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`fishing` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`alchemy` int(10) unsigned NOT NULL DEFAULT '0',"
+ "PRIMARY KEY (`user_id`)) " + "PRIMARY KEY (`user_id`)) "
+ "DEFAULT CHARSET=latin1;"); + "DEFAULT CHARSET=latin1;");
createStatement.close(); createStatement.close();
@ -1024,19 +963,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
createStatement = connection.createStatement(); createStatement = connection.createStatement();
createStatement.executeUpdate("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "experience` (" createStatement.executeUpdate("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "experience` ("
+ "`user_id` int(10) unsigned NOT NULL," + "`user_id` int(10) unsigned NOT NULL,"
+ "`taming` int(10) unsigned NOT NULL DEFAULT '0'," + com.gmail.nossr50.util.StringUtils.createStringFromList(SkillType.getLowerSkillNames(), "`", "` int(10) unsigned NOT NULL DEFAULT '0',")
+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`fishing` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`alchemy` int(10) unsigned NOT NULL DEFAULT '0',"
+ "PRIMARY KEY (`user_id`)) " + "PRIMARY KEY (`user_id`)) "
+ "DEFAULT CHARSET=latin1;"); + "DEFAULT CHARSET=latin1;");
createStatement.close(); createStatement.close();
@ -1163,6 +1090,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
checkUpgradeAddUUIDs(statement); checkUpgradeAddUUIDs(statement);
return; return;
case CHANGE_SQL_COOLDOWN_NAMES:
checkUpgradeChangeCooldownNames(statement);
break;
default: default:
break; break;
@ -1232,62 +1163,33 @@ public final class SQLDatabaseManager implements DatabaseManager {
MobHealthbarType mobHealthbarType; MobHealthbarType mobHealthbarType;
UUID uuid; UUID uuid;
final int OFFSET_SKILLS = 0; // TODO update these numbers when the query int skillOffset = 0;
// changes (a new skill is added) int xpOffset = skillOffset + SkillType.getNonChildSkills().size();
final int OFFSET_XP = 13; int datsOffset = xpOffset + SkillType.getNonChildSkills().size();
final int OFFSET_DATS = 26; int otherOffset = datsOffset + AbilityType.getAbilities().size();
final int OFFSET_OTHER = 38;
skills.put(SkillType.taming, result.getInt(OFFSET_SKILLS + 1)); SkillType skill;
skills.put(SkillType.mining, result.getInt(OFFSET_SKILLS + 2)); for(int i = 0; i < SkillType.getNonChildSkills().size(); i++) {
skills.put(SkillType.repair, result.getInt(OFFSET_SKILLS + 3)); skill = SkillType.getNonChildSkills().get(i);
skills.put(SkillType.woodcutting, result.getInt(OFFSET_SKILLS + 4)); skills.put(skill, result.getInt(skillOffset + i + 1));
skills.put(SkillType.unarmed, result.getInt(OFFSET_SKILLS + 5)); skillsXp.put(skill, result.getFloat(xpOffset + i + 1));
skills.put(SkillType.herbalism, result.getInt(OFFSET_SKILLS + 6)); }
skills.put(SkillType.excavation, result.getInt(OFFSET_SKILLS + 7));
skills.put(SkillType.archery, result.getInt(OFFSET_SKILLS + 8));
skills.put(SkillType.swords, result.getInt(OFFSET_SKILLS + 9));
skills.put(SkillType.axes, result.getInt(OFFSET_SKILLS + 10));
skills.put(SkillType.acrobatics, result.getInt(OFFSET_SKILLS + 11));
skills.put(SkillType.fishing, result.getInt(OFFSET_SKILLS + 12));
skills.put(SkillType.alchemy, result.getInt(OFFSET_SKILLS + 13));
skillsXp.put(SkillType.taming, result.getFloat(OFFSET_XP + 1)); AbilityType ability;
skillsXp.put(SkillType.mining, result.getFloat(OFFSET_XP + 2)); for(int i = 0; i < AbilityType.getAbilities().size(); i++) {
skillsXp.put(SkillType.repair, result.getFloat(OFFSET_XP + 3)); ability = AbilityType.getAbilities().get(i);
skillsXp.put(SkillType.woodcutting, result.getFloat(OFFSET_XP + 4)); skillsDATS.put(ability, result.getInt(datsOffset + i + 1));
skillsXp.put(SkillType.unarmed, result.getFloat(OFFSET_XP + 5)); }
skillsXp.put(SkillType.herbalism, result.getFloat(OFFSET_XP + 6));
skillsXp.put(SkillType.excavation, result.getFloat(OFFSET_XP + 7));
skillsXp.put(SkillType.archery, result.getFloat(OFFSET_XP + 8));
skillsXp.put(SkillType.swords, result.getFloat(OFFSET_XP + 9));
skillsXp.put(SkillType.axes, result.getFloat(OFFSET_XP + 10));
skillsXp.put(SkillType.acrobatics, result.getFloat(OFFSET_XP + 11));
skillsXp.put(SkillType.fishing, result.getFloat(OFFSET_XP + 12));
skillsXp.put(SkillType.alchemy, result.getFloat(OFFSET_XP + 13));
// Taming - Unused - result.getInt(OFFSET_DATS + 1)
skillsDATS.put(AbilityType.superBreaker, result.getInt(OFFSET_DATS + 2));
// Repair - Unused - result.getInt(OFFSET_DATS + 3)
skillsDATS.put(AbilityType.treeFeller, result.getInt(OFFSET_DATS + 4));
skillsDATS.put(AbilityType.berserk, result.getInt(OFFSET_DATS + 5));
skillsDATS.put(AbilityType.greenTerra, result.getInt(OFFSET_DATS + 6));
skillsDATS.put(AbilityType.gigaDrillBreaker, result.getInt(OFFSET_DATS + 7));
// Archery - Unused - result.getInt(OFFSET_DATS + 8)
skillsDATS.put(AbilityType.serratedStrikes, result.getInt(OFFSET_DATS + 9));
skillsDATS.put(AbilityType.skullSplitter, result.getInt(OFFSET_DATS + 10));
// Acrobatics - Unused - result.getInt(OFFSET_DATS + 11)
skillsDATS.put(AbilityType.blastMining, result.getInt(OFFSET_DATS + 12));
try { try {
mobHealthbarType = MobHealthbarType.valueOf(result.getString(OFFSET_OTHER + 2)); mobHealthbarType = MobHealthbarType.valueOf(result.getString(otherOffset + 2));
} }
catch (Exception e) { catch (Exception e) {
mobHealthbarType = Config.getInstance().getMobHealthbarDefault(); mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
} }
try { try {
uuid = UUID.fromString(result.getString(OFFSET_OTHER + 3)); uuid = UUID.fromString(result.getString(otherOffset + 3));
} }
catch (Exception e) { catch (Exception e) {
uuid = null; uuid = null;
@ -1426,6 +1328,26 @@ public final class SQLDatabaseManager implements DatabaseManager {
new GetUUIDUpdatesRequired().runTaskLaterAsynchronously(mcMMO.p, 100); // wait until after first purge new GetUUIDUpdatesRequired().runTaskLaterAsynchronously(mcMMO.p, 100); // wait until after first purge
} }
private void checkUpgradeChangeCooldownNames(final Statement statement) throws SQLException {
try {
statement.executeQuery("SELECT `" + AbilityType.getLowerAbilitieNames().get(0) + "` FROM `" + tablePrefix + "cooldowns` LIMIT 1");
}
catch (SQLException ex) {
mcMMO.p.getLogger().info("Updating mcMMO MySQL tables for changed MySQL ability cooldown names...");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` CHANGE `mining` `super_breaker` int(32) unsigned NOT NULL DEFAULT '0'");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` CHANGE `woodcutting` `tree_feller` int(32) unsigned NOT NULL DEFAULT '0'");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` CHANGE `unarmed` `berserk` int(32) unsigned NOT NULL DEFAULT '0'");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` CHANGE `herbalism` `green_terra` int(32) unsigned NOT NULL DEFAULT '0'");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` CHANGE `excavation` `giga_drill_breaker` int(32) unsigned NOT NULL DEFAULT '0'");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` CHANGE `swords` `serrated_strikes` int(32) unsigned NOT NULL DEFAULT '0'");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` CHANGE `axes` `skull_splitter` int(32) unsigned NOT NULL DEFAULT '0'");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` DROP `taming`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` DROP `repair`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` DROP `archery`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "cooldowns` DROP `acrobatics`");
}
}
private class GetUUIDUpdatesRequired extends BukkitRunnable { private class GetUUIDUpdatesRequired extends BukkitRunnable {
public void run() { public void run() {
massUpdateLock.lock(); massUpdateLock.lock();
@ -1596,7 +1518,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
return -1; return -1;
} }
@Override private static String getAllQueryVersion() {
return org.apache.commons.lang.StringUtils.join(SkillType.getLowerSkillNames(), '+');
}
@Override
public void onDisable() { public void onDisable() {
mcMMO.p.debug("Releasing connection pool resource..."); mcMMO.p.debug("Releasing connection pool resource...");
miscPool.release(); miscPool.release();
@ -1609,12 +1535,4 @@ public final class SQLDatabaseManager implements DatabaseManager {
LOAD, LOAD,
SAVE; SAVE;
} }
private class mcMMOValidator implements ConnectionValidator {
@Override
public boolean isValid(Connection connection) throws SQLException {
return connection instanceof CacheConnection && connection.isValid(0);
}
}
} }

3
src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java
View File

@ -9,5 +9,6 @@ public enum UpgradeType {
DROP_SPOUT, DROP_SPOUT,
ADD_ALCHEMY, ADD_ALCHEMY,
ADD_UUIDS, ADD_UUIDS,
ADD_INDEX_NAMES; ADD_FLATFILE_INDEX_NAMES,
CHANGE_SQL_COOLDOWN_NAMES;
} }

12
src/main/java/com/gmail/nossr50/datatypes/skills/AbilityType.java
View File

@ -14,6 +14,8 @@ import com.gmail.nossr50.util.StringUtils;
public class AbilityType { public class AbilityType {
private static List<AbilityType> abilityTypes = new ArrayList<AbilityType>(); private static List<AbilityType> abilityTypes = new ArrayList<AbilityType>();
private static List<String> abilityNames = new ArrayList<String>();
private static List<String> lowerAbilityNames = new ArrayList<String>();
public static final AbilityType berserk = new AbilityType( public static final AbilityType berserk = new AbilityType(
"BERSERK", "BERSERK",
@ -122,6 +124,8 @@ public class AbilityType {
this.abilityRefresh = abilityRefresh; this.abilityRefresh = abilityRefresh;
this.abilityPlayerOff = abilityPlayerOff; this.abilityPlayerOff = abilityPlayerOff;
abilityTypes.add(this); abilityTypes.add(this);
abilityNames.add(this.getUnprettyName());
lowerAbilityNames.add(this.getUnprettyName().toLowerCase());
} }
public int getCooldown() { public int getCooldown() {
@ -206,4 +210,12 @@ public class AbilityType {
public static List<AbilityType> getAbilities() { public static List<AbilityType> getAbilities() {
return abilityTypes; return abilityTypes;
} }
public static List<String> getAbilitieNames() {
return abilityNames;
}
public static List<String> getLowerAbilitieNames() {
return lowerAbilityNames;
}
} }

12
src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java
View File

@ -58,6 +58,7 @@ public class SkillType {
} }
private static List<String> skillNames = new ArrayList<String>(); private static List<String> skillNames = new ArrayList<String>();
private static List<String> lowerSkillNames = new ArrayList<String>();
private static List<SkillType> skillList = new ArrayList<SkillType>(); private static List<SkillType> skillList = new ArrayList<SkillType>();
private static List<SkillType> childSkills = new ArrayList<SkillType>(); private static List<SkillType> childSkills = new ArrayList<SkillType>();
@ -278,13 +279,22 @@ public class SkillType {
public static void setUpSkillTypes() public static void setUpSkillTypes()
{ {
Collections.sort(getSkillNames()); Collections.sort(skillNames);
for(SkillType skill : nonChildSkills) {
if(skill != null) {
lowerSkillNames.add(skill.getName());
}
}
} }
public static List<String> getSkillNames() { public static List<String> getSkillNames() {
return skillNames; return skillNames;
} }
public static List<String> getLowerSkillNames() {
return lowerSkillNames;
}
public static List<SkillType> getSkillList() { public static List<SkillType> getSkillList() {
return skillList; return skillList;
} }

3
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -24,6 +24,7 @@ import com.gmail.nossr50.config.skills.salvage.SalvageConfigManager;
import com.gmail.nossr50.config.treasure.TreasureConfig; import com.gmail.nossr50.config.treasure.TreasureConfig;
import com.gmail.nossr50.database.DatabaseManager; import com.gmail.nossr50.database.DatabaseManager;
import com.gmail.nossr50.database.DatabaseManagerFactory; import com.gmail.nossr50.database.DatabaseManagerFactory;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.listeners.BlockListener; import com.gmail.nossr50.listeners.BlockListener;
import com.gmail.nossr50.listeners.EntityListener; import com.gmail.nossr50.listeners.EntityListener;
import com.gmail.nossr50.listeners.InventoryListener; import com.gmail.nossr50.listeners.InventoryListener;
@ -130,6 +131,8 @@ public class mcMMO extends JavaPlugin {
getLogger().setFilter(new LogFilter(this)); getLogger().setFilter(new LogFilter(this));
metadataValue = new FixedMetadataValue(this, true); metadataValue = new FixedMetadataValue(this, true);
SkillType.setUpSkillTypes();
PluginManager pluginManager = getServer().getPluginManager(); PluginManager pluginManager = getServer().getPluginManager();
healthBarPluginEnabled = pluginManager.getPlugin("HealthBar") != null; healthBarPluginEnabled = pluginManager.getPlugin("HealthBar") != null;

25
src/main/java/com/gmail/nossr50/util/StringUtils.java
View File

@ -1,5 +1,7 @@
package com.gmail.nossr50.util; package com.gmail.nossr50.util;
import java.util.List;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.TreeSpecies; import org.bukkit.TreeSpecies;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -106,4 +108,27 @@ public class StringUtils {
} }
} }
public static String createStringFromListWithNoPrefixBeforeFirst(List<String> list, String prefix, String suffix) {
String toRet = "";
toRet = org.apache.commons.lang.StringUtils.join(list.toArray(), suffix + prefix) + suffix;
/*Iterator<String> itr = list.iterator();
if(itr.hasNext()) {
toRet += itr.next() + suffix;
}
while(itr.hasNext()) {
toRet += prefix + itr.next() + suffix;
}*/
return toRet;
}
public static String createStringFromList(List<String> list, String prefix, String suffix) {
String toRet = "";
toRet = prefix + createStringFromListWithNoPrefixBeforeFirst(list, prefix, suffix);
/*Iterator<String> itr = list.iterator();
while(itr.hasNext()) {
toRet += prefix + itr.next() + suffix;
}*/
return toRet;
}
} }

3
src/main/resources/upgrades.yml
View File

@ -7,4 +7,5 @@ Upgrades_Finished:
DROP_SQL_PARTY_NAMES: false DROP_SQL_PARTY_NAMES: false
DROP_SPOUT: false DROP_SPOUT: false
ADD_ALCHEMY: false ADD_ALCHEMY: false
ADD_INDEX_NAMES: true ADD_FLATFILE_INDEX_NAMES: false
CHANGE_SQL_COOLDOWN_NAMES: false