diff options
Diffstat (limited to '')
-rw-r--r-- | builtin/game/register.lua | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/builtin/game/register.lua b/builtin/game/register.lua index ee4edabbf..08856dc17 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -181,6 +181,7 @@ function core.register_item(name, itemdef) --core.log("Registering item: " .. itemdef.name) core.registered_items[itemdef.name] = itemdef core.registered_aliases[itemdef.name] = nil + register_item_raw(itemdef) end @@ -207,6 +208,14 @@ end function core.register_node(name, nodedef) nodedef.type = "node" + if nodedef.use_texture_alpha == true then + nodedef.use_texture_alpha = "blend" + elseif nodedef.use_texture_alpha == false then + nodedef.use_texture_alpha = "opaque" + end + if nodedef.tile_images then + nodedef.tiles = nodedef.tile_images + end core.register_item(name, nodedef) end @@ -305,14 +314,14 @@ function core.on_craft(itemstack, player, old_craft_list, craft_inv) for _, func in ipairs(core.registered_on_crafts) do itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack end - return itemstack + return ItemStack(itemstack) end function core.craft_predict(itemstack, player, old_craft_list, craft_inv) for _, func in ipairs(core.registered_craft_predicts) do itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack end - return itemstack + return ItemStack(itemstack) end -- Alias the forbidden item names to "" so they can't be @@ -424,6 +433,7 @@ function core.run_callbacks(callbacks, mode, ...) end local ret = nil for i = 1, cb_len do + local start_time = os.clock() local origin = core.callback_origins[callbacks[i]] core.set_last_run_mod(origin.mod) local cb_ret = callbacks[i](...) @@ -615,9 +625,15 @@ core.registered_on_player_inventory_actions, core.register_on_player_inventory_a core.registered_allow_player_inventory_actions, core.register_allow_player_inventory_action = make_registration() core.registered_on_rightclickplayers, core.register_on_rightclickplayer = make_registration() core.registered_on_liquid_transformed, core.register_on_liquid_transformed = make_registration() +core.registered_on_player_change_wield, core.register_on_player_change_wield = make_registration() +core.registered_on_player_change_keys, core.register_on_player_change_keys = make_registration() -- -- Compatibility for on_mapgen_init() -- core.register_on_mapgen_init = function(func) func(core.get_mapgen_params()) end +core.register_on_mods_loaded(function() + print(time_taken_a, time_taken_b) +-- error("e") +end) |