diff --git a/pom.xml b/pom.xml index 9c8d2774..cb9ac79e 100644 --- a/pom.xml +++ b/pom.xml @@ -154,14 +154,14 @@ 1.7 - - - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + C:\Users\Arte\Desktop\Server 1.13\plugins + + diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index ea80762e..dcb5160f 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -1706,6 +1706,7 @@ public class ItemManager { public static CMIMaterial get(String id) { Integer ids = null; Integer data = null; + id = id.replace("_", "").replace(" ", "").toLowerCase(); try { ids = Integer.parseInt(id); @@ -1785,7 +1786,13 @@ public class ItemManager { return one; if (one.getName().replace("_", "").replace(" ", "").equalsIgnoreCase(id)) return one; + } + for (CMIMaterial one : CMIMaterial.values()) { + if (one.name().replace("_", "").toLowerCase().endsWith(id)) + return one; + } + return CMIMaterial.NONE; } diff --git a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java index b7d221f2..e5ae83fe 100644 --- a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java @@ -37,6 +37,7 @@ import org.bukkit.inventory.meta.ItemMeta; import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.CMILib.ItemManager.CMIMaterial; import com.gamingmesh.jobs.resources.jfep.Parser; +import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.container.CurrencyLimit; import com.gamingmesh.jobs.container.CurrencyType; import com.gamingmesh.jobs.container.LocaleReader; @@ -937,9 +938,11 @@ public class GeneralConfigManager { guiBackButton = tmat == null ? CMIMaterial.JACK_O_LANTERN.newItemStack() : tmat.newItemStack(); tmat = CMIMaterial.get(c.get("JobsGUI.Filler.Material", "STAINED_GLASS_PANE")); + Debug.D(c.get("JobsGUI.Filler.Material", "STAINED_GLASS_PANE")); + Debug.D( CMIMaterial.get(c.get("JobsGUI.Filler.Material", "STAINED_GLASS_PANE"))); guiFiller = tmat == null ? CMIMaterial.GREEN_STAINED_GLASS_PANE.newItemStack() : tmat.newItemStack(); ItemMeta meta = guiFiller.getItemMeta(); - meta.setDisplayName(""); + meta.setDisplayName(" "); guiFiller.setItemMeta(meta); // c.getW().addComment("Schedule.Boost.Enable", "Do you want to enable scheduler for global boost");