feat: Add ranged_attack for skeleton

Author: kbinani

src/java-entity.cpp

@@ -631,7 +631,7 @@ class Entity::Impl {
     E(sheep, C(Animal, AgeableA(u8"minecraft:sheep"), Colorable(u8"sheep"), Definitions({u8"+minecraft:sheep_dyeable", u8"+minecraft:rideable_wooly", u8"+minecraft:loot_wooly"}), Sheep));
     E(shulker, C(Monster, Shulker));
     M(silverfish);
-    M(skeleton); // lefty skeleton does not exist in Bedrock?
+    E(skeleton, C(Monster, RangedAttack)); // lefty skeleton does not exist in Bedrock?
 
     E(skeleton_horse, C(Animal, Definitions({u8"+minecraft:skeleton_horse_adult"}), SkeletonHorse));
     E(slime, C(Monster, Slime));
@@ -693,7 +693,7 @@ class Entity::Impl {
     E(interaction, Null);
 
     E(armadillo, C(Animal, Definitions({u8"+minecraft:armadillo"}), AgeableG, Armadillo));
-    E(bogged, C(Monster, Definitions({u8"+minecraft:bogged", u8"+minecraft:ranged_attack"}), Bogged));
+    E(bogged, C(Monster, Definitions({u8"+minecraft:bogged"}), RangedAttack, Bogged));
     E(breeze, C(Monster, Definitions({u8"+minecraft:breeze"})));
 
     E(creaking, C(Monster, Definitions({u8"+minecraft:creaking"}), Creaking));
@@ -1013,7 +1013,7 @@ class Entity::Impl {
     bool melee = true;
     if (auto handItems = tag.listTag(u8"HandItems"); handItems && !handItems->fValue.empty()) {
       if (auto item = handItems->fValue[0]->asCompound(); item) {
-        if (Item::Count(*item, 0) > 0 && item->string(u8"id") == u8"minecraft:trident") {
+        if (Item::Count(*item, 0) > 0 && Item::IsMeleeWeapon(item->string(u8"id", u8""))) {
           melee = false;
         }
       }
@@ -1444,10 +1444,10 @@ class Entity::Impl {
     }
     if (itemInHand) {
       b.set(u8"ItemInHand", itemInHand);
-      auto name = itemInHand->string(u8"Name");
-      if (name == u8"minecraft:crossbow") {
+      auto name = itemInHand->string(u8"Name", u8"");
+      if (Item::IsRangedWeapon(name)) {
         AddDefinition(b, u8"+ranged_unit");
-      } else if (name == u8"minecraft:golden_sword") {
+      } else if (Item::IsMeleeWeapon(name)) {
         AddDefinition(b, u8"+melee_unit");
       }
     }
@@ -2021,6 +2021,24 @@ class Entity::Impl {
     }
   }
 
+  static void RangedAttack(CompoundTag &b, CompoundTag const &j, ConverterContext &) {
+    auto mainHandB = b.listTag(u8"Mainhand");
+    if (!mainHandB) {
+      return;
+    }
+    if (mainHandB->size() < 1) {
+      return;
+    }
+    auto itemB = mainHandB->fValue[0]->asCompound();
+    if (!itemB) {
+      return;
+    }
+    auto name = itemB->string(u8"Name", u8"");
+    if (Item::IsRangedWeapon(name)) {
+      AddDefinition(b, u8"+minecraft:ranged_attack");
+    }
+  }
+
   static void Sittable(CompoundTag &c, CompoundTag const &tag, ConverterContext &) {
     CopyBoolValues(tag, c, {{u8"Sitting"}});
   }

src/java-item.cpp

@@ -70,6 +70,21 @@ class Item::Impl {
     return armor;
   }
 
+  static bool IsRangedWeapon(std::u8string const &name) {
+    static std::unordered_set<std::u8string> const sWeapons = {u8"bow", u8"crossbow", u8"trident"};
+    return sWeapons.find(Namespace::Remove(name)) != sWeapons.end();
+  }
+
+  static bool IsMeleeWeapon(std::u8string const &name) {
+    if (name.ends_with(u8"_sword")) {
+      return true;
+    }
+    if (name.ends_with(u8"_axe")) {
+      return true;
+    }
+    return false;
+  }
+
 private:
   static CompoundTagPtr Convert(CompoundTagPtr const &in, Context &ctx, DataVersion const &dataVersion) {
     using namespace std;
@@ -2036,4 +2051,11 @@ CompoundTagPtr Item::Empty() {
   return Impl::Empty();
 }
 
+bool Item::IsRangedWeapon(std::u8string const &name) {
+  return Impl::IsRangedWeapon(name);
+}
+
+bool Item::IsMeleeWeapon(std::u8string const &name) {
+  return Impl::IsMeleeWeapon(name);
+}
 } // namespace je2be::java

src/java/_item.hpp

@@ -19,6 +19,8 @@ class Item {
   static CompoundTagPtr From(CompoundTagPtr const &item, Context &ctx, DataVersion const &dataVersion);
   static i8 GetSkullTypeFromBlockName(std::u8string_view const &name);
   static CompoundTagPtr Empty();
+  static bool IsRangedWeapon(std::u8string const &name);
+  static bool IsMeleeWeapon(std::u8string const &name);
 
   static std::optional<i32> Count(CompoundTag const &c) {
     if (auto count = c.int32(u8"count"); count) {