diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 0e63eff9..8333a8a0 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -5,7 +5,7 @@ plugins { repositories { maven("https://jitpack.io/") // rtag - maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi maven("https://oss.sonatype.org/content/repositories/snapshots") } diff --git a/compatibility/build.gradle.kts b/compatibility/build.gradle.kts index deff0b08..b84ea422 100644 --- a/compatibility/build.gradle.kts +++ b/compatibility/build.gradle.kts @@ -1,7 +1,7 @@ repositories { maven("https://maven.enginehub.org/repo/") // worldguard worldedit maven("https://jitpack.io/") // itemsadder customcrops - maven("https://papermc.io/repo/repository/maven-public/") // paper + maven("https://repo.papermc.io/repository/maven-public/") // paper maven("https://mvn.lumine.io/repository/maven-public/") // mythicmobs maven("https://nexus.phoenixdevt.fr/repository/maven-public/") // mmoitems maven("https://papermc.io/repo/repository/maven-public/") diff --git a/compatibility/libs/CraftEngine-beta.jar b/compatibility/libs/CraftEngine-beta.jar index c1cc7820..3db889af 100644 Binary files a/compatibility/libs/CraftEngine-beta.jar and b/compatibility/libs/CraftEngine-beta.jar differ diff --git a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineProvider.java b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineProvider.java index 6655c3df..d8f69079 100644 --- a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineProvider.java +++ b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineProvider.java @@ -17,8 +17,8 @@ package net.momirealms.customfishing.bukkit.integration.item; -import net.momirealms.craftengine.api.CraftEngine; -import net.momirealms.craftengine.common.util.Key; +import net.momirealms.craftengine.api.Key; +import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; import net.momirealms.customfishing.api.integration.ItemProvider; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -38,12 +38,12 @@ public class CraftEngineProvider implements ItemProvider { @NotNull @Override public ItemStack buildItem(@NotNull Player player, @NotNull String id) { - ItemStack itemStack = CraftEngine.instance().itemManager().buildItem(Key.fromString(id), player); + ItemStack itemStack = BukkitCraftEngine.instance().itemManager().buildItem(Key.of(id), BukkitCraftEngine.instance().adapt(player)); return requireNonNull(itemStack, "Item not found in CraftEngine: " + id); } @Override public String itemID(@NotNull ItemStack itemStack) { - return Optional.ofNullable(CraftEngine.instance().itemManager().itemId(itemStack)).map(Key::toString).orElse(null); + return Optional.ofNullable(BukkitCraftEngine.instance().itemManager().itemId(itemStack)).map(Key::toString).orElse(null); } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 099292f1..e7d36a9a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -6,7 +6,7 @@ repositories { maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi maven("https://libraries.minecraft.net") // brigadier maven("https://jitpack.io/") // sparrow-heart, rtag - maven("https://papermc.io/repo/repository/maven-public/") // paper + maven("https://repo.papermc.io/repository/maven-public/") // paper maven("https://oss.sonatype.org/content/repositories/snapshots") maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // spigot } diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java index 4e3e2c2a..87f9cb28 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java @@ -891,7 +891,7 @@ public class BukkitGameManager implements GameManager { + OffsetUtils.getOffsetChars(pointerOffset + progress) + AdventureHelper.surroundWithMiniMessageFont(pointerImage, font) + OffsetUtils.getOffsetChars(totalWidth - progress - pointerWidth); - SparrowHeart.getInstance().sendTitle(getPlayer(), AdventureHelper.miniMessageToJson(sendTitle.render(hook.getContext())), AdventureHelper.miniMessageToJson(bar), 0, 10, 0); + SparrowHeart.getInstance().sendTitle(getPlayer(), AdventureHelper.miniMessageToJson(sendTitle.render(hook.getContext())), AdventureHelper.miniMessageToJson(bar), 0, 20, 0); } }; } diff --git a/gradle.properties b/gradle.properties index 53a67bdf..5f349b19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ asm_commons_version=9.7.1 jar_relocator_version=1.7 h2_driver_version=2.3.232 sqlite_driver_version=3.47.0.0 -adventure_bundle_version=4.17.0 +adventure_bundle_version=4.18.0 adventure_platform_version=4.3.4 sparrow_heart_version=0.49 cloud_core_version=2.0.0