Small Implementation Tweaks

mods/include/mods/misc/misc.h

@@ -59,7 +59,7 @@ std::map<EntityType, std::pair<std::string, std::string>> &misc_get_entity_type_
 std::pair<std::string, std::string> misc_get_entity_type_name(Entity *entity);
 std::string misc_get_entity_name(Entity *entity);
 
-Entity *misc_make_entity_from_id(Level *level, int id, float x, float y, float z);
+Entity *misc_make_entity_from_id(Level *level, int id, float x, float y, float z, bool add_to_level = true);
 
 std::string misc_base64_encode(const std::string &data);
 std::string misc_base64_decode(const std::string &input);

mods/src/api/api.cpp

@@ -142,6 +142,23 @@ static bool is_entity_selected(Entity *entity, const int target_type) {
     return type > 0 && (target_type == no_entity_id || target_type == type);
 }
 
+// Get Selected Item
+static ItemInstance *get_selected_item(Entity *entity) {
+    ItemInstance *item = nullptr;
+    if (entity->isMob()) {
+        // Mob/Player
+        item = ((Mob *) entity)->getCarriedItem();
+        if (!item) {
+            static ItemInstance air = {0, 0, 0};
+            item = &air;
+        }
+    } else if (entity->getEntityTypeId() == static_cast<int>(EntityType::DROPPED_ITEM)) {
+        // Dropped Item
+        item = &((ItemEntity *) entity)->item;
+    }
+    return item;
+}
+
 // Read Arguments
 #define next_string(out, required) \
     std::string out; \
@@ -214,7 +231,7 @@ static std::string CommandServer_parse_injection(CommandServer_parse_t original,
     }
 
     // Read Arguments
-    std::stringstream args(args_str.data());
+    std::istringstream args(std::string(args_str), std::ios::in);
 
     // Manipulate The Level
     package(world) {
@@ -249,9 +266,9 @@ static std::string CommandServer_parse_injection(CommandServer_parse_t original,
             // Search
             std::string username = api_get_input(input);
             for (Player *player : server->minecraft->level->players) {
-                if (misc_get_player_username_utf(player) == username) {
+                if (player->username == username) {
                     // Found
-                    return std::to_string(player->id) + "\n";
+                    return std::to_string(player->id) + '\n';
                 }
             }
             return CommandServer::Fail;
@@ -341,10 +358,16 @@ static std::string CommandServer_parse_injection(CommandServer_parse_t original,
                 .auxiliary = data
             };
             // Spawn
-            ItemEntity *entity = ItemEntity::allocate();
-            entity->constructor(server->minecraft->level, x, y, z, item);
-            entity->velocity_x = entity->velocity_y = entity->velocity_z = 0;
-            entity->moveTo(x, y, z, 0, 0);
+            ItemEntity *entity = (ItemEntity *) misc_make_entity_from_id(
+                server->minecraft->level,
+                static_cast<int>(EntityType::DROPPED_ITEM),
+                x, y, z,
+                false
+            );
+            if (!entity) {
+                return CommandServer::Fail;
+            }
+            entity->item = item;
             server->minecraft->level->addEntity((Entity *) entity);
             return std::to_string(entity->id) + '\n';
         }
@@ -593,18 +616,7 @@ static std::string CommandServer_parse_injection(CommandServer_parse_t original,
             // Parse
             get_entity(Fail);
             // Get Item
-            ItemInstance air = {0, 0, 0};
-            ItemInstance *item = nullptr;
-            if (entity->isMob()) {
-                // Mob/Player
-                item = ((Mob *) entity)->getCarriedItem();
-                if (!item) {
-                    item = &air;
-                }
-            } else if (entity->getEntityTypeId() == static_cast<int>(EntityType::DROPPED_ITEM)) {
-                // Dropped Item
-                item = &((ItemEntity *) entity)->item;
-            }
+            ItemInstance *item = get_selected_item(entity);
             if (!item) {
                 // Entity Does Not Carry Items
                 return CommandServer::Fail;

mods/src/misc/api.cpp

@@ -205,7 +205,7 @@ std::map<EntityType, std::pair<std::string, std::string>> &misc_get_entity_type_
 }
 
 // Spawn Entities
-Entity *misc_make_entity_from_id(Level *level, const int id, const float x, const float y, const float z) {
+Entity *misc_make_entity_from_id(Level *level, const int id, const float x, const float y, const float z, const bool add_to_level) {
     // Create
     Entity *entity;
     if (id < static_cast<int>(EntityType::DROPPED_ITEM)) {
@@ -254,12 +254,16 @@ Entity *misc_make_entity_from_id(Level *level, const int id, const float x, cons
             }
             case static_cast<int>(EntityType::DROPPED_ITEM): {
                 // Sensible Default
-                ((ItemEntity *) entity)->item.constructor_item(Item::sword_iron);
+                ItemEntity *item = (ItemEntity *) entity;
+                item->item.constructor_tile(Tile::rock);
+                item->pickup_delay = 10;
                 break;
             }
         }
         // Add To World
-        level->addEntity(entity);
+        if (add_to_level) {
+            level->addEntity(entity);
+        }
     }
     // Return
     return entity;

symbols/src/entity/ItemEntity.def

@@ -7,4 +7,5 @@ constructor (Level *level, float x, float y, float z, const ItemInstance &item)
 
 property ItemInstance item = 0xd0;
 property int age = 0xdc;
-property float bob_offset = 0xe4;
+property float bob_offset = 0xe4;
+property int pickup_delay = 0xe0;

symbols/src/tile/Tile.def

@@ -99,6 +99,7 @@ static-property Tile *stoneSlab = 0x181b44;
 static-property Tile *fire = 0x181de0;
 static-property Tile *sand = 0x181b20;
 static-property Tile *torch = 0x181d58;
+static-property Tile *rock = 0x181c90;
 
 // "Carried" Tiles
 static-property Tile *leaves_carried = 0x181dd8;