Fix some stuff

Author: TwoLeggedCat

src/main/java/me/twoleggedcat/bettercats/Main.java

@@ -1,7 +1,7 @@
 package me.twoleggedcat.bettercats;
 
 import com.destroystokyo.paper.event.entity.EntityAddToWorldEvent;
-import me.twoleggedcat.bettercats.ai.PlayWithItemGoal;
+import me.twoleggedcat.bettercats.ai.CatPlayWithItemGoal;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -42,8 +42,8 @@ public void onDisable() {
     public void onEntityLoad(EntityAddToWorldEvent e) {
         if (e.getEntityType() == EntityType.CAT) {
             Cat cat = (Cat) e.getEntity();
-            Bukkit.getMobGoals().addGoal(cat, 8, new PlayWithItemGoal(this, cat, Material.SALMON));
-            Bukkit.getMobGoals().addGoal(cat, 8, new PlayWithItemGoal(this, cat, Material.STRING));
+            Bukkit.getMobGoals().addGoal(cat, 8, new CatPlayWithItemGoal(this, cat, Material.SALMON));
+            Bukkit.getMobGoals().addGoal(cat, 8, new CatPlayWithItemGoal(this, cat, Material.STRING));
         }
     }
 

src/main/java/me/twoleggedcat/bettercats/ai/PlayWithItemGoal.java renamed to src/main/java/me/twoleggedcat/bettercats/ai/CatPlayWithItemGoal.java

@@ -5,6 +5,7 @@
 import com.destroystokyo.paper.entity.ai.GoalType;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
+import org.bukkit.Sound;
 import org.bukkit.entity.Cat;
 import org.bukkit.entity.Item;
 import org.bukkit.plugin.Plugin;
@@ -15,21 +16,22 @@
 import java.util.EnumSet;
 import java.util.concurrent.ThreadLocalRandom;
 
-public class PlayWithItemGoal implements Goal<Cat> {
+public class CatPlayWithItemGoal implements Goal<Cat> {
     private final GoalKey<Cat> key;
     private final Cat cat;
     private final Material targetType;
     private Item targetItem;
+    private int ticksPlayed;
 
-    public PlayWithItemGoal(Plugin plugin, Cat cat, Material targetType) {
+    public CatPlayWithItemGoal(Plugin plugin, Cat cat, Material targetType) {
         this.key = GoalKey.of(Cat.class, new NamespacedKey(plugin, "play_with_item"));
         this.cat = cat;
         this.targetType = targetType;
     }
 
     @Override
     public boolean shouldActivate() {
-        return (findItem() && Math.random() < 0.7);
+        return findItem();
     }
 
     @Override
@@ -54,7 +56,13 @@ public void tick() {
             return;
         cat.getPathfinder().moveTo(targetItem.getLocation(), 1.2);
         if (targetItem.getLocation().distanceSquared(cat.getLocation()) < 1) {
-            targetItem.setVelocity(new Vector(randomDouble(-0.25, 0.25), randomDouble(-0.25, 0.25), randomDouble(-0.25, 0.25)));
+            if (ticksPlayed > 600 && targetItem.getItemStack().getType().isEdible()) {
+                targetItem.remove();
+                cat.getWorld().playSound(cat.getLocation(), Sound.ENTITY_CAT_AMBIENT, 1, 1);
+            } else {
+                targetItem.setVelocity(new Vector(randomDouble(-0.25, 0.25), randomDouble(-0.25, 0.25), randomDouble(-0.25, 0.25)));
+                ticksPlayed++;
+            }
         }
     }
 
@@ -87,7 +95,8 @@ private boolean findItem() {
         if (targetItem == null || !targetItem.isValid()) {
             targetItem = getNearbyTargetItem();
             return targetItem != null;
-        } else return true;
+        } else
+            return true;
     }
 
     private int randomInt(int min, int max) {