Tadpole

core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java

@@ -146,6 +146,7 @@ public final class EntityDefinitions {
     public static final EntityDefinition<SquidEntity> SQUID;
     public static final EntityDefinition<AbstractSkeletonEntity> STRAY;
     public static final EntityDefinition<StriderEntity> STRIDER;
+    public static final EntityDefinition<TadpoleEntity> TADPOLE;
     public static final EntityDefinition<TNTEntity> TNT;
     public static final EntityDefinition<MinecartEntity> TNT_MINECART;
     public static final EntityDefinition<TraderLlamaEntity> TRADER_LLAMA;
@@ -651,6 +652,10 @@ public final class EntityDefinitions {
                     .type(EntityType.SALMON)
                     .height(0.5f).width(0.7f)
                     .build();
+            TADPOLE = EntityDefinition.inherited(TadpoleEntity::new, abstractFishEntityBase)
+                    .type(EntityType.TADPOLE)
+                    .height(0.3f).width(0.4f)
+                    .build();
             TROPICAL_FISH = EntityDefinition.inherited(TropicalFishEntity::new, abstractFishEntityBase)
                     .type(EntityType.TROPICAL_FISH)
                     .heightAndWidth(0.6f)

core/src/main/java/org/geysermc/geyser/entity/type/living/TadpoleEntity.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.entity.type.living;
+
+import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
+import com.nukkitx.math.vector.Vector3f;
+import org.geysermc.geyser.entity.EntityDefinition;
+import org.geysermc.geyser.inventory.GeyserItemStack;
+import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.util.InteractionResult;
+import org.geysermc.geyser.util.InteractiveTag;
+
+import javax.annotation.Nonnull;
+import java.util.UUID;
+
+public class TadpoleEntity extends AbstractFishEntity {
+    public TadpoleEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
+        super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
+    }
+
+    @Nonnull
+    @Override
+    protected InteractiveTag testMobInteraction(@Nonnull Hand hand, @Nonnull GeyserItemStack itemInHand) {
+        if (isFood(itemInHand)) {
+            return InteractiveTag.FEED;
+        }
+        return super.testMobInteraction(hand, itemInHand);
+    }
+
+    @Nonnull
+    @Override
+    protected InteractionResult mobInteract(@Nonnull Hand hand, @Nonnull GeyserItemStack itemInHand) {
+        if (isFood(itemInHand)) {
+            //TODO particles
+            return InteractionResult.SUCCESS;
+        }
+        return super.mobInteract(hand, itemInHand);
+    }
+
+    private boolean isFood(GeyserItemStack itemStack) {
+        return itemStack.getJavaId() == session.getItemMappings().getStoredItems().slimeBall();
+    }
+}

core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FrogEntity.java

@@ -69,6 +69,6 @@ public class FrogEntity extends AnimalEntity {
 
     @Override
     public boolean canEat(String javaIdentifierStripped, ItemMapping mapping) {
-        return javaIdentifierStripped.equals("slime_ball");
+        return mapping.getJavaId() == session.getItemMappings().getStoredItems().slimeBall();
     }
 }

core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java

@@ -60,6 +60,7 @@ public class StoredItemMappings {
     private final int saddle;
     private final int shears;
     private final ItemMapping shield;
+    private final int slimeBall;
     private final int waterBucket;
     private final ItemMapping wheat;
     private final ItemMapping writableBook;
@@ -87,6 +88,7 @@ public class StoredItemMappings {
         this.saddle = load(itemMappings, "saddle").getJavaId();
         this.shears = load(itemMappings, "shears").getJavaId();
         this.shield = load(itemMappings, "shield");
+        this.slimeBall = load(itemMappings, "slime_ball").getJavaId();
         this.waterBucket = load(itemMappings, "water_bucket").getJavaId();
         this.wheat = load(itemMappings, "wheat");
         this.writableBook = load(itemMappings, "writable_book");