Refactor books

DEV_GROUPS.md

@@ -53,6 +53,7 @@ These groups are mainly used for a better item sorting in Creative Mode.
 * `food`: Can be eaten by player. Rating: 2 = eatable, 3 = drinkable, 1 = unknown food type
 * `nav_compass`: Compass. Rating: 1 = normal compass, 2 = magnocompass
 * `spawn_egg`: Item that spawns mobs
+* `book`: Book. Rating: 1 = unspecific book, 2 = writable book
 
 
 

mods/rp_book/init.lua

@@ -19,33 +19,51 @@ local F = minetest.formspec_escape
 local BOOK_MAX_TITLE_LENGTH = 64
 local BOOK_MAX_TEXT_LENGTH = 4500
 
+local on_use = function(itemstack, player, pointed_thing)
+   local name = player:get_player_name()
+   local data = itemstack:get_meta()
+
+   local title = ""
+   local text = ""
+
+   if data then
+      text = data:get_string("book:text")
+      title = data:get_string("book:title")
+   end
+
+   local form = rp_formspec.get_page("rp_formspec:default")
+   form = form .. "field[0.5,1.25;8,0;title;"..F(S("Title:"))..";"..F(title).."]"
+   form = form .. "textarea[0.5,1.75;8,6.75;text;"..F(S("Contents:"))..";"..F(text).."]"
+   form = form .. rp_formspec.button_exit(2.75, 7.75, 3, 1, "write", S("Write"))
+
+   minetest.show_formspec(name, "rp_book:book", form)
+end
+
+-- Unwritten book (stackable)
+minetest.register_craftitem(
+   ":rp_default:book_empty",
+   {
+      description = S("Book"),
+      _tt_help = S("Write down some notes"),
+      inventory_image = "rp_book_book_empty.png",
+      groups = { book = 2, tool = 1 },
+
+      on_use = function(itemstack, player, pointed_thing)
+         on_use(itemstack, player, pointed_thing)
+      end,
+})
+
+-- Writable book (not stackable)
 minetest.register_craftitem(
    ":rp_default:book",
    {
       description = S("Unnamed Book"),
-      _tt_help = S("Write down some notes"),
       inventory_image = "default_book.png",
       stack_max = 1,
-      groups = { tool = 1 },
+      groups = { book = 2, tool = 1, not_in_creative_inventory = 1 },
 
       on_use = function(itemstack, player, pointed_thing)
-         local name = player:get_player_name()
-         local data = itemstack:get_meta()
-
-         local title = ""
-         local text = ""
-
-         if data then
-            text = data:get_string("book:text")
-            title = data:get_string("book:title")
-         end
-
-         local form = rp_formspec.get_page("rp_formspec:default")
-         form = form .. "field[0.5,1.25;8,0;title;"..F(S("Title:"))..";"..F(title).."]"
-         form = form .. "textarea[0.5,1.75;8,6.75;text;"..F(S("Contents:"))..";"..F(text).."]"
-         form = form .. rp_formspec.button_exit(2.75, 7.75, 3, 1, "write", S("Write"))
-
-         minetest.show_formspec(name, "rp_book:book", form)
+         on_use(itemstack, player, pointed_thing)
       end,
 })
 
