From 7d2827522cb49f0e36d72a2ea172d43d73024b8e Mon Sep 17 00:00:00 2001 From: Paramat Date: Fri, 18 Oct 2019 02:43:06 +0100 Subject: [PATCH] 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. --- README.txt | 9 +-------- init.lua | 2 -- license.txt | 32 ------------------------------- sounds/player_damage.ogg | Bin 6176 -> 0 bytes textures/gui_hotbar.png | Bin 411 -> 0 bytes textures/gui_hotbar_selected.png | Bin 175 -> 0 bytes 6 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 sounds/player_damage.ogg delete mode 100644 textures/gui_hotbar.png delete mode 100644 textures/gui_hotbar_selected.png diff --git a/README.txt b/README.txt index 22d040c..5a2b927 100644 --- a/README.txt +++ b/README.txt @@ -4,6 +4,7 @@ See license.txt for license information. Provides an API to allow multiple mods to set player models and textures. 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 ---------------------- @@ -19,14 +20,6 @@ stujones11 (CC BY-SA 3.0): Jordach (CC BY-SA 3.0): character.png -paramat (CC BY-SA 3.0): - gui_hotbar.png - gui_hotbar_selected.png - celeron55, Perttu Ahola (CC BY-SA 3.0): player.png player_back.png - -sonictechtonic (CC BY 3.0): -https://www.freesound.org/people/sonictechtonic/sounds/241872/ - player_damage.ogg diff --git a/init.lua b/init.lua index 783ff7e..19028de 100644 --- a/init.lua +++ b/init.lua @@ -31,6 +31,4 @@ minetest.register_on_joinplayer(function(player) {x = 200, y = 219}, 30 ) - player:hud_set_hotbar_image("gui_hotbar.png") - player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") end) diff --git a/license.txt b/license.txt index 69bb2f8..ce67e99 100644 --- a/license.txt +++ b/license.txt @@ -22,7 +22,6 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Copyright (C) 2011-2018 celeron55, Perttu Ahola Copyright (C) 2012-2018 Jordach Copyright (C) 2018 stujones11 -Copyright (C) 2018 paramat You are free to: 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: 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/ - diff --git a/sounds/player_damage.ogg b/sounds/player_damage.ogg deleted file mode 100644 index 788808710c1923c9ae797b7534b66a97dd18dd6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6176 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 z zO)%hANfGQWlKQZZ=fEQAXD?=}OBIUAAFbi?%009 z`ocLkznfdy8TRQWZ(DjUZQt5Nt|wm#JZ%`xNWYWZ;~vDo&>+lE(vZx+!0@lF&%EYUOUjAlZ_6xkSfCQ>~pY8hFMZz~Kx zH2n{rrK2}JEIn`OGiHWEbF++u;#e8>wd(w1OsWa=sn=@XCA$8%Vp0%m=51BW00xG2 z{7suJ55L`X%II%OR>7+iKknb*oBVP`?$p29x($m=8*(50TlVr<%e4a2rfU{Y&(3B^ z*tx=ydy0Hz75l^uTh$(v?EQOf*0Qt%5t{<0Gcg~C@n>aF@Rx4*Q^b^4&BAc6_0RmB zpJMKpEB}>vy7K;=1hq}eDtg;E9XhyYNHA~+GB7Yy^WNCY%pjM0?y`quSth92aAAr& z!z-baFFj6X&1PVzXJwdn;og7MMf?m;yc-xF{Fh~z*ZSwXkInD2emLA6c7M_rUWSIm-JA>zETRkz3z!%pZho{0xtcj` zyUO&rZ&K8)Z=Uokdz7s%uf@)>W4?1vt#VGHhdu)X O1B0ilpUXO@geCyMe^^QY diff --git a/textures/gui_hotbar_selected.png b/textures/gui_hotbar_selected.png deleted file mode 100644 index 7203e9a7e3a6ea213f3f004bf395b1fd5789ff26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0y~yUVa91mMcj-@9if8GBn z`axuXTSOpt);5cIKWFFNGheKBWpYWD)vdjbT2sB2?tgKqf8on6sU_C0rf;`M5#72V c?GpF36K^jZYnTwnz`(%Z>FVdQ&MBb@0Oj6AS^xk5