refactor Content

src/frontend/ContentGfxCache.cpp

@@ -14,11 +14,11 @@
 
 ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) : content(content) {
     auto indices = content->getIndices();
-    sideregions = std::make_unique<UVRegion[]>(indices->countBlockDefs() * 6);
+    sideregions = std::make_unique<UVRegion[]>(indices->blocks.count() * 6);
     auto atlas = assets->get<Atlas>("blocks");
     
-    for (uint i = 0; i < indices->countBlockDefs(); i++) {
-        Block* def = indices->getBlockDef(i);
+    for (uint i = 0; i < indices->blocks.count(); i++) {
+        Block* def = indices->blocks.get(i);
         for (uint side = 0; side < 6; side++) {
             const std::string& tex = def->textureFaces[side];
             if (atlas->has(tex)) {

src/frontend/debug_panel.cpp

@@ -98,7 +98,7 @@ std::shared_ptr<UINode> create_debug_panel(
     }));
     panel->add(create_label([=](){
         auto* indices = level->content->getIndices();
-        if (auto def = indices->getBlockDef(player->selection.vox.id)) {
+        if (auto def = indices->blocks.get(player->selection.vox.id)) {
             return L"name: " + util::str2wstr_utf8(def->name);
         } else {
             return std::wstring {L"name: void"};

src/frontend/hud.cpp

@@ -102,9 +102,9 @@ std::shared_ptr<InventoryView> Hud::createContentAccess() {
     auto indices = content->getIndices();
     auto inventory = player->getInventory();
     
-    int itemsCount = indices->countItemDefs();
+    size_t itemsCount = indices->items.count();
     auto accessInventory = std::make_shared<Inventory>(0, itemsCount);
-    for (int id = 1; id < itemsCount; id++) {
+    for (size_t id = 1; id < itemsCount; id++) {
         accessInventory->getSlot(id-1).set(ItemStack(id, 1));
     }