From e3157dfd99be6f67ef5e91976d83bcfa4484d8e0 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 1 Jun 2021 15:01:22 +0100 Subject: [PATCH] 1.0.1 - EMc for EQ fit again --- dependency-reduced-pom.xml | 2 +- pom.xml | 2 +- .../sefiraat/equivalencytech/gui/GUIItems.java | 1 - .../gui/GuiTransmutationOrb.java | 17 +++++------------ .../listeners/CraftListener.java | 3 --- .../sefiraat/equivalencytech/misc/EQItems.java | 13 ++++++------- .../sefiraat/equivalencytech/misc/Utils.java | 7 ++++++- src/main/resources/plugin.yml | 2 +- 8 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 01b505f..56974ec 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.sefiraat EquivalencyTech - 1.0.0 + 1.0.1 diff --git a/pom.xml b/pom.xml index cb811fb..101d33f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.sefiraat EquivalencyTech - 1.0.0 + 1.0.1 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 be9eeda..ee53af5 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/gui/GUIItems.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/gui/GUIItems.java @@ -5,7 +5,6 @@ import io.github.sefiraat.equivalencytech.configuration.ConfigStrings; import io.github.sefiraat.equivalencytech.misc.Utils; import io.github.sefiraat.equivalencytech.statics.Config; -import io.github.sefiraat.equivalencytech.statics.ContainerStorage; import io.github.sefiraat.equivalencytech.statics.Messages; import io.github.sefiraat.equivalencytech.statics.SkullTextures; import me.mattstudios.mfgui.gui.guis.GuiItem; 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 16e2ca5..471b553 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/gui/GuiTransmutationOrb.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/gui/GuiTransmutationOrb.java @@ -5,7 +5,6 @@ import io.github.sefiraat.equivalencytech.statics.Config; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; import io.github.sefiraat.equivalencytech.statics.Messages; -import jdk.jshell.execution.Util; import me.mattstudios.mfgui.gui.components.ItemBuilder; import me.mattstudios.mfgui.gui.guis.GuiItem; import me.mattstudios.mfgui.gui.guis.PaginatedGui; @@ -139,21 +138,15 @@ private static void inputItemAction(InventoryClickEvent e, EquivalencyTech plugi return; } - Double emcValue; - Material material = itemStack.getType(); - if (isEQ) { - String itemName = itemStack.getItemMeta().getDisplayName(); - emcValue = plugin.getEmcDefinitions().getEmcEQ().get(itemName); - } else { - emcValue = plugin.getEmcDefinitions().getEmcValue(material); - } + Double emcValue = Utils.getEMC(plugin, itemStack); + boolean mustClose = false; if (emcValue != null) { double totalEmc = emcValue * itemStack.getAmount(); String entryName; if (isEQ) { - entryName = itemStack.getItemMeta().getDisplayName(); + entryName = Utils.eqNameConfig(itemStack.getItemMeta().getDisplayName()); } else { entryName = material.toString(); } @@ -202,7 +195,7 @@ private static void emcWithdrawOne(InventoryClickEvent e, EquivalencyTech plugin String itemName; if (isEQ) { - itemName = clickedItem.getItemMeta().getDisplayName(); + itemName = Utils.eqNameConfig(clickedItem.getItemMeta().getDisplayName()); } else { itemName = clickedItem.getType().toString(); } @@ -235,7 +228,7 @@ private static void emcWithdrawStack(InventoryClickEvent e, EquivalencyTech plug Double emcValue = Utils.getEMC(plugin, clickedItem); if (isEQ) { - itemName = e.getCurrentItem().getItemMeta().getDisplayName(); + itemName = Utils.eqNameConfig(e.getCurrentItem().getItemMeta().getDisplayName()); } else { itemName = material.toString(); } 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 0dc3acf..f0bff44 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java @@ -27,8 +27,6 @@ public void onPreCraft(PrepareItemCraftEvent e) { if (e.getView().getPlayer() instanceof Player) { - Player player = (Player) e.getView().getPlayer(); - if (e.getRecipe() != null && e.getRecipe().getResult().getType() == Material.PLAYER_HEAD) { ItemStack[] contents = e.getInventory().getMatrix(); List contentLayer = new ArrayList<>(); @@ -38,7 +36,6 @@ public void onPreCraft(PrepareItemCraftEvent e) { if (itemStack != null) { clone = itemStack.clone(); clone.setAmount(1); - player.sendMessage(clone.getType().toString()); } contentLayer.add(clone); } 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 fec3e2c..b274f1e 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/misc/EQItems.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/misc/EQItems.java @@ -2,7 +2,6 @@ import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.items.*; -import net.md_5.bungee.api.ChatColor; import org.bukkit.inventory.ItemStack; import java.util.HashMap; @@ -61,12 +60,12 @@ public EQItems(EquivalencyTech plugin) { redMatter = new RedMatter(plugin); eqItemMap = new HashMap<>(); - eqItemMap.put(ChatColor.stripColor(transmutationOrb.getItem().getItemMeta().getDisplayName()), transmutationOrb.getItemClone()); - eqItemMap.put(ChatColor.stripColor(alchemicalCoal.getItem().getItemMeta().getDisplayName()), alchemicalCoal.getItemClone()); - eqItemMap.put(ChatColor.stripColor(mobiusFuel.getItem().getItemMeta().getDisplayName()), mobiusFuel.getItemClone()); - eqItemMap.put(ChatColor.stripColor(aeternalisFuel.getItem().getItemMeta().getDisplayName()), aeternalisFuel.getItemClone()); - eqItemMap.put(ChatColor.stripColor(darkMatter.getItem().getItemMeta().getDisplayName()), darkMatter.getItemClone()); - eqItemMap.put(ChatColor.stripColor(redMatter.getItem().getItemMeta().getDisplayName()), redMatter.getItemClone()); + eqItemMap.put(Utils.eqNameConfig(transmutationOrb.getItem().getItemMeta().getDisplayName()), transmutationOrb.getItemClone()); + eqItemMap.put(Utils.eqNameConfig(alchemicalCoal.getItem().getItemMeta().getDisplayName()), alchemicalCoal.getItemClone()); + eqItemMap.put(Utils.eqNameConfig(mobiusFuel.getItem().getItemMeta().getDisplayName()), mobiusFuel.getItemClone()); + eqItemMap.put(Utils.eqNameConfig(aeternalisFuel.getItem().getItemMeta().getDisplayName()), aeternalisFuel.getItemClone()); + eqItemMap.put(Utils.eqNameConfig(darkMatter.getItem().getItemMeta().getDisplayName()), darkMatter.getItemClone()); + eqItemMap.put(Utils.eqNameConfig(redMatter.getItem().getItemMeta().getDisplayName()), redMatter.getItemClone()); } 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 ce504c1..260e828 100644 --- a/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java +++ b/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java @@ -3,6 +3,7 @@ import io.github.sefiraat.equivalencytech.EquivalencyTech; import io.github.sefiraat.equivalencytech.statics.ContainerStorage; import io.github.sefiraat.equivalencytech.statics.Messages; +import net.md_5.bungee.api.ChatColor; import org.apache.commons.lang.WordUtils; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -19,13 +20,17 @@ private Utils() { public static Double getEMC(EquivalencyTech plugin, ItemStack itemStack) { if (ContainerStorage.isCrafting(itemStack, plugin)) { - ItemStack eqStack = plugin.getEqItems().getEqItemMap().get(itemStack.getItemMeta().getDisplayName()); + ItemStack eqStack = plugin.getEqItems().getEqItemMap().get(eqNameConfig(itemStack.getItemMeta().getDisplayName())); return plugin.getEmcDefinitions().getEmcEQ().get(eqStack.getItemMeta().getDisplayName()); } else { return plugin.getEmcDefinitions().getEmcExtended().get(itemStack.getType()); } } + public static String eqNameConfig(String name) { + return ChatColor.stripColor(name.replace(" ","_")); + } + public static String toTitleCase(String string) { final char[] delimiters = { ' ', '_' }; return WordUtils.capitalizeFully(string, delimiters); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 09b3490..00ed298 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EquivalencyTech -version: 1.0.0 +version: 1.0.1 main: io.github.sefiraat.equivalencytech.EquivalencyTech api-version: 1.16 softdepend: