Allow treats to be put in the treat bag & make dogs beg when held

Closes #360
percivalalb · Nov 13, 2021 · 4df2116 · 4df2116
1 parent 990e5fc
commit 4df2116
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/doggytalents/common/entity/ai/DogBegGoal.java b/src/main/java/doggytalents/common/entity/ai/DogBegGoal.java
@@ -71,6 +71,10 @@ private boolean hasTemptationItemInHand(PlayerEntity player) {
                 return true;
             }
 
+            if (itemstack.getItem().is(DoggyTags.TREATS)) {
+                return true;
+            }
+
             if (FoodHandler.isFood(itemstack).isPresent()) {
                 return true;
             }

diff --git a/src/main/java/doggytalents/common/inventory/TreatBagItemHandler.java b/src/main/java/doggytalents/common/inventory/TreatBagItemHandler.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Nonnull;
 
+import doggytalents.DoggyTags;
 import doggytalents.api.feature.FoodHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
@@ -28,6 +29,6 @@ protected void onContentsChanged(int slot) {
 
     @Override
     public boolean isItemValid(int slot, @Nonnull ItemStack stack) {
-        return FoodHandler.isFood(stack).isPresent();
+        return stack.getItem().is(DoggyTags.TREATS) || FoodHandler.isFood(stack).isPresent();
     }
 }