From d9acf2eb53db94fbf2c1131d06a3de06205b525a Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Thu, 8 Dec 2022 12:38:36 -0600 Subject: [PATCH] ItemsAdder Support --- build.gradle.kts | 2 +- .../hmccosmetics/hooks/items/ItemAdderHook.java | 17 +++++++++++++++++ .../hmccosmetics/hooks/items/ItemHooks.java | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemAdderHook.java diff --git a/build.gradle.kts b/build.gradle.kts index c9a520b4..9ee22cc6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -115,7 +115,7 @@ bukkit { apiVersion = "1.19" authors = listOf("LoJoSho") depend = listOf("ProtocolLib") - softDepend = listOf("ModelEngine", "Oraxen") + softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder") version = "${project.version}" commands { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemAdderHook.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemAdderHook.java new file mode 100644 index 00000000..e53e112c --- /dev/null +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemAdderHook.java @@ -0,0 +1,17 @@ +package com.hibiscusmc.hmccosmetics.hooks.items; + +import dev.lone.itemsadder.api.CustomStack; +import org.bukkit.inventory.ItemStack; + +public class ItemAdderHook extends ItemHook { + + public ItemAdderHook() { + super("itemsadder"); + } + + @Override + public ItemStack get(String itemid) { + return CustomStack.getInstance(itemid).getItemStack(); + } + +} diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemHooks.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemHooks.java index 23f12d1c..420e3a73 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemHooks.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/ItemHooks.java @@ -11,6 +11,7 @@ public class ItemHooks { private static HashMap itemHooks = new HashMap<>(); private static OraxenHook ORAXEN_HOOK = new OraxenHook(); + private static ItemAdderHook ITEMADDER_HOOK = new ItemAdderHook(); public static ItemHook getItemHook(String id) { return itemHooks.get(id.toLowerCase()); @@ -31,7 +32,6 @@ public class ItemHooks { HMCCosmeticsPlugin.getInstance().getLogger().info("Successfully hooked into " + itemHook.getId()); } } - } public static ItemStack getItem(String raw) { @@ -43,7 +43,7 @@ public class ItemHooks { // Ex. Oraxen:BigSword // split[0] is the plugin name // split[1] is the item name - String[] split = raw.split(":"); + String[] split = raw.split(":", 2); if (!isItemHook(split[0])) return null; ItemHook itemHook = getItemHook(split[0]);