@@ -55,22 +73,79 @@ minetest.register_on_player_receive_fields(
          return
       end
 
-      local itemstack = player:get_wielded_item()
+      local wieldstack = player:get_wielded_item()
+      local iname = wieldstack:get_name()
+      if minetest.get_item_group(iname, "book") ~= 2 then
+         return
+      end
 
-      local meta = itemstack:get_meta()
+      local title = fields.title
+      local text = fields.text
 
       -- Limit title and text length
-      if string.len(fields.title) > BOOK_MAX_TITLE_LENGTH then
-          fields.title = string.sub(fields.title, 1, BOOK_MAX_TITLE_LENGTH)
+      if string.len(title) > BOOK_MAX_TITLE_LENGTH then
+          title = string.sub(title, 1, BOOK_MAX_TITLE_LENGTH)
       end
-      if string.len(fields.text) > BOOK_MAX_TEXT_LENGTH then
-          fields.text= string.sub(fields.text, 1, BOOK_MAX_TEXT_LENGTH)
+      if string.len(text) > BOOK_MAX_TEXT_LENGTH then
+          text= string.sub(text, 1, BOOK_MAX_TEXT_LENGTH)
       end
 
-      meta:set_string("description", S("Book: “@1”", minetest.colorize("#ffff00", fields.title))) -- Set the item description
+      local function set_book_meta(item, title, text)
+         local meta = item:get_meta()
+	 if title ~= "" then
+            meta:set_string("description", S("Book: “@1”", minetest.colorize("#ffff00", title))) -- Set the item description
+         else
+            meta:set_string("description", "")
+         end
+         meta:set_string("book:title", title)
+         meta:set_string("book:text", text)
+      end
 
-      meta:set_string("book:title", fields.title)
-      meta:set_string("book:text", fields.text)
-
-      player:set_wielded_item(itemstack)
+      if wieldstack:get_name() ~= "rp_default:book" then
+	 if wieldstack:get_count() == 1 then
+            wieldstack:set_name("rp_default:book")
+	    set_book_meta(wieldstack, title, text)
+            player:set_wielded_item(wieldstack)
+         else
+	    local newstack = wieldstack:take_item()
+	    newstack:set_count(1)
+	    newstack:set_name("rp_default:book")
+	    set_book_meta(newstack, title, text)
+            local inv = player:get_inventory()
+	    if inv:room_for_item("main", newstack) then
+               inv:add_item("main", newstack)
+	    else
+               minetest.add_item(player:get_pos(), newstack)
+	    end
+            player:set_wielded_item(wieldstack)
+	 end
+      else
+	 set_book_meta(wieldstack, title, text)
+         player:set_wielded_item(wieldstack)
+      end
 end)
+
+minetest.register_craft(
+   {
+      type = "fuel",
+      recipe = "rp_default:book_empty",
+      burntime = 2,
+})
+
+minetest.register_craft(
+   {
+      type = "fuel",
+      recipe = "rp_default:book",
+      burntime = 2,
+})
+
+crafting.register_craft(
+   {
+      output = "rp_default:book_empty",
+      items = {
+         "rp_default:paper 3",
+         "rp_default:stick",
+         "rp_default:fiber",
+      }
+})
+

mods/rp_book/mod.conf

@@ -1,2 +1,2 @@
 name = rp_book
-depends = rp_default, rp_formspec
+depends = rp_crafting, rp_default, rp_formspec

mods/rp_default/crafting.lua

@@ -180,13 +180,6 @@ minetest.register_craft(
       burntime = 12,
 })
 
-minetest.register_craft(
-   {
-      type = "fuel",
-      recipe = "rp_default:book",
-      burntime = 2,
-})
-
 minetest.register_craft(
    {
       type = "fuel",
@@ -549,16 +542,6 @@ crafting.register_craft(
       }
 })
 
-crafting.register_craft(
-   {
-      output = "rp_default:book",
-      items = {
-         "rp_default:paper 3",
-         "rp_default:stick",
-         "rp_default:fiber",
-      }
-})
-
 crafting.register_craft(
    {
       output = "rp_default:flint_and_steel",
@@ -907,7 +890,7 @@ crafting.register_craft(
    {
       output = "rp_default:bookshelf",
       items = {
-         "rp_default:book 3",
+         "rp_default:book_empty 3",
          "group:planks 6",
       }
 })

mods/rp_gold/init.lua

@@ -515,9 +515,9 @@ minetest.register_craftitem(
    {
       description = S("Trading Book"),
       _tt_help = S("Show this to a villager to trade"),
-      inventory_image = "default_book.png^gold_bookribbon.png",
+      inventory_image = "gold_book.png^gold_bookribbon.png",
       stack_max = 1,
-      groups = { tool = 1 },
+      groups = { book = 1, tool = 1 },
 })
 
 minetest.register_craftitem(
@@ -577,7 +577,7 @@ crafting.register_craft(
    {
       output = "rp_gold:trading_book",
       items = {
-         "rp_default:book",
+         "rp_default:book_empty",
          "rp_gold:ingot_gold",
       }
 })

mods/rp_goodies/init.lua

@@ -27,7 +27,7 @@ goodies.types["FURNACE_DST_general"] = {
 }
 
 goodies.types["BOOKSHELF"] = {
-   ["rp_default:book"] = { chance = 4, max_stack = 1 },
+   ["rp_default:book_empty"] = { chance = 4, max_stack = 1 },
    ["rp_default:paper"] = 16,
 }