From 0e05ac226a8ba5e503ea7d727a2bc6ba0be6d335 Mon Sep 17 00:00:00 2001 From: Ombridride Date: Tue, 3 Mar 2015 20:06:57 +0100 Subject: [PATCH] Fix typo in survival form spec & create legacy file (from MT_game) --- minetestforfun_game/mods/default/aliases.lua | 9 +++++-- .../mods/default/functions.lua | 16 ------------ minetestforfun_game/mods/default/init.lua | 3 ++- minetestforfun_game/mods/default/legacy.lua | 25 +++++++++++++++++++ minetestforfun_game/mods/default/player.lua | 2 +- 5 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 minetestforfun_game/mods/default/legacy.lua diff --git a/minetestforfun_game/mods/default/aliases.lua b/minetestforfun_game/mods/default/aliases.lua index d80082e2..9c9d7974 100644 --- a/minetestforfun_game/mods/default/aliases.lua +++ b/minetestforfun_game/mods/default/aliases.lua @@ -1,6 +1,7 @@ --- aliases (Minetest 0.4 mod) --- Provides alias for most default items +-- mods/default/aliases.lua +-- Aliases to support loading worlds using nodes following the old naming convention +-- These can also be helpful when using chat commands, for example /giveme minetest.register_alias("stone", "default:stone") minetest.register_alias("stone_with_coal", "default:stone_with_coal") minetest.register_alias("stone_with_iron", "default:stone_with_iron") @@ -65,3 +66,7 @@ minetest.register_alias("lump_of_iron", "default:iron_lump") minetest.register_alias("lump_of_clay", "default:clay_lump") minetest.register_alias("steel_ingot", "default:steel_ingot") minetest.register_alias("clay_brick", "default:clay_brick") +minetest.register_alias("snow", "default:snow") + +-- Mese now comes in the form of blocks, ore, crystal and fragments +minetest.register_alias("default:mese", "default:mese_block") \ No newline at end of file diff --git a/minetestforfun_game/mods/default/functions.lua b/minetestforfun_game/mods/default/functions.lua index d4bf13fb..44c8896d 100644 --- a/minetestforfun_game/mods/default/functions.lua +++ b/minetestforfun_game/mods/default/functions.lua @@ -129,22 +129,6 @@ function default.node_sound_glass_defaults(table) return table end --- Legacy: -function default.spawn_falling_node(p, nodename) - spawn_falling_node(p, nodename) -end - --- Horrible crap to support old code, --- don't use this and never do what this does, it's completely wrong! --- (more specifically, the client and the C++ code doesn't get the group). -function default.register_falling_node(nodename, texture) - minetest.log("error", debug.traceback()) - minetest.log("error", "WARNING: default.register_falling_node is deprecated.") - if minetest.registered_nodes[nodename] then - minetest.registered_nodes[nodename].groups.falling_node = 1 - end -end - -- -- Global callbacks -- diff --git a/minetestforfun_game/mods/default/init.lua b/minetestforfun_game/mods/default/init.lua index eee2de3e..0f147756 100644 --- a/minetestforfun_game/mods/default/init.lua +++ b/minetestforfun_game/mods/default/init.lua @@ -23,7 +23,7 @@ function default.get_hotbar_bg(x,y) return out end -default.gui_suvival_form = "size[8,8.5]".. +default.gui_survival_form = "size[8,8.5]".. default.gui_slots .. "list[current_player;main; 0, 4.25; 8, 4; ]" .. "list[current_player;craft; 1.75, 0.5; 3, 3; ]" .. @@ -43,6 +43,7 @@ dofile(minetest.get_modpath("default").."/mapgen.lua") dofile(minetest.get_modpath("default").."/player.lua") dofile(minetest.get_modpath("default").."/trees.lua") dofile(minetest.get_modpath("default").."/aliases.lua") +dofile(minetest.get_modpath("default").."/legacy.lua") -- Code below by Casimir. diff --git a/minetestforfun_game/mods/default/legacy.lua b/minetestforfun_game/mods/default/legacy.lua new file mode 100644 index 00000000..6415df8f --- /dev/null +++ b/minetestforfun_game/mods/default/legacy.lua @@ -0,0 +1,25 @@ +-- mods/default/Legacy.lua + +-- Horrible crap to support old code, +-- don't use this and never do what this does, it's completely wrong! +-- (more specifically, the client and the C++ code doesn't get the group). +function default.register_falling_node(nodename, texture) + minetest.log("error", debug.traceback()) + minetest.log("error", "WARNING: default.register_falling_node is deprecated.") + if minetest.registered_nodes[nodename] then + minetest.registered_nodes[nodename].groups.falling_node = 1 + end +end + +function default.spawn_falling_node(p, nodename) + spawn_falling_node(p, nodename) +end + +-- Liquids +WATER_ALPHA = minetest.registered_nodes["default:water_source"].alpha +WATER_ALPHA = minetest.registered_nodes["default:water_source"].liquid_viscosity +WATER_ALPHA = minetest.registered_nodes["default:lava_source"].liquid_viscosity +LIGHT_MAX = default.LIGHT_MAX + +-- Formspecs +default.gui_survival_form = default.gui_survival_form \ No newline at end of file diff --git a/minetestforfun_game/mods/default/player.lua b/minetestforfun_game/mods/default/player.lua index ea113c30..ae18246f 100644 --- a/minetestforfun_game/mods/default/player.lua +++ b/minetestforfun_game/mods/default/player.lua @@ -147,7 +147,7 @@ minetest.register_on_joinplayer(function(player) if minetest.setting_getbool("creative_mode") then -- creative.set_creative_formspec(player, 0, 1) else - player:set_inventory_formspec(default.gui_suvival_form) + player:set_inventory_formspec(default.gui_survival_form) end minetest.after(0.5,function() player:hud_set_hotbar_image("gui_hotbar.png")