From 7024a186ab9e8e0a30834327b278229264567ba1 Mon Sep 17 00:00:00 2001
From: EERussianguy <eerussianguy@gmail.com>
Date: Tue, 6 Sep 2022 16:58:51 -0400
Subject: [PATCH] fix typo, change swarm behavior

---
 resources/recipes.py                                          | 2 +-
 .../com/eerussianguy/firmalife/common/misc/SwarmEffect.java   | 4 ++--
 .../data/firmalife/recipes/mixing_bowl/pizza_dough.json       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/recipes.py b/resources/recipes.py
index f90435cc..7f918b9d 100644
--- a/resources/recipes.py
+++ b/resources/recipes.py
@@ -133,7 +133,7 @@ def generate(rm: ResourceManager):
     mixing_recipe(rm, 'butter', ingredients=[utils.ingredient('tfc:powder/salt')], fluid='1000 firmalife:cream', output_item='firmalife:food/butter')
     mixing_recipe(rm, 'pie_dough', ingredients=[not_rotten('firmalife:food/butter'), not_rotten('#tfc:foods/flour'), utils.ingredient('#firmalife:sweetener')], fluid='1000 minecraft:water', output_item='firmalife:food/pie_dough')
     mixing_recipe(rm, 'pumpkin_pie_dough', ingredients=[not_rotten('minecraft:egg'), not_rotten('firmalife:food/pumpkin_chunks'), not_rotten('firmalife:food/pumpkin_chunks'), not_rotten('#tfc:foods/flour'), utils.ingredient('#firmalife:sweetener')], fluid='1000 minecraft:water', output_item='firmalife:food/pumpkin_pie_dough')
-    mixing_recipe(rm, 'pizza_dough', ingredients=[not_rotten('#tfc:foods/dough'), utils.ingredient('tfc:powder/salt'), utils.ingredient('firmalife:basil_leaves')], fluid='1000 tfc:olive_oil', output_item='4 firmalife:food/pizza_dough')
+    mixing_recipe(rm, 'pizza_dough', ingredients=[not_rotten('#tfc:foods/dough'), utils.ingredient('tfc:powder/salt'), utils.ingredient('firmalife:spice/basil_leaves')], fluid='1000 tfc:olive_oil', output_item='4 firmalife:food/pizza_dough')
 
     meal_shapeless(rm, 'crafting/filled_pie', ('firmalife:food/pie_dough', '#firmalife:foods/preserves', '#firmalife:pie_pans'), 'firmalife:food/filled_pie', 'firmalife:pie').with_advancement('firmalife:food/pie_dough')
     meal_shapeless(rm, 'crafting/raw_pizza', ('firmalife:food/pizza_dough', '#firmalife:foods/pizza_ingredients', '#firmalife:foods/pizza_ingredients', 'firmalife:food/shredded_cheese'), 'firmalife:food/raw_pizza', 'firmalife:pizza').with_advancement('firmalife:food/pizza_dough')
diff --git a/src/main/java/com/eerussianguy/firmalife/common/misc/SwarmEffect.java b/src/main/java/com/eerussianguy/firmalife/common/misc/SwarmEffect.java
index 774cc711..fa4a6fd0 100644
--- a/src/main/java/com/eerussianguy/firmalife/common/misc/SwarmEffect.java
+++ b/src/main/java/com/eerussianguy/firmalife/common/misc/SwarmEffect.java
@@ -45,9 +45,9 @@ public boolean isDurationEffectTick(int time, int amp)
     @Override
     public void applyEffectTick(LivingEntity entity, int amplifier)
     {
-        if (entity.getHealth() > 1.0F && !entity.isInWaterOrRain() && FLConfig.SERVER.enableBeeSwarm.get())
+        if (!entity.isInWaterOrRain() && FLConfig.SERVER.enableBeeSwarm.get())
         {
-            entity.hurt(FLDamageSources.SWARM, 1.0F);
+            entity.hurt(FLDamageSources.SWARM, 0.5F);
         }
         particles(entity.getLevel(), entity.blockPosition(), entity.getRandom());
     }
diff --git a/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json b/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json
index 044304b1..8f61e5e2 100644
--- a/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json
+++ b/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json
@@ -12,7 +12,7 @@
       "item": "tfc:powder/salt"
     },
     {
-      "item": "firmalife:basil_leaves"
+      "item": "firmalife:spice/basil_leaves"
     }
   ],
   "fluid_ingredient": {