diff --git a/unified_inventory/unified_inventory/api.lua b/api.lua similarity index 81% rename from unified_inventory/unified_inventory/api.lua rename to api.lua index 4a85dc6..5d04d62 100644 --- a/unified_inventory/unified_inventory/api.lua +++ b/api.lua @@ -10,6 +10,8 @@ unified_inventory.filtered_items_list = {} unified_inventory.activefilter = {} unified_inventory.alternate = {} unified_inventory.current_item = {} +unified_inventory.crafts_table ={} +unified_inventory.crafts_table_count=0 -- default inventory page unified_inventory.default = "craft" @@ -26,8 +28,18 @@ minetest.after(0.01, function() if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) and def.description and def.description ~= "" then table.insert(unified_inventory.items_list, name) + local recipes=minetest.get_all_craft_recipes(name) + if unified_inventory.crafts_table[name]==nil then + unified_inventory.crafts_table[name] = {} + end + if recipes then + for i=1,#recipes,1 do + table.insert(unified_inventory.crafts_table[name],recipes[i]) + end + end end end + --print(dump(unified_inventory.crafts_table)) table.sort(unified_inventory.items_list) unified_inventory.items_list_size = #unified_inventory.items_list print ("Unified Inventory. inventory size: "..unified_inventory.items_list_size) @@ -37,7 +49,6 @@ end) minetest.register_on_joinplayer(function(player) local player_name = player:get_player_name() unified_inventory.players[player_name]={} - unified_inventory.players[player_name]["sound_volume"]=minetest.setting_get("sound_volume")*10 unified_inventory.current_index[player_name] = 1 unified_inventory.filtered_items_list[player_name] = {} unified_inventory.filtered_items_list[player_name] = unified_inventory.items_list @@ -47,8 +58,8 @@ minetest.register_on_joinplayer(function(player) unified_inventory.alternate[player_name] = 1 unified_inventory.current_item[player_name] =nil unified_inventory.set_inventory_formspec(player,unified_inventory.get_formspec(player, unified_inventory.default)) - ---crafting guide inventories + +--crafting guide inventories local inv = minetest.create_detached_inventory(player:get_player_name().."craftrecipe",{ allow_put = function(inv, listname, index, stack, player) return 0 @@ -64,8 +75,8 @@ local inv = minetest.create_detached_inventory(player:get_player_name().."craftr return 0 end, }) - inv:set_size("output", 1) - inv:set_size("build", 3*3) +inv:set_size("output", 1) +inv:set_size("build", 3*3) -- refill slot unified_inventory.refill = minetest.create_detached_inventory(player_name.."refill", { @@ -82,7 +93,6 @@ unified_inventory.refill = minetest.create_detached_inventory(player_name.."refi end, }) unified_inventory.refill:set_size("main", 1) -end) -- trash slot unified_inventory.trash = minetest.create_detached_inventory("trash", { @@ -100,24 +110,18 @@ unified_inventory.trash = minetest.create_detached_inventory("trash", { end, }) unified_inventory.trash:set_size("main", 1) +end) -- set_inventory_formspec unified_inventory.set_inventory_formspec = function(player,formspec) if player then - if minetest.setting_getbool("creative_mode") then - -- if creative mode is on then wait a bit - minetest.after(0.01,function() - player:set_inventory_formspec(formspec) - end) - else player:set_inventory_formspec(formspec) - end end end -- get_formspec unified_inventory.get_formspec = function(player,page) - if player==nil then return "" end + if player==nil then return "" end local player_name = player:get_player_name() unified_inventory.current_page[player_name]=page @@ -127,29 +131,29 @@ unified_inventory.get_formspec = function(player,page) formspec = formspec .. "list[current_player;main;0,4.5;8,4;]" -- backgrounds - formspec = formspec .. "background[-0.19,-0.2,;14.38,10.55;ui_form_bg.png]" + formspec = formspec .. "background[-0.19,-0.2;14.38,10.55;ui_form_bg.png]" if page=="craft" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_crafting_form.png]" + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_crafting_form.png]" end if page=="craftguide" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_craftguide_form.png]" + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_craftguide_form.png]" end if page=="misc" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_misc_form.png]" + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_misc_form.png]" end if page=="bags" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_main_form.png]" + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]" end for i=1,4 do if page=="bag"..i then local slots = player:get_inventory():get_stack(page, 1):get_definition().groups.bagslots if slots == 8 then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_sm_form.png]" + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]" elseif slots == 16 then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_med_form.png]" + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]" elseif slots == 24 then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_lg_form.png]" + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]" end end end @@ -206,9 +210,9 @@ unified_inventory.get_formspec = function(player,page) formspec = formspec.."label[2,0;"..item_name.."]" local alternates = 0 local alternate = unified_inventory.alternate[player_name] - local crafts = crafts_table[item_name] + local crafts = unified_inventory.crafts_table[item_name] - if crafts ~= nil then + if crafts ~= nil and #crafts>0 then alternates = #crafts local craft = crafts[alternate] local method = "Crafting" @@ -226,7 +230,13 @@ unified_inventory.get_formspec = function(player,page) end if craft.type == "alloy" then method="Alloy cooking" - end + end + if craft.type == "extracting" then + method="Extracting" + end + if craft.type == "compressing" then + method="Compressing" + end formspec = formspec.."label[6,3;"..method.."]" end @@ -440,7 +450,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if item_name then local alternates = 0 local alternate=unified_inventory.alternate[player_name] - local crafts = crafts_table[item_name] + local crafts = unified_inventory.crafts_table[item_name] if crafts ~= nil then alternates = #crafts end @@ -537,134 +547,68 @@ end -- update_recipe unified_inventory.update_recipe = function(player, stack_name, alternate) - --print("Lookup:"..stack_name) local inv = minetest.get_inventory({type="detached", name=player:get_player_name().."craftrecipe"}) for i=0,inv:get_size("build"),1 do inv:set_stack("build", i, nil) end - inv:set_stack("cook", 1, nil) - inv:set_stack("fuel", 1, nil) - - inv:set_stack("output", 1, stack_name) - local def + inv:set_stack("output", 1, nil) alternate = tonumber(alternate) or 1 - local crafts = crafts_table[stack_name] - if crafts == nil then - --minetest.chat_send_player(player:get_player_name(), "no recipe available for "..stack_name) - return - end + local crafts = unified_inventory.crafts_table[stack_name] + print(dump(crafts)) + local next=next + if next(crafts) == nil then return end -- no craft recipes if alternate < 1 or alternate > #crafts then alternate = 1 end local craft = crafts[alternate] - --print (dump(craft)) - --minetest.chat_send_player(player:get_player_name(), "recipe for "..stack_name..": "..dump(craft)) - - local itemstack = ItemStack(craft.output) - inv:set_stack("output", 1, itemstack) + inv:set_stack("output", 1, craft.output) + local items=craft.items - -- cook, fuel, grinding recipes - if craft.type == "cooking" or craft.type == "fuel" or craft.type == "grinding" then - def=unified_inventory.find_item_def(craft.recipe) + -- cooking, fuel, grinding, and extracting recipes + if craft.type == "cooking" or + craft.type == "fuel" or + craft.type == "grinding" or + craft.type == "extracting" or + craft.type == "compressing" then + def=unified_inventory.find_item_def(craft["items"][1]) if def then inv:set_stack("build", 1, def) end return end - - -- build (shaped or shapeless) - if craft.recipe[1] then - def=unified_inventory.find_item_def(craft.recipe[1]) - if def then - inv:set_stack("build", 1, def) - else - def=unified_inventory.find_item_def(craft.recipe[1][1]) - if def then - inv:set_stack("build", 1, def) - end - def=unified_inventory.find_item_def(craft.recipe[1][2]) - if def then - inv:set_stack("build", 2, def) - end - def=unified_inventory.find_item_def(craft.recipe[1][3]) - if def then - inv:set_stack("build", 3, def) - end + if craft.width==0 then + local build_table={1,2,3} + for i=1,3,1 do + if craft.items[i] then + def=unified_inventory.find_item_def(craft.items[i]) + if def then inv:set_stack("build", build_table[i], def) end end end - if craft.recipe[2] then - def=unified_inventory.find_item_def(craft.recipe[2]) - if def then - inv:set_stack("build", 2, def) - else - def=unified_inventory.find_item_def(craft.recipe[2][1]) - if def then - inv:set_stack("build", 4, def) + end + if craft.width==1 then + local build_table={1,4,7} + for i=1,3,1 do + if craft.items[i] then + def=unified_inventory.find_item_def(craft.items[i]) + if def then inv:set_stack("build", build_table[i], def) end + end + end + end + if craft.width==2 then + local build_table={1,2,4,5,7,8} + for i=1,6,1 do + if craft.items[i] then + def=unified_inventory.find_item_def(craft.items[i]) + if def then inv:set_stack("build", build_table[i], def) end + end + end + end + if craft.width==3 then + for i=1,9,1 do + if craft.items[i] then + def=unified_inventory.find_item_def(craft.items[i]) + if def then inv:set_stack("build", i, def) end end - def=unified_inventory.find_item_def(craft.recipe[2][2]) - if def then - inv:set_stack("build", 5, def) - end - def=unified_inventory.find_item_def(craft.recipe[2][3]) - if def then - inv:set_stack("build", 6, def) - end - end - end - - if craft.recipe[3] then - def=unified_inventory.find_item_def(craft.recipe[3]) - if def then - inv:set_stack("build", 3, def) - else - def=unified_inventory.find_item_def(craft.recipe[3][1]) - if def then - inv:set_stack("build", 7, def) - end - def=unified_inventory.find_item_def(craft.recipe[3][2]) - if def then - inv:set_stack("build", 8, def) - end - def=unified_inventory.find_item_def(craft.recipe[3][3]) - if def then - inv:set_stack("build", 9, def) - end - end - end - if craft.recipe[4] then - def=unified_inventory.find_item_def(craft.recipe[4]) - if def then - inv:set_stack("build", 4, def) - end - end - if craft.recipe[5] then - def=unified_inventory.find_item_def(craft.recipe[5]) - if def then - inv:set_stack("build", 5, def) - end - end - if craft.recipe[6] then - def=unified_inventory.find_item_def(craft.recipe[6]) - if def then - inv:set_stack("build", 6, def) - end - end - if craft.recipe[7] then - def=unified_inventory.find_item_def(craft.recipe[7]) - if def then - inv:set_stack("build", 7, def) - end - end - if craft.recipe[8] then - def=unified_inventory.find_item_def(craft.recipe[8]) - if def then - inv:set_stack("build", 8, def) - end - end - if craft.recipe[9] then - def=unified_inventory.find_item_def(craft.recipe[9]) - if def then - inv:set_stack("build", 9, def) end end end @@ -674,14 +618,39 @@ if type(def1)=="string" then if string.find(def1, "group:") then def1=string.gsub(def1, "group:", "") def1=string.gsub(def1, '\"', "") - for name,def in pairs(minetest.registered_items) do - if def.groups[def1] == 1 and def.groups.not_in_creative_inventory ~= 1 then - return def - end - end + local items=unified_inventory.items_in_group(def1) + return items[1] else - return def1 + return def1 end end return nil end + +unified_inventory.items_in_group = function(group) + local items = {} + for name, item in pairs(minetest.registered_items) do + for _, g in ipairs(group:split(',')) do + if item.groups[g] then + table.insert(items,name) + end + end + end + return items +end + +-- register_craft +unified_inventory.register_craft = function(options) + if options.output == nil then + return + end + local itemstack = ItemStack(options.output) + if itemstack:is_empty() then + return + end + if unified_inventory.crafts_table[itemstack:get_name()]==nil then + unified_inventory.crafts_table[itemstack:get_name()] = {} + end + table.insert(unified_inventory.crafts_table[itemstack:get_name()],options) + --crafts_table_count=crafts_table_count+1 +end diff --git a/unified_inventory/unified_inventory/bags.lua b/bags.lua similarity index 63% rename from unified_inventory/unified_inventory/bags.lua rename to bags.lua index b0ec4b8..4d269db 100644 --- a/unified_inventory/unified_inventory/bags.lua +++ b/bags.lua @@ -1,20 +1,15 @@ ---[[ +-- Bags for Minetest -Bags for Minetest +-- Copyright (c) 2012 cornernote, Brett O'Donnell +-- License: GPLv3 -Copyright (c) 2012 cornernote, Brett O'Donnell -Source Code: https://github.com/cornernote/minetest-particles -License: GPLv3 - -]]-- - --- register_on_joinplayer minetest.register_on_joinplayer(function(player) local player_inv = player:get_inventory() local bags_inv = minetest.create_detached_inventory(player:get_player_name().."_bags",{ on_put = function(inv, listname, index, stack, player) player:get_inventory():set_stack(listname, index, stack) - player:get_inventory():set_size(listname.."contents", stack:get_definition().groups.bagslots) + player:get_inventory():set_size(listname.."contents", + stack:get_definition().groups.bagslots) end, on_take = function(inv, listname, index, stack, player) player:get_inventory():set_stack(listname, index, nil) @@ -41,7 +36,7 @@ minetest.register_on_joinplayer(function(player) local bag = "bag"..i player_inv:set_size(bag, 1) bags_inv:set_size(bag, 1) - bags_inv:set_stack(bag,1,player_inv:get_stack(bag,1)) + bags_inv:set_stack(bag, 1, player_inv:get_stack(bag, 1)) end end) @@ -51,11 +46,13 @@ minetest.register_tool("unified_inventory:bag_small", { inventory_image = "bags_small.png", groups = {bagslots=8}, }) + minetest.register_tool("unified_inventory:bag_medium", { description = "Medium Bag", inventory_image = "bags_medium.png", groups = {bagslots=16}, }) + minetest.register_tool("unified_inventory:bag_large", { description = "Large Bag", inventory_image = "bags_large.png", @@ -66,24 +63,27 @@ minetest.register_tool("unified_inventory:bag_large", { minetest.register_craft({ output = "unified_inventory:bag_small", recipe = { - {"", "default:stick", ""}, - {"default:wood", "default:wood", "default:wood"}, - {"default:wood", "default:wood", "default:wood"}, - }, + {"", "default:stick", ""}, + {"group:wood", "group:wood", "group:wood"}, + {"group:wood", "group:wood", "group:wood"}, + }, }) + minetest.register_craft({ output = "unified_inventory:bag_medium", recipe = { - {"", "default:stick", ""}, - {"unified_inventory:bag_small", "unified_inventory:bag_small", "unified_inventory:bag_small"}, - {"unified_inventory:bag_small", "unified_inventory:bag_small", "unified_inventory:bag_small"}, - }, + {"", "", ""}, + {"default:stick", "unified_inventory:bag_small", "default:stick"}, + {"default:stick", "unified_inventory:bag_small", "default:stick"}, + }, }) + minetest.register_craft({ output = "unified_inventory:bag_large", recipe = { - {"", "default:stick", ""}, - {"unified_inventory:bag_medium", "unified_inventory:bag_medium", "unified_inventory:bag_medium"}, - {"unified_inventory:bag_medium", "unified_inventory:bag_medium", "unified_inventory:bag_medium"}, + {"", "", ""}, + {"default:stick", "unified_inventory:bag_medium", "default:stick"}, + {"default:stick", "unified_inventory:bag_medium", "default:stick"}, }, }) + diff --git a/depends.txt b/depends.txt new file mode 100644 index 0000000..8d390c8 --- /dev/null +++ b/depends.txt @@ -0,0 +1 @@ +creative? diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..cc170a0 --- /dev/null +++ b/init.lua @@ -0,0 +1,11 @@ +-- Unified Inventory mod 0.4.6 + +-- disable default creative inventory +if creative_inventory then + creative_inventory.set_creative_formspec = function(player, start_i, pagenum) + return + end +end + +dofile(minetest.get_modpath("unified_inventory").."/api.lua") +dofile(minetest.get_modpath("unified_inventory").."/bags.lua") diff --git a/unified_inventory/unified_inventory/sounds/birds.ogg b/sounds/birds.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/birds.ogg rename to sounds/birds.ogg diff --git a/unified_inventory/unified_inventory/sounds/click.ogg b/sounds/click.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/click.ogg rename to sounds/click.ogg diff --git a/unified_inventory/unified_inventory/sounds/dingdong.ogg b/sounds/dingdong.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/dingdong.ogg rename to sounds/dingdong.ogg diff --git a/unified_inventory/unified_inventory/sounds/electricity.ogg b/sounds/electricity.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/electricity.ogg rename to sounds/electricity.ogg diff --git a/unified_inventory/unified_inventory/sounds/owl.ogg b/sounds/owl.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/owl.ogg rename to sounds/owl.ogg diff --git a/unified_inventory/unified_inventory/sounds/paperflip1.ogg b/sounds/paperflip1.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/paperflip1.ogg rename to sounds/paperflip1.ogg diff --git a/unified_inventory/unified_inventory/sounds/paperflip2.ogg b/sounds/paperflip2.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/paperflip2.ogg rename to sounds/paperflip2.ogg diff --git a/unified_inventory/unified_inventory/sounds/teleport.ogg b/sounds/teleport.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/teleport.ogg rename to sounds/teleport.ogg diff --git a/unified_inventory/unified_inventory/sounds/trash.ogg b/sounds/trash.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/trash.ogg rename to sounds/trash.ogg diff --git a/unified_inventory/unified_inventory/sounds/trash_all.ogg b/sounds/trash_all.ogg similarity index 100% rename from unified_inventory/unified_inventory/sounds/trash_all.ogg rename to sounds/trash_all.ogg diff --git a/unified_inventory/unified_inventory/textures/bags_large.png b/textures/bags_large.png similarity index 100% rename from unified_inventory/unified_inventory/textures/bags_large.png rename to textures/bags_large.png diff --git a/unified_inventory/unified_inventory/textures/bags_medium.png b/textures/bags_medium.png similarity index 100% rename from unified_inventory/unified_inventory/textures/bags_medium.png rename to textures/bags_medium.png diff --git a/unified_inventory/unified_inventory/textures/bags_small.png b/textures/bags_small.png similarity index 100% rename from unified_inventory/unified_inventory/textures/bags_small.png rename to textures/bags_small.png diff --git a/unified_inventory/unified_inventory/textures/ui_bags_icon.png b/textures/ui_bags_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_bags_icon.png rename to textures/ui_bags_icon.png diff --git a/textures/ui_bags_lg_form.png b/textures/ui_bags_lg_form.png new file mode 100644 index 0000000..15f511d Binary files /dev/null and b/textures/ui_bags_lg_form.png differ diff --git a/textures/ui_bags_main_form.png b/textures/ui_bags_main_form.png new file mode 100644 index 0000000..26e6938 Binary files /dev/null and b/textures/ui_bags_main_form.png differ diff --git a/textures/ui_bags_med_form.png b/textures/ui_bags_med_form.png new file mode 100644 index 0000000..f786806 Binary files /dev/null and b/textures/ui_bags_med_form.png differ diff --git a/textures/ui_bags_sm_form.png b/textures/ui_bags_sm_form.png new file mode 100644 index 0000000..c77ff7c Binary files /dev/null and b/textures/ui_bags_sm_form.png differ diff --git a/textures/ui_colorbutton0.png b/textures/ui_colorbutton0.png new file mode 100644 index 0000000..35b7db2 Binary files /dev/null and b/textures/ui_colorbutton0.png differ diff --git a/textures/ui_colorbutton1.png b/textures/ui_colorbutton1.png new file mode 100644 index 0000000..cbf095d Binary files /dev/null and b/textures/ui_colorbutton1.png differ diff --git a/textures/ui_colorbutton10.png b/textures/ui_colorbutton10.png new file mode 100644 index 0000000..8dfc5f0 Binary files /dev/null and b/textures/ui_colorbutton10.png differ diff --git a/textures/ui_colorbutton11.png b/textures/ui_colorbutton11.png new file mode 100644 index 0000000..3b279e0 Binary files /dev/null and b/textures/ui_colorbutton11.png differ diff --git a/textures/ui_colorbutton12.png b/textures/ui_colorbutton12.png new file mode 100644 index 0000000..a387b5f Binary files /dev/null and b/textures/ui_colorbutton12.png differ diff --git a/textures/ui_colorbutton13.png b/textures/ui_colorbutton13.png new file mode 100644 index 0000000..b1e7790 Binary files /dev/null and b/textures/ui_colorbutton13.png differ diff --git a/textures/ui_colorbutton14.png b/textures/ui_colorbutton14.png new file mode 100644 index 0000000..c4ad486 Binary files /dev/null and b/textures/ui_colorbutton14.png differ diff --git a/textures/ui_colorbutton15.png b/textures/ui_colorbutton15.png new file mode 100644 index 0000000..b7060d6 Binary files /dev/null and b/textures/ui_colorbutton15.png differ diff --git a/textures/ui_colorbutton2.png b/textures/ui_colorbutton2.png new file mode 100644 index 0000000..caf1fc6 Binary files /dev/null and b/textures/ui_colorbutton2.png differ diff --git a/textures/ui_colorbutton3.png b/textures/ui_colorbutton3.png new file mode 100644 index 0000000..6ac79a3 Binary files /dev/null and b/textures/ui_colorbutton3.png differ diff --git a/textures/ui_colorbutton4.png b/textures/ui_colorbutton4.png new file mode 100644 index 0000000..dc43592 Binary files /dev/null and b/textures/ui_colorbutton4.png differ diff --git a/textures/ui_colorbutton5.png b/textures/ui_colorbutton5.png new file mode 100644 index 0000000..98b8c67 Binary files /dev/null and b/textures/ui_colorbutton5.png differ diff --git a/textures/ui_colorbutton6.png b/textures/ui_colorbutton6.png new file mode 100644 index 0000000..66478bc Binary files /dev/null and b/textures/ui_colorbutton6.png differ diff --git a/textures/ui_colorbutton7.png b/textures/ui_colorbutton7.png new file mode 100644 index 0000000..85f6b93 Binary files /dev/null and b/textures/ui_colorbutton7.png differ diff --git a/textures/ui_colorbutton8.png b/textures/ui_colorbutton8.png new file mode 100644 index 0000000..868c35d Binary files /dev/null and b/textures/ui_colorbutton8.png differ diff --git a/textures/ui_colorbutton9.png b/textures/ui_colorbutton9.png new file mode 100644 index 0000000..50eac0b Binary files /dev/null and b/textures/ui_colorbutton9.png differ diff --git a/unified_inventory/unified_inventory/textures/ui_craft_icon.png b/textures/ui_craft_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_craft_icon.png rename to textures/ui_craft_icon.png diff --git a/textures/ui_craftguide_form.png b/textures/ui_craftguide_form.png new file mode 100644 index 0000000..c0078de Binary files /dev/null and b/textures/ui_craftguide_form.png differ diff --git a/unified_inventory/unified_inventory/textures/ui_craftguide_icon.png b/textures/ui_craftguide_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_craftguide_icon.png rename to textures/ui_craftguide_icon.png diff --git a/textures/ui_crafting_form.png b/textures/ui_crafting_form.png new file mode 100644 index 0000000..bd21046 Binary files /dev/null and b/textures/ui_crafting_form.png differ diff --git a/unified_inventory/unified_inventory/textures/ui_doubleleft_icon.png b/textures/ui_doubleleft_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_doubleleft_icon.png rename to textures/ui_doubleleft_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_doubleright_icon.png b/textures/ui_doubleright_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_doubleright_icon.png rename to textures/ui_doubleright_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_form_bg.png b/textures/ui_form_bg.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_form_bg.png rename to textures/ui_form_bg.png diff --git a/unified_inventory/unified_inventory/textures/ui_gohome_icon.png b/textures/ui_gohome_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_gohome_icon.png rename to textures/ui_gohome_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_home_icon.png b/textures/ui_home_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_home_icon.png rename to textures/ui_home_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_left_icon.png b/textures/ui_left_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_left_icon.png rename to textures/ui_left_icon.png diff --git a/textures/ui_main_inventory.png b/textures/ui_main_inventory.png new file mode 100644 index 0000000..b65dabb Binary files /dev/null and b/textures/ui_main_inventory.png differ diff --git a/textures/ui_misc_form.png b/textures/ui_misc_form.png new file mode 100644 index 0000000..d34d326 Binary files /dev/null and b/textures/ui_misc_form.png differ diff --git a/unified_inventory/unified_inventory/textures/ui_moon_icon.png b/textures/ui_moon_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_moon_icon.png rename to textures/ui_moon_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_right_icon.png b/textures/ui_right_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_right_icon.png rename to textures/ui_right_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_search_icon.png b/textures/ui_search_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_search_icon.png rename to textures/ui_search_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_sethome_icon.png b/textures/ui_sethome_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_sethome_icon.png rename to textures/ui_sethome_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_skip_backward_icon.png b/textures/ui_skip_backward_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_skip_backward_icon.png rename to textures/ui_skip_backward_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_skip_forward_icon.png b/textures/ui_skip_forward_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_skip_forward_icon.png rename to textures/ui_skip_forward_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_sun_icon.png b/textures/ui_sun_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_sun_icon.png rename to textures/ui_sun_icon.png diff --git a/unified_inventory/unified_inventory/textures/ui_trash_icon.png b/textures/ui_trash_icon.png similarity index 100% rename from unified_inventory/unified_inventory/textures/ui_trash_icon.png rename to textures/ui_trash_icon.png diff --git a/unified_inventory/aaa_recipeshook/depends.txt b/unified_inventory/aaa_recipeshook/depends.txt deleted file mode 100644 index 8b13789..0000000 --- a/unified_inventory/aaa_recipeshook/depends.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/unified_inventory/aaa_recipeshook/init.lua b/unified_inventory/aaa_recipeshook/init.lua deleted file mode 100644 index 733edd1..0000000 --- a/unified_inventory/aaa_recipeshook/init.lua +++ /dev/null @@ -1,29 +0,0 @@ -crafts_table ={} -crafts_table_count=0 -UI_recipes_hook=true - --- override minetest.register_craft -local minetest_register_craft = minetest.register_craft -minetest.register_craft = function (options) - register_craft(options) - if options.type=="alloy" or options.type=="grinding" then return end - minetest_register_craft(options) -end - --- register_craft -register_craft = function(options) - if options.output == nil then - return - end - local itemstack = ItemStack(options.output) - if itemstack:is_empty() then - return - end - if crafts_table[itemstack:get_name()]==nil then - crafts_table[itemstack:get_name()] = {} - end - table.insert(crafts_table[itemstack:get_name()],options) - crafts_table_count=crafts_table_count+1 -end - - diff --git a/unified_inventory/modpack.txt b/unified_inventory/modpack.txt deleted file mode 100644 index 8b13789..0000000 --- a/unified_inventory/modpack.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/unified_inventory/unified_inventory/depends.txt b/unified_inventory/unified_inventory/depends.txt deleted file mode 100644 index 4be0815..0000000 --- a/unified_inventory/unified_inventory/depends.txt +++ /dev/null @@ -1 +0,0 @@ -aaa_recipeshook diff --git a/unified_inventory/unified_inventory/init.lua b/unified_inventory/unified_inventory/init.lua deleted file mode 100644 index 80855b3..0000000 --- a/unified_inventory/unified_inventory/init.lua +++ /dev/null @@ -1,4 +0,0 @@ --- load api -dofile(minetest.get_modpath("unified_inventory").."/api.lua") - -dofile(minetest.get_modpath("unified_inventory").."/bags.lua") diff --git a/unified_inventory/unified_inventory/textures/ui_bags_lg_form.png b/unified_inventory/unified_inventory/textures/ui_bags_lg_form.png deleted file mode 100644 index de62e21..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_lg_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_main_form.png b/unified_inventory/unified_inventory/textures/ui_bags_main_form.png deleted file mode 100644 index 11cb05d..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_main_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_med_form.png b/unified_inventory/unified_inventory/textures/ui_bags_med_form.png deleted file mode 100644 index 77b89df..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_med_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_sm_form.png b/unified_inventory/unified_inventory/textures/ui_bags_sm_form.png deleted file mode 100644 index f0af238..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_sm_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_craftguide_form.png b/unified_inventory/unified_inventory/textures/ui_craftguide_form.png deleted file mode 100644 index 7dbfa61..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_craftguide_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_crafting_form.png b/unified_inventory/unified_inventory/textures/ui_crafting_form.png deleted file mode 100644 index 1eaea56..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_crafting_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_misc_form.png b/unified_inventory/unified_inventory/textures/ui_misc_form.png deleted file mode 100644 index 103900c..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_misc_form.png and /dev/null differ