diff --git a/pom.xml b/pom.xml index 3b88480..1313faf 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 15.4 + 15.6_dev-1 diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java index 0cdd609..bceaed7 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java @@ -52,6 +52,20 @@ public class T2CitemBuilder { return itemStack; } + public static void setItem(Integer slot, Integer amount, String material, String displayName, List lore, Inventory inventory) { + ItemStack item; + if (getLegacy && material.contains(",")) { + String[] split = material.split(","); + item = new ItemStack(Material.valueOf(split[0]), 1, Short.parseShort(split[1])); + } else item = new ItemStack(Material.valueOf(material)); + ItemMeta itemMeta = item.getItemMeta(); + itemMeta.setDisplayName(displayName); + itemMeta.setLore(lore); + item.setItemMeta(itemMeta); + item.setAmount(amount); + inventory.setItem(slot, item); + } + public static ItemStack base64(String base64Value, Integer amount, String displayName, List lore) { ItemStack itemStack = new ItemStack(T2CitemVersion.getHead()); SkullMeta itemMeta = (SkullMeta) itemStack.getItemMeta(); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemVersion.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemVersion.java index 795162b..086b723 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemVersion.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemVersion.java @@ -1,19 +1,31 @@ package net.t2code.t2codelib.SPIGOT.api.items; +import lombok.Getter; import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; public class T2CitemVersion { + @Getter private static Material Head; + @Getter private static ItemStack HeadIS; + @Getter private static ItemStack CRAFTING_TABLE; + @Getter private static ItemStack YELLOW_WOOL; + @Getter private static ItemStack ORANGE_WOOL; + @Getter private static ItemStack GREEN_WOOL; + @Getter private static ItemStack GRAY_WOOL; + @Getter private static ItemStack RED_WOOL; + @Getter private static ItemStack RED_STAINED_GLASS_PANE; + @Getter + private static ItemStack BLACK_STAINED_GLASS_PANE; public static void scan() { if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) { @@ -24,6 +36,7 @@ public class T2CitemVersion { GRAY_WOOL = new ItemStack(Material.valueOf("WOOL"), 1, (short) 8); RED_WOOL = new ItemStack(Material.valueOf("WOOL"), 1, (short) 14); RED_STAINED_GLASS_PANE = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, (short) 14); + BLACK_STAINED_GLASS_PANE = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, (short) 15); CRAFTING_TABLE = new ItemStack(Material.valueOf("WORKBENCH")); } else { Head = Material.valueOf("PLAYER_HEAD"); @@ -34,43 +47,8 @@ public class T2CitemVersion { GRAY_WOOL = new ItemStack(Material.GRAY_WOOL); RED_WOOL = new ItemStack(Material.RED_WOOL); RED_STAINED_GLASS_PANE = new ItemStack(Material.RED_STAINED_GLASS_PANE); + BLACK_STAINED_GLASS_PANE = new ItemStack(Material.BLACK_STAINED_GLASS_PANE); } HeadIS = new ItemStack(Head, 1, (byte) 3); } - - public static Material getHead() { - return Head; - } - - public static ItemStack getHeadIS() { - return HeadIS; - } - - public static ItemStack getCraftingTable() { - return CRAFTING_TABLE; - } - - public static ItemStack getYellowWool() { - return YELLOW_WOOL; - } - - public static ItemStack getOrangeWool() { - return ORANGE_WOOL; - } - - public static ItemStack getGreenWool() { - return GREEN_WOOL; - } - - public static ItemStack getGrayWool() { - return GRAY_WOOL; - } - - public static ItemStack getRedWool() { - return RED_WOOL; - } - - public static ItemStack getRedStainedGlassPane() { - return RED_STAINED_GLASS_PANE; - } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java index 56c9d72..8021d46 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java @@ -68,6 +68,9 @@ public class T2Ctemplate { T2Csend.console(prefix + " §8-------------------------------"); } + public static void onLoadFooter(String prefix, Long long_, String v) { + onLoadFooter(prefix,long_); + } public static void onLoadFooter(String prefix, Long long_) { onLoadSeparateStroke(prefix); T2Csend.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");