diff --git a/build.gradle.kts b/build.gradle.kts index f1cc2b1fe..86a3d2f44 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,11 @@ plugins { `java-library` - id("io.papermc.paperweight.userdev") version "1.4.0" + id("io.papermc.paperweight.userdev") version "1.5.3" id("xyz.jpenilla.run-paper") version "1.0.6" // Adds runServer and runMojangMappedServer tasks for testing } dependencies { - paperDevBundle("1.19.3-R0.1-SNAPSHOT") + paperDevBundle("1.19.4-R0.1-SNAPSHOT") } java { @@ -28,7 +28,7 @@ subprojects { repositories() { mavenCentral() maven("https://papermc.io/repo/repository/maven-public/") - maven("https://repo.dmulloy2.net/nexus/repository/public/") + //maven("https://repo.dmulloy2.net/nexus/repository/public/") maven("https://repo.mikeprimm.com/") maven("https://repo.codemc.org/repository/maven-public/") maven("https://jitpack.io") @@ -41,8 +41,8 @@ subprojects { } dependencies { - compileOnly(group = "org.jetbrains", name = "annotations", version = "20.0.0") - annotationProcessor("org.jetbrains:annotations:20.0.0") + compileOnly(group = "org.jetbrains", name = "annotations", version = "24.0.1") + annotationProcessor("org.jetbrains:annotations:24.0.1") } } @@ -53,7 +53,7 @@ configure(subprojects.filter { apply(plugin = "io.papermc.paperweight.userdev") dependencies { - paperDevBundle("1.19.3-R0.1-SNAPSHOT") + paperDevBundle("1.19.4-R0.1-SNAPSHOT") } tasks { diff --git a/vane-core/src/main/java/org/oddlama/vane/core/enchantments/BukkitEnchantmentWrapper.java b/vane-core/src/main/java/org/oddlama/vane/core/enchantments/BukkitEnchantmentWrapper.java index 630d3015e..022e1b272 100644 --- a/vane-core/src/main/java/org/oddlama/vane/core/enchantments/BukkitEnchantmentWrapper.java +++ b/vane-core/src/main/java/org/oddlama/vane/core/enchantments/BukkitEnchantmentWrapper.java @@ -1,7 +1,7 @@ package org.oddlama.vane.core.enchantments; import net.minecraft.world.item.enchantment.Enchantment; -import org.bukkit.craftbukkit.v1_19_R2.enchantments.CraftEnchantment; +import org.bukkit.craftbukkit.v1_19_R3.enchantments.CraftEnchantment; import org.jetbrains.annotations.NotNull; public class BukkitEnchantmentWrapper extends CraftEnchantment { diff --git a/vane-core/src/main/java/org/oddlama/vane/core/item/VanillaFunctionalityInhibitor.java b/vane-core/src/main/java/org/oddlama/vane/core/item/VanillaFunctionalityInhibitor.java index cef61432f..468fe8a68 100644 --- a/vane-core/src/main/java/org/oddlama/vane/core/item/VanillaFunctionalityInhibitor.java +++ b/vane-core/src/main/java/org/oddlama/vane/core/item/VanillaFunctionalityInhibitor.java @@ -4,7 +4,7 @@ import static org.oddlama.vane.util.Nms.item_handle; import org.bukkit.Keyed; -import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; diff --git a/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java b/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java index 64e958766..d1ba63d39 100644 --- a/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java +++ b/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java @@ -76,7 +76,7 @@ public void add_item_override( private String generate_pack_mcmeta() { final var pack = new JSONObject(); - pack.put("pack_format", 12); + pack.put("pack_format", 13); pack.put("description", description); final var root = new JSONObject(); diff --git a/vane-core/src/main/java/org/oddlama/vane/util/ItemUtil.java b/vane-core/src/main/java/org/oddlama/vane/util/ItemUtil.java index b5fd59151..fde7fb9f9 100644 --- a/vane-core/src/main/java/org/oddlama/vane/util/ItemUtil.java +++ b/vane-core/src/main/java/org/oddlama/vane/util/ItemUtil.java @@ -20,8 +20,8 @@ import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.OfflinePlayer; -import org.bukkit.craftbukkit.v1_19_R2.enchantments.CraftEnchantment; -import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R3.enchantments.CraftEnchantment; +import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/vane-core/src/main/java/org/oddlama/vane/util/Nms.java b/vane-core/src/main/java/org/oddlama/vane/util/Nms.java index bc166bab3..e6c3d29a7 100644 --- a/vane-core/src/main/java/org/oddlama/vane/util/Nms.java +++ b/vane-core/src/main/java/org/oddlama/vane/util/Nms.java @@ -8,12 +8,12 @@ import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R2.CraftServer; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_19_R2.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v1_19_R3.CraftServer; +import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R3.util.CraftNamespacedKey; import org.bukkit.enchantments.EnchantmentTarget; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -140,7 +140,7 @@ public static void register_entity( // https://papermc.io/forums/t/register-and-spawn-a-custom-entity-on-1-13-x/293, // adapted for 1.18 // Get the datafixer - final var world_version = SharedConstants.getCurrentVersion().getWorldVersion(); + final var world_version = SharedConstants.getCurrentVersion().getDataVersion().getVersion(); final var world_version_key = DataFixUtils.makeKey(world_version); final var data_types = DataFixers .getDataFixer() diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/Trowel.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/Trowel.java index cd5ba397b..2e56b66d9 100644 --- a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/Trowel.java +++ b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/Trowel.java @@ -13,7 +13,7 @@ import org.bukkit.NamespacedKey; import org.bukkit.Sound; import org.bukkit.SoundCategory; -import org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock; +import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventHandler;