Merge branch 'main' into Minecraft-1.20.2

Author: doc-bok

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### 7.6.0 (2026-06-04)
+ - Added the Smile Butterfly.
+
 ### 7.5.0 (2026-05-22)
  - Added the Peacemaker Lair.
 

gradle.properties

@@ -48,7 +48,7 @@ mod_name=Butterfly Mod
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=7.5.0
+mod_version=7.6.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/bokmcdok/butterflies/world/ButterflyData.java

@@ -171,7 +171,8 @@ public enum Trait {
         MIMICRY,
         MOTHWANDERER,
         POISONOUS,
-        LAVA
+        LAVA,
+        FEARLESS
     }
 
     // Constants representing the base life spans of each butterfly cycle.

src/main/java/com/bokmcdok/butterflies/world/ButterflyInfo.java

@@ -50,6 +50,7 @@ public class ButterflyInfo {
             "peacock-pansy-dry",
             "peacock",
             "rainbow",
+            "smile",
             "swallowtail",
             "bluemoonmale",
             "commongrassyellow-dry",
@@ -132,6 +133,9 @@ public class ButterflyInfo {
         {}, // No traits for peacock-pansy-dry
         {}, // No traits for peacock
         {}, // No traits for rainbow
+        {
+            ButterflyData.Trait.FEARLESS,
+        },
         {}, // No traits for swallowtail
         {}, // No traits for bluemoonmale
         {}, // No traits for commongrassyellow-dry

src/main/java/com/bokmcdok/butterflies/world/entity/animal/Butterfly.java

@@ -590,27 +590,31 @@ public void readAdditionalSaveData(@NotNull CompoundTag tag) {
     protected void registerGoals() {
         super.registerGoals();
 
-        // Some butterflies are not scared of cats.
-        Predicate<LivingEntity> predicateOnAvoidEntity = Butterfly::isScaredOfEverything;
-        if (getData().hasTrait(ButterflyData.Trait.CATFRIEND)) {
-            predicateOnAvoidEntity = Butterfly::isNotScaredOfCats;
-        }
+        // Some butterflies are fearless.
+        if (!getData().hasTrait(ButterflyData.Trait.FEARLESS)) {
 
-        // Some butterflies can mimic others.
-        if (getData().hasTrait(ButterflyData.Trait.MIMICRY)) {
-            this.goalSelector.addGoal(1, new ButterflyMimicGoal(this,
-                    LivingEntity.class,
-                    10.0F,
-                    2.2,
-                    2.2,
-                    predicateOnAvoidEntity));
-        } else {
-            this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this,
-                    LivingEntity.class,
-                    10.0F,
-                    2.2,
-                    2.2,
-                    predicateOnAvoidEntity));
+            // Some butterflies are not scared of cats.
+            Predicate<LivingEntity> predicateOnAvoidEntity = Butterfly::isScaredOfEverything;
+            if (getData().hasTrait(ButterflyData.Trait.CATFRIEND)) {
+                predicateOnAvoidEntity = Butterfly::isNotScaredOfCats;
+            }
+
+            // Some butterflies can mimic others.
+            if (getData().hasTrait(ButterflyData.Trait.MIMICRY)) {
+                this.goalSelector.addGoal(1, new ButterflyMimicGoal(this,
+                        LivingEntity.class,
+                        10.0F,
+                        2.2,
+                        2.2,
+                        predicateOnAvoidEntity));
+            } else {
+                this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this,
+                        LivingEntity.class,
+                        10.0F,
+                        2.2,
+                        2.2,
+                        predicateOnAvoidEntity));
+            }
         }
 
         this.goalSelector.addGoal(2, new ButterflyLayEggGoal(this, 0.8, 8, 8));

src/main/resources/assets/butterflies/blockstates/bottled_butterfly_smile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "butterflies:block/bottle"
+    }
+  }
+}

src/main/resources/assets/butterflies/blockstates/bottled_caterpillar_smile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "butterflies:block/bottle"
+    }
+  }
+}

src/main/resources/assets/butterflies/lang/en_us.json

@@ -320,9 +320,9 @@
   "entity.butterflies.oak-silk_egg": "Oak Silk Moth Egg",
   "entity.butterflies.peacemaker": "Peacemaker Butterfly",
   "entity.butterflies.peacemaker_butterfly": "Peacemaker Butterfly",
-  "entity.butterflies.peacemaker_cow": "Peacemaker Cow",
   "entity.butterflies.peacemaker_caterpillar": "Peacemaker Caterpillar",
   "entity.butterflies.peacemaker_chrysalis": "Peacemaker Chrysalis",
+  "entity.butterflies.peacemaker_cow": "Peacemaker Cow",
   "entity.butterflies.peacemaker_egg": "Peacemaker Butterfly Egg",
   "entity.butterflies.peacemaker_evoker": "Evoker",
   "entity.butterflies.peacemaker_illusioner": "Illusioner",
@@ -371,6 +371,10 @@
   "entity.butterflies.rainbow_caterpillar": "Rainbow Caterpillar",
   "entity.butterflies.rainbow_chrysalis": "Rainbow Chrysalis",
   "entity.butterflies.rainbow_egg": "Rainbow Butterfly Egg",
