aboutsummaryrefslogtreecommitdiff
path: root/signs_road
diff options
context:
space:
mode:
authorPierre-Yves Rollo <dev@pyrollo.com>2016-08-25 21:58:28 +0200
committerPierre-Yves Rollo <dev@pyrollo.com>2016-08-25 21:58:28 +0200
commit926242a585216ea3653c936c9b8e88230a61b088 (patch)
treeb524a0485794699e2496937eed3928642ea05b94 /signs_road
parentdc7aea71ee7db3deb1f6672cbe2f6d3a07efe549 (diff)
downloaddisplay_modpack-926242a585216ea3653c936c9b8e88230a61b088.tar.gz
display_modpack-926242a585216ea3653c936c9b8e88230a61b088.tar.bz2
display_modpack-926242a585216ea3653c936c9b8e88230a61b088.zip
Relicensing to LGPL, fixes and evolutions
Diffstat (limited to 'signs_road')
-rw-r--r--signs_road/LICENSE.txt179
-rw-r--r--signs_road/README.md2
-rw-r--r--signs_road/copyright.txt1
-rw-r--r--signs_road/crafts.lua21
-rw-r--r--signs_road/init.lua23
-rw-r--r--signs_road/nodes.lua24
6 files changed, 231 insertions, 19 deletions
diff --git a/signs_road/LICENSE.txt b/signs_road/LICENSE.txt
index bc06764..341c30b 100644
--- a/signs_road/LICENSE.txt
+++ b/signs_road/LICENSE.txt
@@ -1,13 +1,166 @@
- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- Version 2, December 2004
-
-Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
-
- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. You just DO WHAT THE FUCK YOU WANT TO.
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
diff --git a/signs_road/README.md b/signs_road/README.md
index deef3f7..e042855 100644
--- a/signs_road/README.md
+++ b/signs_road/README.md
@@ -4,7 +4,7 @@ This mod provides road signs with text display. Text is locked if area is protec
**Dependancies**: default, display\_lib, font\_lib, signs
-**License**: WTFPL
+**License**: Code under LGPL, texture under CC-BY-SA
## Recipes
diff --git a/signs_road/copyright.txt b/signs_road/copyright.txt
new file mode 100644
index 0000000..20965d5
--- /dev/null
+++ b/signs_road/copyright.txt
@@ -0,0 +1 @@
+Code, Textures and Models by Pierre-Yves Rollo
diff --git a/signs_road/crafts.lua b/signs_road/crafts.lua
index 2ae51ef..670b7e2 100644
--- a/signs_road/crafts.lua
+++ b/signs_road/crafts.lua
@@ -1,3 +1,24 @@
+--[[
+ signs_road mod for Minetest - Various road signs with text displayed
+ on.
+ (c) Pierre-Yves Rollo
+
+ This file is part of signs_road.
+
+ signs_road is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ signs_road is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with signs_road. If not, see <http://www.gnu.org/licenses/>.
+--]]
+
minetest.register_craft({
output = 'signs_road:blue_street',
recipe = {
diff --git a/signs_road/init.lua b/signs_road/init.lua
index 5bec1a4..e78d583 100644
--- a/signs_road/init.lua
+++ b/signs_road/init.lua
@@ -1,6 +1,23 @@
--- Signs mod by P.Y. Rollo
---
--- License: WTFPL
+--[[
+ signs_road mod for Minetest - Various road signs with text displayed
+ on.
+ (c) Pierre-Yves Rollo
+
+ This file is part of signs_road.
+
+ signs_road is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ signs_road is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with signs_road. If not, see <http://www.gnu.org/licenses/>.
+--]]
signs_road = {}
signs_road.path = minetest.get_modpath("signs_road")
diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua
index a4c4b6a..c5c5d72 100644
--- a/signs_road/nodes.lua
+++ b/signs_road/nodes.lua
@@ -1,3 +1,23 @@
+--[[
+ signs_road mod for Minetest - Various road signs with text displayed
+ on.
+ (c) Pierre-Yves Rollo
+
+ This file is part of signs_road.
+
+ signs_road is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ signs_road is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with signs_road. If not, see <http://www.gnu.org/licenses/>.
+--]]
local models = {
blue_street={
@@ -44,7 +64,7 @@ local models = {
tiles={"signs_black_right.png"},
inventory_image="signs_black_inventory.png",
on_place=signs.on_place_direction,
- on_rotate=signs.on_rotate_direction,
+ on_rightclick=signs.on_right_click_direction,
},
},
black_left={
@@ -63,7 +83,7 @@ local models = {
groups={choppy=1,oddly_breakable_by_hand=1,not_in_creative_inventory=1},
drop="signs:black_right",
on_place=signs.on_place_direction,
- on_rotate=signs.on_rotate_direction,
+ on_rightclick=signs.on_right_click_direction,
},
},
}