diff --git a/LICENSE.md b/LICENSE.md index 142459b..1cc9d8d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,9 @@ -## License of the code +# Licenses of Minetest rPlace + +The source codes and media used in rPlace are in different licenses. However, they are all free (as in freedom) to use. + +## License of the code (LGPLv2.1+) + Copyright (C) 2023 1F616EMO This library is free software; you can redistribute it and/or @@ -15,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -### License of Optional HTML Viewer +### License of HTML Viewer Utility (MIT) This license covers files found in the `utils/html_viewer` file tree. @@ -41,6 +46,14 @@ This license covers files found in the `utils/html_viewer` file tree. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ## License of media -All of them are CC BY-SA 4.0 or later unless other specified. -License URl: https://creativecommons.org/licenses/by-sa/4.0/ +All of them are CC BY-SA 4.0 unless other specified. The attribution shoule be "1F616EMO". + +License URL: + +However, the following media have different license: + +1. `mods/rp_core/sounds/rp_nodes_pop.ogg`, `mods/rp_color_pick/sounds/rp_color_pick_suish_pop.ogg` + * Works from Scratch support materieals ("Choose a Sound" from editor menu). + * License: [Creative Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0)](https://creativecommons.org/licenses/by-sa/2.0/) + * Please also see [the related Term of Use of Scratch](https://scratch.mit.edu/terms_of_use#scratch-content). diff --git a/mods/rp_color_pick/init.lua b/mods/rp_color_pick/init.lua index f383827..3d28f7f 100644 --- a/mods/rp_color_pick/init.lua +++ b/mods/rp_color_pick/init.lua @@ -21,6 +21,16 @@ local S = minetest.get_translator("rp_color_pick") +local function play_suish_pop(pname) + minetest.sound_play({ + name = "rp_color_pick_suish_pop", + fade = 0, + gain = 0.7, + }, { + to_player = pname, + }, true) +end + minetest.register_on_punchnode(function(pos, node, puncher, pointed_thing) if not puncher:is_player() then return end local pname = puncher:get_player_name() @@ -37,6 +47,7 @@ minetest.register_on_punchnode(function(pos, node, puncher, pointed_thing) puncher:set_wielded_item(new_equip) inv:add_item("main", old_wield) + play_suish_pop(pname) minetest.chat_send_player(pname, minetest.colorize("orange", S("Picked @1",def.description))) end end diff --git a/mods/rp_color_pick/sounds/rp_color_pick_suish_pop.ogg b/mods/rp_color_pick/sounds/rp_color_pick_suish_pop.ogg new file mode 100644 index 0000000..1502728 Binary files /dev/null and b/mods/rp_color_pick/sounds/rp_color_pick_suish_pop.ogg differ diff --git a/mods/rp_core/placement.lua b/mods/rp_core/placement.lua index 237f8e0..b881257 100644 --- a/mods/rp_core/placement.lua +++ b/mods/rp_core/placement.lua @@ -70,6 +70,14 @@ rp_utils.every_n_seconds(0.5, function() end end) +local function play_pop(pos) + minetest.sound_play({ + name = "rp_nodes_pop", + fade = 0, + }, { + pos = pos, + }, true) +end minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack, pointed_thing) if not placer:is_player() then return true end @@ -91,6 +99,7 @@ minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack deny[name] = nil deny_clear[name] = nil end) + play_pop(pos) return true end) diff --git a/mods/rp_core/sounds/rp_nodes_pop.ogg b/mods/rp_core/sounds/rp_nodes_pop.ogg new file mode 100644 index 0000000..455140e Binary files /dev/null and b/mods/rp_core/sounds/rp_nodes_pop.ogg differ diff --git a/mods/rp_utils/init.lua b/mods/rp_utils/init.lua index 4263422..b7e1a0d 100644 --- a/mods/rp_utils/init.lua +++ b/mods/rp_utils/init.lua @@ -27,4 +27,4 @@ function rp_utils.every_n_seconds(delay, func) minetest.after(delay, loop) end minetest.after(1,loop) -end \ No newline at end of file +end