From 44af9da01da3bbade88bdd56e6b884266e917f7c Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Fri, 11 Feb 2022 13:37:19 -0500
Subject: [PATCH] Use axolotl tempt tag to determine axolotl food

---
 .../geyser/entity/type/living/animal/AxolotlEntity.java    | 2 +-
 .../java/org/geysermc/geyser/session/cache/TagCache.java   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java
index ec919a5c4..2ada1fe09 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java
@@ -56,7 +56,7 @@ public class AxolotlEntity extends AnimalEntity {
 
     @Override
     public boolean canEat(String javaIdentifierStripped, ItemMapping mapping) {
-        return javaIdentifierStripped.equals("tropical_fish_bucket");
+        return session.getTagCache().isAxolotlTemptItem(mapping);
     }
 
     @Override
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
index f2f1597fe..0f73737bb 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
@@ -53,6 +53,7 @@ public class TagCache {
     private IntList requiresDiamondTool;
 
     /* Items */
+    private IntList axolotlTemptItems;
     private IntList flowers;
     private IntList foxFood;
     private IntList piglinLoved;
@@ -77,6 +78,7 @@ public class TagCache {
         this.requiresDiamondTool = IntList.of(blockTags.get("minecraft:needs_diamond_tool"));
 
         Map<String, int[]> itemTags = packet.getTags().get("minecraft:item");
+        this.axolotlTemptItems = IntList.of(itemTags.get("minecraft:axolotl_tempt_items"));
         this.flowers = IntList.of(itemTags.get("minecraft:flowers"));
         this.foxFood = IntList.of(itemTags.get("minecraft:fox_food"));
         this.piglinLoved = IntList.of(itemTags.get("minecraft:piglin_loved"));
@@ -102,11 +104,16 @@ public class TagCache {
         this.requiresIronTool = IntLists.emptyList();
         this.requiresDiamondTool = IntLists.emptyList();
 
+        this.axolotlTemptItems = IntLists.emptyList();
         this.flowers = IntLists.emptyList();
         this.foxFood = IntLists.emptyList();
         this.piglinLoved = IntLists.emptyList();
     }
 
+    public boolean isAxolotlTemptItem(ItemMapping itemMapping) {
+        return axolotlTemptItems.contains(itemMapping.getJavaId());
+    }
+
     public boolean isFlower(ItemMapping mapping) {
         return flowers.contains(mapping.getJavaId());
     }