#317 +Allow bats and hippos to walk on clouds without having to give them other pegasus abilities

Separate cloud interaction and ability to collect weather jars/use rainboom ability into two flags

src/main/java/com/minelittlepony/unicopia/EquineContext.java

@@ -22,7 +22,7 @@ public interface EquineContext {
     }
 
     default boolean collidesWithClouds() {
-        return getCompositeRace().any(Race::canInteractWithClouds);
+        return getCompositeRace().canInteractWithClouds();
     }
 
     static EquineContext of(ShapeContext context) {

src/main/java/com/minelittlepony/unicopia/EquinePredicates.java

@@ -20,7 +20,7 @@ public interface EquinePredicates {
     Predicate<Entity> BAT = physicalRaceMatches(Race.BAT::equals);
     Predicate<Entity> CHANGELING = physicalRaceMatches(Race.CHANGELING::equals);
 
-    Predicate<Entity> RACE_INTERACT_WITH_CLOUDS = raceMatches(Race::canInteractWithClouds);
+    Predicate<Entity> RACE_CAN_INFLUENCE_WEATHER = raceMatches(Race::canInfluenceWeather);
     Predicate<Entity> RAGING = IS_PLAYER.and(SpellType.RAGE::isOn);
 
     Predicate<Entity> PLAYER_EARTH = IS_PLAYER.and(ofRace(Race.EARTH));
@@ -28,7 +28,6 @@ public interface EquinePredicates {
     Predicate<Entity> PLAYER_UNICORN = IS_PLAYER.and(raceMatches(Race::canCast));
     Predicate<Entity> PLAYER_CHANGELING = IS_PLAYER.and(ofRace(Race.CHANGELING));
     Predicate<Entity> PLAYER_KIRIN = IS_PLAYER.and(ofRace(Race.KIRIN));
-    Predicate<Entity> PLAYER_PEGASUS = IS_PLAYER.and(e -> ((PlayerEntity)e).getAbilities().creativeMode || RACE_INTERACT_WITH_CLOUDS.test(e));
     Predicate<Entity> PLAYER_SEAPONY = IS_PLAYER.and(raceMatches(Race::isFish));
 
     Predicate<Entity> PLAYER_CAN_USE_EARTH = IS_PLAYER.and(raceMatches(Race::canUseEarth));

src/main/java/com/minelittlepony/unicopia/Race.java

@@ -108,9 +108,17 @@ public record Race (Supplier<Composite> compositeSupplier, Availability availabi
     }
 
     public boolean canInteractWithClouds() {
+        return canFly() && this != CHANGELING;
+    }
+
+    public boolean canInfluenceWeather() {
         return canFly() && this != CHANGELING && this != BAT && this != HIPPOGRIFF;
     }
 
+    public boolean hasPersistentWeatherMagic() {
+        return canInfluenceWeather();
+    }
+
     public Identifier getId() {
         return REGISTRY.getId(this);
     }
@@ -225,6 +233,18 @@ public record Race (Supplier<Composite> compositeSupplier, Availability availabi
             return any(Race::canCast);
         }
 
+        public boolean canInteractWithClouds() {
+            return any(Race::canInteractWithClouds);
+        }
+
+        public boolean canInfluenceWeather() {
+            return any(Race::canInfluenceWeather);
+        }
+
+        public boolean hasPersistentWeatherMagic() {
+            return any(Race::hasPersistentWeatherMagic);
+        }
+
         public FlightType flightType() {
             if (pseudo() == null) {
                 return physical().flightType();

src/main/java/com/minelittlepony/unicopia/ability/PegasusCaptureStormAbility.java

@@ -35,7 +35,7 @@ public class PegasusCaptureStormAbility implements Ability<Hit> {
 
     @Override
     public boolean canUse(Race race) {
-        return race.canInteractWithClouds();
+        return race.canInfluenceWeather();
     }
 
     @Nullable

src/main/java/com/minelittlepony/unicopia/ability/PegasusRainboomAbility.java

@@ -28,7 +28,7 @@ public class PegasusRainboomAbility implements Ability<Hit> {
 
     @Override
     public boolean canUse(Race race) {
-        return race.canInteractWithClouds();
+        return race.canInfluenceWeather();
     }
 
     @Nullable

src/main/java/com/minelittlepony/unicopia/entity/ItemImpl.java

@@ -160,7 +160,7 @@ public class ItemImpl implements Equine<ItemEntity> {
 
     @Override
     public boolean collidesWithClouds() {
-        return entity.getStack().isIn(UTags.FLOATS_ON_CLOUDS) || getSpecies().canInteractWithClouds();
+        return entity.getStack().isIn(UTags.FLOATS_ON_CLOUDS) || getSpecies().hasPersistentWeatherMagic();
     }
 
     @Override

src/main/java/com/minelittlepony/unicopia/item/FriendshipBraceletItem.java

@@ -39,8 +39,11 @@ public class FriendshipBraceletItem extends WearableItem implements DyeableItem,
     public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) {
         ItemStack stack = player.getStackInHand(hand);
 
-        if (!isSigned(stack) && (EquinePredicates.PLAYER_UNICORN.test(player) || EquinePredicates.PLAYER_PEGASUS.test(player)
+        if (!isSigned(stack) && (
-                || AmuletSelectors.PEARL_NECKLACE.test(player))) {
+                   EquinePredicates.PLAYER_UNICORN.test(player)
+                || EquinePredicates.RACE_CAN_INFLUENCE_WEATHER.test(player)
+                || AmuletSelectors.PEARL_NECKLACE.test(player)
+        )) {
             player.setCurrentHand(hand);
 
             ItemStack result = stack.copy();