diff --git a/build.gradle.kts b/build.gradle.kts index c9921606..1efba9b5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,6 +27,7 @@ allprojects { // ProtocolLib repo maven("https://repo.dmulloy2.net/repository/public/") //ProtocolLib Repo, constantly down maven("https://repo.mineinabyss.com/releases/") + maven("https://repo.mineinabyss.com/snapshots/") // PlaceholderAPI maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") @@ -71,12 +72,10 @@ allprojects { compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") compileOnly("me.clip:placeholderapi:2.11.1") - compileOnly("com.ticxo.modelengine:api:R3.0.1") + compileOnly("com.ticxo:modelengine:R3.0.1") compileOnly("com.github.oraxen:oraxen:-SNAPSHOT") compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5") - compileOnly("com.mineinabyss:idofront:0.12.111") - compileOnly("com.mineinabyss:geary-papermc-core:0.19.113") - compileOnly("com.mineinabyss:looty:0.8.67") + compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT") compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT") compileOnly("it.unimi.dsi:fastutil:8.5.11") compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4") @@ -169,7 +168,7 @@ bukkit { apiVersion = "1.17" authors = listOf("LoJoSho") depend = listOf("ProtocolLib") - softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Looty", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish", "LibsDisguises", "Denizen") + softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Geary", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish", "LibsDisguises", "Denizen") version = "${project.version}" commands { @@ -256,4 +255,4 @@ bukkit { java { toolchain.languageVersion.set(JavaLanguageVersion.of(17 )) -} \ No newline at end of file +} diff --git a/common/build.gradle.kts b/common/build.gradle.kts index d4f52858..5492a45d 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -9,11 +9,10 @@ dependencies { compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") compileOnly("me.clip:placeholderapi:2.11.1") - compileOnly("com.ticxo.modelengine:api:R3.0.1") + compileOnly("com.ticxo:modelengine:R3.0.1") compileOnly("com.github.oraxen:oraxen:-SNAPSHOT") compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5") - compileOnly("com.mineinabyss:geary-papermc-core:0.19.113") - compileOnly("com.mineinabyss:looty:0.8.67") + compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT") compileOnly("com.hibiscus:hmccolor:0.3-SNAPSHOT") compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT") compileOnly("it.unimi.dsi:fastutil:8.5.11") diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java index ecf0b325..43f35232 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java @@ -17,7 +17,7 @@ public class Hooks { private static final HashMap hooks = new HashMap<>(); private static HookOraxen ORAXEN_HOOK = new HookOraxen(); private static HookItemAdder ITEMADDER_HOOK = new HookItemAdder(); - private static HookLooty LOOTY_HOOK = new HookLooty(); + private static HookGeary GEARY_HOOK = new HookGeary(); private static HookMythic MYTHIC_HOOK = new HookMythic(); private static HookDenizen DENIZEN_HOOK = new HookDenizen(); private static HookHMCCosmetics HMCCOSMETIC_HOOK = new HookHMCCosmetics(); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookLooty.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookGeary.java similarity index 55% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookLooty.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookGeary.java index 74e85b8a..a857b69c 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookLooty.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookGeary.java @@ -1,28 +1,28 @@ package com.hibiscusmc.hmccosmetics.hooks.items; import com.hibiscusmc.hmccosmetics.hooks.Hook; +import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingKt; import com.mineinabyss.geary.prefabs.PrefabKey; -import com.mineinabyss.looty.LootyFactory; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; /** - * A hook that integrates the plugin {@link com.mineinabyss.looty.LootyPlugin Looty} to provide custom items + * A hook that integrates the plugin {@link com.mineinabyss.geary.papermc.GearyPlugin Geary} to provide custom items */ @SuppressWarnings("SpellCheckingInspection") -public class HookLooty extends Hook { - public HookLooty() { - super("looty"); +public class HookGeary extends Hook { + public HookGeary() { + super("geary"); setEnabledItemHook(true); } /** - * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link com.mineinabyss.looty.LootyPlugin Looty} + * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link com.mineinabyss.geary.papermc.GearyPlugin Geary} */ @Override public ItemStack getItem(@NotNull String itemId) { PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId); if (prefabKey == null) return null; - return LootyFactory.INSTANCE.createFromPrefab(prefabKey); + return ItemTrackingKt.getItemTracking().getProvider().serializePrefabToItemStack(prefabKey, null); } }