Merge pull request #48 from kaadmy/newcrafting

Newcrafting

mods/achievements/init.lua

@@ -174,10 +174,10 @@ minetest.register_on_placenode(on_place)
 
 -- Formspecs
 
-local form = default.ui.get_page("core")
+local form = default.ui.get_page("default:default")
 form = form .. "tableoptions[background=#DDDDDD30]"
 form = form .. "tablecolumns[text,align=left,width=11;text,align=left,width=28;text,align=left,width=5]"
-default.ui.register_page("core_achievements", form)
+default.ui.register_page("achievements:achievements", form)
 
 function achievements.get_formspec(name, row)
    if not row then row = 1 end
@@ -212,7 +212,7 @@ function achievements.get_formspec(name, row)
       achievement_list = achievement_list .. progress
    end
 
-   local form = default.ui.get_page("core_achievements")
+   local form = default.ui.get_page("achievements:achievements")
 
    form = form .. "table[0.25,2.5;7.75,5.5;achievement_list;" .. achievement_list .. ";" .. row .. "]"
 
@@ -243,7 +243,7 @@ end
 local function receive_fields(player, form_name, fields)
    local name = player:get_player_name()
 
-   if form_name ~= "core_achievements" then return end
+   if form_name ~= "achievements:achievements" then return end
 
    if fields.quit then return end
 
@@ -257,7 +257,7 @@ local function receive_fields(player, form_name, fields)
       end
    end
 
-   minetest.show_formspec(name, "core_achievements", achievements.get_formspec(name, selected))
+   minetest.show_formspec(name, "achievements:achievements", achievements.get_formspec(name, selected))
 end
 
 minetest.register_on_player_receive_fields(receive_fields)

mods/armor/init.lua

@@ -18,8 +18,8 @@ armor.materials = {
 
 armor.slots = {"helmet", "chestplate", "boots"}
 
-local form_armor = default.ui.get_page("core_2part")
-default.ui.register_page("core_armor", form_armor)
+local form_armor = default.ui.get_page("default:2part")
+default.ui.register_page("armor:armor", form_armor)
 
 local enable_drop = minetest.setting_getbool("drop_items_on_die") or false
 
@@ -87,7 +87,7 @@ function armor.get_groups(player)
 
       if armor.is_armor(itemname) then
 	 local item = minetest.registered_items[itemname]
-	 
+
 	 for mat_index, _ in ipairs(armor.materials) do
 	    local mat = armor.materials[mat_index][1]
 
@@ -158,7 +158,7 @@ local function on_die(player)
       }
 
       local drop = minetest.add_item(rpos, item)
-      
+
       if drop then
 	 drop:setvelocity(
 	    {
@@ -190,7 +190,7 @@ minetest.register_craftitem(
       description = "Chainmail sheet",
 
       inventory_image = "armor_chainmail.png",
-      wield_image = "armor_chainmail.png",      
+      wield_image = "armor_chainmail.png",
 
       stack_max = 20,
    })
@@ -264,12 +264,14 @@ end
 
 minetest.register_on_newplayer(on_newplayer)
 minetest.register_on_joinplayer(on_joinplayer)
+
 if enable_drop then
    minetest.register_on_dieplayer(on_die)
 end
+
 minetest.register_globalstep(step)
 
-local form_armor = default.ui.get_page("core_2part")
+local form_armor = default.ui.get_page("default:2part")
 form_armor = form_armor .. "list[current_player;main;0.25,4.75;8,4;]"
 form_armor = form_armor .. default.ui.get_hotbar_itemslot_bg(0.25, 4.75, 8, 1)
 form_armor = form_armor .. default.ui.get_itemslot_bg(0.25, 5.75, 8, 3)
@@ -290,7 +292,7 @@ form_armor = form_armor .. "list[current_player;armor_helmet;2.25,0.75;1,1;]"
 form_armor = form_armor .. "listring[current_player;armor_helmet]"
 form_armor = form_armor .. default.ui.get_itemslot_bg(2.25, 0.75, 1, 1)
 
-default.ui.register_page("core_armor", form_armor)
+default.ui.register_page("armor:armor", form_armor)
 
 -- Achievements
 
@@ -312,4 +314,4 @@ achievements.register_achievement(
       craftitem = "group:is_armor",
    })
 
-default.log("mod:armor", "loaded")
+default.log("mod:armor", "loaded")

mods/book/init.lua

@@ -22,7 +22,7 @@ minetest.register_craftitem(
 		     title = data.title
 		  end
 
-		  local form = default.ui.get_page("core_notabs")
+		  local form = default.ui.get_page("default:notabs")
 		  form = form .. "field[0.5,1.25;8,0;title;Title:;"..minetest.formspec_escape(title).."]"
 		  form = form .. "textarea[0.5,1.75;8,6.75;text;Contents:;"..minetest.formspec_escape(text).."]"
 		  form = form .. default.ui.button_exit(2.75, 7.75, 3, 1, "write", "Write")
@@ -41,7 +41,7 @@ minetest.register_on_player_receive_fields(
       if not data then data = {} end
       data.text = fields.text
       data.title = fields.title
-      
+
       itemstack:set_metadata(minetest.serialize(data))
       player:set_wielded_item(itemstack)
    end)
@@ -57,4 +57,4 @@ achievements.register_achievement(
       craftitem = "default:book",
    })
 
-default.log("mod:book", "loaded")
+default.log("mod:book", "loaded")

mods/crafting/README.txt

@@ -0,0 +1,8 @@
+Cratfing mod
+============
+By Kaadmy, for Pixture
+
+Custom crafting method, uses a list of possible items to craft instead of a grid
+recipe.
+
+Source license: LGPLv2.1