diff --git a/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java b/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java index afd48f2..d92cf7d 100644 --- 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,30 +26,32 @@ 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; } @@ -57,26 +59,27 @@ public FileConfiguration getPlayerEMCConfig() { 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 index bbd7a7a..f911664 100644 --- 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 index 517351a..c28e395 100644 --- 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 index f038809..bf3c384 100644 --- 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 emcBaseValues; + private final int burnRate; + public Map getEmcBaseValues() { return emcBaseValues; } - private final int burnRate; public int getBurnRate() { return burnRate; } diff --git a/src/main/java/io/github/sefiraat/equivalencytech/configuration/Config.java b/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigMain.java similarity index 88% rename from src/main/java/io/github/sefiraat/equivalencytech/configuration/Config.java rename to src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigMain.java index d0fa3bb..a3d75ec 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/configuration/Config.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/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 index 97fddae..1b17226 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigStrings.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigStrings.java @@ -10,11 +10,12 @@ 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; } @@ -22,26 +23,27 @@ public String getGeneralCraftingItem() { // 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; } @@ -49,41 +51,42 @@ public String getCommandOrbGiven() { // Items private final String itemTransmutationOrbName; + private final List 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 itemTransmutationOrbLore; public List 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; } @@ -91,46 +94,47 @@ public String getItemRedMatterName() { // 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 index 91303b9..30bb98e 100644 --- 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,10 +94,10 @@ public static GuiItem guiEMCItem(EquivalencyTech plugin, ItemStack itemStack) { public static List getEmcItemLore(EquivalencyTech plugin, Material material) { ConfigStrings c = plugin.getConfigClass().getStrings(); List 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; } @@ -105,10 +105,10 @@ public static List getEmcItemLore(EquivalencyTech plugin, Material mater public static List getEmcItemLore(EquivalencyTech plugin, ItemStack itemStack) { ConfigStrings c = plugin.getConfigClass().getStrings(); List 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 index da7c432..2e80177 100644 --- 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 ); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/items/AeternalisFuel.java b/src/main/java/io/github/sefiraat/equivalencytech/items/AeternalisFuel.java index 3540e53..81f5732 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/items/AeternalisFuel.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/items/AeternalisFuel.java @@ -3,8 +3,8 @@ import dev.dbassett.skullcreator.SkullCreator; import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.configuration.ConfigStrings; -import io.github.sefiraat.equivalencytech.statics.Colours; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; +import io.github.sefiraat.equivalencytech.statics.Messages; import io.github.sefiraat.equivalencytech.statics.SkullTextures; import net.md_5.bungee.api.ChatColor; import org.bukkit.inventory.ItemStack; @@ -16,15 +16,15 @@ public class AeternalisFuel { private final ItemStack item; + private final EquivalencyTech plugin; - public ItemStack getClone() { + public ItemStack getItemClone() { return item.clone(); } public ItemStack getItem() { return item; } - private final EquivalencyTech plugin; public EquivalencyTech getPlugin() { return plugin; } @@ -37,7 +37,7 @@ public AeternalisFuel(EquivalencyTech plugin) { item = SkullCreator. itemFromBase64(SkullTextures.ITEM_AETERNALIS_FUEL); ItemMeta im = item.getItemMeta(); - im.setDisplayName(Colours.THEME_ITEM_NAME_GENERAL + c.getItemAeternalisFuelName()); + im.setDisplayName(Messages.THEME_ITEM_NAME_GENERAL + c.getItemAeternalisFuelName()); List lore = new ArrayList<>(); lore.add(""); lore.add(ChatColor.GRAY + c.getGeneralCraftingItem()); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/items/AlchemicalCoal.java b/src/main/java/io/github/sefiraat/equivalencytech/items/AlchemicalCoal.java index b7a7db0..7735056 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/items/AlchemicalCoal.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/items/AlchemicalCoal.java @@ -3,8 +3,8 @@ import dev.dbassett.skullcreator.SkullCreator; import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.configuration.ConfigStrings; -import io.github.sefiraat.equivalencytech.statics.Colours; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; +import io.github.sefiraat.equivalencytech.statics.Messages; import io.github.sefiraat.equivalencytech.statics.SkullTextures; import net.md_5.bungee.api.ChatColor; import org.bukkit.inventory.ItemStack; @@ -16,15 +16,16 @@ public class AlchemicalCoal { private final ItemStack item; + private final EquivalencyTech plugin; - public ItemStack getClone() { + public ItemStack getItemClone() { return item.clone(); } + public ItemStack getItem() { return item; } - private final EquivalencyTech plugin; public EquivalencyTech getPlugin() { return plugin; } @@ -37,7 +38,7 @@ public AlchemicalCoal(EquivalencyTech plugin) { item = SkullCreator. itemFromBase64(SkullTextures.ITEM_ALCHEMICAL_COAL); ItemMeta im = item.getItemMeta(); - im.setDisplayName(Colours.THEME_ITEM_NAME_GENERAL + c.getItemAlchemicalCoalName()); + im.setDisplayName(Messages.THEME_ITEM_NAME_GENERAL + c.getItemAlchemicalCoalName()); List lore = new ArrayList<>(); lore.add(""); lore.add(ChatColor.GRAY + c.getGeneralCraftingItem()); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/items/DarkMatter.java b/src/main/java/io/github/sefiraat/equivalencytech/items/DarkMatter.java index 73d8543..d0e4979 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/items/DarkMatter.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/items/DarkMatter.java @@ -3,8 +3,8 @@ import dev.dbassett.skullcreator.SkullCreator; import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.configuration.ConfigStrings; -import io.github.sefiraat.equivalencytech.statics.Colours; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; +import io.github.sefiraat.equivalencytech.statics.Messages; import io.github.sefiraat.equivalencytech.statics.SkullTextures; import net.md_5.bungee.api.ChatColor; import org.bukkit.inventory.ItemStack; @@ -16,15 +16,16 @@ public class DarkMatter { private final ItemStack item; + private final EquivalencyTech plugin; - public ItemStack getClone() { + public ItemStack getItemClone() { return item.clone(); } + public ItemStack getItem() { return item; } - private final EquivalencyTech plugin; public EquivalencyTech getPlugin() { return plugin; } @@ -37,7 +38,7 @@ public DarkMatter(EquivalencyTech plugin) { item = SkullCreator. itemFromBase64(SkullTextures.ITEM_DARK_MATTER); ItemMeta im = item.getItemMeta(); - im.setDisplayName(Colours.THEME_ITEM_NAME_GENERAL + c.getItemDarkMatterName()); + im.setDisplayName(Messages.THEME_ITEM_NAME_GENERAL + c.getItemDarkMatterName()); List lore = new ArrayList<>(); lore.add(""); lore.add(ChatColor.GRAY + c.getGeneralCraftingItem()); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/items/MobiusFuel.java b/src/main/java/io/github/sefiraat/equivalencytech/items/MobiusFuel.java index c297d4d..ebdfe41 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/items/MobiusFuel.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/items/MobiusFuel.java @@ -3,8 +3,8 @@ import dev.dbassett.skullcreator.SkullCreator; import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.configuration.ConfigStrings; -import io.github.sefiraat.equivalencytech.statics.Colours; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; +import io.github.sefiraat.equivalencytech.statics.Messages; import io.github.sefiraat.equivalencytech.statics.SkullTextures; import net.md_5.bungee.api.ChatColor; import org.bukkit.inventory.ItemStack; @@ -16,15 +16,16 @@ public class MobiusFuel { private final ItemStack item; + private final EquivalencyTech plugin; - public ItemStack getClone() { + public ItemStack getItemClone() { return item.clone(); } + public ItemStack getItem() { return item; } - private final EquivalencyTech plugin; public EquivalencyTech getPlugin() { return plugin; } @@ -37,7 +38,7 @@ public MobiusFuel(EquivalencyTech plugin) { item = SkullCreator. itemFromBase64(SkullTextures.ITEM_MOBIUS_FUEL); ItemMeta im = item.getItemMeta(); - im.setDisplayName(Colours.THEME_ITEM_NAME_GENERAL + c.getItemMobiusFuelName()); + im.setDisplayName(Messages.THEME_ITEM_NAME_GENERAL + c.getItemMobiusFuelName()); List lore = new ArrayList<>(); lore.add(""); lore.add(ChatColor.GRAY + c.getGeneralCraftingItem()); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/items/RedMatter.java b/src/main/java/io/github/sefiraat/equivalencytech/items/RedMatter.java index b7816b9..d00c51d 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/items/RedMatter.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/items/RedMatter.java @@ -3,8 +3,8 @@ import dev.dbassett.skullcreator.SkullCreator; import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.configuration.ConfigStrings; -import io.github.sefiraat.equivalencytech.statics.Colours; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; +import io.github.sefiraat.equivalencytech.statics.Messages; import io.github.sefiraat.equivalencytech.statics.SkullTextures; import net.md_5.bungee.api.ChatColor; import org.bukkit.inventory.ItemStack; @@ -16,15 +16,16 @@ public class RedMatter { private final ItemStack item; + private final EquivalencyTech plugin; - public ItemStack getClone() { + public ItemStack getItemClone() { return item.clone(); } + public ItemStack getItem() { return item; } - private final EquivalencyTech plugin; public EquivalencyTech getPlugin() { return plugin; } @@ -37,7 +38,7 @@ public RedMatter(EquivalencyTech plugin) { item = SkullCreator. itemFromBase64(SkullTextures.ITEM_RED_MATTER); ItemMeta im = item.getItemMeta(); - im.setDisplayName(Colours.THEME_ITEM_NAME_GENERAL + c.getItemRedMatterName()); + im.setDisplayName(Messages.THEME_ITEM_NAME_GENERAL + c.getItemRedMatterName()); List lore = new ArrayList<>(); lore.add(""); lore.add(ChatColor.GRAY + c.getGeneralCraftingItem()); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/items/TransmutationOrb.java b/src/main/java/io/github/sefiraat/equivalencytech/items/TransmutationOrb.java index e3ab953..ce46f28 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/items/TransmutationOrb.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/items/TransmutationOrb.java @@ -3,8 +3,8 @@ import dev.dbassett.skullcreator.SkullCreator; import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.configuration.ConfigStrings; -import io.github.sefiraat.equivalencytech.statics.Colours; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; +import io.github.sefiraat.equivalencytech.statics.Messages; import io.github.sefiraat.equivalencytech.statics.SkullTextures; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -15,15 +15,16 @@ public class TransmutationOrb { private final ItemStack item; + private final EquivalencyTech plugin; - public ItemStack getClone() { + public ItemStack getItemClone() { return item.clone(); } + public ItemStack getItem() { return item; } - private final EquivalencyTech plugin; public EquivalencyTech getPlugin() { return plugin; } @@ -36,13 +37,13 @@ public TransmutationOrb(EquivalencyTech plugin) { item = SkullCreator. itemFromBase64(SkullTextures.ITEM_TRANSMUTATION_ORB); ItemMeta im = item.getItemMeta(); - im.setDisplayName(Colours.THEME_EMC_PURPLE + c.getItemTransmutationOrbName()); + im.setDisplayName(Messages.THEME_EMC_PURPLE + c.getItemTransmutationOrbName()); List lore = new ArrayList<>(); for (String s : c.getItemTransmutationOrbLore()) { - lore.add(Colours.THEME_PASSIVE_GRAY + s); + lore.add(Messages.THEME_PASSIVE_GRAY + s); } lore.add(""); - lore.add(Colours.THEME_CLICK_INSTRUCTION + c.getItemRightClickToOpen()); + lore.add(Messages.THEME_CLICK_INSTRUCTION + c.getItemRightClickToOpen()); im.setLore(lore); item.setItemMeta(im); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java b/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java index e1fcc4e..66ca1c7 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java @@ -15,7 +15,7 @@ public class CraftListener implements Listener { - EquivalencyTech plugin; + private final EquivalencyTech plugin; public CraftListener(EquivalencyTech plugin) { this.plugin = plugin; @@ -46,19 +46,19 @@ public void onPreCraft(PrepareItemCraftEvent e) { if (contentlayer.equals(Recipes.recipeCoal2Check(plugin))) { player.sendMessage("coal2"); - e.getInventory().setResult(plugin.getEqItems().getMobiusFuel().getClone()); + e.getInventory().setResult(plugin.getEqItems().getMobiusFuel().getItemClone()); } else if (contentlayer.equals(Recipes.recipeCoal3Check(plugin))) { player.sendMessage("coal3"); - e.getInventory().setResult(plugin.getEqItems().getAeternalisFuel().getClone()); + e.getInventory().setResult(plugin.getEqItems().getAeternalisFuel().getItemClone()); } else if (contentlayer.equals(Recipes.recipeDarkMatterCheck(plugin))) { player.sendMessage("dark"); - e.getInventory().setResult(plugin.getEqItems().getDarkMatter().getClone()); + e.getInventory().setResult(plugin.getEqItems().getDarkMatter().getItemClone()); } else if (contentlayer.equals(Recipes.recipeRedMatterCheck(plugin))) { player.sendMessage("red"); - e.getInventory().setResult(plugin.getEqItems().getRedMatter().getClone()); + e.getInventory().setResult(plugin.getEqItems().getRedMatter().getItemClone()); } else if (contentlayer.equals(Recipes.recipeTransmutationOrbCheck(plugin))) { player.sendMessage("orb"); - e.getInventory().setResult(plugin.getEqItems().getTransmutationOrb().getClone()); + e.getInventory().setResult(plugin.getEqItems().getTransmutationOrb().getItemClone()); } else if (contentsEQ(contentlayer)) { e.getInventory().setResult(new ItemStack(Material.AIR)); } diff --git a/src/main/java/io/github/sefiraat/equivalencytech/listeners/OrbOpenListener.java b/src/main/java/io/github/sefiraat/equivalencytech/listeners/OrbOpenListener.java index a196278..3dbbba1 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/listeners/OrbOpenListener.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/listeners/OrbOpenListener.java @@ -15,7 +15,7 @@ public class OrbOpenListener implements Listener { - final EquivalencyTech plugin; + private final EquivalencyTech plugin; public OrbOpenListener(@Nonnull EquivalencyTech plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/misc/EQItems.java b/src/main/java/io/github/sefiraat/equivalencytech/misc/EQItems.java index 08aa1f2..c5c4808 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/misc/EQItems.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/misc/EQItems.java @@ -10,41 +10,42 @@ public class EQItems { private final EquivalencyTech plugin; + private final TransmutationOrb transmutationOrb; + private final AlchemicalCoal alchemicalCoal; + private final MobiusFuel mobiusFuel; + private final AeternalisFuel aeternalisFuel; + private final DarkMatter darkMatter; + private final RedMatter redMatter; + private final Map eqItemMap; + public EquivalencyTech getPlugin() { return plugin; } - private final TransmutationOrb transmutationOrb; public TransmutationOrb getTransmutationOrb() { return transmutationOrb; } - private final AlchemicalCoal alchemicalCoal; public AlchemicalCoal getAlchemicalCoal() { return alchemicalCoal; } - private final MobiusFuel mobiusFuel; public MobiusFuel getMobiusFuel() { return mobiusFuel; } - private final AeternalisFuel aeternalisFuel; public AeternalisFuel getAeternalisFuel() { return aeternalisFuel; } - private final DarkMatter darkMatter; public DarkMatter getDarkMatter() { return darkMatter; } - private final RedMatter redMatter; public RedMatter getRedMatter() { return redMatter; } - private final Map eqItemMap; public Map getEqItemMap() { return eqItemMap; } @@ -59,12 +60,12 @@ public EQItems(EquivalencyTech plugin) { redMatter = new RedMatter(plugin); eqItemMap = new HashMap<>(); - eqItemMap.put(transmutationOrb.getItem().getItemMeta().getDisplayName(), transmutationOrb.getClone()); - eqItemMap.put(alchemicalCoal.getItem().getItemMeta().getDisplayName(), alchemicalCoal.getClone()); - eqItemMap.put(mobiusFuel.getItem().getItemMeta().getDisplayName(), mobiusFuel.getClone()); - eqItemMap.put(aeternalisFuel.getItem().getItemMeta().getDisplayName(), aeternalisFuel.getClone()); - eqItemMap.put(darkMatter.getItem().getItemMeta().getDisplayName(), darkMatter.getClone()); - eqItemMap.put(redMatter.getItem().getItemMeta().getDisplayName(), redMatter.getClone()); + eqItemMap.put(transmutationOrb.getItem().getItemMeta().getDisplayName(), transmutationOrb.getItemClone()); + eqItemMap.put(alchemicalCoal.getItem().getItemMeta().getDisplayName(), alchemicalCoal.getItemClone()); + eqItemMap.put(mobiusFuel.getItem().getItemMeta().getDisplayName(), mobiusFuel.getItemClone()); + eqItemMap.put(aeternalisFuel.getItem().getItemMeta().getDisplayName(), aeternalisFuel.getItemClone()); + eqItemMap.put(darkMatter.getItem().getItemMeta().getDisplayName(), darkMatter.getItemClone()); + eqItemMap.put(redMatter.getItem().getItemMeta().getDisplayName(), redMatter.getItemClone()); } diff --git a/src/main/java/io/github/sefiraat/equivalencytech/misc/EmcDefinitions.java b/src/main/java/io/github/sefiraat/equivalencytech/misc/EmcDefinitions.java index 3ed0f1f..cbddc57 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/misc/EmcDefinitions.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/misc/EmcDefinitions.java @@ -2,7 +2,7 @@ import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; -import io.github.sefiraat.equivalencytech.statics.DebugLogging; +import io.github.sefiraat.equivalencytech.statics.DebugLogs; import io.github.sefiraat.equivalencytech.statics.Recipes; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -19,14 +19,17 @@ public class EmcDefinitions { private final Map emcBase = new EnumMap<> (Material.class); + private final Map emcExtended = new EnumMap<> (Material.class); + private final Map emcEQ = new HashMap<>(); + public Map getEmcBase() { return emcBase; } - private final Map emcExtended = new EnumMap<> (Material.class); + public Map getEmcExtended() { return emcExtended; } - private final Map emcEQ = new HashMap<>(); + public Map getEmcEQ() { return emcEQ; } @@ -43,12 +46,13 @@ private void fillBase(EquivalencyTech plugin) { for (Map.Entry entry : h.entrySet()) { if (entry.getValue() > 0) { emcBase.put(Material.matchMaterial(entry.getKey()), entry.getValue()); - DebugLogging.logEmcBaseValueLoaded(plugin, entry.getKey(), entry.getValue()); + DebugLogs.logEmcBaseValueLoaded(plugin, entry.getKey(), entry.getValue()); } } } private void fillSpecialCases() { + // Used to escape loops where the item isn't BASe but also has a reversing craft. emcExtended.put(Material.NETHERITE_INGOT, specialCaseNetheriteIngot()); emcExtended.put(Material.DRIED_KELP, specialCaseDriedKelp()); emcExtended.put(Material.BONE_MEAL, specialCaseBoneMeal()); @@ -70,10 +74,10 @@ private void fillExtended(EquivalencyTech plugin) { ItemStack i = new ItemStack(m); Double emcValue = getEmcValue(plugin, i, 1); if (emcValue != null) { - DebugLogging.logEmcPosted(plugin, emcValue, 1); + DebugLogs.logEmcPosted(plugin, emcValue, 1); emcExtended.put(i.getType(), roundDown(emcValue,2)); } else { - DebugLogging.logEmcNull(plugin, 1); + DebugLogs.logEmcNull(plugin, 1); } } } @@ -82,7 +86,7 @@ private void fillExtended(EquivalencyTech plugin) { private void fillEQItems(EquivalencyTech plugin) { for (Map.Entry, ItemStack> recipeMap : Recipes.getEQRecipes(plugin).entrySet()) { ItemStack checkedItem = recipeMap.getValue(); - DebugLogging.logBoring(plugin, checkedItem.getItemMeta().getDisplayName()); + DebugLogs.logBoring(plugin, checkedItem.getItemMeta().getDisplayName()); Double itemAmount = 0D; for (ItemStack recipeItem : recipeMap.getKey()) { Double testAmount = getEQEmcValue(plugin, recipeItem, 1); @@ -90,7 +94,7 @@ private void fillEQItems(EquivalencyTech plugin) { itemAmount += testAmount; } } - DebugLogging.logBoring(plugin, checkedItem.getItemMeta().getDisplayName() + " added to EQ for : " + itemAmount); + DebugLogs.logBoring(plugin, checkedItem.getItemMeta().getDisplayName() + " added to EQ for : " + itemAmount); emcEQ.put(checkedItem.getItemMeta().getDisplayName(), roundDown(itemAmount,2)); } } @@ -98,13 +102,13 @@ private void fillEQItems(EquivalencyTech plugin) { @Nullable private Double getEQEmcValue(EquivalencyTech plugin, ItemStack itemStack, Integer nestLevel) { if (itemStack != null) { - DebugLogging.logEQStart(plugin, nestLevel, itemStack); + DebugLogs.logEQStart(plugin, nestLevel, itemStack); if (ContainerStorage.isCrafting(itemStack, plugin)) { double amount = 0D; - DebugLogging.logEQisCrafting(plugin, nestLevel); + DebugLogs.logEQisCrafting(plugin, nestLevel); if (emcEQ.containsKey(itemStack.getItemMeta().getDisplayName())) { amount = getEmcEQ().get(itemStack.getItemMeta().getDisplayName()); - DebugLogging.logEmcIsRegisteredExtended(plugin, amount, nestLevel); + DebugLogs.logEmcIsRegisteredExtended(plugin, amount, nestLevel); } else { List itemStacks = Recipes.getEQRecipe(plugin, itemStack); for (ItemStack itemStack1 : itemStacks) { @@ -113,7 +117,7 @@ private Double getEQEmcValue(EquivalencyTech plugin, ItemStack itemStack, Intege if (stackAmount != null) { amount += stackAmount; } else { - DebugLogging.logEmcNull(plugin, nestLevel); + DebugLogs.logEmcNull(plugin, nestLevel); return null; } } @@ -121,7 +125,7 @@ private Double getEQEmcValue(EquivalencyTech plugin, ItemStack itemStack, Intege } return amount; } else { - DebugLogging.logEQisNotCrafting(plugin, nestLevel); + DebugLogs.logEQisNotCrafting(plugin, nestLevel); return getEmcValue(plugin, itemStack, nestLevel + 1); } } else { @@ -134,35 +138,37 @@ private Double getEmcValue(EquivalencyTech plugin, ItemStack i, Integer nestLeve List recipeList = Bukkit.getServer().getRecipesFor(i); Material m = i.getType(); Double eVal = 0D; - DebugLogging.logEmcTestingItemStack(plugin, i.getType().name(), nestLevel); + DebugLogs.logEmcTestingItemStack(plugin, i.getType().name(), nestLevel); if (emcBase.containsKey(m)) { - eVal = emcBase.get(m); - DebugLogging.logEmcIsBase(plugin, eVal, nestLevel); + // Item is in the base list (config.yml) draw from there first + DebugLogs.logEmcIsBase(plugin, eVal, nestLevel); + return emcBase.get(m); } else if (emcExtended.containsKey(m)) { - eVal = emcExtended.get(m); - DebugLogging.logEmcIsRegisteredExtended(plugin, eVal, nestLevel); + // Item is in the extended list (already registered during fillExtended) + DebugLogs.logEmcIsRegisteredExtended(plugin, eVal, nestLevel); + return emcExtended.get(m); } else if (recipeList.isEmpty()) { - DebugLogging.logEmcNoRecipes(plugin, nestLevel); + // Recipe is not in Base and has no recipes, so it cannot be EMC'd + DebugLogs.logEmcNoRecipes(plugin, nestLevel); return null; } else { - + // Item not yet registered but DOES have valid recipes, lets check them out! for (Recipe r : Bukkit.getServer().getRecipesFor(i)) { Double tempVal = checkRecipe(plugin, r,nestLevel + 1); if (tempVal != null && (eVal.equals(0D) || tempVal < eVal)) { - DebugLogging.logRecipeCheaper(plugin, nestLevel); + DebugLogs.logRecipeCheaper(plugin, nestLevel); eVal = tempVal; } else if (tempVal != null) { - DebugLogging.logRecipeNotCheaper(plugin, nestLevel); + DebugLogs.logRecipeNotCheaper(plugin, nestLevel); } } - } - DebugLogging.logEmcRecipeResult(plugin, eVal, nestLevel); + DebugLogs.logEmcRecipeResult(plugin, eVal, nestLevel); return eVal; } private Double roundDown(Double value, int places) { - BigDecimal decimal = new BigDecimal(value); + BigDecimal decimal = BigDecimal.valueOf(value); decimal = decimal.setScale(places, RoundingMode.DOWN); return decimal.doubleValue(); } @@ -172,42 +178,38 @@ private Double checkRecipe(EquivalencyTech plugin, Recipe recipe, Integer nestLe double eVal = 0D; - DebugLogging.logCheckingRecipe(plugin, nestLevel); + DebugLogs.logCheckingRecipe(plugin, nestLevel); if (recipe instanceof ShapedRecipe) { - - DebugLogging.logRecipeType(plugin, "Shaped", nestLevel); - ShapedRecipe r = (ShapedRecipe) recipe; - for (ItemStack i2 : r.getIngredientMap().values()) { - if (i2 != null) { - Double prVal = 0D; - if (!i2.getType().equals(Material.AIR)) { - prVal = getEmcValue(plugin, i2, nestLevel + 1); - } - if (prVal != null) { - if (r.getResult().getAmount() > 1) { - DebugLogging.logRecipeMultipleOutputs(plugin, prVal, r.getResult().getAmount(), nestLevel); - eVal = eVal + (prVal / r.getResult().getAmount()); - } else { - eVal = eVal + prVal; - } - } else { - return null; - } - } - } - + ShapedRecipe shapedRecipe = (ShapedRecipe) recipe; + return checkShaped(plugin, shapedRecipe, nestLevel); } else if (recipe instanceof ShapelessRecipe) { + ShapelessRecipe shapelessRecipe = (ShapelessRecipe) recipe; + return checkShapeless(plugin, shapelessRecipe, nestLevel); + } else if (recipe instanceof FurnaceRecipe) { + FurnaceRecipe furnaceRecipe = (FurnaceRecipe) recipe; + return checkFurnace(plugin, furnaceRecipe, nestLevel); + } else if (recipe instanceof StonecuttingRecipe) { + StonecuttingRecipe stonecuttingRecipe = (StonecuttingRecipe) recipe; + return checkStoneCutter(plugin, stonecuttingRecipe, nestLevel); + } + + return eVal; + } - DebugLogging.logRecipeType(plugin, "Shapeless", nestLevel); - ShapelessRecipe r = (ShapelessRecipe) recipe; - for (ItemStack i2 : r.getIngredientList()) { - Double prVal; - prVal = getEmcValue(plugin, i2, nestLevel + 1); + private Double checkShaped(EquivalencyTech plugin, ShapedRecipe recipe, int nestLevel) { + DebugLogs.logRecipeType(plugin, "Shaped", nestLevel); + Double eVal= 0D; + for (ItemStack i2 : recipe.getIngredientMap().values()) { + if (i2 != null) { + Double prVal = 0D; + if (!i2.getType().equals(Material.AIR)) { + prVal = getEmcValue(plugin, i2, nestLevel + 1); + } if (prVal != null) { - if (r.getResult().getAmount() > 1) { - DebugLogging.logRecipeMultipleOutputs(plugin, prVal, r.getResult().getAmount(), nestLevel); - eVal = eVal + (prVal / r.getResult().getAmount()); + if (recipe.getResult().getAmount() > 1) { + DebugLogs.logRecipeMultipleOutputs(plugin, prVal, recipe.getResult().getAmount(), nestLevel); + eVal = eVal + (prVal / recipe.getResult().getAmount()); } else { eVal = eVal + prVal; } @@ -215,42 +217,60 @@ private Double checkRecipe(EquivalencyTech plugin, Recipe recipe, Integer nestLe return null; } } + } + return eVal; + } - } else if (recipe instanceof FurnaceRecipe) { - - DebugLogging.logRecipeType(plugin, "Furnace", nestLevel); - FurnaceRecipe r = (FurnaceRecipe) recipe; + private Double checkShapeless(EquivalencyTech plugin, ShapelessRecipe recipe, int nestLevel) { + DebugLogs.logRecipeType(plugin, "Shapeless", nestLevel); + Double eVal = 0D; + for (ItemStack i2 : recipe.getIngredientList()) { Double prVal; - prVal = getEmcValue(plugin, r.getInput(), nestLevel + 1); + prVal = getEmcValue(plugin, i2, nestLevel + 1); if (prVal != null) { - if (r.getResult().getAmount() > 1) { - DebugLogging.logRecipeMultipleOutputs(plugin, prVal, r.getResult().getAmount(), nestLevel); - return prVal / r.getResult().getAmount(); + if (recipe.getResult().getAmount() > 1) { + DebugLogs.logRecipeMultipleOutputs(plugin, prVal, recipe.getResult().getAmount(), nestLevel); + eVal = eVal + (prVal / recipe.getResult().getAmount()); } else { - return prVal; + eVal = eVal + prVal; } } else { return null; } - } else if (recipe instanceof StonecuttingRecipe) { + } + return eVal; + } - DebugLogging.logRecipeType(plugin, "Stonecutting", nestLevel); - StonecuttingRecipe r = (StonecuttingRecipe) recipe; - Double prVal; - prVal = getEmcValue(plugin, r.getInput(), nestLevel + 1); - if (prVal != null) { - if (r.getResult().getAmount() > 1) { - DebugLogging.logRecipeMultipleOutputs(plugin, prVal, r.getResult().getAmount(), nestLevel); - return prVal / r.getResult().getAmount(); - } else { - return prVal; - } + private Double checkFurnace(EquivalencyTech plugin, FurnaceRecipe recipe, int nestLevel) { + DebugLogs.logRecipeType(plugin, "Furnace", nestLevel); + Double prVal; + prVal = getEmcValue(plugin, recipe.getInput(), nestLevel + 1); + if (prVal != null) { + if (recipe.getResult().getAmount() > 1) { + DebugLogs.logRecipeMultipleOutputs(plugin, prVal, recipe.getResult().getAmount(), nestLevel); + return prVal / recipe.getResult().getAmount(); } else { - return null; + return prVal; } + } else { + return null; } + } - return eVal; + private Double checkStoneCutter(EquivalencyTech plugin, StonecuttingRecipe recipe, int nestLevel) { + DebugLogs.logRecipeType(plugin, "Stonecutting", nestLevel); + Double prVal; + prVal = getEmcValue(plugin, recipe.getInput(), nestLevel + 1); + if (prVal != null) { + if (recipe.getResult().getAmount() > 1) { + DebugLogs.logRecipeMultipleOutputs(plugin, prVal, recipe.getResult().getAmount(), nestLevel); + return prVal / recipe.getResult().getAmount(); + } else { + return prVal; + } + } else { + return null; + } } @Nullable diff --git a/src/main/java/io/github/sefiraat/equivalencytech/misc/SlimefunEQAddon.java b/src/main/java/io/github/sefiraat/equivalencytech/misc/SlimefunEQAddon.java index a93fc7a..f188edd 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/misc/SlimefunEQAddon.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/misc/SlimefunEQAddon.java @@ -41,27 +41,27 @@ public SlimefunEQAddon(EquivalencyTech plugin) { // Items // Coal 1 - SlimefunItemStack coal1Stack = new SlimefunItemStack( "EQ_COAL_1", plugin.getEqItems().getAlchemicalCoal().getClone()); + SlimefunItemStack coal1Stack = new SlimefunItemStack( "EQ_COAL_1", plugin.getEqItems().getAlchemicalCoal().getItemClone()); SlimefunItem coal1Item = new EQSlimefunItem(eqCategory, coal1Stack, new RecipeType(MinecraftRecipe.SHAPED_CRAFTING), Recipes.getSFRecipeCoal1()); coal1Item.register(this); // Coal 2 - SlimefunItemStack coal2Stack = new SlimefunItemStack( "EQ_COAL_2", plugin.getEqItems().getMobiusFuel().getClone()); + SlimefunItemStack coal2Stack = new SlimefunItemStack( "EQ_COAL_2", plugin.getEqItems().getMobiusFuel().getItemClone()); SlimefunItem coal2Item = new EQSlimefunItem(eqCategory, coal2Stack, new RecipeType(MinecraftRecipe.SHAPED_CRAFTING), Recipes.getSFRecipeCoal2(coal1Stack)); coal2Item.register(this); // Coal 3 - SlimefunItemStack coal3Stack = new SlimefunItemStack( "EQ_COAL_3", plugin.getEqItems().getAeternalisFuel().getClone()); + SlimefunItemStack coal3Stack = new SlimefunItemStack( "EQ_COAL_3", plugin.getEqItems().getAeternalisFuel().getItemClone()); SlimefunItem coal3Item = new EQSlimefunItem(eqCategory, coal3Stack, new RecipeType(MinecraftRecipe.SHAPED_CRAFTING), Recipes.getSFRecipeCoal3(coal2Stack)); coal3Item.register(this); // Dark Matter - SlimefunItemStack darkStack = new SlimefunItemStack( "EQ_DARK_MATTER", plugin.getEqItems().getDarkMatter().getClone()); + SlimefunItemStack darkStack = new SlimefunItemStack( "EQ_DARK_MATTER", plugin.getEqItems().getDarkMatter().getItemClone()); SlimefunItem darkItem = new EQSlimefunItem(eqCategory, darkStack, new RecipeType(MinecraftRecipe.SHAPED_CRAFTING), Recipes.getSFRecipeDarkMatter(coal3Stack)); darkItem.register(this); // Red Matter - SlimefunItemStack redStack = new SlimefunItemStack( "EQ_RED_MATTER", plugin.getEqItems().getRedMatter().getClone()); + SlimefunItemStack redStack = new SlimefunItemStack( "EQ_RED_MATTER", plugin.getEqItems().getRedMatter().getItemClone()); SlimefunItem redItem = new EQSlimefunItem(eqCategory, redStack, new RecipeType(MinecraftRecipe.SHAPED_CRAFTING), Recipes.getSFRecipeRedMatter(coal3Stack, darkStack)); redItem.register(this); // Transmutation Orb - SlimefunItemStack orbStack = new SlimefunItemStack( "EQ_T_ORB", plugin.getEqItems().getTransmutationOrb().getClone()); + SlimefunItemStack orbStack = new SlimefunItemStack( "EQ_T_ORB", plugin.getEqItems().getTransmutationOrb().getItemClone()); SlimefunItem orbItem = new EQSlimefunItem(eqCategory, orbStack, new RecipeType(MinecraftRecipe.SHAPED_CRAFTING), Recipes.getSFRecipeTransmutationOrb(darkStack, redStack)); orbItem.register(this); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java b/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java index 5e03683..25b23c4 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java @@ -34,12 +34,12 @@ public static String materialFriendlyName(Material m) { } public static void givePlayerOrb(EquivalencyTech plugin, Player player) { - player.getPlayer().getInventory().addItem(plugin.getEqItems().getTransmutationOrb().getClone()); + player.getPlayer().getInventory().addItem(plugin.getEqItems().getTransmutationOrb().getItemClone()); player.getPlayer().sendMessage(Messages.messageCommandOrbGiven(plugin)); } public static double roundDown(double number, int places) { - BigDecimal value = new BigDecimal(number); + BigDecimal value = BigDecimal.valueOf(number); value = value.setScale(places, RoundingMode.DOWN); return value.doubleValue(); } diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/Colours.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/Colours.java deleted file mode 100644 index 7c83723..0000000 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/Colours.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.github.sefiraat.equivalencytech.statics; - -import net.md_5.bungee.api.ChatColor; - -public final class Colours { - - private Colours() { - throw new IllegalStateException("Utility class"); - } - - public static final ChatColor THEME_EMC_PURPLE = ChatColor.of("#5d2999"); - public static final ChatColor THEME_ITEM_NAME_GENERAL = ChatColor.of("#cfab1d"); - public static final ChatColor THEME_PASSIVE_GRAY = ChatColor.of("#a3a3a3"); - - public static final ChatColor THEME_CLICK_INSTRUCTION = ChatColor.of("#cfab1d"); - - public static final ChatColor THEME_PASSIVE_CONGRATULATE = ChatColor.of("#fff41f"); - -} diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/Config.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/Config.java index 3e82689..8c8bd17 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/Config.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/statics/Config.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; -public class Config { +public final class Config { private Config() { throw new IllegalStateException("Utility class"); @@ -19,6 +19,11 @@ public static void addLearnedItem(EquivalencyTech plugin, Player player, String c.set(player.getUniqueId().toString() + "." + itemName, true); } + public static void removeLearnedItem(EquivalencyTech plugin, Player player, String itemName) { + FileConfiguration c = plugin.getLearnedItemsConfig(); + c.set(player.getUniqueId().toString() + "." + itemName, null); + } + public static List getLearnedItems(EquivalencyTech plugin, Player player) { FileConfiguration c = plugin.getLearnedItemsConfig(); List list = new ArrayList<>(); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/Constants.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/Constants.java deleted file mode 100644 index e25de01..0000000 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/Constants.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.github.sefiraat.equivalencytech.statics; - -public class Constants { - - private Constants() { - throw new IllegalStateException("Utility class"); - } - - public static final String CS_IS_TRANSMUTATION_ORB = "is_orb"; - public static final String CS_IS_CRAFTING = "is_craft"; - public static final String CS_IS_COAL_1 = "is_coal_1"; - public static final String CS_IS_COAL_2 = "is_coal_2"; - public static final String CS_IS_COAL_3 = "is_coal_3"; - public static final String CS_IS_DRK = "is_drk"; - public static final String CS_IS_RED = "is_red"; -} diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/ContainerStorage.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/ContainerStorage.java index c7c531a..47d3259 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/ContainerStorage.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/statics/ContainerStorage.java @@ -9,7 +9,15 @@ import java.util.Objects; -public class ContainerStorage { +public final class ContainerStorage { + + public static final String CS_IS_TRANSMUTATION_ORB = "is_orb"; + public static final String CS_IS_CRAFTING = "is_craft"; + public static final String CS_IS_COAL_1 = "is_coal_1"; + public static final String CS_IS_COAL_2 = "is_coal_2"; + public static final String CS_IS_COAL_3 = "is_coal_3"; + public static final String CS_IS_DRK = "is_drk"; + public static final String CS_IS_RED = "is_red"; private ContainerStorage() { throw new IllegalStateException("Utility class"); @@ -87,72 +95,72 @@ public static void removeData(ItemStack i, NamespacedKey key) { } public static boolean isTransmutationOrb(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_TRANSMUTATION_ORB); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_TRANSMUTATION_ORB); return containerHasData(i, key, PersistentDataType.INTEGER); } public static void makeTransmutationOrb(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_TRANSMUTATION_ORB); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_TRANSMUTATION_ORB); setData(i, key, 1); } public static boolean isCrafting(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_CRAFTING); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_CRAFTING); return containerHasData(i, key, PersistentDataType.INTEGER); } public static void makeCrafting(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_CRAFTING); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_CRAFTING); setData(i, key, 1); } public static boolean isAlchemicalCoal(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_COAL_1); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_COAL_1); return containerHasData(i, key, PersistentDataType.INTEGER); } public static void makeAlchemicalCoal(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_COAL_1); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_COAL_1); setData(i, key, 1); } public static boolean isMobiusFuel(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_COAL_2); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_COAL_2); return containerHasData(i, key, PersistentDataType.INTEGER); } public static void makeMobiusFuel(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_COAL_2); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_COAL_2); setData(i, key, 1); } public static boolean isAeternalisFuel(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_COAL_3); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_COAL_3); return containerHasData(i, key, PersistentDataType.INTEGER); } public static void makeAeternalisFuel(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_COAL_3); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_COAL_3); setData(i, key, 1); } public static boolean isDarkMatter(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_DRK); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_DRK); return containerHasData(i, key, PersistentDataType.INTEGER); } public static void makeDarkMatter(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_DRK); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_DRK); setData(i, key, 1); } public static boolean isRedMatter(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_RED); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_RED); return containerHasData(i, key, PersistentDataType.INTEGER); } public static void makeRedMatter(ItemStack i, EquivalencyTech plugin) { - NamespacedKey key = new NamespacedKey(plugin.getInstance(), Constants.CS_IS_RED); + NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_RED); setData(i, key, 1); } } \ No newline at end of file diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/DebugLogging.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/DebugLogs.java similarity index 98% rename from src/main/java/io/github/sefiraat/equivalencytech/statics/DebugLogging.java rename to src/main/java/io/github/sefiraat/equivalencytech/statics/DebugLogs.java index 4f0457a..edae25f 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/DebugLogging.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/statics/DebugLogs.java @@ -5,9 +5,9 @@ import java.util.logging.Level; -public class DebugLogging { +public final class DebugLogs { - private DebugLogging() { + private DebugLogs() { throw new IllegalStateException("Utility class"); } diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/Messages.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/Messages.java index e09bfa0..770ccbc 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/Messages.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/statics/Messages.java @@ -8,80 +8,82 @@ public final class Messages { - private Messages() { - throw new IllegalStateException("Utility class"); - } - - // General public static final String PREFIX = "" + ChatColor.GRAY + "[EMCTech] "; public static final String SUFFIX = "" + ChatColor.GRAY + ""; - public static final String WARNING = "" + ChatColor.YELLOW; - public static final String ERROR = "" + ChatColor.RED; - public static final String NOTICE = "" + ChatColor.WHITE; - public static final String PASSIVE = "" + ChatColor.GRAY; - public static final String SUCCESS = "" + ChatColor.GREEN; + public static final ChatColor THEME_WARNING = ChatColor.YELLOW; + public static final ChatColor THEME_ERROR = ChatColor.RED; + public static final ChatColor THEME_NOTICE = ChatColor.WHITE; + public static final ChatColor THEME_PASSIVE = ChatColor.GRAY; + public static final ChatColor THEME_SUCCESS = ChatColor.GREEN; + public static final ChatColor THEME_EMC_PURPLE = ChatColor.of("#5d2999"); + public static final ChatColor THEME_ITEM_NAME_GENERAL = ChatColor.of("#cfab1d"); + public static final ChatColor THEME_PASSIVE_GRAY = ChatColor.of("#a3a3a3"); + public static final ChatColor THEME_CLICK_INSTRUCTION = ChatColor.of("#cfab1d"); + public static final ChatColor THEME_PASSIVE_CONGRATULATE = ChatColor.of("#fff41f"); - public static final String ID = " - ID: "; + private Messages() { + throw new IllegalStateException("Utility class"); + } // Commands public static String msgCmdSubcommand(EquivalencyTech plugin) { - return PREFIX + NOTICE + plugin.getConfigClass().getStrings().getCommandSubcommand(); + return PREFIX + THEME_NOTICE + plugin.getConfigClass().getStrings().getCommandSubcommand(); } public static String msgCmdEmcMustHold(EquivalencyTech plugin) { - return PREFIX + WARNING + plugin.getConfigClass().getStrings().getCommandEmcMustHold(); + return PREFIX + THEME_WARNING + plugin.getConfigClass().getStrings().getCommandEmcMustHold(); } public static String msgCmdEmcNone(EquivalencyTech plugin) { - return PREFIX + WARNING + plugin.getConfigClass().getStrings().getCommandEmcNone(); + return PREFIX + THEME_WARNING + plugin.getConfigClass().getStrings().getCommandEmcNone(); } public static String msgCmdEmcDisplay(Material m, Double emc) { - return PREFIX + WARNING + Utils.materialFriendlyName(m) + " x 1 = EMC " + emc; + return PREFIX + THEME_WARNING + Utils.materialFriendlyName(m) + " x 1 = EMC " + emc; } public static String msgCmdEmcDisplay(String s, Double emc) { - return PREFIX + WARNING + s + " x 1 = EMC " + emc; + return PREFIX + THEME_WARNING + s + " x 1 = EMC " + emc; } public static String msgCmdEmcDisplayStack(Material m, Integer amount, Double emc) { - return PREFIX + WARNING + Utils.materialFriendlyName(m) + " x " + amount + " = EMC " + emc; + return PREFIX + THEME_WARNING + Utils.materialFriendlyName(m) + " x " + amount + " = EMC " + emc; } public static String msgCmdEmcDisplayStack(String s, Integer amount, Double emc) { - return PREFIX + WARNING + s + " x " + amount + " = EMC " + emc; + return PREFIX + THEME_WARNING + s + " x " + amount + " = EMC " + emc; } public static String messageCommandSelectItem(EquivalencyTech plugin) { - return PREFIX + NOTICE + plugin.getConfigClass().getStrings().getCommandSelectItem(); + return PREFIX + THEME_NOTICE + plugin.getConfigClass().getStrings().getCommandSelectItem(); } public static String messageCommandOrbGiven(EquivalencyTech plugin) { - return PREFIX + NOTICE + plugin.getConfigClass().getStrings().getCommandOrbGiven(); + return PREFIX + THEME_NOTICE + plugin.getConfigClass().getStrings().getCommandOrbGiven(); } public static String messageCommandEmc(EquivalencyTech plugin, Player player) { - return PREFIX + NOTICE + "You have " + SUCCESS + Config.getPlayerEmc(plugin, player) + NOTICE + " EMC."; + return PREFIX + THEME_NOTICE + "You have " + THEME_SUCCESS + Config.getPlayerEmc(plugin, player) + THEME_NOTICE + " EMC."; } // GUI public static String messageGuiItemLearned(EquivalencyTech plugin) { - return PREFIX + Colours.THEME_PASSIVE_CONGRATULATE + plugin.getConfigClass().getStrings().getGuiItemLearned(); + return PREFIX + THEME_PASSIVE_CONGRATULATE + plugin.getConfigClass().getStrings().getGuiItemLearned(); } public static String messageGuiEmcGiven(EquivalencyTech plugin, Player player, double emcBase, double emcTotal, int itemAmt, int burnRate) { - return PREFIX + SUCCESS + "+" + emcTotal + " EMC " + PASSIVE + "(" + emcBase + " * " + itemAmt + ")" + ERROR + " burn rate = " + burnRate + "%" + NOTICE+ " : [EMC : " + Config.getPlayerEmc(plugin, player) + "]"; + return PREFIX + THEME_SUCCESS + "+" + emcTotal + " EMC " + THEME_PASSIVE + "(" + emcBase + " * " + itemAmt + ")" + THEME_ERROR + " burn rate = " + burnRate + "%" + THEME_NOTICE + " : [EMC : " + Config.getPlayerEmc(plugin, player) + "]"; } public static String messageGuiEmcRemoved(EquivalencyTech plugin, Player player, double emcBase, double emcTotal, int itemAmt) { - return PREFIX + ERROR + "-" + emcTotal + " EMC " + PASSIVE + "(" + emcBase + " * " + itemAmt + ") : " + NOTICE + " [EMC : " + Config.getPlayerEmc(plugin, player) + "]"; + return PREFIX + THEME_ERROR + "-" + emcTotal + " EMC " + THEME_PASSIVE + "(" + emcBase + " * " + itemAmt + ") : " + THEME_NOTICE + " [EMC : " + Config.getPlayerEmc(plugin, player) + "]"; } public static String messageGuiEmcNotEnough(EquivalencyTech plugin, Player player) { - return PREFIX + ERROR + plugin.getConfigClass().getStrings().getGuiNotEnoughEmc() + NOTICE + " [EMC : " + Config.getPlayerEmc(plugin, player) + "]"; + return PREFIX + THEME_ERROR + plugin.getConfigClass().getStrings().getGuiNotEnoughEmc() + THEME_NOTICE + " [EMC : " + Config.getPlayerEmc(plugin, player) + "]"; } public static String messageGuiNoSpace(EquivalencyTech plugin) { - return PREFIX + ERROR + plugin.getConfigClass().getStrings().getGeneralNoInvSpace(); + return PREFIX + THEME_ERROR + plugin.getConfigClass().getStrings().getGeneralNoInvSpace(); } public static String messageGuiItemMeta(EquivalencyTech plugin) { - return PREFIX + ERROR + plugin.getConfigClass().getStrings().getGuiItemMeta(); + return PREFIX + THEME_ERROR + plugin.getConfigClass().getStrings().getGuiItemMeta(); } } diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/Recipes.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/Recipes.java index 29ff262..894459b 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/Recipes.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/statics/Recipes.java @@ -13,14 +13,14 @@ import java.util.List; import java.util.Map; -public class Recipes { +public final class Recipes { private Recipes() { throw new IllegalStateException("Utility class"); } public static Recipe recipeCoal1(EquivalencyTech plugin) { - ItemStack i = plugin.getEqItems().getAlchemicalCoal().getClone(); + ItemStack i = plugin.getEqItems().getAlchemicalCoal().getItemClone(); NamespacedKey key = new NamespacedKey(plugin, "coal1"); ShapedRecipe r = new ShapedRecipe(key, i); r.shape("NNN","NN "," "); @@ -43,7 +43,7 @@ public static List recipeCoal1Check() { } public static Recipe recipeCoal2(EquivalencyTech plugin) { - ItemStack i = plugin.getEqItems().getMobiusFuel().getClone(); + ItemStack i = plugin.getEqItems().getMobiusFuel().getItemClone(); NamespacedKey key = new NamespacedKey(plugin, "coal2"); ShapedRecipe r = new ShapedRecipe(key, i); r.shape("NNN","NN "," "); @@ -53,11 +53,11 @@ public static Recipe recipeCoal2(EquivalencyTech plugin) { public static List recipeCoal2Check(EquivalencyTech plugin) { List itemStacks = new ArrayList<>(); - itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getClone()); - itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getClone()); - itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getClone()); - itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getClone()); - itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getClone()); + itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getItemClone()); + itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getItemClone()); + itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getItemClone()); + itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getItemClone()); + itemStacks.add(plugin.getEqItems().getAlchemicalCoal().getItemClone()); itemStacks.add(null); itemStacks.add(null); itemStacks.add(null); @@ -66,7 +66,7 @@ public static List recipeCoal2Check(EquivalencyTech plugin) { } public static Recipe recipeCoal3(EquivalencyTech plugin) { - ItemStack i = plugin.getEqItems().getAeternalisFuel().getClone(); + ItemStack i = plugin.getEqItems().getAeternalisFuel().getItemClone(); NamespacedKey key = new NamespacedKey(plugin, "coal3"); ShapedRecipe r = new ShapedRecipe(key, i); r.shape("NNN","NN "," "); @@ -76,11 +76,11 @@ public static Recipe recipeCoal3(EquivalencyTech plugin) { public static List recipeCoal3Check(EquivalencyTech plugin) { List itemStacks = new ArrayList<>(); - itemStacks.add(plugin.getEqItems().getMobiusFuel().getClone()); - itemStacks.add(plugin.getEqItems().getMobiusFuel().getClone()); - itemStacks.add(plugin.getEqItems().getMobiusFuel().getClone()); - itemStacks.add(plugin.getEqItems().getMobiusFuel().getClone()); - itemStacks.add(plugin.getEqItems().getMobiusFuel().getClone()); + itemStacks.add(plugin.getEqItems().getMobiusFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getMobiusFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getMobiusFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getMobiusFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getMobiusFuel().getItemClone()); itemStacks.add(null); itemStacks.add(null); itemStacks.add(null); @@ -90,7 +90,7 @@ public static List recipeCoal3Check(EquivalencyTech plugin) { public static Recipe recipeDarkMatter(EquivalencyTech plugin) { - ItemStack i = plugin.getEqItems().getDarkMatter().getClone(); + ItemStack i = plugin.getEqItems().getDarkMatter().getItemClone(); NamespacedKey key = new NamespacedKey(plugin, "darkmatter"); ShapedRecipe r = new ShapedRecipe(key, i); r.shape("NNN","NEN","NNN"); @@ -101,20 +101,20 @@ public static Recipe recipeDarkMatter(EquivalencyTech plugin) { public static List recipeDarkMatterCheck(EquivalencyTech plugin) { List itemStacks = new ArrayList<>(); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); itemStacks.add(new ItemStack(Material.NETHERITE_BLOCK)); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); return itemStacks; } public static Recipe recipeRedMatter(EquivalencyTech plugin) { - ItemStack i = plugin.getEqItems().getDarkMatter().getClone(); + ItemStack i = plugin.getEqItems().getDarkMatter().getItemClone(); NamespacedKey key = new NamespacedKey(plugin, "redmatter"); ShapedRecipe r = new ShapedRecipe(key, i); r.shape("NNN","EEE","NNN"); @@ -125,20 +125,20 @@ public static Recipe recipeRedMatter(EquivalencyTech plugin) { public static List recipeRedMatterCheck(EquivalencyTech plugin) { List itemStacks = new ArrayList<>(); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getDarkMatter().getClone()); - itemStacks.add(plugin.getEqItems().getDarkMatter().getClone()); - itemStacks.add(plugin.getEqItems().getDarkMatter().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); - itemStacks.add(plugin.getEqItems().getAeternalisFuel().getClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getDarkMatter().getItemClone()); + itemStacks.add(plugin.getEqItems().getDarkMatter().getItemClone()); + itemStacks.add(plugin.getEqItems().getDarkMatter().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); + itemStacks.add(plugin.getEqItems().getAeternalisFuel().getItemClone()); return itemStacks; } public static Recipe recipeTransmutationOrb(EquivalencyTech plugin) { - ItemStack i = plugin.getEqItems().getDarkMatter().getClone(); + ItemStack i = plugin.getEqItems().getDarkMatter().getItemClone(); NamespacedKey key = new NamespacedKey(plugin, "t_orb"); ShapedRecipe r = new ShapedRecipe(key, i); r.shape("BDB","DRD","BDB"); @@ -151,13 +151,13 @@ public static Recipe recipeTransmutationOrb(EquivalencyTech plugin) { public static List recipeTransmutationOrbCheck(EquivalencyTech plugin) { List itemStacks = new ArrayList<>(); itemStacks.add(new ItemStack(Material.DIAMOND_BLOCK)); - itemStacks.add(plugin.getEqItems().getDarkMatter().getClone()); + itemStacks.add(plugin.getEqItems().getDarkMatter().getItemClone()); itemStacks.add(new ItemStack(Material.DIAMOND_BLOCK)); - itemStacks.add(plugin.getEqItems().getDarkMatter().getClone()); - itemStacks.add(plugin.getEqItems().getRedMatter().getClone()); - itemStacks.add(plugin.getEqItems().getDarkMatter().getClone()); + itemStacks.add(plugin.getEqItems().getDarkMatter().getItemClone()); + itemStacks.add(plugin.getEqItems().getRedMatter().getItemClone()); + itemStacks.add(plugin.getEqItems().getDarkMatter().getItemClone()); itemStacks.add(new ItemStack(Material.DIAMOND_BLOCK)); - itemStacks.add(plugin.getEqItems().getDarkMatter().getClone()); + itemStacks.add(plugin.getEqItems().getDarkMatter().getItemClone()); itemStacks.add(new ItemStack(Material.DIAMOND_BLOCK)); return itemStacks; } @@ -212,12 +212,12 @@ public static ItemStack[] getSFRecipeTransmutationOrb(SlimefunItemStack darkMatt public static Map, ItemStack> getEQRecipes(EquivalencyTech plugin) { Map, ItemStack> recipes = new HashMap<>(); - recipes.put(recipeCoal1Check(), plugin.getEqItems().getAlchemicalCoal().getClone()); - recipes.put(recipeCoal2Check(plugin), plugin.getEqItems().getMobiusFuel().getClone()); - recipes.put(recipeCoal3Check(plugin), plugin.getEqItems().getAeternalisFuel().getClone()); - recipes.put(recipeDarkMatterCheck(plugin), plugin.getEqItems().getDarkMatter().getClone()); - recipes.put(recipeRedMatterCheck(plugin), plugin.getEqItems().getRedMatter().getClone()); - recipes.put(recipeTransmutationOrbCheck(plugin), plugin.getEqItems().getTransmutationOrb().getClone()); + recipes.put(recipeCoal1Check(), plugin.getEqItems().getAlchemicalCoal().getItemClone()); + recipes.put(recipeCoal2Check(plugin), plugin.getEqItems().getMobiusFuel().getItemClone()); + recipes.put(recipeCoal3Check(plugin), plugin.getEqItems().getAeternalisFuel().getItemClone()); + recipes.put(recipeDarkMatterCheck(plugin), plugin.getEqItems().getDarkMatter().getItemClone()); + recipes.put(recipeRedMatterCheck(plugin), plugin.getEqItems().getRedMatter().getItemClone()); + recipes.put(recipeTransmutationOrbCheck(plugin), plugin.getEqItems().getTransmutationOrb().getItemClone()); return recipes; } diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/SkullTextures.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/SkullTextures.java index 05e144d..3c38b8e 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/statics/SkullTextures.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/statics/SkullTextures.java @@ -1,6 +1,6 @@ package io.github.sefiraat.equivalencytech.statics; -public class SkullTextures { +public final class SkullTextures { private SkullTextures() { throw new IllegalStateException("Utility class"); diff --git a/src/main/java/io/github/sefiraat/equivalencytech/timers/TimerSave.java b/src/main/java/io/github/sefiraat/equivalencytech/timers/TimerSave.java index f114dbc..8706c59 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/timers/TimerSave.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/timers/TimerSave.java @@ -13,7 +13,6 @@ public TimerSave(EquivalencyTech plugin) { @Override public void run() { - plugin.saveLearnedConfig(); - plugin.saveEmcConfig(); + plugin.saveAdditionalConfigs(); } } \ No newline at end of file