From f3bf84a7a251ade652843538cbbba252095623d5 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 1 Jan 2024 12:19:07 +0700
Subject: [PATCH] Make mod compile against 1.19.4

---
 .../ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt    | 4 +---
 .../mc/otm/datagen/recipes/MatteryRecipeProvider.kt          | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

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 0e999e52a..bfb78c050 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
@@ -1,11 +1,9 @@
 package ru.dbotthepony.mc.otm.datagen.advancements
 
 import net.minecraft.advancements.Advancement
-import net.minecraft.advancements.Criterion
 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
@@ -71,6 +69,6 @@ fun criterion(item: ItemLike): CriterionTriggerInstance {
 	return InventoryChangeTrigger.TriggerInstance.hasItems(predicate(item))
 }
 
-fun EntityPredicate.wrap(): ContextAwarePredicate = EntityPredicate.wrap(this)
+fun EntityPredicate.wrap(): EntityPredicate.Composite = EntityPredicate.Composite.wrap(this)
 
 fun Advancement.Builder.save(advancement: Consumer<Advancement>, name: ResourceLocation) = save(advancement, name.toString())
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 bb937d3ed..510ce2bd2 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,8 +1,7 @@
 package ru.dbotthepony.mc.otm.datagen.recipes
 
-import net.minecraft.advancements.Criterion
 import net.minecraft.advancements.CriterionTriggerInstance
-import net.minecraft.advancements.critereon.ContextAwarePredicate
+import net.minecraft.advancements.critereon.EntityPredicate
 import net.minecraft.advancements.critereon.InventoryChangeTrigger
 import net.minecraft.advancements.critereon.ItemPredicate
 import net.minecraft.advancements.critereon.MinMaxBounds
@@ -41,7 +40,7 @@ fun has(p_125976_: TagKey<Item>): CriterionTriggerInstance {
 
 fun inventoryTrigger(vararg p_126012_: ItemPredicate): CriterionTriggerInstance {
 	return InventoryChangeTrigger.TriggerInstance(
-		ContextAwarePredicate.ANY,
+		EntityPredicate.Composite.ANY,
 		MinMaxBounds.Ints.ANY,
 		MinMaxBounds.Ints.ANY,
 		MinMaxBounds.Ints.ANY,