From 92274ae1fae6487ca2a927da5a9821aed06edda7 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 1 Feb 2017 23:15:23 +0100 Subject: [PATCH] Move book/bookshelf to new mod mcl_books --- mods/bookex/depends.txt | 1 - mods/bookex/init.lua | 39 --------- mods/mcl_books/depends.txt | 2 + mods/mcl_books/init.lua | 74 ++++++++++++++++++ mods/mcl_books/mod.conf | 1 + .../textures/default_book.png | Bin .../textures/default_bookshelf.png | Bin .../textures/mcl_books_book_bg.png} | Bin .../textures/mcl_books_book_writable.png | Bin 0 -> 536 bytes .../textures/mcl_books_book_written.png | Bin 0 -> 427 bytes mods/mcl_core/crafting.lua | 22 ------ mods/mcl_core/craftitems.lua | 7 -- mods/mcl_core/nodes.lua | 10 --- 13 files changed, 77 insertions(+), 79 deletions(-) delete mode 100644 mods/bookex/depends.txt delete mode 100644 mods/bookex/init.lua create mode 100644 mods/mcl_books/depends.txt create mode 100644 mods/mcl_books/init.lua create mode 100644 mods/mcl_books/mod.conf rename mods/{mcl_core => mcl_books}/textures/default_book.png (100%) rename mods/{mcl_core => mcl_books}/textures/default_bookshelf.png (100%) rename mods/{bookex/textures/book_bg.png => mcl_books/textures/mcl_books_book_bg.png} (100%) create mode 100644 mods/mcl_books/textures/mcl_books_book_writable.png create mode 100644 mods/mcl_books/textures/mcl_books_book_written.png diff --git a/mods/bookex/depends.txt b/mods/bookex/depends.txt deleted file mode 100644 index 315237e0..00000000 --- a/mods/bookex/depends.txt +++ /dev/null @@ -1 +0,0 @@ -mcl_core diff --git a/mods/bookex/init.lua b/mods/bookex/init.lua deleted file mode 100644 index 33e1edd3..00000000 --- a/mods/bookex/init.lua +++ /dev/null @@ -1,39 +0,0 @@ -local function deepcopy ( t ) - local nt = { }; - for k, v in pairs(t) do - if (type(v) == "table") then - nt[k] = deepcopy(v); - else - nt[k] = v; - end - end - return nt; -end - -local newbook = deepcopy(minetest.registered_items["mcl_core:book"]); - -newbook.on_use = function ( itemstack, user, pointed_thing ) - - local text = itemstack:get_metadata(); - - local formspec = "size[8,9]".. - "background[-0.5,-0.5;9,10;book_bg.png]".. - "textarea[0.5,0.25;7.5,9.25;text;;"..minetest.formspec_escape(text).."]".. - "button_exit[3,8.25;2,1;ok;Exit]"; - - minetest.show_formspec(user:get_player_name(), "mcl_core:book", formspec); - -end - -minetest.register_craftitem(":mcl_core:book", newbook); - -minetest.register_on_player_receive_fields(function ( player, formname, fields ) - if ((formname == "mcl_core:book") and fields and fields.text) then - local stack = player:get_wielded_item(); - if (stack:get_name() and (stack:get_name() == "mcl_core:book")) then - local t = stack:to_table(); - t.metadata = fields.text; - player:set_wielded_item(ItemStack(t)); - end - end -end); diff --git a/mods/mcl_books/depends.txt b/mods/mcl_books/depends.txt new file mode 100644 index 00000000..c115aa1e --- /dev/null +++ b/mods/mcl_books/depends.txt @@ -0,0 +1,2 @@ +mcl_core +mcl_mobitems diff --git a/mods/mcl_books/init.lua b/mods/mcl_books/init.lua new file mode 100644 index 00000000..80c06085 --- /dev/null +++ b/mods/mcl_books/init.lua @@ -0,0 +1,74 @@ +-- Book +minetest.register_craftitem("mcl_books:book", { + description = "Book", + inventory_image = "default_book.png", + stack_max = 64, + groups = { book=1 }, +}) + +minetest.register_craft({ + type = 'shapeless', + output = 'mcl_books:book', + recipe = { 'mcl_core:paper', 'mcl_core:paper', 'mcl_core:paper', 'mcl_mobitems:leather', + } +}) + +-- Book and Quill +minetest.register_craftitem("mcl_books:writable_book", { + description = "Book and Quill", + inventory_image = "mcl_books_book_writable.png", + groups = { book=1 }, + stack_max = 1, + on_use = function (itemstack, user, pointed_thing) + local text = itemstack:get_metadata() + local formspec = "size[8,9]".. + "background[-0.5,-0.5;9,10;mcl_books_book_bg.png]".. + "textarea[0.5,0.25;7.5,9.25;text;;"..minetest.formspec_escape(text).."]".. + "button_exit[3,8.25;2,1;ok;Exit]" + minetest.show_formspec(user:get_player_name(), "mcl_core:book", formspec) + end, +}) + +minetest.register_on_player_receive_fields(function ( player, formname, fields ) + if ((formname == "mcl_books:writable_book") and fields and fields.text) then + local stack = player:get_wielded_item() + if (stack:get_name() and (stack:get_name() == "mcl_books:writable_book")) then + local t = stack:to_table() + t.metadata = fields.text + player:set_wielded_item(ItemStack(t)) + end + end +end) + +minetest.register_craft({ + type = "shapeless", + output = "mcl_books:writable_book", + recipe = { "mcl_books:books", "mcl_dyes:black", "mcl_mobitems:feather" }, +}) + +-- Bookshelf +minetest.register_node("mcl_books:bookshelf", { + description = "Bookshelf", + tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"}, + stack_max = 64, + is_ground_content = false, + groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3,building_block=1}, + drop = "mcl_books:book 3", + sounds = mcl_core.node_sound_wood_defaults(), +}) + +minetest.register_craft({ + output = 'mcl_books:bookshelf', + recipe = { + {'group:wood', 'group:wood', 'group:wood'}, + {'mcl_books:book', 'mcl_books:book', 'mcl_books:book'}, + {'group:wood', 'group:wood', 'group:wood'}, + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:bookshelf", + burntime = 15, +}) + diff --git a/mods/mcl_books/mod.conf b/mods/mcl_books/mod.conf new file mode 100644 index 00000000..9597005c --- /dev/null +++ b/mods/mcl_books/mod.conf @@ -0,0 +1 @@ +name = mcl_books diff --git a/mods/mcl_core/textures/default_book.png b/mods/mcl_books/textures/default_book.png similarity index 100% rename from mods/mcl_core/textures/default_book.png rename to mods/mcl_books/textures/default_book.png diff --git a/mods/mcl_core/textures/default_bookshelf.png b/mods/mcl_books/textures/default_bookshelf.png similarity index 100% rename from mods/mcl_core/textures/default_bookshelf.png rename to mods/mcl_books/textures/default_bookshelf.png diff --git a/mods/bookex/textures/book_bg.png b/mods/mcl_books/textures/mcl_books_book_bg.png similarity index 100% rename from mods/bookex/textures/book_bg.png rename to mods/mcl_books/textures/mcl_books_book_bg.png diff --git a/mods/mcl_books/textures/mcl_books_book_writable.png b/mods/mcl_books/textures/mcl_books_book_writable.png new file mode 100644 index 0000000000000000000000000000000000000000..ce5a5eaff8726aa7e05cae62912df6f3acbd9390 GIT binary patch literal 536 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNf_dQ)4Ln>}voo<-d;=tpY zsiYcuX@c6@tf^|Dd=sjICv)A}5~IKx%C}MdA>Wq*em{eY@h4A6RNDxI1$M1>+;Hpv zvwmBHNDjr{-fzFTA76gk;g)EE%<%)MlJ)cB)Ydk77`^{(cOpCU&)2dUnxaaT&xBa2 z?4NNz-YW2nd4}iVb+5$?_P2U;$shB*e8z!;;c<4IxEDGp6b|MRl#!%n*oNGuMJ8o^K|T?PJX)*IeA5UF&B&cs7-5kAx;` zzNWoy)amU;GecUm|Z%##G7xP-i}HL^8U2i)G~-H<2|!m(Ct zOKOLxl6l*?=fxVQi})JY4LKq^Zdp5dJ4!k4h+{Z#r)hymQgxG#%jp}w3Tz9vD(|13 zWaG`y>JWS2tSQG$!CT8hu5Zoe@r`YWi{U=VJ@GxW#OhT=y`I7cq&Re0`4UtQ^q#C? zo501Gc=~G41)&W+XSXk8XH1+{bGMRfN<+HLU%3v)fISA6f)B>Ar-f-PB+XuY{28X zmqm8=QpdIh#atz?Y^#{gySAUP?eTv!`-hcQ#sldsPF+h>ww(ANs4VnpUdE}3?Ncs& znE&#d^YrJ6iuGCyFU}v&-nDoBbr+Rc2U%1sgr>e=bK7^{FME$r=+bFnXIOvCPz~gD zvpesv-C?)1(0h^88O8}0^0-|mbKFl}`$xsmk-tLqil{f!o-?<)E;ig^D&j1*_WTf3 z;qM_->A!|4{p+hK{QjFo6H=bNUmf*%p*RI3_R$N4b4 iWqkLq=+_3O{bl>}=dY^`yUxJCz~JfX=d#Wzp$Pz0P_+aA literal 0 HcmV?d00001 diff --git a/mods/mcl_core/crafting.lua b/mods/mcl_core/crafting.lua index f6119118..eabf5a50 100644 --- a/mods/mcl_core/crafting.lua +++ b/mods/mcl_core/crafting.lua @@ -591,22 +591,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - type = 'shapeless', - output = 'mcl_core:book', - recipe = { 'mcl_core:paper', 'mcl_core:paper', 'mcl_core:paper', 'mcl_mobitems:leather', - } -}) - -minetest.register_craft({ - output = 'mcl_core:bookshelf', - recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'mcl_core:book', 'mcl_core:book', 'mcl_core:book'}, - {'group:wood', 'group:wood', 'group:wood'}, - } -}) - minetest.register_craft({ output = 'mcl_core:ladder 3', recipe = { @@ -950,12 +934,6 @@ minetest.register_craft({ burntime = 15, }) -minetest.register_craft({ - type = "fuel", - recipe = "mcl_core:bookshelf", - burntime = 15, -}) - minetest.register_craft({ type = "fuel", recipe = "mcl_core:ladder", diff --git a/mods/mcl_core/craftitems.lua b/mods/mcl_core/craftitems.lua index f57cf93f..64596f5a 100644 --- a/mods/mcl_core/craftitems.lua +++ b/mods/mcl_core/craftitems.lua @@ -18,13 +18,6 @@ minetest.register_craftitem("mcl_core:paper", { groups = { craftitem=1 }, }) -minetest.register_craftitem("mcl_core:book", { - description = "Book", - inventory_image = "default_book.png", - stack_max = 64, - groups = { craftitem=1 }, -}) - minetest.register_craftitem("mcl_core:coal_lump", { description = "Coal", groups = { coal=1 }, diff --git a/mods/mcl_core/nodes.lua b/mods/mcl_core/nodes.lua index f8736c68..4faa7132 100644 --- a/mods/mcl_core/nodes.lua +++ b/mods/mcl_core/nodes.lua @@ -985,16 +985,6 @@ minetest.register_node("mcl_core:bedrock", { drop = '', }) -minetest.register_node("mcl_core:bookshelf", { - description = "Bookshelf", - tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"}, - stack_max = 64, - is_ground_content = false, - groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3,building_block=1}, - drop = "mcl_core:book 3", - sounds = mcl_core.node_sound_wood_defaults(), -}) - minetest.register_node("mcl_core:slimeblock", { description = "Slime Block", drawtype = "nodebox",