Move hotbar code/textures, and damage sound, from player_api to default

These are unrelated to the Player API and player object.
All other GUI/HUD code and textures are in default.
All other engine hardcoded sounds are in default.
The player_api mod is highly likely to be used unchanged in new games,
so logical grouping of content will help the creation of new games.
This commit is contained in:
Paramat 2019-10-18 02:43:06 +01:00 committed by GitHub
parent 7c1fd9c24e
commit 7caa5d36f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 44 deletions

View File

@ -123,6 +123,8 @@ paramat (CC BY-SA 3.0):
default_fence_rail_junglewood default_fence_rail_junglewood
default_fence_rail_pine_wood default_fence_rail_pine_wood
default_fence_rail_wood -- Derived from a texture by BlockMen (CC BY-SA 3.0) default_fence_rail_wood -- Derived from a texture by BlockMen (CC BY-SA 3.0)
gui_hotbar.png
gui_hotbar_selected.png
TumeniNodes (CC BY-SA 3.0): TumeniNodes (CC BY-SA 3.0):
default_desert_cobble.png -- Derived from a texture by brunob.santos (CC BY-SA 3.0) default_desert_cobble.png -- Derived from a texture by brunob.santos (CC BY-SA 3.0)
@ -150,7 +152,10 @@ BlockMen (CC BY-SA 3.0):
default_mineral_mese.png default_mineral_mese.png
default_meselamp.png default_meselamp.png
bubble.png bubble.png
gui_*.png gui_formbg.png
gui_furnace_arrow_bg.png
gui_furnace_arrow_fg.png
gui_hb_bg.png
sofar (CC BY-SA 3.0): sofar (CC BY-SA 3.0):
default_aspen_sapling default_aspen_sapling
@ -330,6 +335,10 @@ http://freesound.org/people/Ryding/sounds/94337/
Ferk (CC0 1.0): Ferk (CC0 1.0):
default_item_smoke.ogg, based on a sound by http://opengameart.org/users/bart default_item_smoke.ogg, based on a sound by http://opengameart.org/users/bart
sonictechtonic (CC BY 3.0):
https://www.freesound.org/people/sonictechtonic/sounds/241872/
player_damage.ogg
Models Models
------ ------

View File

@ -14,10 +14,10 @@ default.get_translator = S
-- GUI related stuff -- GUI related stuff
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
-- Set formspec prepend
local formspec = [[ local formspec = [[
bgcolor[#080808BB;true] bgcolor[#080808BB;true]
listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] ]] listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] ]]
local name = player:get_player_name() local name = player:get_player_name()
local info = minetest.get_player_information(name) local info = minetest.get_player_information(name)
if info.formspec_version > 1 then if info.formspec_version > 1 then
@ -26,6 +26,10 @@ minetest.register_on_joinplayer(function(player)
formspec = formspec .. "background[5,5;1,1;gui_formbg.png;true]" formspec = formspec .. "background[5,5;1,1;gui_formbg.png;true]"
end end
player:set_formspec_prepend(formspec) player:set_formspec_prepend(formspec)
-- Set hotbar textures
player:hud_set_hotbar_image("gui_hotbar.png")
player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
end) end)
function default.get_hotbar_bg(x,y) function default.get_hotbar_bg(x,y)

View File

Before

Width:  |  Height:  |  Size: 411 B

After

Width:  |  Height:  |  Size: 411 B

View File

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

View File

@ -4,6 +4,7 @@ See license.txt for license information.
Provides an API to allow multiple mods to set player models and textures. Provides an API to allow multiple mods to set player models and textures.
Also sets the default model, texture, and player flags. Also sets the default model, texture, and player flags.
This mod is only for content related to the Player API and the player object.
Authors of source code Authors of source code
---------------------- ----------------------
@ -19,14 +20,6 @@ stujones11 (CC BY-SA 3.0):
Jordach (CC BY-SA 3.0): Jordach (CC BY-SA 3.0):
character.png character.png
paramat (CC BY-SA 3.0):
gui_hotbar.png
gui_hotbar_selected.png
celeron55, Perttu Ahola <celeron55@gmail.com> (CC BY-SA 3.0): celeron55, Perttu Ahola <celeron55@gmail.com> (CC BY-SA 3.0):
player.png player.png
player_back.png player_back.png
sonictechtonic (CC BY 3.0):
https://www.freesound.org/people/sonictechtonic/sounds/241872/
player_damage.ogg

View File

@ -31,6 +31,4 @@ minetest.register_on_joinplayer(function(player)
{x = 200, y = 219}, {x = 200, y = 219},
30 30
) )
player:hud_set_hotbar_image("gui_hotbar.png")
player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
end) end)

View File

@ -22,7 +22,6 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
Copyright (C) 2011-2018 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2011-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2012-2018 Jordach Copyright (C) 2012-2018 Jordach
Copyright (C) 2018 stujones11 Copyright (C) 2018 stujones11
Copyright (C) 2018 paramat
You are free to: You are free to:
Share — copy and redistribute the material in any medium or format. Share — copy and redistribute the material in any medium or format.
@ -51,34 +50,3 @@ rights may limit how you use the material.
For more details: For more details:
http://creativecommons.org/licenses/by-sa/3.0/ http://creativecommons.org/licenses/by-sa/3.0/
------------------------------------
Attribution 3.0 Unported (CC BY 3.0)
Copyright (C) 2014-2018 sonictechtonic
You are free to:
Share — copy and redistribute the material in any medium or format.
Adapt — remix, transform, and build upon the material for any purpose, even commercially.
The licensor cannot revoke these freedoms as long as you follow the license terms.
Under the following terms:
Attribution — You must give appropriate credit, provide a link to the license, and
indicate if changes were made. You may do so in any reasonable manner, but not in any way
that suggests the licensor endorses you or your use.
No additional restrictions — You may not apply legal terms or technological measures that
legally restrict others from doing anything the license permits.
Notices:
You do not have to comply with the license for elements of the material in the public
domain or where your use is permitted by an applicable exception or limitation.
No warranties are given. The license may not give you all of the permissions necessary
for your intended use. For example, other rights such as publicity, privacy, or moral
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by/3.0/