Merge pull request #49 from sys4-fr/master

Delete depends.txt, update mod.conf

README.md

@@ -1,64 +1,115 @@
 # Display Modpack
+Version 1.3.1
 
 This modpack provides mods with dynamic display. Mods are :
 
-- **display_lib**: A library for adding display entities to nodes;
+- **[display_api](https://github.com/pyrollo/display_modpack/tree/master/display_api)**: A library for adding display entities to nodes;
-- **font_lib**: A library for displaying fonts on entities;
+- **[font_api](https://github.com/pyrollo/display_modpack/tree/master/font_api)**: A library for displaying fonts on entities;
-- **ontime_clocks**: A mod providing clocks which display the ingame time;
+- **[signs_api](https://github.com/pyrollo/display_modpack/tree/master/signs_api)**: A library for the easy creation of signs;
-- **signs**: A mod providing signs and direction signs displaying text;
+- **[font_metro](https://github.com/pyrollo/display_modpack/tree/master/font_metro)**: A font mod used as default font (includes uppercase, lowercase and accentuated latin letters, usual signs, cyrillic and greek letters)
-- **signs_road**: A mod providing road signs displaying text;
+
-- **steles**: A mod providing stone steles with text;
+- **[boards](https://github.com/pyrollo/display_modpack/tree/master/boards)**: A mod providing school boards (includes *tiny cursive font*, a handwriting style font);
+- **[ontime_clocks](https://github.com/pyrollo/display_modpack/tree/master/ontime_clocks)**: A mod providing clocks which display the ingame time;
+- **[signs](https://github.com/pyrollo/display_modpack/tree/master/signs)**: A mod providing signs and direction signs displaying text;
+- **[signs_road](https://github.com/pyrollo/display_modpack/tree/master/signs_road)**: A mod providing road signs displaying text;
+- **[steles](https://github.com/pyrollo/display_modpack/tree/master/steles)**: A mod providing stone steles with text;
 
 For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.
 
 ![Presentation image of Display_Modpack](screenshot.png)
 
+## Extra fonts
+
+*Metro* and *Tiny Cursive* fonts are provided in **Display Modpack** (in **font_metro** and **boards** mods) but you can add more fonts by installing font mods. Be aware that each font mod comes with numerous textures. This can result in slowing media downloading and/or client display.
+
+Extra font mods can be found here:
+ * [OldWizard](https://github.com/pyrollo/font_oldwizard): An old style gothic font.
+ * [Botic](https://github.com/pyrollo/font_botic): A scifi style font.
+
+## Deprecation notice (for modders)
+
+### December 2018
+Following objects are deprecated, shows a warning in log when used:
+* `display_modpack_node` group (use `display_api` group instead);
+* `display_lib_node` group (use `display_api` group instead);
+* `display_lib` global table (use `display_api` global table instead);
+* `font_lib` global table (use `font_api` global table instead);
+
+These objects will be removed in the future.
+
 ## Changelog
+### 2019-03-14 (Version 1.3.1)
+- __dispay_api__: Display API now detects automatically whenr rotation restrictions have to be applied.
+- __sign_api__: Screwdriver behavior changed. Now, left click rotates and changes direction.
+
+### 2019-03-09 (Version 1.3)
+- __display_api__: Display nodes can be rotated in every directions (if running Minetest 5 or above).
+- __display_api__: New setting to restrict rotations to Minetest 0.4 abilities (restriction enabled by default).
+- __sign_api__: Changed behavior of screwdriver if no rotation restriction.
+
+### 2018-12-14 (Version 1.2.3)
+- __display_api__: New `yaw` attributes, entities can now have different angles with node.
+- __font_api__: New `Font:render` method for texture creation
+- __font_api__: Specific management for fixed width font. Allows number of columns based texture width.
+- __font_api__: Improve `display_api` integration into `font_api`. Display API fully optional. `font_api.on_display_update` defined only if `display_api` enabled.
+- __font_api__: Improve management of invalid UTF strings (should not crash anymore)
+- __font_api__: Deprecation of `font_lib`
+- __signs__: Fixed craft recipe for labels
+
+### 2018-12-02 (Version 1.2.2)
+- Fixed a bug that prevented Display API from working on some systems (Raspberry Pi)
+
+### 2018-11-01 (Version 1.2.1)
+- Now font can be chosen per sign / stele
+
+### 2018-11-01 (Version 1.2)
+- Labels and woodend signs added.
+- Fallback mechanism for missing chars (For example: "é" --> "e" --> "E").
+- Several bug fixes by 12Me21 and naturefreshmilk.
+
+### 2018-07-16 (Version 1.1.1)
+- Boards mod added.
+- Bug fix in default font chosing when multiple font registered.
+
+### 2018-07-13 (Version 1.1.0)
+- Font API rework introducing Font class.
+- Replaced default Epilepsy Font by Metro Font for licensing purposes,
+- Rework of all nodes displaying text accordingly to the Font API rework.
+
+As font_epilepsy mod has been replaced by font_metro mod, **don't forget to activate font_metro mod after updating** or you won't have any text displayed.
+
+### 2018-05-30 (Version 1.0.1)
+Mostly bug fixes :
+- Fix steles orientation when placing
+- Update entity on mapblock load
+- Use default formspec style
+- Fix ndef nill value in steles mod when technics not installed
+- Seperate signs API from signs définitions
+- Allow a greater offset between display and block
 
 ### 2018-01-13 (Version 1.0)
-
 - Switch to Epilepsy font by KREATIVE SOFTWARE
-
 - Add settings "default_font"
-
 - Add horizontal alignment
-
 - Add tool for creating font textures from .ttf font files
-
 - Fix UTF 8 to Unicode decoding
-
 - Updated forum thread link in README.md
 
 ### 2017-12-19
-
 This change is a preparation to merge Andrzej Pieńkowski fork (apienk) : new font and support of UTF chars.
-
 - Font\_lib support for multiple fonts (nothing yet visible in mods) ;
-
 - Font\_lib support for Unicode characters (limited to Unicode Plane 0: 0000-FFFF, see [Wikipedia](https://en.wikipedia.org/wiki/Unicode)) ;
-
 - New "default" font with original textures from Vanessa Ezekowitz (VanessaE) ;
 
 ### 2017-12-10
-
 - Compatibility of signs mod with signs_lib (thanks to gpcf) ;
-
 - Added large banner in road signs (thanks to gpcf) ;
 
 ### 2017-08-26
-
 - Changed signs from wallmounted to facedir to improve textures and make it possible to use screwdriver.
 **IMPORTANT** : Map will be updated to change to new nodes but inventory items will turn into "Unknown items" and have to be re-crafted.
-
 - Intllib support added with french translation (whole modpack, thanks to fat115) ;
-
 - Punch on nodes to update entity (signs, signs_road and steles). Usefull in case of /clearobjects ;
-
 - Changed wooden direction sign textures (signs) ;
-
 - Added back and side textures to all signs (road_signs) ;
-
 - Added more sign types : White/yellow/green signs and direction signs (signs_road) ;
-
-
-

boards/LICENSE_FONT.txt

@@ -0,0 +1,4 @@
+The FontStruction “Tiny Cursive”
+(https://fontstruct.com/fontstructions/show/63155) by “cyfry77” is licensed
+under a Creative Commons Attribution Share Alike license
+(http://creativecommons.org/licenses/by-sa/3.0/).

boards/copyright.txt

@@ -1,2 +1,2 @@
 Code by Pierre-Yves Rollo (pyrollo)
-
+Font by (cyfry77)

boards/font_tinycurs.lua

@@ -0,0 +1,27 @@
+--[[
+ Tinycurs font for Font API
+
+ Original font Tiny Cursive
+ by cyfry77
+ G and J textures by Pierre-Yves Rollo (pyrollo)
+ released under CC-BY-SA license
+
+ https://fontstruct.com/fontstructions/show/63155/tiny_cursive
+ 
+ Derivative texture are under CC-BY-SA license
+ Code is under LGPL v3 license
+--]]
+
+font_api.register_font('tinycurs',
+	{
+		default = false, -- Don't register this font as a possible default font
+		margintop = -2,
+		marginbottom = -2,
+		linespacing = -4,
+		height = 19,
+		widths = { 
+			[0]=9, [32]=9, [33]=6, [34]=7, [35]=10, [36]=14, [37]=14, [38]=12, [39]=3, [40]=6, [41]=6, [42]=9, [43]=8, [44]=3, [45]=7, [46]=3, [47]=9, [48]=9, [49]=7, [50]=10, [51]=9, [52]=9, [53]=10, [54]=10, [55]=9, [56]=10, [57]=8, [58]=5, [59]=5, [60]=8, [61]=8, [62]=8, [63]=8, [64]=12, [65]=9, [66]=7, [67]=9, [68]=10, [69]=8, [70]=8, [71]=8, [72]=10, [73]=7, [74]=8, [75]=9, [76]=9, [77]=12, [78]=10, [79]=9, [80]=9, [81]=9, [82]=11, [83]=11, [84]=8, [85]=11, [86]=11, [87]=12, [88]=12, [89]=11, [90]=11, [91]=8, [92]=5, [93]=8, [94]=8, [95]=8, [96]=5, [97]=6, [98]=6, [99]=6, [100]=7, [101]=6, [102]=5, [103]=6, [104]=6, [105]=4, [106]=5, [107]=7, [108]=5, [109]=9, [110]=8, [111]=6, [112]=9, [113]=8, [114]=7, [115]=7, [116]=6, [117]=8, [118]=8, [119]=11, [120]=10, [121]=8, [122]=8, [123]=8, [124]=6, [125]=9, [126]=10, [8216]=4, [8217]=4, [8220]=6, [8221]=6
+		},
+	}
+);
+

boards/init.lua

@@ -0,0 +1,139 @@
+--[[
+    boards mod for Minetest. Black boards with text on it.
+    (c) Pierre-Yves Rollo
+
+    This file is part of boards.
+
+    boards 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.
+
+    boards 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 boards.  If not, see <http://www.gnu.org/licenses/>.
+--]]
+
+boards = {}
+boards.name = minetest.get_current_modname()
+boards.path = minetest.get_modpath(boards.name)
+
+-- Load support for intllib.
+local S, NS = dofile(boards.path.."/intllib.lua")
+boards.intllib = S
+local F = function(...) return minetest.formspec_escape(S(...)) end
+
+-- Load font
+dofile(boards.path.."/font_tinycurs.lua")
+
+local function set_formspec(pos)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("formspec",
+		"size[6,4]"..default.gui_bg..default.gui_bg_img..default.gui_slots..
+		"textarea[0.5,0.7;5.5,3;display_text;"..F("Text")..";${display_text}]"..
+		"button_exit[3,3.5;2,1;ok;"..F("Write").."]"..
+		"button_exit[1,3.5;2,1;wipe;"..F("Wipe").."]")
+end
+
+-- On boards, everyone is allowed to write and wipe
+local function on_receive_fields(pos, formname, fields, player)
+	if fields then
+		if fields.ok or fields.key_enter then
+			signs_api.set_display_text(pos, fields.display_text, fields.font)
+		end
+		if fields.wipe then
+			signs_api.set_display_text(pos, "", fields.font)
+		end
+	end
+end
+
+models = {
+	black_board = {
+		depth = 1/16, width = 1, height = 1,
+		entity_fields = {
+			top = -1/32,
+			size = { x = 1, y = 15/16 },
+			maxlines = 5,
+			color = "#fff",
+			font_name = "tinycurs",
+			valign = "top",
+		},
+		node_fields = {
+			description = S("Black board"),
+			tiles = { "default_wood.png", "default_wood.png",
+				"default_wood.png", "default_wood.png",
+				"default_wood.png", "board_black_front.png" },
+			drawtype = "nodebox",
+			node_box = {
+				type = "fixed",
+				fixed = {
+					{-0.5, -0.5, 7/16, 0.5, 0.5, 0.5},
+					{-0.5, -7/16, 6/16, 0.5, -0.5, 7/16}
+				},
+			},
+			on_construct = function(pos)
+				set_formspec(pos)
+				display_api.on_construct(pos)
+			end,
+			on_receive_fields = on_receive_fields,
+		},
+	},
+	green_board = {
+		depth = 1/16, width = 1, height = 1,
+		entity_fields = {
+			top = -1/32,
+			size = { x = 1, y = 15/16 },
+			maxlines = 5,
+			color = "#fff",
+			font_name = "tinycurs",
+			valign = "top",
+		},
+		node_fields = {
+			description = S("Green board"),
+			tiles = { "default_wood.png", "default_wood.png",
+				"default_wood.png", "default_wood.png",
+				"default_wood.png", "board_green_front.png" },
+			drawtype = "nodebox",
+			node_box = {
+				type = "fixed",
+				fixed = {
+					{-0.5, -0.5, 7/16, 0.5, 0.5, 0.5},
+					{-0.5, -7/16, 6/16, 0.5, -0.5, 7/16}
+				},
+			},
+			on_construct = function(pos)
+				set_formspec(pos)
+				display_api.on_construct(pos)
+			end,
+			on_receive_fields = on_receive_fields,
+		},
+	},
+}
+
+-- Node registration
+for name, model in pairs(models)
+do
+	signs_api.register_sign("boards", name, model)
+end
+
+-- Recipes
+minetest.register_craft(
+	{
+		output = "boards:black_board",
+		recipe = {
+			{"group:wood", "group:stone", "dye:black"},
+		}		
+	})
+
+minetest.register_craft(
+	{
+		output = "boards:green_board",
+		recipe = {
+			{"group:wood", "group:stone", "dye:dark_green"},
+		}		
+	})
+

boards/intllib.lua

@@ -0,0 +1,45 @@
+
+-- Fallback functions for when `intllib` is not installed.
+-- Code released under Unlicense <http://unlicense.org>.
+
+-- Get the latest version of this file at:
+--   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
+
+local function format(str, ...)
+	local args = { ... }
+	local function repl(escape, open, num, close)
+		if escape == "" then
+			local replacement = tostring(args[tonumber(num)])
+			if open == "" then
+				replacement = replacement..close
+			end
+			return replacement
+		else
+			return "@"..open..num..close
+		end
+	end
+	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
+end
+
+local gettext, ngettext
+if minetest.get_modpath("intllib") then
+	if intllib.make_gettext_pair then
+		-- New method using gettext.
+		gettext, ngettext = intllib.make_gettext_pair()
+	else
+		-- Old method using text files.
+		gettext = intllib.Getter()
+	end
+end
+
+-- Fill in missing functions.
+
+gettext = gettext or function(msgid, ...)
+	return format(msgid, ...)
+end
+
+ngettext = ngettext or function(msgid, msgid_plural, n, ...)
+	return format(n==1 and msgid or msgid_plural, ...)
+end
+
+return gettext, ngettext

boards/locale/fr.po

@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-16 10:00+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: init.lua
+msgid "Text"
+msgstr "Texte"
+
+#: init.lua
+msgid "Write"
+msgstr "Ecrire"
+
+#: init.lua
+msgid "Wipe"
+msgstr "Effacer"
+
+#: init.lua
+msgid "Black board"
+msgstr "Tableau noir"
+
+#: init.lua
+msgid "Green board"
+msgstr "Tableau vert"
+
+

boards/locale/ms.po

@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Yaya (Nurul Azeera Hidayah @ Muhammad Nur Hidayat) <translation@mnh48.moe>, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Display Modpack\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-16 10:00+0200\n"
+"PO-Revision-Date: 2020-07-05 11:31+0000\n"
+"Language-Team: Malay <translation@mnh48.moe>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.3\n"
+"Last-Translator: Yaya MNH48 <translation@mnh48.moe>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: ms\n"
+
+#: init.lua
+msgid "Text"
+msgstr "Teks"
+
+#: init.lua
+msgid "Write"
+msgstr "Tulis"
+
+#: init.lua
+msgid "Wipe"
+msgstr "Padam"
+
+#: init.lua
+msgid "Black board"
+msgstr "Papan hitam"

boards/locale/template.pot

@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-16 10:00+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: init.lua
+msgid "Text"
+msgstr ""
+
+#: init.lua
+msgid "Write"
+msgstr ""
+
+#: init.lua
+msgid "Wipe"
+msgstr ""
+
+#: init.lua
+msgid "Black board"
+msgstr ""

boards/mod.conf

@@ -0,0 +1,4 @@
+name = boards
+title = Black boards
+description = Writable school boards using sign_api
+depends = default,signs_api