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 315237e07..000000000 --- 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 33e1edd32..000000000 --- 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 000000000..c115aa1ef --- /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 000000000..80c06085d --- /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 000000000..9597005c1 --- /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 zcmV+z0_XjSP)ZuF3`J=oB~{XpChcmKCRGlQdQ+1M+O%9C1yv5QC*cnCa1Tx}(O=2P7<)VrR#A$t zL9p8Y=8ruvSqLHfOYQbY$EVvs+7)0N$G~M7f1h3^t$|1~@B2Q;Yia!Tc9;QVFu#RJiXX;J)675!0OM3cMI81#c-h z#0B8hWr!6b zH-^sVb12Jl4uA(S2w8~QJ3>oA8bi2V0KnXWpcGo3z6>w7^|vsjY$*08VD@~4qzp~jmdllkO~1|%hgiQ z60nTTx1k3CVU~Q|c?y((XB_<=h(S=iFw#<>7m{b}evnuYbd9LB6bQgGPWmd=ASeNh zG6jsO#>wXb2|*wfF=os+rmLKcI0WsQa*Y8{6h*k&(TqdH)_6_)tIvjH>Y40X1OMi9 ayj4G5Ah#L7j78S~0000b>!3`M;J9h;>=hM;o_bm~2N0?$Q<%sq@x;+yz7Drn#vv_gucB(%uz5hD`vo@mOE zhm_LrpXv5Pm**iNe<}dz&&O-Jy`R@aB$~klBsdb4=mti<-%e}15>=&^R?G$Xm?cpS zMn2C^D~LX&aZ92a%mI+lZVN?|2;XC^{3Jm^4|pZi6-xrV%-V|4fZ76b33EG1@KShB zND_HZtO8%x7j<$(0`oodAh8KVBudYKk_5&uemWk~CO}_k61>}`N@z_d^$ePIp67dk zWm!y#(v#2HssK}_X-eZb?gePTlCXq4U$ZUq<510@N-TEXUl zM3c}e5CyxAWRgT)fm*QpOqfeRq!k=G6>|yff>v<&Sk5JSfU90i0PO+p{&M=T0>5^@ VZ=bGxR@VRk002ovPDHLkV1iXpwFCeF literal 0 HcmV?d00001 diff --git a/mods/mcl_core/crafting.lua b/mods/mcl_core/crafting.lua index f6119118d..eabf5a50f 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 f57cf93fc..64596f5a3 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 f8736c68d..4faa71323 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",