+  "entity.butterflies.smile": "Smile Butterfly",
+  "entity.butterflies.smile_caterpillar": "Smile Caterpillar",
+  "entity.butterflies.smile_chrysalis": "Smile Chrysalis",
+  "entity.butterflies.smile_egg": "Smile Butterfly Egg",
   "entity.butterflies.spongy": "Spongy Moth (Female)",
   "entity.butterflies.spongy_caterpillar": "Spongy Larva",
   "entity.butterflies.spongy_chrysalis": "Spongy Cocoon",
@@ -449,6 +453,7 @@
   "gui.butterflies.fact.peacock-pansy-wet": "Peacock Pansies look different depending on the season.",
   "gui.butterflies.fact.peppered": "These moths use wood as camouflage.",
   "gui.butterflies.fact.rainbow": "Rainbow butterflies have only been recently discovered.",
+  "gui.butterflies.fact.smile": "Smile butterflies are unafraid of other creatures.",
   "gui.butterflies.fact.spongy": "Female spongy moths don't fly well.",
   "gui.butterflies.fact.spongymale": "Spongy moths are destructive to foliage.",
   "gui.butterflies.fact.swallowtail": "Swallowtails are the largest butterflies in the world.",
@@ -684,6 +689,9 @@
   "item.butterflies.rainbow_caterpillar": "Rainbow Caterpillar",
   "item.butterflies.rainbow_egg": "Rainbow Butterfly Egg",
   "item.butterflies.silk": "Silk",
+  "item.butterflies.smile": "Smile Butterfly",
+  "item.butterflies.smile_caterpillar": "Smile Caterpillar",
+  "item.butterflies.smile_egg": "Smile Butterfly Egg",
   "item.butterflies.spawn_egg_butterfly_admiral": "Admiral Butterfly",
   "item.butterflies.spawn_egg_butterfly_atlas": "Atlas Moth",
   "item.butterflies.spawn_egg_butterfly_bluemoon": "Bluemoon Butterfly (Female)",
@@ -745,6 +753,7 @@
   "item.butterflies.spawn_egg_butterfly_peacock-pansy-wet": "Peacock Pansy Butterfly (Wet)",
   "item.butterflies.spawn_egg_butterfly_peppered": "Peppered Moth",
   "item.butterflies.spawn_egg_butterfly_rainbow": "Rainbow Butterfly",
+  "item.butterflies.spawn_egg_butterfly_smile": "Smile Butterfly",
   "item.butterflies.spawn_egg_butterfly_spongy": "Spongy Moth (Female)",
   "item.butterflies.spawn_egg_butterfly_spongymale": "Spongy Moth (Male)",
   "item.butterflies.spawn_egg_butterfly_swallowtail": "Swallowtail Butterfly",
@@ -810,6 +819,7 @@
   "item.butterflies.spawn_egg_caterpillar_peacock-pansy-wet": "Peacock Pansy Caterpillar",
   "item.butterflies.spawn_egg_caterpillar_peppered": "Peppered Larva",
   "item.butterflies.spawn_egg_caterpillar_rainbow": "Rainbow Caterpillar",
+  "item.butterflies.spawn_egg_caterpillar_smile": "Smile Caterpillar",
   "item.butterflies.spawn_egg_caterpillar_spongy": "Spongy Larva (Female)",
   "item.butterflies.spawn_egg_caterpillar_spongymale": "Spongy Larva (Male)",
   "item.butterflies.spawn_egg_caterpillar_swallowtail": "Swallowtail Caterpillar",
@@ -875,6 +885,7 @@
   "item.butterflies.spawn_egg_chrysalis_peacock-pansy-wet": "Peacock Pansy Chrysalis",
   "item.butterflies.spawn_egg_chrysalis_peppered": "Peppered Larva",
   "item.butterflies.spawn_egg_chrysalis_rainbow": "Rainbow Chrysalis",
+  "item.butterflies.spawn_egg_chrysalis_smile": "Smile Chrysalis",
   "item.butterflies.spawn_egg_chrysalis_spongy": "Spongy Larva (Female)",
   "item.butterflies.spawn_egg_chrysalis_spongymale": "Spongy Larva (Male)",
   "item.butterflies.spawn_egg_chrysalis_swallowtail": "Swallowtail Chrysalis",
@@ -940,6 +951,7 @@
   "item.butterflies.spawn_egg_egg_peacock-pansy-wet": "Peacock Pansy Egg",
   "item.butterflies.spawn_egg_egg_peppered": "Peppered Egg",
   "item.butterflies.spawn_egg_egg_rainbow": "Rainbow Egg",
+  "item.butterflies.spawn_egg_egg_smile": "Smile Egg",
   "item.butterflies.spawn_egg_egg_spongy": "Spongy Egg (Female)",
   "item.butterflies.spawn_egg_egg_spongymale": "Spongy Egg (Male)",
   "item.butterflies.spawn_egg_egg_swallowtail": "Swallowtail Egg",

src/main/resources/assets/butterflies/models/item/bottled_butterfly_smile.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld_rod",
+  "textures": {
+    "layer0": "butterflies:item/bottled_butterfly/bottled_smile"
+  }
+}

src/main/resources/assets/butterflies/models/item/bottled_caterpillar_smile.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld_rod",
+  "textures": {
+    "layer0": "butterflies:item/bottled_caterpillar/bottled_caterpillar_smile"
+  }
+}