From cfd6b101d8269c6862787237abdac22ae29ec959 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Wed, 12 Mar 2025 20:31:59 +0700
Subject: [PATCH] Fix addEatEffect hook

---
 .../kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt     | 5 +++--
 src/main/resources/coremods/code_injector.js                 | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
index c69c2a785..f758b929c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
@@ -29,6 +29,7 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.boss.wither.WitherBoss
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.food.FoodProperties
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.ProjectileWeaponItem
@@ -1521,14 +1522,14 @@ class MatteryPlayer(val ply: Player) {
 		 * hooked into LivingEntity through coremod script
 		 */
 		@JvmStatic
-		fun addEatEffectHook(iterator: Iterator<com.mojang.datafixers.util.Pair<MobEffectInstance, Float>>, entity: LivingEntity): Iterator<com.mojang.datafixers.util.Pair<MobEffectInstance, Float>> {
+		fun addEatEffectHook(iterator: Iterator<FoodProperties.PossibleEffect>, entity: LivingEntity): Iterator<FoodProperties.PossibleEffect> {
 			if (entity !is Player) {
 				return iterator
 			}
 
 			if (entity.matteryPlayer.isAndroid) {
 				return iterator.filter {
-					it.first.effect != MobEffects.HUNGER
+					it.effect().effect != MobEffects.HUNGER
 				}
 			}
 
diff --git a/src/main/resources/coremods/code_injector.js b/src/main/resources/coremods/code_injector.js
index 7e74e0071..bd543beb8 100644
--- a/src/main/resources/coremods/code_injector.js
+++ b/src/main/resources/coremods/code_injector.js
@@ -576,7 +576,7 @@ function backtrack(instructions, from, opcode, skipAmount) {
 
 function initializeCoreMod() {
 	return {
-		'LivingEntity#addEatEffect patch for androids': method('net.minecraft.world.entity.LivingEntity.m_21063_(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)V', function(node) {
+		'LivingEntity#addEatEffect patch for androids': method('net.minecraft.world.entity.LivingEntity.addEatEffect(Lnet/minecraft/world/food/FoodProperties;)V', function(node) {
 			for (var i = 0; i < node.instructions.size(); i++) {
 				var instr = node.instructions.get(i)