From 7ecb29e87f1f272f92d0fec871dd525a80a9537c Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar+github@foo-projects.org>
Date: Fri, 27 May 2016 16:08:53 -0700
Subject: [PATCH] Convert digilines to a mod (not modpack). (#32)

Digilines is probably used by most people in its entirety.

I've retained the ability to disable inventory, rtc, lightsensor and
LCD by the minetest settings "diglines_enable_rtc" etc.. If set to
"false", these components will not be loaded. It is assumed by default
that these are enabled.

In the conversion the digilines_lcd:lcd node was renamed to
digilines:lcd (same for all the other nodes). To retain backwards
compatibility I've provided aliases for each of these nodes.
---
 .../README => README.inventory                |   0
 digilines_lcd/characters => characters        |   0
 digilines/depends.txt => depends.txt          |   0
 digilines_inventory/depends.txt               |   1 -
 digilines_lightsensor/depends.txt             |   1 -
 digilines_rtc/depends.txt                     |   1 -
 digilines/init.lua => init.lua                |  31 ++++++++++++++----
 digilines/internal.lua => internal.lua        |   0
 digilines_inventory/init.lua => inventory.lua |   5 +--
 digilines_lcd/init.lua => lcd.lua             |  15 +++++----
 .../init.lua => lightsensor.lua               |   3 +-
 mod.conf                                      |   1 +
 modpack.txt                                   |   0
 digilines/presetrules.lua => presetrules.lua  |   0
 digilines_rtc/init.lua => rtc.lua             |   3 +-
 {digilines_lcd/textures => textures}/_0.png   | Bin
 {digilines_lcd/textures => textures}/_1.png   | Bin
 {digilines_lcd/textures => textures}/_2.png   | Bin
 {digilines_lcd/textures => textures}/_3.png   | Bin
 {digilines_lcd/textures => textures}/_4.png   | Bin
 {digilines_lcd/textures => textures}/_5.png   | Bin
 {digilines_lcd/textures => textures}/_6.png   | Bin
 {digilines_lcd/textures => textures}/_7.png   | Bin
 {digilines_lcd/textures => textures}/_8.png   | Bin
 {digilines_lcd/textures => textures}/_9.png   | Bin
 {digilines_lcd/textures => textures}/_a.png   | Bin
 {digilines_lcd/textures => textures}/_a_.png  | Bin
 {digilines_lcd/textures => textures}/_am.png  | Bin
 {digilines_lcd/textures => textures}/_ap.png  | Bin
 {digilines_lcd/textures => textures}/_as.png  | Bin
 {digilines_lcd/textures => textures}/_at.png  | Bin
 {digilines_lcd/textures => textures}/_b.png   | Bin
 {digilines_lcd/textures => textures}/_b_.png  | Bin
 {digilines_lcd/textures => textures}/_bl.png  | Bin
 {digilines_lcd/textures => textures}/_br.png  | Bin
 {digilines_lcd/textures => textures}/_c.png   | Bin
 {digilines_lcd/textures => textures}/_c_.png  | Bin
 {digilines_lcd/textures => textures}/_ca.png  | Bin
 {digilines_lcd/textures => textures}/_cl.png  | Bin
 {digilines_lcd/textures => textures}/_cm.png  | Bin
 {digilines_lcd/textures => textures}/_co.png  | Bin
 {digilines_lcd/textures => textures}/_cr.png  | Bin
 {digilines_lcd/textures => textures}/_d.png   | Bin
 {digilines_lcd/textures => textures}/_d_.png  | Bin
 {digilines_lcd/textures => textures}/_dl.png  | Bin
 {digilines_lcd/textures => textures}/_dt.png  | Bin
 {digilines_lcd/textures => textures}/_dv.png  | Bin
 {digilines_lcd/textures => textures}/_e.png   | Bin
 {digilines_lcd/textures => textures}/_e_.png  | Bin
 {digilines_lcd/textures => textures}/_eq.png  | Bin
 {digilines_lcd/textures => textures}/_ex.png  | Bin
 {digilines_lcd/textures => textures}/_f.png   | Bin
 {digilines_lcd/textures => textures}/_f_.png  | Bin
 {digilines_lcd/textures => textures}/_g.png   | Bin
 {digilines_lcd/textures => textures}/_g_.png  | Bin
 {digilines_lcd/textures => textures}/_gt.png  | Bin
 {digilines_lcd/textures => textures}/_h.png   | Bin
 {digilines_lcd/textures => textures}/_h_.png  | Bin
 {digilines_lcd/textures => textures}/_ha.png  | Bin
 {digilines_lcd/textures => textures}/_hs.png  | Bin
 {digilines_lcd/textures => textures}/_i.png   | Bin
 {digilines_lcd/textures => textures}/_i_.png  | Bin
 {digilines_lcd/textures => textures}/_j.png   | Bin
 {digilines_lcd/textures => textures}/_j_.png  | Bin
 {digilines_lcd/textures => textures}/_k.png   | Bin
 {digilines_lcd/textures => textures}/_k_.png  | Bin
 {digilines_lcd/textures => textures}/_l.png   | Bin
 {digilines_lcd/textures => textures}/_l_.png  | Bin
 {digilines_lcd/textures => textures}/_lt.png  | Bin
 {digilines_lcd/textures => textures}/_m.png   | Bin
 {digilines_lcd/textures => textures}/_m_.png  | Bin
 {digilines_lcd/textures => textures}/_mn.png  | Bin
 {digilines_lcd/textures => textures}/_n.png   | Bin
 {digilines_lcd/textures => textures}/_n_.png  | Bin
 {digilines_lcd/textures => textures}/_o.png   | Bin
 {digilines_lcd/textures => textures}/_o_.png  | Bin
 {digilines_lcd/textures => textures}/_p.png   | Bin
 {digilines_lcd/textures => textures}/_p_.png  | Bin
 {digilines_lcd/textures => textures}/_pr.png  | Bin
 {digilines_lcd/textures => textures}/_ps.png  | Bin
 {digilines_lcd/textures => textures}/_q.png   | Bin
 {digilines_lcd/textures => textures}/_q_.png  | Bin
 {digilines_lcd/textures => textures}/_qo.png  | Bin
 {digilines_lcd/textures => textures}/_qu.png  | Bin
 {digilines_lcd/textures => textures}/_r.png   | Bin
 {digilines_lcd/textures => textures}/_r_.png  | Bin
 {digilines_lcd/textures => textures}/_re.png  | Bin
 {digilines_lcd/textures => textures}/_s.png   | Bin
 {digilines_lcd/textures => textures}/_s_.png  | Bin
 {digilines_lcd/textures => textures}/_sl.png  | Bin
 {digilines_lcd/textures => textures}/_sm.png  | Bin
 {digilines_lcd/textures => textures}/_sp.png  | Bin
 {digilines_lcd/textures => textures}/_sr.png  | Bin
 {digilines_lcd/textures => textures}/_t.png   | Bin
 {digilines_lcd/textures => textures}/_t_.png  | Bin
 {digilines_lcd/textures => textures}/_tl.png  | Bin
 {digilines_lcd/textures => textures}/_u.png   | Bin
 {digilines_lcd/textures => textures}/_u_.png  | Bin
 {digilines_lcd/textures => textures}/_un.png  | Bin
 {digilines_lcd/textures => textures}/_v.png   | Bin
 {digilines_lcd/textures => textures}/_v_.png  | Bin
 {digilines_lcd/textures => textures}/_vb.png  | Bin
 {digilines_lcd/textures => textures}/_w.png   | Bin
 {digilines_lcd/textures => textures}/_w_.png  | Bin
 {digilines_lcd/textures => textures}/_x.png   | Bin
 {digilines_lcd/textures => textures}/_x_.png  | Bin
 {digilines_lcd/textures => textures}/_y.png   | Bin
 {digilines_lcd/textures => textures}/_y_.png  | Bin
 {digilines_lcd/textures => textures}/_z.png   | Bin
 {digilines_lcd/textures => textures}/_z_.png  | Bin
 .../textures => textures}/digiline_std.png    | Bin
 .../digiline_std_bump.png                     | Bin
 .../digiline_std_inv.png                      | Bin
 .../digiline_std_vertical.png                 | Bin
 .../digilines_lightsensor.png                 | Bin
 .../textures => textures}/digilines_rtc.png   | Bin
 .../textures => textures}/lcd_anyside.png     | Bin
 .../textures => textures}/lcd_lcd.png         | Bin
 digilines/util.lua => util.lua                |   0
 digilines/wire_std.lua => wire_std.lua        |   0
 .../wires_common.lua => wires_common.lua      |   0
 121 files changed, 41 insertions(+), 20 deletions(-)
 rename digilines_inventory/README => README.inventory (100%)
 rename digilines_lcd/characters => characters (100%)
 rename digilines/depends.txt => depends.txt (100%)
 delete mode 100644 digilines_inventory/depends.txt
 delete mode 100644 digilines_lightsensor/depends.txt
 delete mode 100644 digilines_rtc/depends.txt
 rename digilines/init.lua => init.lua (50%)
 rename digilines/internal.lua => internal.lua (100%)
 rename digilines_inventory/init.lua => inventory.lua (97%)
 rename digilines_lcd/init.lua => lcd.lua (92%)
 rename digilines_lightsensor/init.lua => lightsensor.lua (92%)
 create mode 100644 mod.conf
 delete mode 100644 modpack.txt
 rename digilines/presetrules.lua => presetrules.lua (100%)
 rename digilines_rtc/init.lua => rtc.lua (93%)
 rename {digilines_lcd/textures => textures}/_0.png (100%)
 rename {digilines_lcd/textures => textures}/_1.png (100%)
 rename {digilines_lcd/textures => textures}/_2.png (100%)
 rename {digilines_lcd/textures => textures}/_3.png (100%)
 rename {digilines_lcd/textures => textures}/_4.png (100%)
 rename {digilines_lcd/textures => textures}/_5.png (100%)
 rename {digilines_lcd/textures => textures}/_6.png (100%)
 rename {digilines_lcd/textures => textures}/_7.png (100%)
 rename {digilines_lcd/textures => textures}/_8.png (100%)
 rename {digilines_lcd/textures => textures}/_9.png (100%)
 rename {digilines_lcd/textures => textures}/_a.png (100%)
 rename {digilines_lcd/textures => textures}/_a_.png (100%)
 rename {digilines_lcd/textures => textures}/_am.png (100%)
 rename {digilines_lcd/textures => textures}/_ap.png (100%)
 rename {digilines_lcd/textures => textures}/_as.png (100%)
 rename {digilines_lcd/textures => textures}/_at.png (100%)
 rename {digilines_lcd/textures => textures}/_b.png (100%)
 rename {digilines_lcd/textures => textures}/_b_.png (100%)
 rename {digilines_lcd/textures => textures}/_bl.png (100%)
 rename {digilines_lcd/textures => textures}/_br.png (100%)
 rename {digilines_lcd/textures => textures}/_c.png (100%)
 rename {digilines_lcd/textures => textures}/_c_.png (100%)
 rename {digilines_lcd/textures => textures}/_ca.png (100%)
 rename {digilines_lcd/textures => textures}/_cl.png (100%)
 rename {digilines_lcd/textures => textures}/_cm.png (100%)
 rename {digilines_lcd/textures => textures}/_co.png (100%)
 rename {digilines_lcd/textures => textures}/_cr.png (100%)
 rename {digilines_lcd/textures => textures}/_d.png (100%)
 rename {digilines_lcd/textures => textures}/_d_.png (100%)
 rename {digilines_lcd/textures => textures}/_dl.png (100%)
 rename {digilines_lcd/textures => textures}/_dt.png (100%)
 rename {digilines_lcd/textures => textures}/_dv.png (100%)
 rename {digilines_lcd/textures => textures}/_e.png (100%)
 rename {digilines_lcd/textures => textures}/_e_.png (100%)
 rename {digilines_lcd/textures => textures}/_eq.png (100%)
 rename {digilines_lcd/textures => textures}/_ex.png (100%)
 rename {digilines_lcd/textures => textures}/_f.png (100%)
 rename {digilines_lcd/textures => textures}/_f_.png (100%)
 rename {digilines_lcd/textures => textures}/_g.png (100%)
 rename {digilines_lcd/textures => textures}/_g_.png (100%)
 rename {digilines_lcd/textures => textures}/_gt.png (100%)
 rename {digilines_lcd/textures => textures}/_h.png (100%)
 rename {digilines_lcd/textures => textures}/_h_.png (100%)
 rename {digilines_lcd/textures => textures}/_ha.png (100%)
 rename {digilines_lcd/textures => textures}/_hs.png (100%)
 rename {digilines_lcd/textures => textures}/_i.png (100%)
 rename {digilines_lcd/textures => textures}/_i_.png (100%)
 rename {digilines_lcd/textures => textures}/_j.png (100%)
 rename {digilines_lcd/textures => textures}/_j_.png (100%)
 rename {digilines_lcd/textures => textures}/_k.png (100%)
 rename {digilines_lcd/textures => textures}/_k_.png (100%)
 rename {digilines_lcd/textures => textures}/_l.png (100%)
 rename {digilines_lcd/textures => textures}/_l_.png (100%)
 rename {digilines_lcd/textures => textures}/_lt.png (100%)
 rename {digilines_lcd/textures => textures}/_m.png (100%)
 rename {digilines_lcd/textures => textures}/_m_.png (100%)
 rename {digilines_lcd/textures => textures}/_mn.png (100%)
 rename {digilines_lcd/textures => textures}/_n.png (100%)
 rename {digilines_lcd/textures => textures}/_n_.png (100%)
 rename {digilines_lcd/textures => textures}/_o.png (100%)
 rename {digilines_lcd/textures => textures}/_o_.png (100%)
 rename {digilines_lcd/textures => textures}/_p.png (100%)
 rename {digilines_lcd/textures => textures}/_p_.png (100%)
 rename {digilines_lcd/textures => textures}/_pr.png (100%)
 rename {digilines_lcd/textures => textures}/_ps.png (100%)
 rename {digilines_lcd/textures => textures}/_q.png (100%)
 rename {digilines_lcd/textures => textures}/_q_.png (100%)
 rename {digilines_lcd/textures => textures}/_qo.png (100%)
 rename {digilines_lcd/textures => textures}/_qu.png (100%)
 rename {digilines_lcd/textures => textures}/_r.png (100%)
 rename {digilines_lcd/textures => textures}/_r_.png (100%)
 rename {digilines_lcd/textures => textures}/_re.png (100%)
 rename {digilines_lcd/textures => textures}/_s.png (100%)
 rename {digilines_lcd/textures => textures}/_s_.png (100%)
 rename {digilines_lcd/textures => textures}/_sl.png (100%)
 rename {digilines_lcd/textures => textures}/_sm.png (100%)
 rename {digilines_lcd/textures => textures}/_sp.png (100%)
 rename {digilines_lcd/textures => textures}/_sr.png (100%)
 rename {digilines_lcd/textures => textures}/_t.png (100%)
 rename {digilines_lcd/textures => textures}/_t_.png (100%)
 rename {digilines_lcd/textures => textures}/_tl.png (100%)
 rename {digilines_lcd/textures => textures}/_u.png (100%)
 rename {digilines_lcd/textures => textures}/_u_.png (100%)
 rename {digilines_lcd/textures => textures}/_un.png (100%)
 rename {digilines_lcd/textures => textures}/_v.png (100%)
 rename {digilines_lcd/textures => textures}/_v_.png (100%)
 rename {digilines_lcd/textures => textures}/_vb.png (100%)
 rename {digilines_lcd/textures => textures}/_w.png (100%)
 rename {digilines_lcd/textures => textures}/_w_.png (100%)
 rename {digilines_lcd/textures => textures}/_x.png (100%)
 rename {digilines_lcd/textures => textures}/_x_.png (100%)
 rename {digilines_lcd/textures => textures}/_y.png (100%)
 rename {digilines_lcd/textures => textures}/_y_.png (100%)
 rename {digilines_lcd/textures => textures}/_z.png (100%)
 rename {digilines_lcd/textures => textures}/_z_.png (100%)
 rename {digilines/textures => textures}/digiline_std.png (100%)
 rename {digilines/textures => textures}/digiline_std_bump.png (100%)
 rename {digilines/textures => textures}/digiline_std_inv.png (100%)
 rename {digilines/textures => textures}/digiline_std_vertical.png (100%)
 rename {digilines_lightsensor/textures => textures}/digilines_lightsensor.png (100%)
 rename {digilines_rtc/textures => textures}/digilines_rtc.png (100%)
 rename {digilines_lcd/textures => textures}/lcd_anyside.png (100%)
 rename {digilines_lcd/textures => textures}/lcd_lcd.png (100%)
 rename digilines/util.lua => util.lua (100%)
 rename digilines/wire_std.lua => wire_std.lua (100%)
 rename digilines/wires_common.lua => wires_common.lua (100%)

