From 839c32f5c00ee95ad3b2154b911e37c792569a5f Mon Sep 17 00:00:00 2001
From: Jordan Irwin <antumdeluge@gmail.com>
Date: Tue, 18 May 2021 18:11:24 -0700
Subject: [PATCH] Move node & entity functions into segregated modules

---
 entities.lua | 37 ++++++++++++++++++++++
 init.lua     | 88 +++++-----------------------------------------------
 nodes.lua    | 44 ++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 81 deletions(-)
 create mode 100644 entities.lua
 create mode 100644 nodes.lua

diff --git a/entities.lua b/entities.lua
new file mode 100644
index 0000000..8eae2cf
--- /dev/null
+++ b/entities.lua
@@ -0,0 +1,37 @@
+
+local old_entities = {}
+
+-- Populate entities list from file in world path
+local e_list = nil
+local e_path = core.get_worldpath() .. "/clean_entities.txt"
+local e_file = io.open(e_path, "r")
+
+if e_file then
+	e_list = e_file:read("*a")
+	e_file:close()
+else
+	-- Create empty file
+	e_file = io.open(e_path, "w")
+	if e_file then
+		e_file:close()
+	end
+end
+
+if e_list then
+	cleaner.log("debug", "Loading entities to clean from file ...")
+
+	e_list = string.split(e_list, "\n")
+	for _, entity_name in ipairs(e_list) do
+		table.insert(old_entities, entity_name)
+	end
+end
+
+for _, entity_name in ipairs(old_entities) do
+	cleaner.log("debug", "Cleaning entity: " .. entity_name)
+
+	core.register_entity(":" .. entity_name, {
+		on_activate = function(self, staticdata)
+			self.object:remove()
+		end,
+	})
+end
diff --git a/init.lua b/init.lua
index d9fac5c..2119774 100644
--- a/init.lua
+++ b/init.lua
@@ -5,6 +5,7 @@
 
 cleaner = {}
 cleaner.modname = core.get_current_modname()
+cleaner.modpath = core.get_modpath(cleaner.modname)
 
 local cleaner_debug = core.settings:get_bool("enable_debug_mods", false)
 
@@ -21,86 +22,11 @@ function cleaner.log(lvl, msg)
 end
 
 
--- ENTITIES
+local scripts = {
+	"entities",
+	"nodes",
+}
 
-local old_entities = {}
-
--- Populate entities list from file in world path
-local e_list = nil
-local e_path = core.get_worldpath() .. "/clean_entities.txt"
-local e_file = io.open(e_path, "r")
-if e_file then
-	e_list = e_file:read("*a")
-	e_file:close()
-else
-	-- Create empty file
-	e_file = io.open(e_path, "w")
-	if e_file then
-		e_file:close()
-	end
+for _, script in ipairs(scripts) do
+	dofile(cleaner.modpath .. "/" .. script .. ".lua")
 end
-
-if e_list then
-	cleaner.log("debug", "Loading entities to clean from file ...")
-
-	e_list = string.split(e_list, "\n")
-	for _, entity_name in ipairs(e_list) do
-		table.insert(old_entities, entity_name)
-	end
-end
-
-for _, entity_name in ipairs(old_entities) do
-	cleaner.log("debug", "Cleaning entity: " .. entity_name)
-
-    core.register_entity(":" .. entity_name, {
-        on_activate = function(self, staticdata)
-            self.object:remove()
-        end,
-    })
-end
-
-
--- NODES
-
-local old_nodes = {}
-
--- Populate nodes list from file in world path
-local n_list = nil
-local n_path = core.get_worldpath() .. "/clean_nodes.txt"
-local n_file = io.open(n_path, "r")
-if n_file then
-	n_list = n_file:read("*a")
-	n_file:close()
-else
-	-- Create empty file
-	n_file = io.open(n_path, "w")
-	if n_file then
-		n_file:close()
-	end
-end
-
-if n_list then
-	cleaner.log("debug", "Loading nodes to clean from file ...")
-
-	n_list = string.split(n_list, "\n")
-	for _, node_name in ipairs(n_list) do
-		table.insert(old_nodes, node_name)
-	end
-end
-
-for _, node_name in ipairs(old_nodes) do
-	cleaner.log("debug", "Cleaning node: " .. node_name)
-
-    core.register_node(":" .. node_name, {
-        groups = {old=1},
-    })
-end
-
-core.register_abm({
-    nodenames = {"group:old"},
-    interval = 1,
-    chance = 1,
-    action = function(pos, node)
-        core.remove_node(pos)
-    end,
-})
diff --git a/nodes.lua b/nodes.lua
new file mode 100644
index 0000000..c0e2005
--- /dev/null
+++ b/nodes.lua
@@ -0,0 +1,44 @@
+
+local old_nodes = {}
+
+-- Populate nodes list from file in world path
+local n_list = nil
+local n_path = core.get_worldpath() .. "/clean_nodes.txt"
+local n_file = io.open(n_path, "r")
+
+if n_file then
+	n_list = n_file:read("*a")
+	n_file:close()
+else
+	-- Create empty file
+	n_file = io.open(n_path, "w")
+	if n_file then
+		n_file:close()
+	end
+end
+
+if n_list then
+	cleaner.log("debug", "Loading nodes to clean from file ...")
+
+	n_list = string.split(n_list, "\n")
+	for _, node_name in ipairs(n_list) do
+		table.insert(old_nodes, node_name)
+	end
+end
+
+for _, node_name in ipairs(old_nodes) do
+	cleaner.log("debug", "Cleaning node: " .. node_name)
+
+	core.register_node(":" .. node_name, {
+		groups = {old=1},
+	})
+end
+
+core.register_abm({
+	nodenames = {"group:old"},
+	interval = 1,
+	chance = 1,
+	action = function(pos, node)
+			core.remove_node(pos)
+	end,
+})