diff --git a/build.gradle b/build.gradle index 9174fe69..fd9b1db6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group 'io.github.fisher2911' -version '1.2.0' +version '1.3.0' repositories { mavenCentral() @@ -34,6 +34,7 @@ dependencies { implementation 'org.spongepowered:configurate-yaml:4.1.2' implementation 'org.bstats:bstats-bukkit:2.2.1' implementation 'com.zaxxer:HikariCP:5.0.0' + implementation 'com.github.LoneDev6:API-ItemsAdder:2.5.4-beta2' } test { diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/HMCCosmetics.java b/src/main/java/io/github/fisher2911/hmccosmetics/HMCCosmetics.java index 0139b58a..f8d4744b 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/HMCCosmetics.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/HMCCosmetics.java @@ -9,11 +9,7 @@ import io.github.fisher2911.hmccosmetics.database.Database; import io.github.fisher2911.hmccosmetics.database.DatabaseFactory; import io.github.fisher2911.hmccosmetics.gui.ArmorItem; import io.github.fisher2911.hmccosmetics.gui.CosmeticsMenu; -import io.github.fisher2911.hmccosmetics.listener.ClickListener; -import io.github.fisher2911.hmccosmetics.listener.HatRemoveFixListener; -import io.github.fisher2911.hmccosmetics.listener.JoinListener; -import io.github.fisher2911.hmccosmetics.listener.RespawnListener; -import io.github.fisher2911.hmccosmetics.listener.TeleportListener; +import io.github.fisher2911.hmccosmetics.listener.*; import io.github.fisher2911.hmccosmetics.message.MessageHandler; import io.github.fisher2911.hmccosmetics.message.Messages; import io.github.fisher2911.hmccosmetics.user.UserManager; diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/hook/HookManager.java b/src/main/java/io/github/fisher2911/hmccosmetics/hook/HookManager.java index 7e86b014..71f5b55f 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/hook/HookManager.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/hook/HookManager.java @@ -41,7 +41,7 @@ public class HookManager { final Map itemHookMap = new HashMap<>(); final OraxenHook oraxenHook = new OraxenHook(); - final ItemAdderHook = new ItemAdderHook(); + final ItemAdderHook itemAdderHook = new ItemAdderHook(); if (pluginManager.getPlugin("Oraxen") != null) itemHookMap.put(oraxenHook.getIdentifier(), oraxenHook); if (pluginManager.getPlugin("ItemAdder") != null) itemHookMap.put(itemAdderHook.getIdentifier(), itemAdderHook); this.itemHooks = new ItemHooks(itemHookMap); diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/ItemAdderHook.java b/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/ItemAdderHook.java index c1a462a5..71ea8905 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/ItemAdderHook.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/ItemAdderHook.java @@ -1,9 +1,8 @@ package io.github.fisher2911.hmccosmetics.hook.item; +import dev.lone.itemsadder.api.CustomStack; import io.github.fisher2911.hmccosmetics.hook.Hook; -import io.th0rgal.oraxen.items.ItemBuilder; import org.bukkit.inventory.ItemStack; -import dev.lone.itemsadder.api.CustomItem; public class ItemAdderHook implements ItemHook { @@ -22,8 +21,8 @@ public class ItemAdderHook implements ItemHook { @Override public ItemStack getItem(final String id) { - final CustomItem customItem = CustomItem.getInstance("id); - if (customItem == null) return null; - return customItem.getItemStack(); + final CustomStack stack = CustomStack.getInstance(id); + if ( stack == null ) return null; + return stack.getItemStack(); } } diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/listener/ItemsAdderListener.java b/src/main/java/io/github/fisher2911/hmccosmetics/listener/ItemsAdderListener.java index cace3b5f..de851e6c 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/listener/ItemsAdderListener.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/listener/ItemsAdderListener.java @@ -1,7 +1,10 @@ package io.github.fisher2911.hmccosmetics.listener; +import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent; import io.github.fisher2911.hmccosmetics.HMCCosmetics; import io.github.fisher2911.hmccosmetics.database.Database; +import io.github.fisher2911.hmccosmetics.hook.HookManager; +import io.github.fisher2911.hmccosmetics.hook.item.ItemAdderHook; import io.github.fisher2911.hmccosmetics.user.User; import io.github.fisher2911.hmccosmetics.user.UserManager; import net.kyori.adventure.text.Component; @@ -18,24 +21,25 @@ public class ItemsAdderListener implements Listener { private boolean enabled; private boolean loaded; - public JoinListener(final HMCCosmetics plugin) { + public ItemsAdderListener(final HMCCosmetics plugin) { this.plugin = plugin; enabled = HookManager.getInstance().isEnabled(ItemAdderHook.class); if (!this.enabled) { - this.plugin.load(); - this.loaded = true; - return; - } + this.plugin.load(); + this.loaded = true; + return; + } } @EventHandler public void onJoin(final ItemsAdderLoadDataEvent event) { this.load(); } - + private void load() { - if (this.enabled) { - this.plugin.load(); - this.loaded = true; + if (this.enabled) { + this.plugin.load(); + this.loaded = true; + } } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index dd407905..3d3f46d7 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,11 +1,12 @@ name: HMCCosmetics main: io.github.fisher2911.hmccosmetics.HMCCosmetics -version: 1.2.0 +version: 1.3.0 api-version: 1.17 softdepend: - Multiverse - PlaceholderAPI - Oraxen + - ItemsAdder depend: - ProtocolLib permissions: