From 92b45b2a189b703fc7cfc8ddbc09a7ad563a13bc Mon Sep 17 00:00:00 2001
From: Loïc Blot <nerzhul@users.noreply.github.com>
Date: Fri, 27 Jan 2017 07:41:10 +0100
Subject: [CSM] implement client side mod loading (#5123)

* client side mods are located in clientmods/
* move builtin/preview.lua to clientmods/preview/init.lua as a preview mod
* refactor ModConfiguration class to work properly with client and server using child objects
* move some Server constructor mod load code to ModConfiguration to reduce code duplication between client and server
* remove mods.{cpp,h} unused functions
* use UNORDERED_SET instead of std::set in some modspec storages
---
 builtin/client/chatcommands.lua | 14 +++++++-------
 builtin/client/init.lua         |  1 -
 builtin/client/preview.lua      | 42 -----------------------------------------
 3 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 builtin/client/preview.lua

(limited to 'builtin/client')

diff --git a/builtin/client/chatcommands.lua b/builtin/client/chatcommands.lua
index b49c222ef..43b4d9a72 100644
--- a/builtin/client/chatcommands.lua
+++ b/builtin/client/chatcommands.lua
@@ -5,24 +5,24 @@ core.register_on_sending_chat_messages(function(message)
 	if not (message:sub(1,1) == "/") then
 		return false
 	end
-	
+
 	core.display_chat_message("issued command: " .. message)
-	
+
 	local cmd, param = string.match(message, "^/([^ ]+) *(.*)")
 	if not param then
 		param = ""
 	end
-	
+
 	local cmd_def = core.registered_chatcommands[cmd]
-	
+
 	if cmd_def then
 		core.set_last_run_mod(cmd_def.mod_origin)
-		local success, message = cmd_def.func(param)
+		local _, message = cmd_def.func(param)
 		if message then
 			core.display_chat_message(message)
 		end
 		return true
 	end
-	
+
 	return false
-end)
\ No newline at end of file
+end)
diff --git a/builtin/client/init.lua b/builtin/client/init.lua
index b204ee5e6..592274540 100644
--- a/builtin/client/init.lua
+++ b/builtin/client/init.lua
@@ -7,7 +7,6 @@ dofile(clientpath .. "register.lua")
 dofile(commonpath .. "after.lua")
 dofile(commonpath .. "chatcommands.lua")
 dofile(clientpath .. "chatcommands.lua")
-dofile(clientpath .. "preview.lua")
 
 core.register_on_death(function()
 	core.display_chat_message("You died.")
diff --git a/builtin/client/preview.lua b/builtin/client/preview.lua
deleted file mode 100644
index 4c01d665f..000000000
--- a/builtin/client/preview.lua
+++ /dev/null
@@ -1,42 +0,0 @@
--- This is an example function to ensure it's working properly, should be removed before merge
-core.register_on_shutdown(function()
-	print("[PREVIEW] shutdown client")
-end)
-
--- This is an example function to ensure it's working properly, should be removed before merge
-core.register_on_receiving_chat_messages(function(message)
-	print("[PREVIEW] Received message " .. message)
-	return false
-end)
-
--- This is an example function to ensure it's working properly, should be removed before merge
-core.register_on_sending_chat_messages(function(message)
-	print("[PREVIEW] Sending message " .. message)
-	return false
-end)
-
--- This is an example function to ensure it's working properly, should be removed before merge
-core.register_on_hp_modification(function(hp)
-	print("[PREVIEW] HP modified " .. hp)
-end)
-
--- This is an example function to ensure it's working properly, should be removed before merge
-core.register_on_damage_taken(function(hp)
-	print("[PREVIEW] Damage taken " .. hp)
-end)
-
--- This is an example function to ensure it's working properly, should be removed before merge
-core.register_globalstep(function(dtime)
-	-- print("[PREVIEW] globalstep " .. dtime)
-end)
-
--- This is an example function to ensure it's working properly, should be removed before merge
-core.register_chatcommand("dump", {
-	func = function(param)
-		return true, dump(_G)
-	end,
-})
-
-core.after(2, function()
-	print("After 2")
-end)
-- 
cgit v1.2.3