diff --git a/closet/api/api_container.lua b/closet/api/api_container.lua index af68269..461b759 100644 --- a/closet/api/api_container.lua +++ b/closet/api/api_container.lua @@ -232,14 +232,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) return end - local cloth = player_api.compose_cloth(player) - local gender = player:get_meta():get_string("gender") - player_api.registered_models[player_api.get_gender_model(gender)].textures[1] = cloth - local player_name = player:get_player_name() - if minetest.get_modpath("3d_armor")~=nil then - armor.textures[player_name].skin = cloth - end - player_api.set_textures(player, player_api.registered_models[player_api.get_gender_model(gender)].textures) + player_api.set_texture(player) closet.container.container_lid_close(pn) return true diff --git a/closet/mod.conf b/closet/mod.conf index b87522e..bb89d83 100644 --- a/closet/mod.conf +++ b/closet/mod.conf @@ -1,5 +1,3 @@ name = closet description = A Wardove for put/store cloths depends = default, player_api, mirrors -optional_depends = -version = diff --git a/closet/textures/closet_female_preview.png b/closet/textures/closet_female_preview.png index 01bf340..2645c5d 100644 Binary files a/closet/textures/closet_female_preview.png and b/closet/textures/closet_female_preview.png differ diff --git a/default_clothes/mod.conf b/default_clothes/mod.conf index 40f9815..121285b 100644 --- a/default_clothes/mod.conf +++ b/default_clothes/mod.conf @@ -1,5 +1,3 @@ name = default_clothes description = Craft the default player_api cloths depends = player_api, fabric -optional_depends = -version = diff --git a/fabric/mod.conf b/fabric/mod.conf index 89e5e11..484f183 100644 --- a/fabric/mod.conf +++ b/fabric/mod.conf @@ -1,5 +1,3 @@ name = fabric description = Craft fabrics thru cotton depends = farming, dye -optional_depends = -version = diff --git a/mirrors/mod.conf b/mirrors/mod.conf index b8dd5ab..0102f6e 100644 --- a/mirrors/mod.conf +++ b/mirrors/mod.conf @@ -1,5 +1,3 @@ name = mirrors description = A Wardove for put/store cloths depends = default, xpanes -optional_depends = -version = diff --git a/vanity/api/api.lua b/vanity/api/api.lua new file mode 100644 index 0000000..de52bbf --- /dev/null +++ b/vanity/api/api.lua @@ -0,0 +1,3 @@ +local modpath = ... + +assert(loadfile(modpath .. "/api/api_vanity.lua"))() diff --git a/vanity/api/api_vanity.lua b/vanity/api/api_vanity.lua new file mode 100644 index 0000000..af68269 --- /dev/null +++ b/vanity/api/api_vanity.lua @@ -0,0 +1,304 @@ +closet.container = {} +closet.container.open_containers = {} + +local _contexts = {} + +local function get_context(name) + local context = _contexts[name] or {} + _contexts[name] = context + return context +end + +minetest.register_on_leaveplayer(function(player) + _contexts[player:get_player_name()] = nil +end) + +function closet.compose_preview(clicker, gender) + local inv = clicker:get_inventory() + local inv_list = inv:get_list("cloths") + local head, upper, lower, underwear, footwear + for i = 1, #inv_list do + local item_name = inv_list[i]:get_name() + local cloth_type = minetest.get_item_group(item_name, "cloth") + if cloth_type == 1 then + head = minetest.registered_items[item_name]._cloth_preview + elseif cloth_type == 2 then + upper = minetest.registered_items[item_name]._cloth_preview + elseif cloth_type == 3 then + lower = minetest.registered_items[item_name]._cloth_preview + underwear = true + elseif cloth_type == 4 then + footwear = minetest.registered_items[item_name]._cloth_preview + end + end + if not(underwear) then + lower = "cloth_lower_underwear_preview.png" + end + local preview, texture_base + if gender == "male" then + texture_base= "closet_player_preview.png" + else + texture_base = "closet_female_preview.png" + end + preview="[combine:32x64:0,0="..texture_base + if head then + preview= preview .. ":8,0="..head + end + if upper then + preview= preview .. ":0,16="..upper + end + if lower then + preview= preview .. ":8,40="..lower + end + if footwear then + preview= preview .. ":8,40="..footwear + end + return preview +end + + --if minetest.get_modpath("3d_armor")~=nil then + --local clicker_name = clicker:get_player_name() + --texture = armor.textures[clicker_name].skin + --5.4--texture = minetest.formspec_escape(armor.textures[clicker_name].skin)..",".. + --5.4armor.textures[clicker_name].armor..","..armor.textures[clicker_name].wielditem + --else + + --5.4--texture = clicker:get_properties().textures[1] + --end + --minetest.chat_send_all(raw_texture) + +local function get_bg(x,y,rows,columns,image) + local out = "" + for i=0,columns do + out = out .."image["..x+i..","..y..";1,1;"..image.."]" + for j = 0,rows do + out = out .."image["..x+i..","..y+j..";1,1;"..image.."]" + end + end + return out +end + +function closet.container.get_container_formspec(pos, clicker) + local gender = player_api.get_gender(clicker) + --5.4--local model = player_api.get_gender_model(gender) + local preview = closet.compose_preview(clicker, gender) + local spos = pos.x .. "," .. pos.y .. "," .. pos.z + local formspec = + "size[8,8.25]" .. + --5.4--"model[0,0;5,5;preview_model;"..model..";"..texture..";-10,195;;;0,79]".. + "image[0.5,0.5;2,4;"..preview.."]" .. + "list[current_player;cloths;2.5,0.25;2,4]" .. + get_bg(2.5,0.25,3,1,"closet_gui_clothes_bg.png").. + "list[nodemeta:" .. spos .. ";closet;5,0.25;3,12;]" .. + get_bg(5,0.25,3,2,"closet_gui_closet_bg.png").. + "list[current_player;main;0,4.5;8,1;]" .. + "list[current_player;main;0,5.5;8,3;8]" .. + default.get_hotbar_bg(0,4.5) + return formspec +end + +-- Allow only "cloth" groups to put/move + +minetest.register_allow_player_inventory_action(function(player, action, inventory, inventory_info) + local stack, from_inv, to_index + if action == "move" and inventory_info.to_list == "cloths" then + if inventory_info.from_list == inventory_info.to_list then --for moving inside the 'cloths' inventory + return 1 + end + --for moving items from player inventory list 'main' to 'cloths' + from_inv = "main" + to_index = inventory_info.to_index + stack = inventory:get_stack(inventory_info.from_list, inventory_info.from_index) + elseif action == "put" and inventory_info.listname == "cloths" then + --for moving from node inventory 'closet' to player inventory 'cloths' + from_inv = "closet" + to_index = inventory_info.index + stack = inventory_info.stack + else + return + end + if stack then + local stack_name = stack:get_name() + local item_group = minetest.get_item_group(stack_name , "cloth") + if item_group == 0 then --not a cloth + return 0 + end + --search for another cloth of the same type + local player_inv = player:get_inventory() + local cloth_list = player_inv:get_list("cloths") + for i = 1, #cloth_list do + local cloth_name = cloth_list[i]:get_name() + local cloth_type = minetest.get_item_group(cloth_name, "cloth") + if cloth_type == item_group then + if player_inv:get_stack("cloths", to_index):get_count() == 0 then --if put on an empty slot + if from_inv == "main" then + if player_inv:room_for_item("main", cloth_name) then + player_inv:remove_item("cloths", cloth_name) + player_inv:add_item("main", cloth_name) + return 1 + end + else --closet inventory + local closet_inv = minetest.get_inventory({ type="node", pos=get_context(player:get_player_name())}) + if closet_inv:room_for_item("closet", cloth_name) then + player_inv:remove_item("cloths", cloth_name) + closet_inv:add_item("closet", cloth_name) + return 1 + end + end + end + return 0 + end + end + return 1 + end + return 0 +end) + +minetest.register_on_player_inventory_action(function(player, action, inventory, inventory_info) + local update_cloths + if (action == "move" and inventory_info.to_list == "cloths") then + --for moving items from player inventory list 'main' to 'cloths' + if inventory_info.from_list == inventory_info.to_list then --for moving inside the 'cloths' inventory + update_cloths = false + else + update_cloths = true + end + elseif (action == "move" and inventory_info.to_list == "main" and inventory_info.from_list == "cloths") then + update_cloths = true + elseif (action == "put" or action == "take") and inventory_info.listname == "cloths" then + update_cloths = true + else + return + end + if update_cloths then + local player_name = player:get_player_name() + minetest.show_formspec(player_name, + "closet:container", closet.container.get_container_formspec(_contexts[player_name], player)) + end +end) + +function closet.container.container_lid_close(pn) + local container_open_info = closet.container.open_containers[pn] + local pos = container_open_info.pos + local sound = container_open_info.sound + local swap = container_open_info.swap + + closet.container.open_containers[pn] = nil + for k, v in pairs(closet.container.open_containers) do + if v.pos.x == pos.x and v.pos.y == pos.y and v.pos.z == pos.z then + return true + end + end + + local node = minetest.get_node(pos) + minetest.after(0.2, minetest.swap_node, pos, { name = "closet:" .. swap, + param2 = node.param2 }) + minetest.sound_play(sound, {gain = 0.3, pos = pos, max_hear_distance = 10}) +end + +minetest.register_on_leaveplayer(function(player) + local pn = player:get_player_name() + if closet.container.open_containers[pn] then + closet.container.container_lid_close(pn) + end +end) + +function closet.container.container_lid_obstructed(pos, direction) + if direction == "above" then + pos = {x = pos.x, y = pos.y + 1, z = pos.z} + end + local def = minetest.registered_nodes[minetest.get_node(pos).name] + -- allow ladders, signs, wallmounted things and torches to not obstruct + if def and + (def.drawtype == "airlike" or + def.drawtype == "signlike" or + def.drawtype == "torchlike" or + (def.drawtype == "nodebox" and def.paramtype2 == "wallmounted")) then + return false + end + return true +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= "closet:container" then + return + end + if not player or not fields.quit then + return + end + local pn = player:get_player_name() + + if not closet.container.open_containers[pn] then + return + end + + local cloth = player_api.compose_cloth(player) + local gender = player:get_meta():get_string("gender") + player_api.registered_models[player_api.get_gender_model(gender)].textures[1] = cloth + local player_name = player:get_player_name() + if minetest.get_modpath("3d_armor")~=nil then + armor.textures[player_name].skin = cloth + end + player_api.set_textures(player, player_api.registered_models[player_api.get_gender_model(gender)].textures) + + closet.container.container_lid_close(pn) + return true +end) + +function closet.register_container(name, d) + local def = table.copy(d) + def.drawtype = 'mesh' + def.use_texture_alpha = true + def.paramtype = "light" + def.paramtype2 = "facedir" + def.is_ground_content = false + + def.on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("infotext", d.description) + local inv = meta:get_inventory() + inv:set_size("closet", 12*1) + end + def.can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("closet") + end + def.on_rightclick = function(pos, node, clicker) + minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos, max_hear_distance = 10}) + if not closet.container.container_lid_obstructed(pos, "above") then + minetest.swap_node(pos, { + name = "closet:" .. name .. "_open", + param2 = node.param2 }) + end + minetest.after(0.2, minetest.show_formspec, + clicker:get_player_name(), + "closet:container", closet.container.get_container_formspec(pos, clicker)) + local player_name = clicker:get_player_name() + _contexts[player_name] = pos + closet.container.open_containers[player_name] = { pos = pos, sound = def.sound_close, swap = name } + end + def.on_blast = function(pos) + local drops = {} + default.get_inventory_drops(pos, "closet", drops) + drops[#drops+1] = "closet:" .. name + minetest.remove_node(pos) + return drops + end + + local def_opened = table.copy(def) + local def_closed = table.copy(def) + + def_opened.mesh = "closet_open.obj" + def_opened.tiles = {"closet_closet_open.png",} + def_opened.drop = "closet:" .. name + def_opened.groups.not_in_creative_inventory = 1 + def_opened.can_dig = function() + return false + end + def_opened.on_blast = function() end + + minetest.register_node("closet:" .. name, def_closed) + minetest.register_node("closet:" .. name .. "_open", def_opened) + +end diff --git a/vanity/init.lua b/vanity/init.lua new file mode 100644 index 0000000..7da1729 --- /dev/null +++ b/vanity/init.lua @@ -0,0 +1,18 @@ +-- +-- vanity +-- License:GPLv3 +-- + +local modname = "vanity" +local modpath = minetest.get_modpath(modname) +-- internationalization boilerplate +local S = minetest.get_translator(minetest.get_current_modname()) + +-- +-- Vanity Mod +-- + +vanity = {} + +-- Load the files +assert(loadfile(modpath .. "/vanity.lua"))(S) diff --git a/vanity/locale/vanity.es.tr b/vanity/locale/vanity.es.tr new file mode 100644 index 0000000..6936f4b --- /dev/null +++ b/vanity/locale/vanity.es.tr @@ -0,0 +1,5 @@ +# textdomain: vanity +Vanity Table=Tocador +Close=Cerrar +Skin Tone=Tono de piel +Eyes Color=Color de ojos diff --git a/vanity/mod.conf b/vanity/mod.conf new file mode 100644 index 0000000..a18657d --- /dev/null +++ b/vanity/mod.conf @@ -0,0 +1,3 @@ +name = vanity +description = A Vanity Set +depends = default, player_api, mirrors diff --git a/vanity/models/vanity_set.b3d b/vanity/models/vanity_set.b3d new file mode 100644 index 0000000..f52b595 Binary files /dev/null and b/vanity/models/vanity_set.b3d differ diff --git a/vanity/models/vanity_set.blend b/vanity/models/vanity_set.blend new file mode 100644 index 0000000..6c2e007 Binary files /dev/null and b/vanity/models/vanity_set.blend differ diff --git a/vanity/models/vanity_set.obj b/vanity/models/vanity_set.obj new file mode 100644 index 0000000..bfe0c7c --- /dev/null +++ b/vanity/models/vanity_set.obj @@ -0,0 +1,109 @@ +mtllib vanity.mtl +o converted_out +v 0.5 0.0625 -0.5 +v 0.5 0.0625 0.5 +v 0.5 0.5 0.5 +v 0.5 0.5 -0.5 +v -0.5 0.0625 -0.5 +v -0.5 0.0625 0.5 +v -0.5 0.5 0.5 +v -0.5 0.5 -0.5 +v 0.5 -0.5 -0.5 +v 0.5 -0.5 -0.375 +v 0.5 0.0625 -0.375 +v 0.5 0.0625 -0.5 +v 0.375 -0.5 -0.5 +v 0.375 -0.5 -0.375 +v 0.375 0.0625 -0.375 +v 0.375 0.0625 -0.5 +v -0.375 -0.5 0.375 +v -0.375 -0.5 0.5 +v -0.375 0.0625 0.5 +v -0.375 0.0625 0.375 +v -0.5 -0.5 0.375 +v -0.5 -0.5 0.5 +v -0.5 0.0625 0.5 +v -0.5 0.0625 0.375 +v 0.5 0.5 0.375 +v 0.5 0.5 0.5 +v 0.5 1.25 0.5 +v 0.5 1.25 0.375 +v -0.5 0.5 0.375 +v -0.5 0.5 0.5 +v -0.5 1.25 0.5 +v -0.5 1.25 0.375 +v 0.375 -0.5 0.5 +v 0.375 -0.5 0.375 +v 0.375 0.0625 0.375 +v 0.375 0.0625 0.5 +v 0.5 -0.5 0.5 +v 0.5 -0.5 0.375 +v 0.5 0.0625 0.375 +v 0.5 0.0625 0.5 +v -0.375 -0.5 -0.5 +v -0.375 -0.5 -0.375 +v -0.375 0.0625 -0.375 +v -0.375 0.0625 -0.5 +v -0.5 -0.5 -0.5 +v -0.5 -0.5 -0.375 +v -0.5 0.0625 -0.375 +v -0.5 0.0625 -0.5 +v 0.5 1.25 0.4375 +v 0.5 1.25 0.4375 +v 0.5 1.5 0.4375 +v 0.5 1.5 0.4375 +v -0.5 1.25 0.4375 +v -0.5 1.25 0.4375 +v -0.5 1.5 0.4375 +v -0.5 1.5 0.4375 +usemtl none +s off +g nodebox1 +f 1 2 3 4 +f 5 6 7 8 +f 1 4 8 5 +f 2 3 7 6 +f 1 2 6 5 +f 4 3 7 8 +g nodebox2 +f 9 10 11 12 +f 13 14 15 16 +f 9 12 16 13 +f 10 11 15 14 +f 9 10 14 13 +f 12 11 15 16 +g nodebox3 +f 17 18 19 20 +f 21 22 23 24 +f 17 20 24 21 +f 18 19 23 22 +f 17 18 22 21 +f 20 19 23 24 +g nodebox4 +f 25 26 27 28 +f 29 30 31 32 +f 25 28 32 29 +f 26 27 31 30 +f 25 26 30 29 +f 28 27 31 32 +g nodebox5 +f 33 34 35 36 +f 37 38 39 40 +f 33 36 40 37 +f 34 35 39 38 +f 33 34 38 37 +f 36 35 39 40 +g nodebox6 +f 41 42 43 44 +f 45 46 47 48 +f 41 44 48 45 +f 42 43 47 46 +f 41 42 46 45 +f 44 43 47 48 +g nodebox7 +f 49 50 51 52 +f 53 54 55 56 +f 49 52 56 53 +f 50 51 55 54 +f 49 50 54 53 +f 52 51 55 56 diff --git a/vanity/textures/player_black_skin.png b/vanity/textures/player_black_skin.png new file mode 100644 index 0000000..ac9d2a6 Binary files /dev/null and b/vanity/textures/player_black_skin.png differ diff --git a/vanity/textures/player_brown_skin.png b/vanity/textures/player_brown_skin.png new file mode 100644 index 0000000..1062032 Binary files /dev/null and b/vanity/textures/player_brown_skin.png differ diff --git a/vanity/textures/player_gray_eye.png b/vanity/textures/player_gray_eye.png new file mode 100644 index 0000000..26d6df6 Binary files /dev/null and b/vanity/textures/player_gray_eye.png differ diff --git a/vanity/textures/player_green_eye.png b/vanity/textures/player_green_eye.png new file mode 100644 index 0000000..8bec815 Binary files /dev/null and b/vanity/textures/player_green_eye.png differ diff --git a/vanity/textures/player_hazel_eye.png b/vanity/textures/player_hazel_eye.png new file mode 100644 index 0000000..90b7f31 Binary files /dev/null and b/vanity/textures/player_hazel_eye.png differ diff --git a/vanity/textures/player_normal_skin.png b/vanity/textures/player_normal_skin.png new file mode 100644 index 0000000..3bf1b12 Binary files /dev/null and b/vanity/textures/player_normal_skin.png differ diff --git a/vanity/textures/player_violet_eye.png b/vanity/textures/player_violet_eye.png new file mode 100644 index 0000000..74a2e79 Binary files /dev/null and b/vanity/textures/player_violet_eye.png differ diff --git a/vanity/textures/vanity_face_base.png b/vanity/textures/vanity_face_base.png new file mode 100644 index 0000000..767947f Binary files /dev/null and b/vanity/textures/vanity_face_base.png differ diff --git a/vanity/textures/vanity_vanity.png b/vanity/textures/vanity_vanity.png new file mode 100644 index 0000000..35e0238 Binary files /dev/null and b/vanity/textures/vanity_vanity.png differ diff --git a/vanity/vanity.lua b/vanity/vanity.lua new file mode 100644 index 0000000..e153f95 --- /dev/null +++ b/vanity/vanity.lua @@ -0,0 +1,101 @@ +local S = ... + +function vanity.get_vanity_formspec(clicker) + local gender = player_api.get_gender(clicker) + --5.4--local model = player_api.get_gender_model(gender) + local face_base = player_api.compose_skin(clicker, "vanity_face_base.png") + local base_texture = player_api.get_base_texture_table(clicker) + local eyebrows = base_texture["eyebrowns"] + local eye = base_texture["eye"] + local mouth = base_texture["mouth"] + local hair = base_texture["hair"] + local face_preview = minetest.formspec_escape("[combine:16x16:0,0=".. face_base .. + ":0,0=" .. eyebrows .. + ":2,8=" .. eye .. + ":10,8=" .. eye .. + ":0,12=" .. mouth .. + ":0,0 =" .. string.sub(hair, 0, -5).."_preview.png" + ) + local formspec = + "formspec_version[4]".. + "size[8.75,6.25]".. + "image[0.5,0.5;4,4;".. face_preview .."]".. + "image_button[4.75,2.5;1,1;player_blue_eye.png;btn_blue_eye;]".. + "label[6,0.5;"..S("Skin Tone").."]".. + "image_button[4.75,0.75;1,1;player_normal_skin.png;btn_normal_skin;]".. + "image_button[6,0.75;1,1;player_brown_skin.png;btn_brown_skin;]".. + "image_button[7.25,0.75;1,1;player_black_skin.png;btn_black_skin;]".. + "label[6,2.25;"..S("Eyes Color").."]".. + "image_button[6,2.5;1,1;player_brown_eye.png;btn_brown_eye;]".. + "image_button[7.25,2.5;1,1;player_green_eye.png;btn_green_eye;]".. + "image_button[4.75,3.75;1,1;player_gray_eye.png;btn_gray_eye;]".. + "image_button[6,3.75;1,1;player_hazel_eye.png;btn_hazel_eye;]".. + "image_button[7.25,3.75;1,1;player_violet_eye.png;btn_violet_eye;]".. + "style_type[button_exit;bgcolor=#006699;textcolor=white]".. + "button_exit[4,5;1,1;btn_close;"..S("Close").."]" + return formspec +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= "form:vanity" then + return + end + if not player or fields.quit then + return + end + local player_name = player:get_player_name() + base_texture = player_api.get_base_texture_table(player) + local change = false + if fields.btn_blue_eye then + base_texture["eye"] = "player_blue_eye.png" + elseif fields.btn_brown_eye then + base_texture["eye"] = "player_brown_eye.png" + elseif fields.btn_green_eye then + base_texture["eye"] = "player_green_eye.png" + elseif fields.btn_gray_eye then + base_texture["eye"] = "player_gray_eye.png" + elseif fields.btn_hazel_eye then + base_texture["eye"] = "player_hazel_eye.png" + elseif fields.btn_violet_eye then + base_texture["eye"] = "player_violet_eye.png" + elseif fields.btn_normal_skin then + base_texture["skin"] = nil + elseif fields.btn_brown_skin then + base_texture["skin"] = {color = "#a56d40", ratio = 150} + elseif fields.btn_black_skin then + base_texture["skin"] = {color = "#462409", ratio = 127} + end + player_api.set_base_texture(player, base_texture) + player_api.set_texture(player) + minetest.show_formspec(player_name, + "form:vanity", vanity.get_vanity_formspec(player)) + return true +end) + +-- Vanity Set + +minetest.register_node("vanity:vanity", { + description = S("Vanity Table"), + drawtype = "mesh", + mesh = "vanity_set.b3d", + tiles = {"vanity_vanity.png"}, + paramtype2 = "facedir", + is_ground_content = false, + groups = {cracky=3, wood=1}, + + on_rightclick = function(pos, node, player, itemstack, pointed_thing) + local player_name = player:get_player_name() + minetest.show_formspec(player_name, + "form:vanity", vanity.get_vanity_formspec(player)) + end, +}) + +minetest.register_craft({ + output = "vanity:vanity", + type = "shaped", + recipe = { + {"", "", ""}, + {"", "group:mirror", ""}, + {"", "group:wood", ""}, + } +})