From d41b5f7a1f375dc43238ae2a021a1ec03c64ed5b Mon Sep 17 00:00:00 2001 From: montlikadani Date: Sun, 23 Dec 2018 17:31:05 +0100 Subject: [PATCH] Fix wrong file & folder path - Code clean up --- src/main/java/com/gamingmesh/jobs/commands/list/gtop.java | 4 +--- src/main/java/com/gamingmesh/jobs/commands/list/quests.java | 1 - src/main/java/com/gamingmesh/jobs/commands/list/top.java | 1 - .../com/gamingmesh/jobs/config/NameTranslatorManager.java | 2 +- src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java | 1 - .../com/gamingmesh/jobs/listeners/JobsPaymentListener.java | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java b/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java index a2c116fa..9396b3bb 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java @@ -11,9 +11,7 @@ import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.commands.Cmd; import com.gamingmesh.jobs.commands.JobCommand; import com.gamingmesh.jobs.container.TopList; -import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.PageInfo; -import com.gamingmesh.jobs.CMILib.RawMessage; public class gtop implements Cmd { @@ -46,7 +44,7 @@ public class gtop implements Cmd { page = 1; PageInfo pi = new PageInfo(Jobs.getGCManager().JobsTopAmount, Jobs.getPlayerManager().getPlayersCache().size(), page); - + List FullList = Jobs.getJobsDAO().getGlobalTopList(pi.getStart()); if (FullList.isEmpty()) { sender.sendMessage(Jobs.getLanguage().getMessage("command.gtop.error.nojob")); diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/quests.java b/src/main/java/com/gamingmesh/jobs/commands/list/quests.java index 75bb6ef7..22ad56d5 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/quests.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/quests.java @@ -13,7 +13,6 @@ import com.gamingmesh.jobs.container.JobProgression; import com.gamingmesh.jobs.container.JobsPlayer; import com.gamingmesh.jobs.container.QuestProgression; import com.gamingmesh.jobs.CMILib.RawMessage; -import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.TimeManage; public class quests implements Cmd { diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/top.java b/src/main/java/com/gamingmesh/jobs/commands/list/top.java index 9eeb2324..46995312 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/top.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/top.java @@ -13,7 +13,6 @@ import com.gamingmesh.jobs.commands.JobCommand; import com.gamingmesh.jobs.container.Job; import com.gamingmesh.jobs.container.TopList; import com.gamingmesh.jobs.stuff.PageInfo; -import com.gamingmesh.jobs.CMILib.RawMessage; public class top implements Cmd { diff --git a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java index 3e6fbf53..06cb3977 100644 --- a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java @@ -259,7 +259,7 @@ public class NameTranslatorManager { // Fail safe if file get corrupted and being created with corrupted data, we need to recreate it if ((f.length() / 1024) > 1024) { f.delete(); - f = new File(Jobs.getFolder(), "locale" + File.separator + "messages_" + lang + ".yml"); + f = new File(Jobs.getFolder(), "TranslatableWords" + File.separator + "Words_" + lang + ".yml"); } YamlConfiguration config = YamlConfiguration.loadConfiguration(f); diff --git a/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java b/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java index a9df4d80..cc4c3c25 100644 --- a/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java +++ b/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java @@ -33,7 +33,6 @@ import com.gamingmesh.jobs.dao.JobsDAO; import com.gamingmesh.jobs.economy.PaymentData; import com.gamingmesh.jobs.resources.jfep.Parser; import com.gamingmesh.jobs.stuff.ChatColor; -import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling; import com.gamingmesh.jobs.stuff.TimeManage; diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java index 523a8fcf..17e58357 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java @@ -97,7 +97,6 @@ import com.gamingmesh.jobs.container.ExploreRespond; import com.gamingmesh.jobs.container.FastPayment; import com.gamingmesh.jobs.container.JobProgression; import com.gamingmesh.jobs.container.JobsPlayer; -import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling.ownershipFeedback; import com.google.common.base.Objects;