diff --git a/jetpacks/build.gradle.kts b/jetpacks/build.gradle.kts index b47c1df..0b5c556 100644 --- a/jetpacks/build.gradle.kts +++ b/jetpacks/build.gradle.kts @@ -1,4 +1,4 @@ -version = "0.1.11-RC.1" +version = "0.1.12-RC.1" addon { main.set("xyz.xenondevs.nova.addon.jetpacks.Jetpacks") diff --git a/logistics/build.gradle.kts b/logistics/build.gradle.kts index b893b4a..5d0e746 100644 --- a/logistics/build.gradle.kts +++ b/logistics/build.gradle.kts @@ -1,4 +1,4 @@ -version = "0.2.7-RC.2" +version = "0.2.8-RC.1" dependencies { implementation(project(":simple-upgrades")) diff --git a/logistics/src/main/kotlin/xyz/xenondevs/nova/addon/logistics/advancement/Advancements.kt b/logistics/src/main/kotlin/xyz/xenondevs/nova/addon/logistics/advancement/Advancements.kt index 21629d5..7ab7ca0 100644 --- a/logistics/src/main/kotlin/xyz/xenondevs/nova/addon/logistics/advancement/Advancements.kt +++ b/logistics/src/main/kotlin/xyz/xenondevs/nova/addon/logistics/advancement/Advancements.kt @@ -1,8 +1,8 @@ package xyz.xenondevs.nova.addon.logistics.advancement import net.kyori.adventure.text.Component +import net.minecraft.advancements.AdvancementType import net.minecraft.advancements.DisplayInfo -import net.minecraft.advancements.FrameType import net.minecraft.advancements.critereon.PlayerTrigger import net.minecraft.resources.ResourceLocation import xyz.xenondevs.nmsutils.advancement.AdvancementLoader @@ -15,6 +15,7 @@ import xyz.xenondevs.nova.util.advancement import xyz.xenondevs.nova.util.component.adventure.toNMSComponent import xyz.xenondevs.nova.util.nmsCopy import xyz.xenondevs.nova.util.obtainNovaItemAdvancement +import java.util.* @Init(stage = InitStage.POST_PACK_PRE_WORLD) object Advancements { @@ -24,8 +25,8 @@ object Advancements { Items.ULTIMATE_CABLE.clientsideProvider.get().nmsCopy, Component.translatable("advancement.logistics.root.title").toNMSComponent(), Component.empty().toNMSComponent(), - ResourceLocation("minecraft", "textures/block/tuff.png"), - FrameType.TASK, + Optional.of(ResourceLocation("minecraft", "textures/block/tuff.png")), + AdvancementType.TASK, false, false, false )) diff --git a/machines/build.gradle.kts b/machines/build.gradle.kts index a9faa39..61f662e 100644 --- a/machines/build.gradle.kts +++ b/machines/build.gradle.kts @@ -1,4 +1,4 @@ -version = "0.4.4-RC.1" +version = "0.4.5-RC.1" dependencies { implementation(project(":simple-upgrades")) diff --git a/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/advancement/Advancements.kt b/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/advancement/Advancements.kt index c3bfd16..b7b7bd0 100644 --- a/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/advancement/Advancements.kt +++ b/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/advancement/Advancements.kt @@ -1,8 +1,8 @@ package xyz.xenondevs.nova.addon.machines.advancement import net.kyori.adventure.text.Component +import net.minecraft.advancements.AdvancementType import net.minecraft.advancements.DisplayInfo -import net.minecraft.advancements.FrameType import net.minecraft.advancements.critereon.PlayerTrigger import net.minecraft.resources.ResourceLocation import xyz.xenondevs.nmsutils.advancement.AdvancementLoader @@ -16,14 +16,15 @@ import xyz.xenondevs.nova.util.component.adventure.toNMSComponent import xyz.xenondevs.nova.util.nmsCopy import xyz.xenondevs.nova.util.obtainNovaItemAdvancement import xyz.xenondevs.nova.util.obtainNovaItemsAdvancement +import java.util.* private val ROOT = advancement(Machines, "root") { display(DisplayInfo( Items.QUARRY.clientsideProvider.get().nmsCopy, Component.translatable("advancement.machines.root.title").toNMSComponent(), Component.empty().toNMSComponent(), - ResourceLocation("minecraft", "textures/block/tuff.png"), - FrameType.TASK, + Optional.of(ResourceLocation("minecraft", "textures/block/tuff.png")), + AdvancementType.TASK, false, false, false )) diff --git a/settings.gradle.kts b/settings.gradle.kts index 6f11c43..ec06b2f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - from("xyz.xenondevs.nova:catalog:0.15-alpha.1") + from("xyz.xenondevs.nova:catalog:0.16-alpha.1") } } } diff --git a/simple-upgrades/build.gradle.kts b/simple-upgrades/build.gradle.kts index 519ec33..e4d0b52 100644 --- a/simple-upgrades/build.gradle.kts +++ b/simple-upgrades/build.gradle.kts @@ -1,4 +1,4 @@ -version = "1.2-RC.1" +version = "1.3-RC.1" addon { main.set("xyz.xenondevs.nova.addon.simpleupgrades.SimpleUpgrades") diff --git a/vanilla-hammers/build.gradle.kts b/vanilla-hammers/build.gradle.kts index f07020c..5676b52 100644 --- a/vanilla-hammers/build.gradle.kts +++ b/vanilla-hammers/build.gradle.kts @@ -1,4 +1,4 @@ -version = "1.3-RC.1" +version = "1.4-RC.1" addon { main.set("xyz.xenondevs.nova.addon.vanillahammers.VanillaHammers") diff --git a/vanilla-hammers/src/main/kotlin/xyz/xenondevs/nova/addon/vanillahammers/advancement/Advancements.kt b/vanilla-hammers/src/main/kotlin/xyz/xenondevs/nova/addon/vanillahammers/advancement/Advancements.kt index d54c3ee..2b128d7 100644 --- a/vanilla-hammers/src/main/kotlin/xyz/xenondevs/nova/addon/vanillahammers/advancement/Advancements.kt +++ b/vanilla-hammers/src/main/kotlin/xyz/xenondevs/nova/addon/vanillahammers/advancement/Advancements.kt @@ -1,8 +1,8 @@ package xyz.xenondevs.nova.addon.vanillahammers.advancement import net.kyori.adventure.text.Component +import net.minecraft.advancements.AdvancementType import net.minecraft.advancements.DisplayInfo -import net.minecraft.advancements.FrameType import net.minecraft.advancements.critereon.PlayerTrigger import net.minecraft.resources.ResourceLocation import xyz.xenondevs.nmsutils.advancement.AdvancementLoader @@ -15,14 +15,15 @@ import xyz.xenondevs.nova.util.advancement import xyz.xenondevs.nova.util.component.adventure.toNMSComponent import xyz.xenondevs.nova.util.nmsCopy import xyz.xenondevs.nova.util.obtainNovaItemAdvancement +import java.util.* private val ROOT = advancement(VanillaHammers, "root") { display(DisplayInfo( Items.WOODEN_HAMMER.clientsideProvider.get().nmsCopy, Component.translatable("advancement.vanilla_hammers.root.title").toNMSComponent(), Component.empty().toNMSComponent(), - ResourceLocation("minecraft", "textures/block/tuff.png"), - FrameType.TASK, + Optional.of(ResourceLocation("minecraft", "textures/block/tuff.png")), + AdvancementType.TASK, false, false, false ))