From a5eef1c5de77fa7770877802e66c3e1c53f9a0da Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 24 Apr 2019 18:59:36 -0400 Subject: update castles, areas, homedecor, plantlife, gloopblocks, hotbar, inspector, maptools, mesecons, moreblocks, moreores, technic, teleport_request, and worldedit switched to caverealms_lite (with minor fixes by me) switched to CWz's fork of player_textures The homedecor update brings in the big split, and will require you to re-enable all modpack components in order to avoid loss of content. --- homedecor/wardrobe.lua | 146 ------------------------------------------------- 1 file changed, 146 deletions(-) delete mode 100644 homedecor/wardrobe.lua (limited to 'homedecor/wardrobe.lua') diff --git a/homedecor/wardrobe.lua b/homedecor/wardrobe.lua deleted file mode 100644 index 6ce13f8..0000000 --- a/homedecor/wardrobe.lua +++ /dev/null @@ -1,146 +0,0 @@ - -local S = homedecor_i18n.gettext - -local wd_cbox = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } -} - --- cache set_textures function (fallback to old version) --- default.player_set_textures is deprecated and will be removed in future -local set_player_textures = - minetest.get_modpath("player_api") and player_api.set_textures - or default.player_set_textures - -local armor_mod_path = minetest.get_modpath("3d_armor") - -local skinslist = {"male1", "male2", "male3", "male4", "male5"} -local default_skin = "character.png" - -local skinsdb_mod_path = minetest.get_modpath("skinsdb") -if skinsdb_mod_path then - for _, shrt in ipairs(skinslist) do - for _, prefix in ipairs({"", "fe"}) do - local skin_name = prefix..shrt - local skin_obj = skins.new("homedecor_clothes_"..skin_name..".png") -- Texture PNG file as key to be compatible in set_player_skin - skin_obj:set_preview("homedecor_clothes_"..skin_name.."_preview.png") - skin_obj:set_texture("homedecor_clothes_"..skin_name..".png") - skin_obj:set_meta("name", "Wardrobe "..skin_name) - skin_obj:set_meta("author", 'Calinou and Jordach') - skin_obj:set_meta("license", 'CC-by-SA-4.0') - local file = io.open(homedecor.modpath.."/textures/homedecor_clothes_"..skin_name..".png", "r") - skin_obj:set_meta("format", skins.get_skin_format(file)) - file:close() - skin_obj:set_meta("in_inventory_list", false) - end - end -end - -function homedecor.get_player_skin(player) - local skin = player:get_attribute("homedecor:player_skin") - if not skin or skin == "" then - return default_skin, true - end - return skin, false -end - -function homedecor.set_player_skin(player, skin, save) - if skinsdb_mod_path then - skins.set_player_skin(player, skin or skins.default) - elseif armor_mod_path then -- if 3D_armor's installed, let it set the skin - armor.textures[player:get_player_name()].skin = skin or default_skin - armor:update_player_visuals(player) - else - set_player_textures(player, { skin or default_skin}) - end - - if save and not skinsdb_mod_path then - if skin == default_skin then - skin = "default" - player:set_attribute("homedecor:player_skin", "") - else - player:set_attribute("homedecor:player_skin", skin) - end - if save == "player" then -- if player action - minetest.log("verbose", - S("player @1 sets skin to @2", player:get_player_name(), skin) .. - (armor_mod_path and ' [3d_armor]' or '') - ) - end - end -end - -function homedecor.unset_player_skin(player) - homedecor.set_player_skin(player, nil, true) -end - -homedecor.register("wardrobe", { - mesh = "homedecor_bedroom_wardrobe.obj", - tiles = { - homedecor.plain_wood, - "homedecor_wardrobe_drawers.png", - "homedecor_wardrobe_doors.png" - }, - inventory_image = "homedecor_wardrobe_inv.png", - description = S("Wardrobe"), - groups = {snappy=3}, - selection_box = wd_cbox, - collision_box = wd_cbox, - sounds = default.node_sound_wood_defaults(), - expand = { top="placeholder" }, - on_rotate = screwdriver.rotate_simple, - infotext = S("Wardrobe"), - inventory = { - size = 10 - }, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - -- textures made by the Minetest community (mostly Calinou and Jordach) - local clothes_strings = "" - for i = 1,5 do - clothes_strings = clothes_strings.. - "image_button_exit["..(i-1)..".5,0;1.1,2;homedecor_clothes_"..skinslist[i].."_preview.png;"..skinslist[i]..";]".. - "image_button_exit["..(i-1)..".5,2;1.1,2;homedecor_clothes_fe"..skinslist[i].."_preview.png;fe"..skinslist[i]..";]" - end - meta:set_string("formspec", "size[5.5,8.5]"..default.gui_bg..default.gui_bg_img..default.gui_slots.. - "vertlabel[0,0.5;"..minetest.formspec_escape(S("Clothes")).."]".. - "button_exit[0,3.29;0.6,0.6;default;x]".. - clothes_strings.. - "vertlabel[0,5.2;"..minetest.formspec_escape(S("Storage")).."]".. - "list[current_name;main;0.5,4.5;5,2;]".. - "list[current_player;main;0.5,6.8;5,2;]" .. - "listring[]") - end, - on_receive_fields = function(pos, formname, fields, sender) - if fields.default then - homedecor.set_player_skin(sender, nil, "player") - return - end - - for i = 1,5 do - if fields[skinslist[i]] then - homedecor.set_player_skin(sender, "homedecor_clothes_"..skinslist[i]..".png", "player") - break - elseif fields["fe"..skinslist[i]] then - homedecor.set_player_skin(sender, "homedecor_clothes_fe"..skinslist[i]..".png", "player") - break - end - end - end -}) - -minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") -minetest.register_alias("homedecor:wardrobe_top", "air") - -if not skinsdb_mod_path then -- If not managed by skinsdb - minetest.register_on_joinplayer(function(player) - local skin = player:get_attribute("homedecor:player_skin") - - if skin and skin ~= "" then - -- setting player skin on connect has no effect, so delay skin change - minetest.after(1, function(player, skin) - homedecor.set_player_skin(player, skin) - end, player, skin) - end - end) -end -- cgit v1.2.3