diff --git a/games/default/files/3d_armor/LICENSE.md b/games/default/files/3d_armor/LICENSE.md index 1877a25a5..07b9c3925 100644 --- a/games/default/files/3d_armor/LICENSE.md +++ b/games/default/files/3d_armor/LICENSE.md @@ -1,10 +1,10 @@ 3D Armor - Visible Player Armor =============================== -Default Item Textures (C) Cisoun - WTFPL +License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v3.0+ -Armor Textures: Copyright (C) 2013 Ryan Jones - CC-BY-SA - -Source Code: Copyright (C) 2013 Stuart Jones - LGPL +Textures: +Copyright (C) 2013 Vattic +Copyright (C) 2017-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua & MultiCraft Developement Team Special credit to Jordach and MirceaKitsune for providing the default 3d character model. diff --git a/games/default/files/3d_armor/armor.lua b/games/default/files/3d_armor/armor.lua index 3bc3432b3..278b1bfe5 100644 --- a/games/default/files/3d_armor/armor.lua +++ b/games/default/files/3d_armor/armor.lua @@ -90,7 +90,7 @@ armor.set_player_armor = function(self, player) minetest.log("error", "Failed to read player inventory") return end - local armor_texture = "3d_armor_trans.png" + local armor_texture = "blank.png" local armor_level = 0 local armor_heal = 0 local state = 0 @@ -390,8 +390,8 @@ minetest.register_on_joinplayer(function(player) } armor.textures[name] = { skin = armor.default_skin..".png", - armor = "3d_armor_trans.png", - wielditem = "3d_armor_trans.png", + armor = "blank.png", + wielditem = "blank.png", preview = armor.default_skin.."_preview.png", } if minetest.get_modpath("skins") then diff --git a/games/default/files/3d_armor/textures/3d_armor_trans.png b/games/default/files/3d_armor/textures/3d_armor_trans.png deleted file mode 100644 index 83d9d1a63..000000000 Binary files a/games/default/files/3d_armor/textures/3d_armor_trans.png and /dev/null differ diff --git a/games/default/files/bonusbox/init.lua b/games/default/files/bonusbox/init.lua index 4dab48672..b6afdcff9 100644 --- a/games/default/files/bonusbox/init.lua +++ b/games/default/files/bonusbox/init.lua @@ -40,9 +40,9 @@ end minetest.register_node("bonusbox:chest", { tiles = { "chest_top.png", - "chest_bottom.png", - "chest_right.png", - "chest_left.png", + "chest_top.png^[transformFY", + "chest_side.png", + "chest_side.png^[transformFX", "chest_back.png", "chest_front.png" }, @@ -66,8 +66,8 @@ minetest.register_node("bonusbox:chest_open", { tiles = { "chest_open_top.png", "chest_open_bottom.png", - "chest_open_riqht.png", - "chest_open_left.png", + "chest_open_side.png", + "chest_open_side.png^[transformFX", "chest_open_back.png", "chest_open_front.png" }, @@ -92,8 +92,8 @@ minetest.register_node("bonusbox:chest_cap", { tiles = { "chest_open_top.png", "chest_open_bottom.png", - "chest_open_right_two.png", - "chest_open_left_two.png", + "chest_open_side_two.png", + "chest_open_side_two.png^[transformFX", "chest_open_back_two.png", "chest_open_front_two.png" }, diff --git a/games/default/files/bonusbox/textures/chest_bottom.png b/games/default/files/bonusbox/textures/chest_bottom.png deleted file mode 100644 index 824d6b8bf..000000000 Binary files a/games/default/files/bonusbox/textures/chest_bottom.png and /dev/null differ diff --git a/games/default/files/bonusbox/textures/chest_left.png b/games/default/files/bonusbox/textures/chest_left.png deleted file mode 100644 index 407ada7ee..000000000 Binary files a/games/default/files/bonusbox/textures/chest_left.png and /dev/null differ diff --git a/games/default/files/bonusbox/textures/chest_open_left.png b/games/default/files/bonusbox/textures/chest_open_left.png deleted file mode 100644 index a75a9bdd5..000000000 Binary files a/games/default/files/bonusbox/textures/chest_open_left.png and /dev/null differ diff --git a/games/default/files/bonusbox/textures/chest_open_left_two.png b/games/default/files/bonusbox/textures/chest_open_left_two.png deleted file mode 100644 index 39e9ca0f1..000000000 Binary files a/games/default/files/bonusbox/textures/chest_open_left_two.png and /dev/null differ diff --git a/games/default/files/bonusbox/textures/chest_open_riqht.png b/games/default/files/bonusbox/textures/chest_open_side.png similarity index 100% rename from games/default/files/bonusbox/textures/chest_open_riqht.png rename to games/default/files/bonusbox/textures/chest_open_side.png diff --git a/games/default/files/bonusbox/textures/chest_open_right_two.png b/games/default/files/bonusbox/textures/chest_open_side_two.png similarity index 100% rename from games/default/files/bonusbox/textures/chest_open_right_two.png rename to games/default/files/bonusbox/textures/chest_open_side_two.png diff --git a/games/default/files/bonusbox/textures/chest_right.png b/games/default/files/bonusbox/textures/chest_side.png similarity index 100% rename from games/default/files/bonusbox/textures/chest_right.png rename to games/default/files/bonusbox/textures/chest_side.png diff --git a/games/default/files/creative/init.lua b/games/default/files/creative/init.lua index 63efe42d5..02a43b5f8 100644 --- a/games/default/files/creative/init.lua +++ b/games/default/files/creative/init.lua @@ -20,8 +20,7 @@ if creative_mode_cache then minetest.register_item(":", { type = "none", - wield_image = "wieldhand.png", - wield_scale = {x = 0.7, y = 2, z = 0}, + wield_image = "blank.png", range = 10, tool_capabilities = { full_punch_interval = 0.9, diff --git a/games/default/files/default/functions.lua b/games/default/files/default/functions.lua index 733a6970b..dd18dbc4d 100644 --- a/games/default/files/default/functions.lua +++ b/games/default/files/default/functions.lua @@ -129,6 +129,18 @@ function default.node_sound_snow_defaults(table) return table end +function default.node_wool_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "wool_coat_movement", gain = 0.4} + table.dig = table.dig or + {name = "wool_coat_movement", gain = 0.6} + table.dug = table.dug or + {name = "wool_coat_movement", gain = 0.6} + table.place = table.place or + {name = "default_place_node", gain = 1.0} + return table +end -- -- Lavacooling diff --git a/games/default/files/stairs/sounds/wool_coat_movement.ogg b/games/default/files/default/sounds/wool_coat_movement.ogg similarity index 100% rename from games/default/files/stairs/sounds/wool_coat_movement.ogg rename to games/default/files/default/sounds/wool_coat_movement.ogg diff --git a/games/default/files/default/textures/crosshair.png b/games/default/files/default/textures/crosshair.png new file mode 100644 index 000000000..30b01b168 Binary files /dev/null and b/games/default/files/default/textures/crosshair.png differ diff --git a/games/default/files/default/textures/wieldhand.png b/games/default/files/default/textures/wieldhand.png deleted file mode 100644 index eb110d2c1..000000000 Binary files a/games/default/files/default/textures/wieldhand.png and /dev/null differ diff --git a/games/default/files/default/tools.lua b/games/default/files/default/tools.lua index 2b933735b..1eb3a9ab3 100644 --- a/games/default/files/default/tools.lua +++ b/games/default/files/default/tools.lua @@ -3,8 +3,7 @@ -- The hand minetest.register_item(":", { type = "none", - wield_image = "wieldhand.png", - wield_scale = {x=0.7,y=2,z=0.0001}, + wield_image = "blank.png", tool_capabilities = { full_punch_interval = 0.9, max_drop_level = 0, diff --git a/games/default/files/hud/textures/crosshair.png b/games/default/files/hud/textures/crosshair.png deleted file mode 100644 index 5bf2fcf31..000000000 Binary files a/games/default/files/hud/textures/crosshair.png and /dev/null differ diff --git a/games/default/files/player_api/init.lua b/games/default/files/player_api/init.lua index 99b90dbb5..4ac69f2da 100644 --- a/games/default/files/player_api/init.lua +++ b/games/default/files/player_api/init.lua @@ -18,6 +18,17 @@ player_api.register_model("character.b3d", { eye_height = 1.47, }) +minetest.register_node("player_api:hand", { + tiles = {"character.png"}, + wield_scale = {x = 1, y = 1, z = 0.7}, + paramtype = "light", + drawtype = "mesh", + mesh = "hand.b3d", + inventory_image = "blank.png", + drop = "", + node_placement_prediction = "", +}) + -- Update appearance when the player joins minetest.register_on_joinplayer(function(player) player_api.player_attached[player:get_player_name()] = false @@ -30,13 +41,9 @@ minetest.register_on_joinplayer(function(player) 30 ) -if PLATFORM == "Android" or PLATFORM == "iOS" then - player:hud_set_hotbar_image("gui_hotbar_touch.png") - player:hud_set_hotbar_itemcount(8) -else - player:hud_set_hotbar_image("gui_hotbar.png") player:hud_set_hotbar_itemcount(9) -end - + player:hud_set_hotbar_image("gui_hotbar.png") player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") + + player:get_inventory():set_stack("hand", 1, "player_api:hand") end) diff --git a/games/default/files/player_api/models/character.png b/games/default/files/player_api/models/character.png index f26139130..e876ad267 100644 Binary files a/games/default/files/player_api/models/character.png and b/games/default/files/player_api/models/character.png differ diff --git a/games/default/files/player_api/models/hand.b3d b/games/default/files/player_api/models/hand.b3d new file mode 100644 index 000000000..a38124c60 Binary files /dev/null and b/games/default/files/player_api/models/hand.b3d differ diff --git a/games/default/files/stairs/init.lua b/games/default/files/stairs/init.lua index 5bb42d0f4..888a311d5 100644 --- a/games/default/files/stairs/init.lua +++ b/games/default/files/stairs/init.lua @@ -1,27 +1,12 @@ stairs = {} stairs.mod = "redo" - -function default.node_sound_wool_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name = "wool_coat_movement", gain = 1.0} - table.dug = table.dug or - {name = "wool_coat_movement", gain = 0.25} - table.place = table.place or - {name = "default_place_node", gain = 1.0} - return table -end - - stairs.wood = default.node_sound_wood_defaults() stairs.dirt = default.node_sound_dirt_defaults() stairs.stone = default.node_sound_stone_defaults() stairs.glass = default.node_sound_glass_defaults() stairs.leaves = default.node_sound_leaves_defaults() stairs.metal = default.node_sound_metal_defaults() -stairs.wool = stairs.leaves - -- cache creative local creative = minetest.settings:get_bool("creative_mode") @@ -534,11 +519,7 @@ stairs.register_all("snowblock", "default:snowblock", {crumbly = 3, puts_out_fire = 1, cools_lava = 1, snowy = 1}, {"default_snow.png"}, "Snow Block", - default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - })) + default.node_sound_snow_defaults()) stairs.register_all("ice", "default:ice", {cracky = 3, puts_out_fire = 1, cools_lava = 1}, @@ -611,7 +592,7 @@ stairs.register_all("wool_" .. colours[i][1], "wool:" .. colours[i][1], {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, flammable = 3}, {"wool_" .. colours[i][1] .. ".png"}, colours[i][2] .. " Wool", - stairs.wool) + default.node_wool_defaults()) end diff --git a/games/default/files/wool/init.lua b/games/default/files/wool/init.lua index 749555953..4153a6332 100644 --- a/games/default/files/wool/init.lua +++ b/games/default/files/wool/init.lua @@ -16,19 +16,6 @@ local dyes = { {"dark_green", "Dark Green"}, } -function default.node_wool_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name = "wool_coat_movement", gain = 1.0} - table.dug = table.dug or - {name = "wool_coat_movement", gain = 0.25} - table.place = table.place or - {name = "default_place_node", gain = 1.0} - return table -end - -local wool_sound = default.node_wool_defaults() - for i = 1, #dyes do local name, desc = unpack(dyes[i]) @@ -38,7 +25,7 @@ for i = 1, #dyes do is_ground_content = false, groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, flammable = 3, wool = 1}, - sounds = wool_sound, + sounds = default.node_wool_defaults(), }) minetest.register_craft{ diff --git a/games/default/files/wool/sounds/wool_coat_movement.ogg b/games/default/files/wool/sounds/wool_coat_movement.ogg deleted file mode 100644 index 89df47f44..000000000 Binary files a/games/default/files/wool/sounds/wool_coat_movement.ogg and /dev/null differ diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index 5b6593469..c5ed49e2e 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -1164,10 +1164,20 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt) if (param == HUD_PARAM_HOTBAR_ITEMCOUNT && value.size() == 4) { s32 hotbar_itemcount = readS32((u8*) value.c_str()); - if (hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX) - player->hud_hotbar_itemcount = hotbar_itemcount; + if (hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX) { + // Hotbar over 8 is not supported by touch controls. This is not a hack, but a quick fix + #if defined(__ANDROID__) || defined(__IOS__) + player->hud_hotbar_itemcount = 8; + #else + player->hud_hotbar_itemcount = hotbar_itemcount; + #endif + } } else if (param == HUD_PARAM_HOTBAR_IMAGE) { + // Set the touch interface to fit the size + #if defined(__ANDROID__) || defined(__IOS__) + std::string value = "gui_hotbar_touch.png"; + #endif // If value not empty verify image exists in texture source if (value != "" && !getTextureSource()->isKnownSourceImage(value)) { errorstream << "Server sent wrong Hud hotbar image (sent value: '" @@ -1177,6 +1187,10 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt) player->hotbar_image = value; } else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) { + // Selection texture too... + #if defined(__ANDROID__) || defined(__IOS__) + std::string value = "gui_hotbar_selected.png"; + #endif // If value not empty verify image exists in texture source if (value != "" && !getTextureSource()->isKnownSourceImage(value)) { errorstream << "Server sent wrong Hud hotbar selected image (sent value: '" diff --git a/textures/base/gui_hotbar_selected.png b/textures/base/gui_hotbar_selected.png new file mode 100644 index 000000000..8240f5e39 Binary files /dev/null and b/textures/base/gui_hotbar_selected.png differ diff --git a/games/default/files/player_api/textures/gui_hotbar_touch.png b/textures/base/gui_hotbar_touch.png similarity index 100% rename from games/default/files/player_api/textures/gui_hotbar_touch.png rename to textures/base/gui_hotbar_touch.png diff --git a/textures/base/server_flags_password.png b/textures/base/server_flags_password.png deleted file mode 100644 index 60d515bb2..000000000 Binary files a/textures/base/server_flags_password.png and /dev/null differ