diff --git a/digilines_inventory/README b/README.inventory
similarity index 100%
rename from digilines_inventory/README
rename to README.inventory
diff --git a/digilines_lcd/characters b/characters
similarity index 100%
rename from digilines_lcd/characters
rename to characters
diff --git a/digilines/depends.txt b/depends.txt
similarity index 100%
rename from digilines/depends.txt
rename to depends.txt
diff --git a/digilines_inventory/depends.txt b/digilines_inventory/depends.txt
deleted file mode 100644
index da1d119..0000000
--- a/digilines_inventory/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-digilines
diff --git a/digilines_lightsensor/depends.txt b/digilines_lightsensor/depends.txt
deleted file mode 100644
index da1d119..0000000
--- a/digilines_lightsensor/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-digilines
diff --git a/digilines_rtc/depends.txt b/digilines_rtc/depends.txt
deleted file mode 100644
index da1d119..0000000
--- a/digilines_rtc/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-digilines
diff --git a/digilines/init.lua b/init.lua
similarity index 50%
rename from digilines/init.lua
rename to init.lua
index 92f916d..2f48a73 100644
--- a/digilines/init.lua
+++ b/init.lua
@@ -1,9 +1,11 @@
 digiline = {}
-dofile(minetest.get_modpath("digilines").."/presetrules.lua")
-dofile(minetest.get_modpath("digilines").."/util.lua")
-dofile(minetest.get_modpath("digilines").."/internal.lua")
-dofile(minetest.get_modpath("digilines").."/wires_common.lua")
-dofile(minetest.get_modpath("digilines").."/wire_std.lua")
+
+local modpath = minetest.get_modpath("digilines")
+dofile(modpath .. "/presetrules.lua")
+dofile(modpath .. "/util.lua")
+dofile(modpath .. "/internal.lua")
+dofile(modpath .. "/wires_common.lua")
+dofile(modpath .. "/wire_std.lua")
 
 function digiline:receptor_send(pos, rules, channel, msg)
 	local checked = {}
