From 9ae9de678b194142539120706b101b45eb93fc0b Mon Sep 17 00:00:00 2001 From: montlikadani Date: Wed, 17 Jun 2020 11:54:24 +0200 Subject: [PATCH] We don't need to delete jobs when inserting Fixes #824 --- .../jobs/commands/list/archive.java | 2 -- .../jobs/commands/list/edititembonus.java | 16 ++++------ .../jobs/commands/list/entitylist.java | 7 ++--- .../jobs/commands/list/expboost.java | 8 ++--- .../gamingmesh/jobs/commands/list/glog.java | 9 +++--- .../jobs/commands/list/itembonus.java | 12 ++++---- .../gamingmesh/jobs/commands/list/log.java | 6 ++-- .../jobs/commands/list/moneyboost.java | 8 ++--- .../jobs/commands/list/pointboost.java | 8 ++--- .../gamingmesh/jobs/config/ConfigManager.java | 30 +++++++++---------- .../jobs/config/NameTranslatorManager.java | 8 ++--- .../java/com/gamingmesh/jobs/dao/JobsDAO.java | 10 +------ .../com/gamingmesh/jobs/dao/JobsMySQL.java | 2 +- 13 files changed, 48 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/archive.java b/src/main/java/com/gamingmesh/jobs/commands/list/archive.java index d9bc0b4a..fb54b758 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/archive.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/archive.java @@ -13,7 +13,6 @@ import com.gamingmesh.jobs.commands.JobCommand; import com.gamingmesh.jobs.container.JobProgression; import com.gamingmesh.jobs.container.JobsPlayer; - public class archive implements Cmd { @Override @@ -37,7 +36,6 @@ public class archive implements Cmd { } Set AllJobs = jPlayer.getArchivedJobs().getArchivedJobs(); - if (AllJobs.isEmpty()) { sender.sendMessage(Jobs.getLanguage().getMessage("command.archive.error.nojob")); return true; diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/edititembonus.java b/src/main/java/com/gamingmesh/jobs/commands/list/edititembonus.java index 45b162cb..96d5759d 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/edititembonus.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/edititembonus.java @@ -66,14 +66,11 @@ public class edititembonus implements Cmd { return false; Player player = (Player) sender; - JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(player); - if (jPlayer == null) return false; ItemStack iih = Jobs.getNms().getItemInMainHand(player); - if (iih == null || iih.getType().equals(Material.AIR)) return false; @@ -92,23 +89,24 @@ public class edititembonus implements Cmd { break; default: break; - } sender.sendMessage(Jobs.getLanguage().getMessage("command.bonus.output.topline")); Object key = Reflections.getNbt(iih, "JobsItemBoost"); - if (key == null) return true; JobItems item = ItemBoostManager.getItemByKey(key.toString()); - if (item == null) - return true; + return true; BoostMultiplier boost = item.getBoost(); + String mc = ChatColor.DARK_GREEN.toString(), + pc = ChatColor.GOLD.toString(), + ec = ChatColor.YELLOW.toString(); + for (Job one : item.getJobs()) { String msg = Jobs.getLanguage().getMessage("command.itembonus.output.list", "[jobname]", one.getName(), @@ -120,10 +118,6 @@ public class edititembonus implements Cmd { return true; } - String mc = ChatColor.DARK_GREEN.toString(); - String pc = ChatColor.GOLD.toString(); - String ec = ChatColor.YELLOW.toString(); - private static String formatText(double amount) { return ((amount > 0 ? "+" : "") + amount + "%"); } diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/entitylist.java b/src/main/java/com/gamingmesh/jobs/commands/list/entitylist.java index 0673831c..15d9022e 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/entitylist.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/entitylist.java @@ -16,10 +16,9 @@ public class entitylist implements Cmd { return true; } - String msg = ""; - - String c1 = "&e"; - String c2 = "&6"; + String msg = "", + c1 = "&e", + c2 = "&6"; int i = 0; for (EntityType type : EntityType.values()) { diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java index 9b4479bc..e4171e34 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java @@ -40,9 +40,7 @@ public class expboost implements Cmd { } if (args.length > 2) { - int sec = 0; - int min = 0; - int hour = 0; + int sec = 0, min = 0, hour = 0; if (!time.isEmpty()) { if (time.contains("s")) { @@ -133,9 +131,7 @@ public class expboost implements Cmd { } if (!time.isEmpty()) { - int sec = 0; - int min = 0; - int hour = 0; + int sec = 0, min = 0, hour = 0; if (time.contains("s")) { sec = Integer.parseInt(time.split("s")[0]); diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/glog.java b/src/main/java/com/gamingmesh/jobs/commands/list/glog.java index 965de9a5..26b83765 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/glog.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/glog.java @@ -70,12 +70,11 @@ public class glog implements Cmd { return; } - int count = 1; - int max = 10; + int count = 1, max = 10; - double totalMoney = 0; - double totalExp = 0; - double totalPoints = 0; + double totalMoney = 0, + totalExp = 0, + totalPoints = 0; sender.sendMessage(Jobs.getLanguage().getMessage("command.glog.output.topline")); for (Entry one : unsortMap.entrySet()) { diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/itembonus.java b/src/main/java/com/gamingmesh/jobs/commands/list/itembonus.java index dea86bd4..90f3a2a0 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/itembonus.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/itembonus.java @@ -69,9 +69,15 @@ public class itembonus implements Cmd { if (boost.get(oneC) != 0D) any = true; } + if (!any) continue; - String msg = null; + + String mc = ChatColor.DARK_GREEN.toString(), + pc = ChatColor.GOLD.toString(), + ec = ChatColor.YELLOW.toString(), + msg = null; + if (jPlayer.isInJob(one)) msg = Jobs.getLanguage().getMessage("command.itembonus.output.list", "[jobname]", one.getName(), @@ -100,10 +106,6 @@ public class itembonus implements Cmd { return true; } - String mc = ChatColor.DARK_GREEN.toString(); - String pc = ChatColor.GOLD.toString(); - String ec = ChatColor.YELLOW.toString(); - private static String formatText(double amount) { return ((amount > 0 ? "+" : "") + amount + "%"); } diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/log.java b/src/main/java/com/gamingmesh/jobs/commands/list/log.java index 622326dd..f742960d 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/log.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/log.java @@ -77,9 +77,9 @@ public class log implements Cmd { for (Entry l : logList.entrySet()) { Log one = l.getValue(); HashMap AmountList = one.getAmountList(); - double totalMoney = 0; - double totalExp = 0; - double totalPoints = 0; + double totalMoney = 0, + totalExp = 0, + totalPoints = 0; for (Entry oneSorted : unsortMap.entrySet()) { for (Entry oneMap : AmountList.entrySet()) { if (oneMap.getKey().equalsIgnoreCase(oneSorted.getKey())) { diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java index 5834d80b..913922a8 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java @@ -40,9 +40,7 @@ public class moneyboost implements Cmd { } if (args.length > 2) { - int sec = 0; - int min = 0; - int hour = 0; + int sec = 0, min = 0, hour = 0; if (!time.isEmpty()) { if (time.contains("s")) { @@ -133,9 +131,7 @@ public class moneyboost implements Cmd { } if (!time.isEmpty()) { - int sec = 0; - int min = 0; - int hour = 0; + int sec = 0, min = 0, hour = 0; if (time.contains("s")) { sec = Integer.parseInt(time.split("s")[0]); diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java index c5cf19b7..78144b47 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java @@ -40,9 +40,7 @@ public class pointboost implements Cmd { } if (args.length > 2) { - int sec = 0; - int min = 0; - int hour = 0; + int sec = 0, min = 0, hour = 0; if (!time.isEmpty()) { if (time.contains("s")) { @@ -133,9 +131,7 @@ public class pointboost implements Cmd { } if (!time.isEmpty()) { - int sec = 0; - int min = 0; - int hour = 0; + int sec = 0, min = 0, hour = 0; if (time.contains("s")) { sec = Integer.parseInt(time.split("s")[0]); diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index f42ae2b9..6e4f3ea8 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -385,9 +385,9 @@ public class ConfigManager { @SuppressWarnings("deprecation") public KeyValues getKeyValue(String myKey, ActionType actionType, String jobName) { - String type = null; - String subType = ""; - String meta = ""; + String type = null, + subType = "", + meta = ""; int id = 0; if (myKey.contains("-")) { @@ -904,8 +904,8 @@ public class ConfigManager { continue; } - List requires = permissionSection.getStringList("requires"); - List perform = permissionSection.getStringList("perform"); + List requires = permissionSection.getStringList("requires"), + perform = permissionSection.getStringList("perform"); jobConditions.add(new JobConditions(ConditionKey.toLowerCase(), requires, perform)); } } @@ -1132,9 +1132,9 @@ public class ConfigManager { int chance = sqsection.getInt("Chance", 100); - List commands = sqsection.getStringList("RewardCommands"); - List desc = sqsection.getStringList("RewardDesc"); - List areas = sqsection.getStringList("RestrictedAreas"); + List commands = sqsection.getStringList("RewardCommands"), + desc = sqsection.getStringList("RewardDesc"), + areas = sqsection.getStringList("RestrictedAreas"); if (sqsection.isInt("fromLevel")) quest.setMinLvl(sqsection.getInt("fromLevel")); @@ -1159,9 +1159,9 @@ public class ConfigManager { } job.setMaxDailyQuests(jobSection.getInt("maxDailyQuests", 1)); - Integer softIncomeLimit = null; - Integer softExpLimit = null; - Integer softPointsLimit = null; + Integer softIncomeLimit = null, + softExpLimit = null, + softPointsLimit = null; if (jobSection.isInt("softIncomeLimit")) softIncomeLimit = jobSection.getInt("softIncomeLimit"); if (jobSection.isInt("softExpLimit")) @@ -1175,10 +1175,10 @@ public class ConfigManager { if (typeSection != null) { for (String key : typeSection.getKeys(false)) { ConfigurationSection section = typeSection.getConfigurationSection(key); - String myKey = key; - String type = null; - String subType = ""; - String meta = ""; + String myKey = key, + type = null, + subType = "", + meta = ""; int id = 0; if (myKey.contains("-")) { diff --git a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java index 5d588e07..7c818fd1 100644 --- a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java @@ -21,11 +21,9 @@ import com.gamingmesh.jobs.stuff.Util; public class NameTranslatorManager { - public HashMap ListOfNames = new HashMap<>(); - public ArrayList ListOfEntities = new ArrayList<>(); - public HashMap ListOfEnchants = new HashMap<>(); - public HashMap ListOfMMEntities = new HashMap<>(); - public ArrayList ListOfColors = new ArrayList<>(); + private final HashMap ListOfNames = new HashMap<>(); + private final ArrayList ListOfEntities = new ArrayList<>(), ListOfColors = new ArrayList<>(); + private final HashMap ListOfEnchants = new HashMap<>(), ListOfMMEntities = new HashMap<>(); public String Translate(String materialName, JobInfo info) { return Translate(materialName, info.getActionType(), info.getId(), info.getMeta(), info.getName()); diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java index 4dca86c0..69c9ac56 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java @@ -414,7 +414,7 @@ public abstract class JobsDAO { public String getQuery() { String rp = ""; - List uniques = new ArrayList(); + List uniques = new ArrayList<>(); for (JobsTableInterface one : this.getInterface()) { if (one.isUnique()) { uniques.add(one); @@ -1125,14 +1125,6 @@ public abstract class JobsDAO { PreparedStatement prestt = null; ResultSet res2 = null; try { - prestt = conn.prepareStatement("DELETE FROM `" + DBTables.JobNameTable.getTableName() - + "` WHERE `" + jobsNameTableFields.name.getCollumn() + "` = ?;"); - prestt.setString(1, job.getName()); - prestt.execute(); - - close(prestt); - prestt = null; - prestt = conn.prepareStatement("INSERT INTO `" + DBTables.JobNameTable.getTableName() + "` (`" + jobsNameTableFields.name.getCollumn() + "`) VALUES (?);", Statement.RETURN_GENERATED_KEYS); prestt.setString(1, job.getName()); diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java b/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java index cf07af08..0090d8f8 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java @@ -12,7 +12,7 @@ public class JobsMySQL extends JobsDAO { JobsMySQL(Jobs plugin, String hostname, String database, String username, String password, String prefix, boolean certificate, boolean ssl, boolean autoReconnect) { super(plugin, "com.mysql.jdbc.Driver", "jdbc:mysql://" + hostname + "/" + database - + "?maxReconnects=1&useUnicode=true&characterEncoding=UTF-8&autoReconnect=" + autoReconnect + "&useSSL=" + ssl + + "?maxReconnects=1&useUnicode=true&characterEncoding=utf8&autoReconnect=" + autoReconnect + "&useSSL=" + ssl + "&verifyServerCertificate=" + certificate, username, password, prefix); setDbType(DataBaseType.MySQL); }