Skip to content

Commit 4ebbb15

Browse files
committed
Recovered latest changes of api items script
1 parent 2d30dae commit 4ebbb15

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

LunaCoreAPI/src/items.lua

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,24 +198,24 @@ function itemRegistry:registerItems()
198198
for _, definition in ipairs(self.definitions) do
199199
local regItem = Game.Items.registerItem(definition.name, definition.itemId)
200200
if regItem ~= nil then
201-
definition.udata = regItem
202-
itemsGlobals.registry[definition.nameId].udata = regItem
201+
definition.item = regItem
202+
itemsGlobals.registry[definition.nameId].item = regItem
203203
else
204204
Core.Debug.log("[Warning] CoreAPI: Failed to register item '" .. definition.nameId .. "'", false)
205205
end
206206
end
207207
end)
208208
Game.Event.OnGameItemsRegisterTexture:Connect(function ()
209209
for _, definition in ipairs(self.definitions) do
210-
if definition.udata ~= nil then
211-
Game.Items.registerItemTexture(definition.udata, definition.name, 0)
210+
if definition.item ~= nil then
211+
definition.item:setTexture(definition.name, 0)
212212
end
213213
end
214214
end)
215215
Game.Event.OnGameCreativeItemsRegister:Connect(function ()
216216
for _, definition in ipairs(self.definitions) do
217-
if definition.group ~= nil and definition.group:is(CoreAPI.ItemGroups.ItemGroupIdentifier) and definition.udata ~= nil then
218-
Game.Items.registerCreativeItem(definition.udata, definition.group.id, definition.group:getCreativePosition())
217+
if definition.group ~= nil and definition.group:is(CoreAPI.ItemGroups.ItemGroupIdentifier) and definition.item ~= nil then
218+
Game.Items.registerCreativeItem(definition.item, definition.group.id, definition.group:getCreativePosition())
219219
end
220220
end
221221
end)
@@ -279,20 +279,18 @@ end)
279279
---@param itemName string
280280
---@return integer?
281281
function CoreAPI.Items.getItemId(itemName)
282-
local itemId
282+
local itemId = nil
283283
itemName = string.lower(itemName)
284284
if string.match(itemName, "^minecraft:") then
285285
itemName = string.gsub(itemName, "^minecraft:", "")
286-
itemId = Game.Items.findItemIDByName(itemName)
286+
local item = Game.Items.findItemByName(itemName)
287+
if item then itemId = item.ID end
287288
elseif not string.find(itemName, ":", 1, true) then
288-
itemId = Game.Items.findItemIDByName(itemName)
289+
local item = Game.Items.findItemByName(itemName)
290+
if item then itemId = item.ID end
289291
else
290292
local instance = itemsGlobals.registry[itemName]
291-
if instance then
292-
itemId = instance.itemId
293-
else
294-
itemId = nil
295-
end
293+
if instance then itemId = instance.itemId end
296294
end
297295
return itemId
298296
end

0 commit comments

Comments
 (0)