@@ -22,4 +24,21 @@ minetest.register_craft({
 		{'mesecons_insulated:insulated_off', 'mesecons_insulated:insulated_off', 'default:gold_ingot'},
 		{'mesecons_materials:fiber', 'mesecons_materials:fiber', 'mesecons_materials:fiber'},
 	}
-})
\ No newline at end of file
+})
+
+-- former submods
+if minetest.is_yes(minetest.setting_get("digilines_enable_inventory") or true) then
+	dofile(modpath .. "/inventory.lua")
+end
+
+if minetest.is_yes(minetest.setting_get("digilines_enable_lcd") or true) then
+	dofile(modpath .. "/lcd.lua")
+end
+
+if minetest.is_yes(minetest.setting_get("digilines_enable_lightsensor") or true) then
+	dofile(modpath .. "/lightsensor.lua")
+end
+
+if minetest.is_yes(minetest.setting_get("digilines_enable_rtc") or true) then
+	dofile(modpath .. "/rtc.lua")
+end
diff --git a/digilines/internal.lua b/internal.lua
similarity index 100%
rename from digilines/internal.lua
rename to internal.lua
diff --git a/digilines_inventory/init.lua b/inventory.lua
similarity index 97%
rename from digilines_inventory/init.lua
rename to inventory.lua
index 0269d4e..0134e5c 100644
--- a/digilines_inventory/init.lua
+++ b/inventory.lua
@@ -26,7 +26,8 @@ end
 local tubeconn = minetest.get_modpath("pipeworks") and "^pipeworks_tube_connection_wooden.png" or ""
 local tubescan = minetest.get_modpath("pipeworks") and function(pos) pipeworks.scan_for_tube_objects(pos) end or nil
 
