fix dupe with drying mats, make firmalife bushes mineable with a scythe

eerussianguy · Sep 23, 2023 · 830e3d8 · 830e3d8
1 parent 4d72cda
commit 830e3d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/resources/data.py b/resources/data.py
@@ -88,7 +88,7 @@ def generate(rm: ResourceManager):
     rm.block_tag('drops_ice_shavings', 'minecraft:ice')
 
     rm.block_tag('minecraft:mineable/axe', *['firmalife:plant/%s_branch' % t for t in FRUITS], *['firmalife:plant/%s_growing_branch' % t for t in FRUITS])
-    rm.block_tag('tfc:mineable_with_sharp_tool', *['firmalife:plant/%s_leaves' % t for t in FRUITS], *['firmalife:plant/%s_sapling' % t for t in FRUITS])
+    rm.block_tag('tfc:mineable_with_sharp_tool', *['firmalife:plant/%s_leaves' % t for t in FRUITS], *['firmalife:plant/%s_sapling' % t for t in FRUITS], *['firmalife:plant/%s_bush' % b for b in STILL_BUSHES.keys()])
     rm.block_tag('tfc:replaceable_plants', *['firmalife:plant/%s' % p for p in HERBS], 'firmalife:plant/butterfly_grass')
 
     rm.entity_tag('drops_rennet', 'tfc:goat', 'tfc:yak')

diff --git a/src/main/java/com/eerussianguy/firmalife/common/blockentities/DryingMatBlockEntity.java b/src/main/java/com/eerussianguy/firmalife/common/blockentities/DryingMatBlockEntity.java
@@ -41,7 +41,12 @@ public static void serverTick(Level level, BlockPos pos, BlockState state, Dryin
 
         if (mat.cachedRecipe != null)
         {
-            if (mat.getTicksLeft() <= 0)
+            if (!mat.cachedRecipe.matches(new ItemStackInventory(mat.inventory.getStackInSlot(0)), level))
+            {
+                mat.cachedRecipe = null;
+                mat.resetCounter();
+            }
+            else if (mat.getTicksLeft() <= 0)
             {
                 mat.finish();
             }

diff --git a/src/main/resources/data/tfc/tags/blocks/mineable_with_sharp_tool.json b/src/main/resources/data/tfc/tags/blocks/mineable_with_sharp_tool.json
@@ -23,6 +23,8 @@
     "firmalife:plant/cocoa_leaves",
     "firmalife:plant/fig_leaves",
     "firmalife:plant/cocoa_sapling",
-    "firmalife:plant/fig_sapling"
+    "firmalife:plant/fig_sapling",
+    "firmalife:plant/nightshade_bush",
+    "firmalife:plant/pineapple_bush"
   ]
 }