From 556008b68fac55b9a149a1fc721c3e8f2ee042c4 Mon Sep 17 00:00:00 2001
From: Alexander Weber <web.alexander@web.de>
Date: Sat, 5 Nov 2016 01:48:07 +0100
Subject: [PATCH] adjust global namespaces carpet vs. carpets

---
 carpet_api.lua | 4 +---
 init.lua       | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/carpet_api.lua b/carpet_api.lua
index 5a80ddf..3b2c8c1 100644
--- a/carpet_api.lua
+++ b/carpet_api.lua
@@ -1,5 +1,3 @@
-carpet = {}
-
 local config = Settings(minetest.get_modpath("carpets").."/settings.txt")
 
 local carpet_proto = {
@@ -19,7 +17,7 @@ if config:get_bool("WoolFeeling") then
 end
 
 
-function carpet.register(recipe, def)
+function carpets.register(recipe, def)
 	local node = {}
 
 	if def then
diff --git a/init.lua b/init.lua
index 4f6d57a..5b6913f 100644
--- a/init.lua
+++ b/init.lua
@@ -6,7 +6,7 @@ dofile(minetest.get_modpath("carpets").."/modutils.lua")
 depmod = carpets.modutils.get_depmod("carpets")
 
 
-function carpet.enabledfilter(name, def)
+local function enabledfilter(name, def)
 -- disable carpets from loaded modules but not defined in dependency
 	if depmod:check_depmod(name) == false then
 		return false
@@ -40,7 +40,7 @@ end
 ------------------------------------------------
 -- main execution
 for name, def in pairs(minetest.registered_nodes) do
-	if carpet.enabledfilter(name, def) == true then
-		carpet.register(name)
+	if enabledfilter(name, def) then
+		carpets.register(name)
 	end
 end