diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt index 4a5289f30..7ff42e320 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt @@ -4,6 +4,7 @@ import net.minecraft.advancements.Advancement import net.minecraft.advancements.CriterionTriggerInstance import net.minecraft.advancements.DisplayInfo import net.minecraft.advancements.FrameType +import net.minecraft.advancements.critereon.ContextAwarePredicate import net.minecraft.advancements.critereon.EntityPredicate import net.minecraft.advancements.critereon.InventoryChangeTrigger import net.minecraft.advancements.critereon.ItemPredicate @@ -68,4 +69,4 @@ fun criterion(item: ItemLike): CriterionTriggerInstance { return InventoryChangeTrigger.TriggerInstance.hasItems(predicate(item)) } -fun EntityPredicate.wrap(): EntityPredicate.Composite = EntityPredicate.Composite.wrap(this) +fun EntityPredicate.wrap(): ContextAwarePredicate = EntityPredicate.wrap(this) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt index c034f6803..945763b6f 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt @@ -1,5 +1,6 @@ package ru.dbotthepony.mc.otm.datagen.recipes +import net.minecraft.advancements.critereon.ContextAwarePredicate import net.minecraft.advancements.critereon.EntityPredicate import net.minecraft.advancements.critereon.InventoryChangeTrigger import net.minecraft.advancements.critereon.ItemPredicate @@ -38,7 +39,7 @@ fun has(p_125976_: TagKey): InventoryChangeTrigger.TriggerInstance { fun inventoryTrigger(vararg p_126012_: ItemPredicate): InventoryChangeTrigger.TriggerInstance { return InventoryChangeTrigger.TriggerInstance( - EntityPredicate.Composite.ANY, + ContextAwarePredicate.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY,