Модуль:Entity Lookup: различия между версиями

@@ Строка 1: / Строка 1: @@
-local prototypes = mw.loadData("Модуль:IanComradeBot/entity prototypes.json/data")
+local p = {}
-local overrides = mw.loadData("Модуль:IanComradeBot/entity name overrides.json/data")
+local JsonPaths = require('Module:JsonPaths')
-local p = {}
+local function safeLoad(page)
-p.entities = prototypes.entities
+    local moduleName = JsonPaths.get(page)
-p.name_overrides = overrides.name_overrides or {}
+    local ok, data = pcall(mw.loadData, moduleName)
+    if not ok then
+        return {}
+    end
+    return data or {}
+end
+p.entities = safeLoad("entity prototypes.json")
+p.name_overrides = safeLoad("entity name overrides.json")
@@ Строка 19: / Строка 27: @@
 	local entity = p.entities[id]
 	if entity then
-		return entity.name
+		local name = entity.name or ""
+		if entity.label and entity.label ~= "" then
+			name = name .. " (" .. entity.label .. ")"
+		end
+		return name
 	end