Initial 1.14 support

src/main/java/com/gamingmesh/jobs/CMILib/ActionBarTitleMessages.java

@@ -115,11 +115,7 @@ public class ActionBarTitleMessages {
     }
 
     public static void sendTitle(final Player receivingPacket, final Object title, final Object subtitle, final int fadeIn, final int keep, final int fadeOut) {
-	Bukkit.getScheduler().runTaskAsynchronously(Jobs.getInstance(), new Runnable() {
+	Bukkit.getScheduler().runTaskAsynchronously(Jobs.getInstance(), () -> {
-	    @SuppressWarnings("deprecation")
-		@Override
-	    public void run() {
-
 	    String t = title == null ? null : CMIChatColor.translateAlternateColorCodes((String) title);
 	    String s = subtitle == null ? null : CMIChatColor.translateAlternateColorCodes((String) subtitle);
 
@@ -177,7 +173,6 @@ public class ActionBarTitleMessages {
 			Bukkit.getLogger().log(Level.SEVERE, "Your server can't fully support title messages. They will be shown in chat instead.");
 	    }
 	    return;
-	    }
 	});
     }
 

src/main/java/com/gamingmesh/jobs/CMILib/CMIItemStack.java

@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2017 Zrips
- */
 package com.gamingmesh.jobs.CMILib;
 
 import java.util.ArrayList;
@@ -10,14 +7,17 @@ import java.util.Map.Entry;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.block.CreatureSpawner;
 import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.PotionMeta;
+import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.CMILib.ItemManager.CMIMaterial;
 import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
 
@@ -30,15 +30,19 @@ public class CMIItemStack {
 
     private String bukkitName = null;
     private String mojangName = null;
-    private CMIMaterial material = null;
+    private CMIMaterial cmiMaterial = null;
+    private Material material = null;
     private ItemStack item;
 
     public CMIItemStack(Material material) {
-	this.material = CMIMaterial.get(material);
+	this.material = material;
+	this.cmiMaterial = CMIMaterial.get(material);
     }
 
-    public CMIItemStack(CMIMaterial material) {
+    public CMIItemStack(CMIMaterial cmiMaterial) {
-	this.material = material;
+	this.cmiMaterial = cmiMaterial;
+	if (cmiMaterial != null)
+	    this.material = cmiMaterial.getMaterial();
     }
 
     public CMIItemStack(ItemStack item) {
@@ -54,7 +58,8 @@ public class CMIItemStack {
 	cm.setDurability(durability);
 	cm.setBukkitName(bukkitName);
 	cm.setMojangName(mojangName);
-	cm.setCMIMaterial(material);
+	cm.setCMIMaterial(cmiMaterial);
+	cm.setMaterial(material);
 	cm.setItemStack(this.item != null ? this.item.clone() : null);
 	return cm;
     }
@@ -63,7 +68,7 @@ public class CMIItemStack {
 	return id;
     }
 
-    public void setId(int id) {
+    public void setId(Integer id) {
 	this.id = id;
     }
 
@@ -80,10 +85,12 @@ public class CMIItemStack {
     }
 
     public short getMaxDurability() {
-	return material.getMaxDurability();
+    	return this.material.getMaxDurability();
     }
 
     public void setData(short data) {
+//    	CMIMaterial got = CMIMaterial.get(id, data);
+//    	if (got != null && got.getLegacyData() == data)
 	this.data = data;
     }
 
@@ -101,7 +108,7 @@ public class CMIItemStack {
 
     public String getDisplayName() {
 	ItemMeta meta = this.getItemStack().getItemMeta();
-	return meta == null || meta.getDisplayName() == null || meta.getDisplayName().isEmpty() ? this.material.getName() : meta.getDisplayName();
+	return meta == null || meta.getDisplayName() == null || meta.getDisplayName().isEmpty() ? getRealName() : meta.getDisplayName();
     }
 
     public CMIItemStack addLore(String string) {
@@ -110,7 +117,7 @@ public class CMIItemStack {
 	ItemMeta meta = this.getItemStack().getItemMeta();
 	List<String> lore = meta.getLore();
 	if (lore == null)
-	    lore = new ArrayList<>();
+	    lore = new ArrayList<String>();
 	lore.add(ChatColor.translateAlternateColorCodes('&', string));
 	meta.setLore(lore);
 	this.getItemStack().setItemMeta(meta);
@@ -165,20 +172,33 @@ public class CMIItemStack {
 
     public List<String> getLore() {
     ItemMeta meta = this.getItemStack().getItemMeta();
+//    List<String> lore = null;
     if (meta != null) {
         List<String> lore = meta.getLore();
-	    if (lore == null || lore.isEmpty()) {
+        if (lore == null) {
-		lore = new ArrayList<>();
+    	lore = new ArrayList<String>();
     	meta.setLore(lore);
+//    	this.getItemStack().setItemMeta(meta);
         }
 
         return meta.getLore() == null ? new ArrayList<String>() : meta.getLore();
     }
-	return new ArrayList<>();
+    return new ArrayList<String>();
     }
 
     public String getRealName() {
-	return material.getName();
+    return this.getCMIType() == null || this.getCMIType() == CMIMaterial.NONE ? this.getType().name() : this.getCMIType().getName();
+//    if (this.getItemStack() != null) {
+    //
+////        String translated = CMI.getInstance().getItemManager().getTranslatedName(this.getItemStack());
+////        if (translated != null)
+////    	return translated;
+//        try {
+//    	return CMI.getInstance().getRef().getItemMinecraftName(this.getItemStack());
+//        } catch (Exception e) {
+//        }
+//    }
+//    return CMI.getInstance().getItemManager().getRealName(this, true).getName();
     }
 
     public String getBukkitName() {
@@ -190,7 +210,14 @@ public class CMIItemStack {
     }
 
     public String getMojangName() {
-	return mojangName == null || mojangName.isEmpty() ? null : mojangName;
+//    if (getCMIType().isSkull() && !Version.isCurrentEqualOrHigher(Version.v1_13_R1))
+//        mojangName = "skull";
+//    try {
+//        mojangName = CMI.getInstance().getRef().getItemMinecraftName(getItemStack()).replace("minecraft:", "");
+//    } catch (Exception e) {
+    //
+//    }
+    return mojangName == null || mojangName.isEmpty() ? this.getCMIType().getMaterial().name() : mojangName;
     }
 
     public void setMojangName(String mojangName) {
@@ -199,13 +226,13 @@ public class CMIItemStack {
     }
 
     public Material getType() {
-	if (material == null)
+	if (material == null && cmiMaterial != null)
-	    return null;
+	    return cmiMaterial.getMaterial();
-	return material.getMaterial();
+	return material;
     }
 
     public CMIMaterial getCMIType() {
-	return material;
+	return cmiMaterial == null ? CMIMaterial.get(material) : cmiMaterial;
     }
 
     @Deprecated
@@ -214,31 +241,40 @@ public class CMIItemStack {
     }
 
     public void setMaterial(Material material) {
-	this.material = CMIMaterial.get(material);
+	this.cmiMaterial = CMIMaterial.get(material);
+	this.material = material;
     }
 
     public void setCMIMaterial(CMIMaterial material) {
-	this.material = material;
+	this.cmiMaterial = material;
+	this.material = material == null ? null : material.getMaterial();
     }
 
     @SuppressWarnings("deprecation")
     public ItemStack getItemStack() {
 	if (item == null) {
-	    if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) {
+	    if (cmiMaterial.isMonsterEgg()) {
-		this.item = new ItemStack(material.getMaterial(), this.amount == 0 ? 1 : this.amount);
+		if (Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
+		    this.item = new ItemStack(this.getType());
+		    this.item.setAmount(this.getAmount());
+		} else
+		    this.item = new ItemStack(this.getType(), this.amount == 0 ? 1 : this.amount, data == 0 ? (short) 90 : data);
 	    } else {
-		this.item = new ItemStack(material.getMaterial(), this.amount == 0 ? 1 : this.amount, data);
+		if (Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
+		    this.item = new ItemStack(this.getType());
+		    this.item.setAmount(this.getAmount());
+		} else
+		    this.item = new ItemStack(this.getType(), this.amount == 0 ? 1 : this.amount, data);
 	    }
 
-	    if (this.item.getType() == Material.POTION || item.getType().name().contains("SPLASH_POTION") || item.getType().name().contains("TIPPED_ARROW")) {
+	    if (this.getCMIType().isPotion() || item.getType().name().contains("SPLASH_POTION") || item.getType().name().contains("TIPPED_ARROW")) {
 		PotionMeta potion = (PotionMeta) item.getItemMeta();
 		PotionEffectType effect = PotionEffectType.getById(data);
 		if (effect != null) {
-		    potion.addCustomEffect(new PotionEffect(PotionEffectType.getById(data), 60, 0), true);
+		    potion.addCustomEffect(new PotionEffect(effect, 60, 0), true);
 		}
 		item.setItemMeta(potion);
 		item.setDurability((short) 0);
-
 		potion = (PotionMeta) item.getItemMeta();
 		potion.setDisplayName(this.getRealName());
 		item.setItemMeta(potion);
@@ -249,44 +285,48 @@ public class CMIItemStack {
 
     @SuppressWarnings("deprecation")
     public CMIItemStack setItemStack(ItemStack item) {
-	this.item = item;
+	this.item = item == null ? null : item;
 	if (item != null) {
-	    this.id = item.getType().getId();
 	    this.amount = item.getAmount();
-	    this.material = CMIMaterial.get(item);
+	    this.material = item.getType();
-	    if ((material.isBlock() || material.isSolid())) {
+	    this.cmiMaterial = CMIMaterial.get(this.material);
-		data = item.getData().getData();
+	    if (Version.isCurrentEqualOrLower(Version.v1_13_R2))
+		this.id = item.getType().getId();
+	    else if (cmiMaterial != null) {
+		this.id = cmiMaterial.getId();
 	    }
-	    if (item.getType().getMaxDurability() - item.getDurability() < 0) {
+	    if ((this.getType().isBlock() || this.getType().isSolid()))
 		data = item.getData().getData();
-	    }
 
-	    if (item.getType().getMaxDurability() > 15) {
+	    if (item.getType().getMaxDurability() - item.getDurability() < 0)
+		data = item.getData().getData();
+
+	    if (item.getType().getMaxDurability() > 15)
 		data = (short) 0;
-	    }
 
-	    if (item.getType() == Material.POTION || item.getType().name().contains("SPLASH_POTION") || item.getType().name().contains("TIPPED_ARROW")) {
+	    if (CMIMaterial.SPAWNER.equals(item.getType()))
-	    	PotionMeta meta = (PotionMeta) item.getItemMeta();
+		data = getEntityType().getTypeId();
-	    	if (meta instanceof PotionMeta) {
+	    else if (item.getType() == Material.POTION || item.getType().name().contains("SPLASH_POTION") || item.getType().name().contains("TIPPED_ARROW")) {
-	    		PotionMeta potionMeta = (PotionMeta) meta;
+		PotionMeta potion = (PotionMeta) item.getItemMeta();
 		try {
-	    		    if (potionMeta != null && potionMeta.getBasePotionData() != null && potionMeta.getBasePotionData() != null && potionMeta.getBasePotionData().getType().getEffectType() != null) {
+		    if (potion != null && potion.getBasePotionData() != null && potion.getBasePotionData().getType() != null && potion.getBasePotionData().getType().getEffectType() != null) {
-	    			data = (short) potionMeta.getBasePotionData().getType().getEffectType().getId();
+			data = (short) potion.getBasePotionData().getType().getEffectType().getId();
 		    }
 		} catch (NoSuchMethodError e) {
 		}
 	    }
 	}
-	}
 	return this;
     }
 
     public int getAmount() {
-	return amount;
+	return amount <= 0 ? 1 : amount;
     }
 
     public void setAmount(int amount) {
 	this.amount = amount;
+	if (item != null)
+	    this.item.setAmount(this.amount == 0 ? item.getAmount() : this.amount);
     }
 
     public boolean isSimilar(ItemStack item) {
@@ -296,54 +336,117 @@ public class CMIItemStack {
     public boolean isSimilar(CMIItemStack item) {
 	if (item == null)
 	    return false;
-	return this.material.equals(item.material) && this.getData() == item.getData();
+
+	try {
+	    if ((item.getCMIType().isPotion() || item.getCMIType().equals(CMIMaterial.TIPPED_ARROW)) &&
+		(this.getCMIType().isPotion() || this.getCMIType().equals(CMIMaterial.TIPPED_ARROW)) &&
+		this.getType().equals(item.getType())) {
+		PotionMeta potion = (PotionMeta) item.getItemStack().getItemMeta();
+		PotionMeta potion2 = (PotionMeta) this.getItemStack().getItemMeta();
+		try {
+		    if (potion != null && potion.getBasePotionData() != null) {
+			PotionData base1 = potion.getBasePotionData();
+			if (base1.getType() != null) {
+			    if (potion2 != null && potion2.getBasePotionData() != null) {
+				PotionData base2 = potion2.getBasePotionData();
+				if (base2.getType() != null) {
+				    if (base1.getType().equals(base2.getType()) && base1.isExtended() == base2.isExtended() && base1.isUpgraded() == base2.isUpgraded())
+					return true;
+				}
+			    }
+			}
+		    }
+		    return false;
+		} catch (NoSuchMethodError e) {
+		}
+	    }
+	} catch (Throwable e) {
+	    e.printStackTrace();
+	}
+	try {
+	    if (this.getItemStack().getItemMeta() instanceof EnchantmentStorageMeta && item.getItemStack().getItemMeta() instanceof EnchantmentStorageMeta) {
+		EnchantmentStorageMeta meta1 = (EnchantmentStorageMeta) this.getItemStack().getItemMeta();
+		EnchantmentStorageMeta meta2 = (EnchantmentStorageMeta) item.getItemStack().getItemMeta();
+
+		for (Entry<Enchantment, Integer> one : meta1.getEnchants().entrySet()) {
+		    if (!meta2.getEnchants().containsKey(one.getKey()) || meta2.getEnchants().get(one.getKey()) != one.getValue())
+			return false;
 		}
 
-//    public boolean hasNbtTag() {
+		for (Entry<Enchantment, Integer> one : meta1.getStoredEnchants().entrySet()) {
-//	return CMI.getInstance().getRef().hasNbt(this.getItemStack());
+		    if (!meta2.getStoredEnchants().containsKey(one.getKey()) || meta2.getStoredEnchants().get(one.getKey()) != one.getValue())
-//    }
+			return false;
+		}
+	    }
+	} catch (Throwable e) {
+	    e.printStackTrace();
+	}
 
-//    public List<Recipe> getRecipesFor() {
+	if ((item.getCMIType() == CMIMaterial.SPAWNER || item.getCMIType().isMonsterEgg()) && (getCMIType() == CMIMaterial.SPAWNER || getCMIType().isMonsterEgg())) {
-//	ItemStack i = getItemStack().clone();
+	    if (this.cmiMaterial != item.cmiMaterial)
-//	i.getData().setData((byte) data);
+		return false;
-//	if (i.getType().getMaxDurability() > 15)
+	    if (getEntityType() != item.getEntityType())
-//	    i.setDurability((short) 0);
+		return false;
-//	return Bukkit.getRecipesFor(i);
+	    return true;
-//    }
+	}
-//
+
-//    public List<Recipe> getRecipesFrom() {
+	if (Version.isCurrentEqualOrHigher(Version.v1_13_R1))
-//	ItemStack i = getItemStack().clone();
+	    return this.cmiMaterial == item.cmiMaterial;
-//	i.getData().setData((byte) data);
+	return this.cmiMaterial == item.cmiMaterial && this.getData() == item.getData();
-//	if (i.getType().getMaxDurability() > 15)
+    }
-//	    i.setDurability((short) 0);
+
-//	Iterator<Recipe> it = Bukkit.recipeIterator();
+    public EntityType getEntityType() {
-//	List<Recipe> recipes = new ArrayList<Recipe>();
+	if (this.getItemStack() == null)
-//	while (it.hasNext()) {
+	    return null;
-//	    Recipe rec = it.next();
+	ItemStack is = this.getItemStack().clone();
-//	    for (ItemStack one : CMI.getInstance().getRecipeManager().getIngredientsList(rec)) {
+	if (is.getItemMeta() instanceof org.bukkit.inventory.meta.BlockStateMeta) {
-//		if (one.isSimilar(i)) {
+	    org.bukkit.inventory.meta.BlockStateMeta bsm = (org.bukkit.inventory.meta.BlockStateMeta) is.getItemMeta();
-//		    recipes.add(rec);
+	    if (bsm.getBlockState() instanceof CreatureSpawner) {
-//		    break;
+		CreatureSpawner bs = (CreatureSpawner) bsm.getBlockState();
-//		}
+		return bs.getSpawnedType();
-//	    }
+	    }
-//	}
+	}
-//
+
-//	return recipes;
+	return EntityType.fromId(is.getData().getData());
-//    }
+    }
 
     public void setDurability(short durability) {
 	this.durability = durability;
     }
 
-//    public Set<Enchantment> getValidEnchants() {
+    public String toOneLiner() {
-//	Set<Enchantment> enchants = new HashSet<Enchantment>();
+	String liner = this.getType().toString();
-//	for (Enchantment one : CMIEnchantment.values()) {
+	if (this.getCMIType().isPotion() || this.getType().name().contains("TIPPED_ARROW")) {
-//	    if (!CMIEnchantment.isEnabled(one))
+	    PotionMeta potion = (PotionMeta) item.getItemMeta();
-//		continue;
+	    try {
-//	    if (one.canEnchantItem(this.getItemStack()))
+		if (potion != null && potion.getBasePotionData() != null && potion.getBasePotionData().getType() != null && potion.getBasePotionData().getType().getEffectType() != null) {
-//		enchants.add(one);
+		    liner += ":" + potion.getBasePotionData().getType().getEffectType().getName() + "-" + potion.getBasePotionData().isUpgraded() + "-" + potion.getBasePotionData().isExtended();
-//	}
+		}
-//	return enchants;
+	    } catch (NoSuchMethodError e) {
-//    }
+	    }
+	} else {
+	    if (Version.isCurrentLower(Version.v1_13_R1))
+		liner += ":" + this.getData();
+	}
+	if (this.getItemStack().getItemMeta() instanceof EnchantmentStorageMeta) {
+	    EnchantmentStorageMeta meta = (EnchantmentStorageMeta) this.getItemStack().getItemMeta();
+	    String s = "";
+	    for (Entry<Enchantment, Integer> one : meta.getStoredEnchants().entrySet()) {
+		if (!s.isEmpty())
+		    s += ";";
+		s += one.getKey().getName() + "x" + one.getValue();
+	    }
+
+	    for (Entry<Enchantment, Integer> one : meta.getEnchants().entrySet()) {
+		if (!s.isEmpty())
+		    s += ";";
+		s += one.getKey().getName() + "x" + one.getValue();
+	    }
+	    if (!s.isEmpty())
+		liner += ":" + s;
+	}
+
+	return liner;
+    }
 
 }

src/main/java/com/gamingmesh/jobs/CMILib/ItemReflection.java

@@ -82,53 +82,6 @@ public class ItemReflection {
 	}
     }
 
-    public static String getItemRealName(ItemStack item) {
-	try {
-	    Object nmsStack = asNMSCopy(item);
-	    Method itemMeth = Item.getMethod("getById", int.class);
-	    @SuppressWarnings("deprecation")
-		Object res = itemMeth.invoke(Item, item.getType().getId());
-
-	    String ff = "b";
-	    switch (Jobs.getVersionCheckManager().getVersion()) {
-	    case v1_10_R1:
-	    case v1_9_R1:
-	    case v1_9_R2:
-	    case v1_8_R1:
-	    case v1_8_R3:
-	    case v1_8_R2:
-		ff = "a";
-		break;
-	    case v1_11_R1:
-	    case v1_12_R1:
-		ff = "b";
-		break;
-	    case v1_13_R2:
-	    case v1_13_R1:
-	    case v1_14_R2:
-	    case v1_14_R1:
-	    case v1_15_R2:
-	    case v1_15_R1:
-		ff = "h";
-		break;
-	    case v1_7_R1:
-	    case v1_7_R2:
-	    case v1_7_R3:
-	    case v1_7_R4:
-		ff = "n";
-		break;
-	    default:
-		break;
-	    }
-
-	    Method meth2 = res.getClass().getMethod(ff, IStack);
-	    Object name = meth2.invoke(res, nmsStack);
-	    return name.toString();
-	} catch (Throwable e) {
-	    return item != null ? item.getType().name() : "";
-	}
-    }
-
     public String getItemMinecraftNamePath(ItemStack item) {
 	try {
 	    Object nmsStack = asNMSCopy(item);

src/main/java/com/gamingmesh/jobs/CMILib/VersionChecker.java

@@ -22,7 +22,7 @@ public class VersionChecker {
 	version = Version.getCurrent();
     }
 
-    private static Version version = Version.v1_13_R2;
+    private static Version version = Version.v1_14_R1;
 
     public Version getVersion() {
 	return Version.getCurrent();
@@ -151,9 +151,7 @@ public class VersionChecker {
 	if (!Jobs.getGCManager().isShowNewVersion())
 	    return;
 
-	Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+	Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-	    @Override
-	    public void run() {
 	    String currentVersion = plugin.getDescription().getVersion();
 	    String newVersion = getNewVersion();
 	    if (newVersion == null || newVersion.equalsIgnoreCase(currentVersion))
@@ -168,7 +166,6 @@ public class VersionChecker {
 			    player.sendMessage(one);
 			else
 			    Jobs.consoleMsg(one);
-	    }
 		});
     }
 
@@ -181,7 +178,7 @@ public class VersionChecker {
 	    String version = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
 	    if (version.length() <= 7)
 		return version;
-	} catch (Throwable ex) {
+	} catch (Throwable t) {
 	    Jobs.consoleMsg("&cFailed to check for " + plugin.getDescription().getName() + " update on spigot web page.");
 	}
 	return null;

src/main/java/com/gamingmesh/jobs/config/RestrictedBlockManager.java

@@ -26,8 +26,8 @@ public class RestrictedBlockManager {
 	ConfigReader cfg = null;
 	try {
 	    cfg = new ConfigReader("restrictedBlocks.yml");
-	} catch (Throwable e1) {
+	} catch (Throwable t) {
-	    e1.printStackTrace();
+	    t.printStackTrace();
 	}
 	if (cfg == null)
 	    return;
@@ -43,7 +43,7 @@ public class RestrictedBlockManager {
 	    for (String one : lss) {
 		if (((cfg.getC().isString("blocksTimer." + one + ".id")) || (cfg.getC().isInt("blocksTimer." + one + ".id"))) && (cfg.getC().isInt("blocksTimer." + one
 		    + ".cd"))) {
-		    CMIItemStack cm = ItemManager.getItem(cfg.getC().getString("blocksTimer." + one + ".id"));
+		    CMIItemStack cm = ItemManager.getItem(CMIMaterial.get(cfg.getC().getString("blocksTimer." + one + ".id")));
 		    if ((cm == null) || (!cm.getCMIType().isBlock())) {
 			Jobs.consoleMsg("&e[Jobs] Your defined (" + one + ") protected block id/name is not correct!");
 			continue;

src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java

@@ -484,12 +484,14 @@ public class JobsListener implements Listener {
 	}
 
 	com.gamingmesh.jobs.Signs.Sign signInfo = new com.gamingmesh.jobs.Signs.Sign();
+	com.gamingmesh.jobs.Signs.SignUtil signUtil = Jobs.getSignUtil();
 
 	Location loc = sign.getLocation();
 
 	int category = 1;
-	if (Jobs.getSignUtil().getSigns().GetAllSigns().size() > 0)
+	if (signUtil.getSigns().GetAllSigns().size() > 0)
-	    category = Jobs.getSignUtil().getSigns().GetAllSigns().get(Jobs.getSignUtil().getSigns().GetAllSigns().size() - 1).GetCategory() + 1;
+	    category = signUtil.getSigns().GetAllSigns().get(signUtil.getSigns().GetAllSigns().size() - 1).GetCategory() + 1;
+
 	signInfo.setNumber(Number);
 	signInfo.setWorld(loc.getWorld().getName());
 	signInfo.setX(loc.getX());
@@ -502,17 +504,17 @@ public class JobsListener implements Listener {
 	    signInfo.setJobName("gtoplist");
 	signInfo.setSpecial(special);
 
-	Jobs.getSignUtil().getSigns().addSign(signInfo);
+	signUtil.getSigns().addSign(signInfo);
-	Jobs.getSignUtil().saveSigns();
+	signUtil.saveSigns();
 	event.setCancelled(true);
 
 	Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
 	    @Override
 	    public void run() {
 		if (!signtype.contains("gtoplist") && job != null)
-		    Jobs.getSignUtil().SignUpdate(job.getName());
+		    signUtil.SignUpdate(job.getName());
 		else
-		    Jobs.getSignUtil().SignUpdate("gtoplist");
+		    signUtil.SignUpdate("gtoplist");
 		return;
 	    }
 	}, 1L);