Overhaul weather effects

[crafter_client.git] / init.lua

diff --git a/init.lua b/init.lua
index 21cc13ed592be96fb2c9c6849203cc3dbfb14fad..bf07b14318bd3caefadb2a6d0439559ab18c45f5 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -2,19 +2,24 @@
 weather_intake = nil
 weather = nil
 weather_type = nil
-running_send = nil
 player_movement_state = nil
 nether = nil
+aether = nil
+name = nil
+version_channel = nil
+fire_handling_channel = nil
 
 function initialize_all()
        --declare globals for now
        weather_intake = minetest.mod_channel_join("weather_intake")
        weather = minetest.mod_channel_join("weather_nodes")
        weather_type = minetest.mod_channel_join("weather_type")
-       running_send = minetest.mod_channel_join("running_send")
-       player_movement_state = minetest.mod_channel_join("player.player_movement_state")
-       nether = minetest.mod_channel_join("nether_teleporters")
-               
+       player_movement_state = minetest.mod_channel_join(name..":player_movement_state")
+       nether = minetest.mod_channel_join(name..":nether_teleporters")
+       aether = minetest.mod_channel_join(name..":aether_teleporters")
+       version_channel = minetest.mod_channel_join(name..":client_version_channel")
+       fire_handling_channel = minetest.mod_channel_join(name..":fire_state")
+
        --next we load everything seperately because it's easier to work on individual files than have everything jammed into one file
        --not into seperate mods because that is unnecessary and cumbersome
        local path = minetest.get_modpath("crafter_client")
@@ -22,12 +27,19 @@ function initialize_all()
        dofile(path.."/weather_handling.lua")
        dofile(path.."/environment_effects.lua")
        dofile(path.."/nether.lua")
+       dofile(path.."/aether.lua")
+       dofile(path.."/waila.lua")
+       dofile(path.."/music_handling.lua")
+       dofile(path.."/version_send.lua")
+       dofile(path.."/colored_names/colored_names.lua")
+       dofile(path.."/fire_handling.lua")
 end
 
 --we must delay initialization until the player exists in the world
 local function recursive_startup_attempt()
        local ready_to_go = minetest.localplayer
-       if ready_to_go then
+       if ready_to_go and minetest.get_node_or_nil(minetest.localplayer:get_pos()) then
+               name = minetest.localplayer:get_name()
                --good to begin
                initialize_all()
        else