-minetest.register_node("digilines_inventory:chest", {
+minetest.register_alias("digilines_inventory:chest", "digilines:chest")
+minetest.register_node("digilines:chest", {
 	description = "Digiline Chest",
 	tiles = {
 		"default_chest_top.png"..tubeconn,
@@ -145,6 +146,6 @@ minetest.register_node("digilines_inventory:chest", {
 
 minetest.register_craft({
 	type = "shapeless",
-	output = "digilines_inventory:chest",
+	output = "digilines:chest",
 	recipe = {"default:chest", "digilines:wire_std_00000000"}
 })
diff --git a/digilines_lcd/init.lua b/lcd.lua
similarity index 92%
rename from digilines_lcd/init.lua
rename to lcd.lua
index fafa477..3370a31 100644
--- a/digilines_lcd/init.lua
+++ b/lcd.lua
@@ -3,11 +3,11 @@
 -- Font: 04.jp.org
 
 -- load characters map
-local chars_file = io.open(minetest.get_modpath("digilines_lcd").."/characters", "r")
+local chars_file = io.open(minetest.get_modpath("digilines").."/characters", "r")
 local charmap = {}
 local max_chars = 12
 if not chars_file then
-	print("[digilines_lcd] E: character map file not found")
+	print("[digilines] E: LCD: character map file not found")
 else
 	while true do
 		local char = chars_file:read("*l")
@@ -76,7 +76,8 @@ local lcd_box = {
 	wall_top = {-8/16, 7/16, -8/16, 8/16, 8/16, 8/16}
 }
 
-minetest.register_node("digilines_lcd:lcd", {
+minetest.register_alias("digilines_lcd:lcd", "digilines:lcd")
+minetest.register_node("digilines:lcd", {
 	drawtype = "nodebox",
 	description = "Digiline LCD",
 	inventory_image = "lcd_lcd.png",
@@ -93,7 +94,7 @@ minetest.register_node("digilines_lcd:lcd", {
 	after_place_node = function (pos, placer, itemstack)
 		local param2 = minetest.get_node(pos).param2
 		if param2 == 0 or param2 == 1 then
-			minetest.add_node(pos, {name = "digilines_lcd:lcd", param2 = 3})
+			minetest.add_node(pos, {name = "digilines:lcd", param2 = 3})
 		end
 		prepare_writing (pos)
 	end,
@@ -128,7 +129,7 @@ minetest.register_node("digilines_lcd:lcd", {
 	light_source = 6,
 })
 
-minetest.register_entity("digilines_lcd:text", {
+minetest.register_entity(":digilines_lcd:text", {
 	collisionbox = { 0, 0, 0, 0, 0, 0 },
 	visual = "upright_sprite",
 	textures = {},
@@ -202,7 +203,7 @@ generate_line = function(s, ypos)
 			file = charmap[s:sub(i, i + 1)]
 			i = i + 2
 		else
-			print("[digilines_lcd] W: unknown symbol in '"..s.."' at "..i)
+			print("[digilines] W: LCD: unknown symbol in '"..s.."' at "..i)
 			i = i + 1
 		end
 		if file ~= nil then
@@ -223,7 +224,7 @@ generate_line = function(s, ypos)
 end
 
 minetest.register_craft({
-	output = "digilines_lcd:lcd 2",
+	output = "digilines:lcd 2",
 	recipe = {
 		{"default:steel_ingot", "digilines:wire_std_00000000", "default:steel_ingot"},
 		{"mesecons_lightstone:lightstone_green_off","mesecons_lightstone:lightstone_green_off","mesecons_lightstone:lightstone_green_off"},
diff --git a/digilines_lightsensor/init.lua b/lightsensor.lua
similarity index 92%
rename from digilines_lightsensor/init.lua
rename to lightsensor.lua
index 914899b..86a29c9 100644
--- a/digilines_lightsensor/init.lua
+++ b/lightsensor.lua
@@ -29,7 +29,8 @@ local on_digiline_receive = function (pos, node, channel, msg)
 	end
 end
 
-minetest.register_node("digilines_lightsensor:lightsensor", {
+minetest.register_alias("digilines_lightsensor:lightsensor", "digilines:lightsensor")
+minetest.register_node("digilines:lightsensor", {
 	description = "Digiline Lightsensor",
 	drawtype = "nodebox",
 	tiles = {"digilines_lightsensor.png"},
diff --git a/mod.conf b/mod.conf
new file mode 100644
index 0000000..0b01ac5
--- /dev/null
+++ b/mod.conf
@@ -0,0 +1 @@
+name = digilines
diff --git a/modpack.txt b/modpack.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/digilines/presetrules.lua b/presetrules.lua
similarity index 100%
rename from digilines/presetrules.lua
rename to presetrules.lua
diff --git a/digilines_rtc/init.lua b/rtc.lua
similarity index 93%
rename from digilines_rtc/init.lua
rename to rtc.lua
index 5abafc1..f8f6af4 100644
--- a/digilines_rtc/init.lua
+++ b/rtc.lua
@@ -24,7 +24,8 @@ local on_digiline_receive = function (pos, node, channel, msg)
 	end
 end
 
-minetest.register_node("digilines_rtc:rtc", {
+minetest.register_alias("digilines_rtc:rtc", "digilines:rtc")
+minetest.register_node("digilines:rtc", {
 	description = "Digiline Real Time Clock (RTC)",
 	drawtype = "nodebox",
 	tiles = {"digilines_rtc.png"},
diff --git a/digilines_lcd/textures/_0.png b/textures/_0.png
similarity index 100%
rename from digilines_lcd/textures/_0.png
rename to textures/_0.png
diff --git a/digilines_lcd/textures/_1.png b/textures/_1.png
similarity index 100%
rename from digilines_lcd/textures/_1.png
rename to textures/_1.png
diff --git a/digilines_lcd/textures/_2.png b/textures/_2.png
similarity index 100%
rename from digilines_lcd/textures/_2.png
rename to textures/_2.png
diff --git a/digilines_lcd/textures/_3.png b/textures/_3.png
similarity index 100%
rename from digilines_lcd/textures/_3.png
rename to textures/_3.png
diff --git a/digilines_lcd/textures/_4.png b/textures/_4.png
similarity index 100%
rename from digilines_lcd/textures/_4.png
rename to textures/_4.png
diff --git a/digilines_lcd/textures/_5.png b/textures/_5.png
similarity index 100%
rename from digilines_lcd/textures/_5.png
rename to textures/_5.png
diff --git a/digilines_lcd/textures/_6.png b/textures/_6.png
similarity index 100%
rename from digilines_lcd/textures/_6.png
rename to textures/_6.png
diff --git a/digilines_lcd/textures/_7.png b/textures/_7.png
similarity index 100%
rename from digilines_lcd/textures/_7.png
rename to textures/_7.png
diff --git a/digilines_lcd/textures/_8.png b/textures/_8.png
similarity index 100%
rename from digilines_lcd/textures/_8.png
rename to textures/_8.png
diff --git a/digilines_lcd/textures/_9.png b/textures/_9.png
similarity index 100%
rename from digilines_lcd/textures/_9.png
rename to textures/_9.png
diff --git a/digilines_lcd/textures/_a.png b/textures/_a.png
similarity index 100%
rename from digilines_lcd/textures/_a.png
rename to textures/_a.png
diff --git a/digilines_lcd/textures/_a_.png b/textures/_a_.png
similarity index 100%
rename from digilines_lcd/textures/_a_.png
rename to textures/_a_.png
diff --git a/digilines_lcd/textures/_am.png b/textures/_am.png
similarity index 100%
rename from digilines_lcd/textures/_am.png
rename to textures/_am.png
diff --git a/digilines_lcd/textures/_ap.png b/textures/_ap.png
similarity index 100%
rename from digilines_lcd/textures/_ap.png
rename to textures/_ap.png
diff --git a/digilines_lcd/textures/_as.png b/textures/_as.png
similarity index 100%
rename from digilines_lcd/textures/_as.png
rename to textures/_as.png
diff --git a/digilines_lcd/textures/_at.png b/textures/_at.png
similarity index 100%
rename from digilines_lcd/textures/_at.png
rename to textures/_at.png
diff --git a/digilines_lcd/textures/_b.png b/textures/_b.png
similarity index 100%
rename from digilines_lcd/textures/_b.png
rename to textures/_b.png
diff --git a/digilines_lcd/textures/_b_.png b/textures/_b_.png
similarity index 100%
rename from digilines_lcd/textures/_b_.png
rename to textures/_b_.png
diff --git a/digilines_lcd/textures/_bl.png b/textures/_bl.png
similarity index 100%
rename from digilines_lcd/textures/_bl.png
rename to textures/_bl.png
diff --git a/digilines_lcd/textures/_br.png b/textures/_br.png
similarity index 100%
rename from digilines_lcd/textures/_br.png
rename to textures/_br.png
diff --git a/digilines_lcd/textures/_c.png b/textures/_c.png
similarity index 100%
rename from digilines_lcd/textures/_c.png
rename to textures/_c.png
diff --git a/digilines_lcd/textures/_c_.png b/textures/_c_.png
similarity index 100%
rename from digilines_lcd/textures/_c_.png
rename to textures/_c_.png
diff --git a/digilines_lcd/textures/_ca.png b/textures/_ca.png
similarity index 100%
rename from digilines_lcd/textures/_ca.png
rename to textures/_ca.png
diff --git a/digilines_lcd/textures/_cl.png b/textures/_cl.png
similarity index 100%
rename from digilines_lcd/textures/_cl.png
rename to textures/_cl.png
diff --git a/digilines_lcd/textures/_cm.png b/textures/_cm.png
similarity index 100%
rename from digilines_lcd/textures/_cm.png
rename to textures/_cm.png
diff --git a/digilines_lcd/textures/_co.png b/textures/_co.png
similarity index 100%
rename from digilines_lcd/textures/_co.png
rename to textures/_co.png
diff --git a/digilines_lcd/textures/_cr.png b/textures/_cr.png
similarity index 100%
rename from digilines_lcd/textures/_cr.png
rename to textures/_cr.png
diff --git a/digilines_lcd/textures/_d.png b/textures/_d.png
similarity index 100%
rename from digilines_lcd/textures/_d.png
rename to textures/_d.png
diff --git a/digilines_lcd/textures/_d_.png b/textures/_d_.png
similarity index 100%
rename from digilines_lcd/textures/_d_.png
rename to textures/_d_.png
diff --git a/digilines_lcd/textures/_dl.png b/textures/_dl.png
similarity index 100%
rename from digilines_lcd/textures/_dl.png
rename to textures/_dl.png
diff --git a/digilines_lcd/textures/_dt.png b/textures/_dt.png
similarity index 100%
rename from digilines_lcd/textures/_dt.png
rename to textures/_dt.png
diff --git a/digilines_lcd/textures/_dv.png b/textures/_dv.png
similarity index 100%
rename from digilines_lcd/textures/_dv.png
rename to textures/_dv.png
diff --git a/digilines_lcd/textures/_e.png b/textures/_e.png
similarity index 100%
rename from digilines_lcd/textures/_e.png
rename to textures/_e.png
diff --git a/digilines_lcd/textures/_e_.png b/textures/_e_.png
similarity index 100%
rename from digilines_lcd/textures/_e_.png
rename to textures/_e_.png
diff --git a/digilines_lcd/textures/_eq.png b/textures/_eq.png
similarity index 100%
rename from digilines_lcd/textures/_eq.png
rename to textures/_eq.png
diff --git a/digilines_lcd/textures/_ex.png b/textures/_ex.png
similarity index 100%
rename from digilines_lcd/textures/_ex.png
rename to textures/_ex.png
diff --git a/digilines_lcd/textures/_f.png b/textures/_f.png
similarity index 100%
rename from digilines_lcd/textures/_f.png
rename to textures/_f.png
diff --git a/digilines_lcd/textures/_f_.png b/textures/_f_.png
similarity index 100%
rename from digilines_lcd/textures/_f_.png
rename to textures/_f_.png
diff --git a/digilines_lcd/textures/_g.png b/textures/_g.png
similarity index 100%
rename from digilines_lcd/textures/_g.png
rename to textures/_g.png
diff --git a/digilines_lcd/textures/_g_.png b/textures/_g_.png
similarity index 100%
rename from digilines_lcd/textures/_g_.png
rename to textures/_g_.png
diff --git a/digilines_lcd/textures/_gt.png b/textures/_gt.png
similarity index 100%
rename from digilines_lcd/textures/_gt.png
rename to textures/_gt.png
diff --git a/digilines_lcd/textures/_h.png b/textures/_h.png
similarity index 100%
rename from digilines_lcd/textures/_h.png
rename to textures/_h.png
diff --git a/digilines_lcd/textures/_h_.png b/textures/_h_.png
similarity index 100%
rename from digilines_lcd/textures/_h_.png
rename to textures/_h_.png
diff --git a/digilines_lcd/textures/_ha.png b/textures/_ha.png
similarity index 100%
rename from digilines_lcd/textures/_ha.png
rename to textures/_ha.png
diff --git a/digilines_lcd/textures/_hs.png b/textures/_hs.png
similarity index 100%
rename from digilines_lcd/textures/_hs.png
rename to textures/_hs.png
diff --git a/digilines_lcd/textures/_i.png b/textures/_i.png
similarity index 100%
rename from digilines_lcd/textures/_i.png
rename to textures/_i.png
diff --git a/digilines_lcd/textures/_i_.png b/textures/_i_.png
similarity index 100%
rename from digilines_lcd/textures/_i_.png
rename to textures/_i_.png
diff --git a/digilines_lcd/textures/_j.png b/textures/_j.png
similarity index 100%
rename from digilines_lcd/textures/_j.png
rename to textures/_j.png
diff --git a/digilines_lcd/textures/_j_.png b/textures/_j_.png
similarity index 100%
rename from digilines_lcd/textures/_j_.png
rename to textures/_j_.png
diff --git a/digilines_lcd/textures/_k.png b/textures/_k.png
similarity index 100%
rename from digilines_lcd/textures/_k.png
rename to textures/_k.png
diff --git a/digilines_lcd/textures/_k_.png b/textures/_k_.png
similarity index 100%
rename from digilines_lcd/textures/_k_.png
rename to textures/_k_.png
diff --git a/digilines_lcd/textures/_l.png b/textures/_l.png
similarity index 100%
rename from digilines_lcd/textures/_l.png
rename to textures/_l.png
diff --git a/digilines_lcd/textures/_l_.png b/textures/_l_.png
similarity index 100%
rename from digilines_lcd/textures/_l_.png
rename to textures/_l_.png
diff --git a/digilines_lcd/textures/_lt.png b/textures/_lt.png
similarity index 100%
rename from digilines_lcd/textures/_lt.png
rename to textures/_lt.png
diff --git a/digilines_lcd/textures/_m.png b/textures/_m.png
similarity index 100%
rename from digilines_lcd/textures/_m.png
rename to textures/_m.png
diff --git a/digilines_lcd/textures/_m_.png b/textures/_m_.png
similarity index 100%
rename from digilines_lcd/textures/_m_.png
rename to textures/_m_.png
diff --git a/digilines_lcd/textures/_mn.png b/textures/_mn.png
similarity index 100%
rename from digilines_lcd/textures/_mn.png
rename to textures/_mn.png
diff --git a/digilines_lcd/textures/_n.png b/textures/_n.png
similarity index 100%
rename from digilines_lcd/textures/_n.png
rename to textures/_n.png
diff --git a/digilines_lcd/textures/_n_.png b/textures/_n_.png
similarity index 100%
rename from digilines_lcd/textures/_n_.png
rename to textures/_n_.png
diff --git a/digilines_lcd/textures/_o.png b/textures/_o.png
similarity index 100%
rename from digilines_lcd/textures/_o.png
rename to textures/_o.png
diff --git a/digilines_lcd/textures/_o_.png b/textures/_o_.png
similarity index 100%
rename from digilines_lcd/textures/_o_.png
rename to textures/_o_.png
diff --git a/digilines_lcd/textures/_p.png b/textures/_p.png
similarity index 100%
rename from digilines_lcd/textures/_p.png
rename to textures/_p.png
diff --git a/digilines_lcd/textures/_p_.png b/textures/_p_.png
similarity index 100%
rename from digilines_lcd/textures/_p_.png
rename to textures/_p_.png
diff --git a/digilines_lcd/textures/_pr.png b/textures/_pr.png
similarity index 100%
rename from digilines_lcd/textures/_pr.png
rename to textures/_pr.png
diff --git a/digilines_lcd/textures/_ps.png b/textures/_ps.png
similarity index 100%
rename from digilines_lcd/textures/_ps.png
rename to textures/_ps.png
diff --git a/digilines_lcd/textures/_q.png b/textures/_q.png
similarity index 100%
rename from digilines_lcd/textures/_q.png
rename to textures/_q.png
diff --git a/digilines_lcd/textures/_q_.png b/textures/_q_.png
similarity index 100%
rename from digilines_lcd/textures/_q_.png
rename to textures/_q_.png
diff --git a/digilines_lcd/textures/_qo.png b/textures/_qo.png
similarity index 100%
rename from digilines_lcd/textures/_qo.png
rename to textures/_qo.png
diff --git a/digilines_lcd/textures/_qu.png b/textures/_qu.png
similarity index 100%
rename from digilines_lcd/textures/_qu.png
rename to textures/_qu.png
diff --git a/digilines_lcd/textures/_r.png b/textures/_r.png
similarity index 100%
rename from digilines_lcd/textures/_r.png
rename to textures/_r.png
diff --git a/digilines_lcd/textures/_r_.png b/textures/_r_.png
similarity index 100%
rename from digilines_lcd/textures/_r_.png
rename to textures/_r_.png
diff --git a/digilines_lcd/textures/_re.png b/textures/_re.png
similarity index 100%
rename from digilines_lcd/textures/_re.png
rename to textures/_re.png
diff --git a/digilines_lcd/textures/_s.png b/textures/_s.png
similarity index 100%
rename from digilines_lcd/textures/_s.png
rename to textures/_s.png
diff --git a/digilines_lcd/textures/_s_.png b/textures/_s_.png
similarity index 100%
rename from digilines_lcd/textures/_s_.png
rename to textures/_s_.png
diff --git a/digilines_lcd/textures/_sl.png b/textures/_sl.png
similarity index 100%
rename from digilines_lcd/textures/_sl.png
rename to textures/_sl.png
diff --git a/digilines_lcd/textures/_sm.png b/textures/_sm.png
similarity index 100%
rename from digilines_lcd/textures/_sm.png
rename to textures/_sm.png
diff --git a/digilines_lcd/textures/_sp.png b/textures/_sp.png
similarity index 100%
rename from digilines_lcd/textures/_sp.png
rename to textures/_sp.png
diff --git a/digilines_lcd/textures/_sr.png b/textures/_sr.png
similarity index 100%
rename from digilines_lcd/textures/_sr.png
rename to textures/_sr.png
diff --git a/digilines_lcd/textures/_t.png b/textures/_t.png
similarity index 100%
rename from digilines_lcd/textures/_t.png
rename to textures/_t.png
diff --git a/digilines_lcd/textures/_t_.png b/textures/_t_.png
similarity index 100%
rename from digilines_lcd/textures/_t_.png
rename to textures/_t_.png
diff --git a/digilines_lcd/textures/_tl.png b/textures/_tl.png
similarity index 100%
rename from digilines_lcd/textures/_tl.png
rename to textures/_tl.png
diff --git a/digilines_lcd/textures/_u.png b/textures/_u.png
similarity index 100%
rename from digilines_lcd/textures/_u.png
rename to textures/_u.png
diff --git a/digilines_lcd/textures/_u_.png b/textures/_u_.png
similarity index 100%
rename from digilines_lcd/textures/_u_.png
rename to textures/_u_.png
diff --git a/digilines_lcd/textures/_un.png b/textures/_un.png
similarity index 100%
rename from digilines_lcd/textures/_un.png
rename to textures/_un.png
diff --git a/digilines_lcd/textures/_v.png b/textures/_v.png
similarity index 100%
rename from digilines_lcd/textures/_v.png
rename to textures/_v.png
diff --git a/digilines_lcd/textures/_v_.png b/textures/_v_.png
similarity index 100%
rename from digilines_lcd/textures/_v_.png
rename to textures/_v_.png
diff --git a/digilines_lcd/textures/_vb.png b/textures/_vb.png
similarity index 100%
rename from digilines_lcd/textures/_vb.png
rename to textures/_vb.png
diff --git a/digilines_lcd/textures/_w.png b/textures/_w.png
similarity index 100%
rename from digilines_lcd/textures/_w.png
rename to textures/_w.png
diff --git a/digilines_lcd/textures/_w_.png b/textures/_w_.png
similarity index 100%
rename from digilines_lcd/textures/_w_.png
rename to textures/_w_.png
diff --git a/digilines_lcd/textures/_x.png b/textures/_x.png
similarity index 100%
rename from digilines_lcd/textures/_x.png
rename to textures/_x.png
diff --git a/digilines_lcd/textures/_x_.png b/textures/_x_.png
similarity index 100%
rename from digilines_lcd/textures/_x_.png
rename to textures/_x_.png
diff --git a/digilines_lcd/textures/_y.png b/textures/_y.png
similarity index 100%
rename from digilines_lcd/textures/_y.png
rename to textures/_y.png
diff --git a/digilines_lcd/textures/_y_.png b/textures/_y_.png
similarity index 100%
rename from digilines_lcd/textures/_y_.png
rename to textures/_y_.png
diff --git a/digilines_lcd/textures/_z.png b/textures/_z.png
similarity index 100%
rename from digilines_lcd/textures/_z.png
rename to textures/_z.png
diff --git a/digilines_lcd/textures/_z_.png b/textures/_z_.png
similarity index 100%
rename from digilines_lcd/textures/_z_.png
rename to textures/_z_.png
diff --git a/digilines/textures/digiline_std.png b/textures/digiline_std.png
similarity index 100%
rename from digilines/textures/digiline_std.png
rename to textures/digiline_std.png
diff --git a/digilines/textures/digiline_std_bump.png b/textures/digiline_std_bump.png
similarity index 100%
rename from digilines/textures/digiline_std_bump.png
rename to textures/digiline_std_bump.png
diff --git a/digilines/textures/digiline_std_inv.png b/textures/digiline_std_inv.png
similarity index 100%
rename from digilines/textures/digiline_std_inv.png
rename to textures/digiline_std_inv.png
diff --git a/digilines/textures/digiline_std_vertical.png b/textures/digiline_std_vertical.png
similarity index 100%
rename from digilines/textures/digiline_std_vertical.png
rename to textures/digiline_std_vertical.png
diff --git a/digilines_lightsensor/textures/digilines_lightsensor.png b/textures/digilines_lightsensor.png
similarity index 100%
rename from digilines_lightsensor/textures/digilines_lightsensor.png
rename to textures/digilines_lightsensor.png
diff --git a/digilines_rtc/textures/digilines_rtc.png b/textures/digilines_rtc.png
similarity index 100%
rename from digilines_rtc/textures/digilines_rtc.png
rename to textures/digilines_rtc.png
diff --git a/digilines_lcd/textures/lcd_anyside.png b/textures/lcd_anyside.png
similarity index 100%
rename from digilines_lcd/textures/lcd_anyside.png
rename to textures/lcd_anyside.png
diff --git a/digilines_lcd/textures/lcd_lcd.png b/textures/lcd_lcd.png
similarity index 100%
rename from digilines_lcd/textures/lcd_lcd.png
rename to textures/lcd_lcd.png
diff --git a/digilines/util.lua b/util.lua
similarity index 100%
rename from digilines/util.lua
rename to util.lua
diff --git a/digilines/wire_std.lua b/wire_std.lua
similarity index 100%
rename from digilines/wire_std.lua
rename to wire_std.lua
diff --git a/digilines/wires_common.lua b/wires_common.lua
similarity index 100%
rename from digilines/wires_common.lua
rename to wires_common.lua