Tidy up + Debt reduction

Sefiraat · Jun 1, 2021 · 6ce7a9e · 6ce7a9e
1 parent d6fe580
commit 6ce7a9e
Show file tree

Hide file tree

Showing 29 changed files with 328 additions and 309 deletions.
diff --git a/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java b/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java
@@ -2,7 +2,7 @@
 
 import co.aikar.commands.PaperCommandManager;
 import io.github.sefiraat.equivalencytech.commands.Commands;
-import io.github.sefiraat.equivalencytech.configuration.Config;
+import io.github.sefiraat.equivalencytech.configuration.ConfigMain;
 import io.github.sefiraat.equivalencytech.listeners.CraftListener;
 import io.github.sefiraat.equivalencytech.listeners.OrbOpenListener;
 import io.github.sefiraat.equivalencytech.misc.EQItems;
@@ -26,57 +26,60 @@ public class EquivalencyTech extends JavaPlugin {
     private EquivalencyTech instance;
     private PaperCommandManager commandManager;
 
-    private Config configClass;
+    private ConfigMain configMainClass;
     private EmcDefinitions emcDefinitions;
     private EQItems eqItems;
 
     private boolean isUnitTest = false;
 
-    private boolean mcMMO = false;
     private boolean slimefun = false;
     private SlimefunEQAddon slimefunAddon;
 
     private File learnedItemsConfigFile;
+    private FileConfiguration learnedItemsConfig;
+    private File playerEMCConfigFile;
+    private FileConfiguration playerEMCConfig;
+
     public File getLearnedItemsConfigFile() {
         return learnedItemsConfigFile;
     }
-    private FileConfiguration learnedItemsConfig;
+
     public FileConfiguration getLearnedItemsConfig() {
         return learnedItemsConfig;
     }
 
-    private File playerEMCConfigFile;
     public File getPlayerEMCConfigFile() {
         return playerEMCConfigFile;
     }
-    private FileConfiguration playerEMCConfig;
+
     public FileConfiguration getPlayerEMCConfig() {
         return playerEMCConfig;
     }
 
     public PaperCommandManager getCommandManager() {
         return commandManager;
     }
+
     public EquivalencyTech getInstance() {
         return instance;
     }
 
-    public Config getConfigClass() {
-        return configClass;
+    public ConfigMain getConfigClass() {
+        return configMainClass;
     }
+
     public EmcDefinitions getEmcDefinitions() {
         return emcDefinitions;
     }
+
     public EQItems getEqItems() {
         return eqItems;
     }
 
-    public boolean isMcMMO() {
-        return mcMMO;
-    }
     public boolean isSlimefun() {
         return slimefun;
     }
+
     public SlimefunEQAddon getSlimefunAddon() {
         return slimefunAddon;
     }
@@ -108,7 +111,7 @@ public void onEnable() {
 
         new OrbOpenListener(this.getInstance());
 
-        configClass = new Config(this.getInstance());
+        configMainClass = new ConfigMain(this.getInstance());
         eqItems = new EQItems(this.getInstance());
         emcDefinitions = new EmcDefinitions(this.getInstance());
 
@@ -153,6 +156,11 @@ private void sortConfigs() {
         createEmcConfig();
     }
 
+    public void saveAdditionalConfigs() {
+        saveEmcConfig();
+        saveLearnedConfig();
+    }
+
     private void createLearnedConfig() {
         learnedItemsConfigFile = new File(getDataFolder(), "learned_items.yml");
         if (!learnedItemsConfigFile.exists()) {
@@ -167,7 +175,7 @@ private void createLearnedConfig() {
         }
     }
 
-    public void saveLearnedConfig() {
+    private void saveLearnedConfig() {
         try {
             learnedItemsConfig.save(learnedItemsConfigFile);
         } catch (IOException e) {
@@ -189,7 +197,7 @@ private void createEmcConfig() {
         }
     }
 
-    public void saveEmcConfig() {
+    private void saveEmcConfig() {
         try {
             playerEMCConfig.save(playerEMCConfigFile);
         } catch (IOException e) {

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/commands/Commands.java b/src/main/java/io/github/sefiraat/equivalencytech/commands/Commands.java
@@ -17,6 +17,7 @@
 public class Commands extends BaseCommand {
 
     private final EquivalencyTech plugin;
+
     public EquivalencyTech getPlugin() {
         return plugin;
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigBooleans.java b/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigBooleans.java
@@ -6,6 +6,7 @@
 public class ConfigBooleans {
 
     private final boolean debuggingLogs;
+
     public boolean getDebuggingLogs() {
         return debuggingLogs;
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigEMC.java b/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigEMC.java
@@ -9,11 +9,12 @@
 public class ConfigEMC {
 
     private Map<String, Double> emcBaseValues;
+    private final int burnRate;
+
     public Map<String, Double> getEmcBaseValues() {
         return emcBaseValues;
     }
 
-    private final int burnRate;
     public int getBurnRate() {
         return burnRate;
     }

diff --git a/...equivalencytech/configuration/Config.java → ...valencytech/configuration/ConfigMain.java b/...equivalencytech/configuration/Config.java → ...valencytech/configuration/ConfigMain.java
@@ -2,7 +2,7 @@
 
 import io.github.sefiraat.equivalencytech.EquivalencyTech;
 
-public class Config {
+public class ConfigMain {
 
     private final ConfigStrings strings;
     private final ConfigEMC emc;
@@ -18,7 +18,7 @@ public ConfigBooleans getBools() {
         return bools;
     }
 
-    public Config(EquivalencyTech plugin) {
+    public ConfigMain(EquivalencyTech plugin) {
         strings = new ConfigStrings(plugin);
         emc = new ConfigEMC(plugin);
         bools = new ConfigBooleans(plugin);

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigStrings.java b/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigStrings.java
@@ -10,127 +10,131 @@ public class ConfigStrings {
     // General
 
     private final String generalNoInvSpace;
+    private final String generalCraftingItem;
+
     public String getGeneralNoInvSpace() {
         return generalNoInvSpace;
     }
 
-    private final String generalCraftingItem;
     public String getGeneralCraftingItem() {
         return generalCraftingItem;
     }
 
     // Commands
 
     private final String commandSubcommand;
+    private final String commandEmcMustHold;
+    private final String commandEmcNone;
+    private final String commandSelectItem;
+    private final String commandOrbGiven;
+
     public String getCommandSubcommand() {
         return commandSubcommand;
     }
 
-    private final String commandEmcMustHold;
     public String getCommandEmcMustHold() {
         return commandEmcMustHold;
     }
 
-    private final String commandEmcNone;
     public String getCommandEmcNone() {
         return commandEmcNone;
     }
 
-    private final String commandSelectItem;
     public String getCommandSelectItem() {
         return commandSelectItem;
     }
 
-    private final String commandOrbGiven;
     public String getCommandOrbGiven() {
         return commandOrbGiven;
     }
 
     // Items
 
     private final String itemTransmutationOrbName;
+    private final List<String> itemTransmutationOrbLore;
+    private final String itemRightClickToOpen;
+    private final String itemAlchemicalCoalName;
+    private final String itemMobiusFuelName;
+    private final String itemAeternalisFuelName;
+    private final String itemDarkMatterName;
+    private final String itemRedMatterName;
+
     public String getItemTransmutationOrbName() {
         return itemTransmutationOrbName;
     }
 
-    private final List<String> itemTransmutationOrbLore;
     public List<String> getItemTransmutationOrbLore() {
         return itemTransmutationOrbLore;
     }
 
-    private final String itemRightClickToOpen;
     public String getItemRightClickToOpen() {
         return itemRightClickToOpen;
     }
 
-    private final String itemAlchemicalCoalName;
     public String getItemAlchemicalCoalName() {
         return itemAlchemicalCoalName;
     }
 
-    private final String itemMobiusFuelName;
     public String getItemMobiusFuelName() {
         return itemMobiusFuelName;
     }
 
-    private final String itemAeternalisFuelName;
     public String getItemAeternalisFuelName() {
         return itemAeternalisFuelName;
     }
 
-    private final String itemDarkMatterName;
     public String getItemDarkMatterName() {
         return itemDarkMatterName;
     }
 
-    private final String itemRedMatterName;
     public String getItemRedMatterName() {
         return itemRedMatterName;
     }
 
     // GUI
 
     private final String guiBorderName;
+    private final String guiFillerName;
+    private final String guiItemLearned;
+    private final String guiInfoName;
+    private final String guiInfoRecipes;
+    private final String guiEntryLeftClick;
+    private final String guiEntryRightClick;
+    private final String guiNotEnoughEmc;
+    private final String guiItemMeta;
+
     public String getGuiBorderName() {
         return guiBorderName;
     }
 
-    private final String guiFillerName;
     public String getGuiFillerName() {
         return guiFillerName;
     }
 
-    private final String guiItemLearned;
     public String getGuiItemLearned() {
         return guiItemLearned;
     }
 
-    private final String guiInfoName;
     public String getGuiInfoName() {
         return guiInfoName;
     }
 
-    private final String guiInfoRecipes;
     public String getGuiInfoRecipes() {
         return guiInfoRecipes;
     }
 
-    private final String guiEntryLeftClick;
     public String getGuiEntryLeftClick() {
         return guiEntryLeftClick;
     }
 
-    private final String guiEntryRightClick;
     public String getGuiEntryRightClick() {
         return guiEntryRightClick;
     }
 
-    private final String guiNotEnoughEmc;
     public String getGuiNotEnoughEmc() {
         return guiNotEnoughEmc;
     }
 
-    private final String guiItemMeta;
     public String getGuiItemMeta() {
         return guiItemMeta;
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/gui/GUIItems.java b/src/main/java/io/github/sefiraat/equivalencytech/gui/GUIItems.java
@@ -4,8 +4,8 @@
 import io.github.sefiraat.equivalencytech.EquivalencyTech;
 import io.github.sefiraat.equivalencytech.configuration.ConfigStrings;
 import io.github.sefiraat.equivalencytech.misc.Utils;
-import io.github.sefiraat.equivalencytech.statics.Colours;
 import io.github.sefiraat.equivalencytech.statics.Config;
+import io.github.sefiraat.equivalencytech.statics.Messages;
 import io.github.sefiraat.equivalencytech.statics.SkullTextures;
 import me.mattstudios.mfgui.gui.guis.GuiItem;
 import net.md_5.bungee.api.ChatColor;
@@ -41,7 +41,7 @@ public static GuiItem guiOrbBorder(EquivalencyTech plugin) {
         GuiItem g = new GuiItem(Material.GRAY_STAINED_GLASS_PANE);
         ItemStack i = g.getItemStack();
         ItemMeta im = i.getItemMeta();
-        im.setDisplayName(Colours.THEME_PASSIVE_GRAY + plugin.getConfigClass().getStrings().getGuiBorderName());
+        im.setDisplayName(Messages.THEME_PASSIVE_GRAY + plugin.getConfigClass().getStrings().getGuiBorderName());
         im.addItemFlags(ItemFlag.HIDE_ENCHANTS);
         i.setItemMeta(im);
         g.setItemStack(i);
@@ -53,7 +53,7 @@ public static GuiItem guiOrbFiller(EquivalencyTech plugin) {
         GuiItem g = new GuiItem(Material.LIGHT_GRAY_STAINED_GLASS_PANE);
         ItemStack i = g.getItemStack();
         ItemMeta im = i.getItemMeta();
-        im.setDisplayName(Colours.THEME_PASSIVE_GRAY + plugin.getConfigClass().getStrings().getGuiFillerName());
+        im.setDisplayName(Messages.THEME_PASSIVE_GRAY + plugin.getConfigClass().getStrings().getGuiFillerName());
         im.addItemFlags(ItemFlag.HIDE_ENCHANTS);
         i.setItemMeta(im);
         g.setItemStack(i);
@@ -94,21 +94,21 @@ public static GuiItem guiEMCItem(EquivalencyTech plugin, ItemStack itemStack) {
     public static List<String> getEmcItemLore(EquivalencyTech plugin, Material material) {
         ConfigStrings c = plugin.getConfigClass().getStrings();
         List<String> lore = new ArrayList<>();
-        lore.add(Colours.THEME_EMC_PURPLE + "EMC: " + Utils.getEMC(plugin, material));
+        lore.add(Messages.THEME_EMC_PURPLE + "EMC: " + Utils.getEMC(plugin, material));
         lore.add("");
-        lore.add(Colours.THEME_CLICK_INSTRUCTION + "Left Click: " + ChatColor.WHITE + c.getGuiEntryLeftClick());
-        lore.add(Colours.THEME_CLICK_INSTRUCTION + "Right Click: " + ChatColor.WHITE + c.getGuiEntryRightClick());
+        lore.add(Messages.THEME_CLICK_INSTRUCTION + "Left Click: " + ChatColor.WHITE + c.getGuiEntryLeftClick());
+        lore.add(Messages.THEME_CLICK_INSTRUCTION + "Right Click: " + ChatColor.WHITE + c.getGuiEntryRightClick());
         return lore;
     }
 
 
     public static List<String> getEmcItemLore(EquivalencyTech plugin, ItemStack itemStack) {
         ConfigStrings c = plugin.getConfigClass().getStrings();
         List<String> lore = new ArrayList<>();
-        lore.add(Colours.THEME_EMC_PURPLE + "EMC: " + Utils.getEmcEq(plugin, itemStack));
+        lore.add(Messages.THEME_EMC_PURPLE + "EMC: " + Utils.getEmcEq(plugin, itemStack));
         lore.add("");
-        lore.add(Colours.THEME_CLICK_INSTRUCTION + "Left Click: " + ChatColor.WHITE + c.getGuiEntryLeftClick());
-        lore.add(Colours.THEME_CLICK_INSTRUCTION + "Right Click: " + ChatColor.WHITE + c.getGuiEntryRightClick());
+        lore.add(Messages.THEME_CLICK_INSTRUCTION + "Left Click: " + ChatColor.WHITE + c.getGuiEntryLeftClick());
+        lore.add(Messages.THEME_CLICK_INSTRUCTION + "Right Click: " + ChatColor.WHITE + c.getGuiEntryRightClick());
         return lore;
     }
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/gui/GuiTransmutationOrb.java b/src/main/java/io/github/sefiraat/equivalencytech/gui/GuiTransmutationOrb.java
@@ -1,7 +1,6 @@
 package io.github.sefiraat.equivalencytech.gui;
 
 import io.github.sefiraat.equivalencytech.EquivalencyTech;
-import io.github.sefiraat.equivalencytech.statics.Colours;
 import io.github.sefiraat.equivalencytech.statics.Config;
 import io.github.sefiraat.equivalencytech.statics.ContainerStorage;
 import io.github.sefiraat.equivalencytech.statics.Messages;
@@ -42,7 +41,7 @@ public static GuiTransmutationOrb buildGui(EquivalencyTech plugin, Player player
         GuiTransmutationOrb gui = new GuiTransmutationOrb(
                 6,
                 GuiTransmutationOrb.PAGE_SIZE,
-                Colours.THEME_EMC_PURPLE + plugin.getConfigClass().getStrings().getItemTransmutationOrbName(),
+                Messages.THEME_EMC_PURPLE + plugin.getConfigClass().getStrings().getItemTransmutationOrbName(),
                 plugin,
                 player
         );