1.0.1 - EMc for EQ fit again

Sefiraat · Jun 1, 2021 · e3157df · e3157df
1 parent e4e9c1b
commit e3157df
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 27 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.sefiraat</groupId>
   <artifactId>EquivalencyTech</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <build>
     <plugins>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.sefiraat</groupId>
     <artifactId>EquivalencyTech</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <build>
         <plugins>

diff --git 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
@@ -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
@@ -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<ItemStack> 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
@@ -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
@@ -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
@@ -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: