diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index e2856e5b87..37781d2181 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -634,10 +634,16 @@ minetest.register_craft({ } }) +-- TODO: Remove helper recipe +minetest.register_craft({ + type = 'shapeless', + output = 'default:book', + recipe = { 'default:paper', 'default:paper', 'default:paper', 'mobs:leather', + } +}) minetest.register_craft({ type = 'shapeless', output = 'default:book', - -- FIXME: Update recipe. 3 paper 1 lether recipe = { 'default:paper', 'default:paper', 'default:paper', 'default:paper', } }) @@ -668,6 +674,7 @@ minetest.register_craft({ } }) +-- TODO: Remove recipe when mobs are working minetest.register_craft({ type = "shapeless", output = "default:gunpowder", diff --git a/mods/itemframes/init.lua b/mods/itemframes/init.lua index 991dd442e3..038676f1bf 100644 --- a/mods/itemframes/init.lua +++ b/mods/itemframes/init.lua @@ -130,7 +130,15 @@ minetest.register_node("itemframes:frame",{ end, }) --- FIXME: Replace paper with leather +minetest.register_craft({ + output = 'itemframes:frame', + recipe = { + {'default:stick', 'default:stick', 'default:stick'}, + {'default:stick', 'mobs:leather', 'default:stick'}, + {'default:stick', 'default:stick', 'default:stick'}, + } +}) +-- FIXME: Remove helper recipe minetest.register_craft({ output = 'itemframes:frame', recipe = { diff --git a/mods/mcl_end/init.lua b/mods/mcl_end/init.lua index 0df64fdded..9ecc98d3bb 100644 --- a/mods/mcl_end/init.lua +++ b/mods/mcl_end/init.lua @@ -41,3 +41,17 @@ minetest.register_craft({ {"mcl_end:end_stone", "mcl_end:end_stone"}, } }) + +minetest.register_craftitem("mcl_end:ender_eye", { + description = "Eye of Ender", + wield_image = "mcl_end_ender_eye.png", + inventory_image = "mcl_end_ender_eye.png", + stack_max = 64, +}) + +minetest.register_craft({ + type = "shapeless", + output = "mcl_end:ender_eye", + recipe = {"mobs:blaze_powder", "mcl_ender_pearl:ender_pearl"}, +}) + diff --git a/mods/mcl_end/textures/mcl_end_ender_eye.png b/mods/mcl_end/textures/mcl_end_ender_eye.png new file mode 100644 index 0000000000..5b2a843f60 Binary files /dev/null and b/mods/mcl_end/textures/mcl_end_ender_eye.png differ diff --git a/mods/mcl_potions/init.lua b/mods/mcl_potions/init.lua new file mode 100644 index 0000000000..0d4b556ff1 --- /dev/null +++ b/mods/mcl_potions/init.lua @@ -0,0 +1,22 @@ +minetest.register_craftitem("mcl_potions:fermented_spider_eye", { + description = "Fermented Spider Eye", + wield_image = "mcl_potions_spider_eye_fermented.png", + inventory_image = "mcl_potions_spider_eye_fermented.png", + stack_max = 64, +}) + +minetest.register_craft({ + type = "shapeless", + output = "mcl_potions:fermented_spider_eye", + recipe = { "farming:mushroom_brown", "default:sugar", "mobs:spider_eye" }, +}) + +-- TODO: Get texture +--[[ +minetest.register_craftitem("mcl_potions:dragon_breath", { + description = "Dragon's Breath", + wield_image = "mcl_potions_dragon_breath.png", + inventory_image = "mcl_potions_dragon_breath.png", + stack_max = 64, +}) +]] diff --git a/mods/mcl_potions/textures/mcl_potions_spider_eye_fermented.png b/mods/mcl_potions/textures/mcl_potions_spider_eye_fermented.png new file mode 100644 index 0000000000..e99267c50d Binary files /dev/null and b/mods/mcl_potions/textures/mcl_potions_spider_eye_fermented.png differ diff --git a/mods/mobs/creeper.lua b/mods/mobs/creeper.lua index 5141b81e77..9cbfc46286 100644 --- a/mods/mobs/creeper.lua +++ b/mods/mobs/creeper.lua @@ -17,8 +17,8 @@ mobs:register_mob("mobs:creeper", { drops = { {name = "default:gunpowder", chance = 1, - min = 1, - max = 3,}, + min = 0, + max = 2,}, }, armor = 70, drawtype = "front", diff --git a/mods/mobs/item.lua b/mods/mobs/item.lua index 288bd65163..3aec161228 100644 --- a/mods/mobs/item.lua +++ b/mods/mobs/item.lua @@ -49,7 +49,6 @@ minetest.register_craftitem("mobs:zombie", { end, }) - minetest.register_craftitem("mobs:spider", { description = "Spawn Spider", inventory_image = "spawn_spider.png", @@ -90,25 +89,105 @@ minetest.register_craftitem("mobs:creeper", { minetest.register_craftitem("mobs:rotten_flesh", { description = "Rotten Flesh", inventory_image = "rotten_flesh.png", + wield_image = "rotten_flesh.png", on_use = minetest.item_eat(2), + stack_max = 64, }) minetest.register_craftitem("mobs:meat_raw_sheep", { description = "Raw Mutton", inventory_image = "mutton_raw.png", + wield_image = "mutton_raw.png", on_use = minetest.item_eat(2), + stack_max = 64, }) minetest.register_craftitem("mobs:meat_cooked_sheep", { description = "Cooked Mutton", inventory_image = "mutton_cooked.png", + wield_image = "mutton_cooked.png", on_use = minetest.item_eat(4), + stack_max = 64, }) minetest.register_craftitem("mobs:spider_eye", { description = "Spider Eye", inventory_image = "spider_eye.png", + wield_image = "spider_eye.png", on_use = minetest.item_eat(2), + stack_max = 64, +}) + +minetest.register_craftitem("mobs:blaze_rod", { + description = "Blaze Rod", + wield_image = "mobs_blaze_rod.png", + inventory_image = "mobs_blaze_rod.png", + stack_max = 64, +}) + +minetest.register_craftitem("mobs:blaze_powder", { + description = "Blaze Powder", + wield_image = "mobs_blaze_powder.png", + inventory_image = "mobs_blaze_powder.png", + stack_max = 64, +}) + +minetest.register_craftitem("mobs:magma_cream", { + description = "Magma Cream", + wield_image = "mobs_magma_cream.png", + inventory_image = "mobs_magma_cream.png", + stack_max = 64, +}) + +minetest.register_craftitem("mobs:ghast_tear", { + description = "Ghast Tear", + wield_image = "mobs_ghast_tear.png", + inventory_image = "mobs_ghast_tear.png", + stack_max = 64, +}) + +minetest.register_craftitem("mobs:nether_star", { + description = "Nether Star", + wield_image = "mobs_nether_star.png", + inventory_image = "mobs_nether_star.png", + stack_max = 64, +}) + +minetest.register_craftitem("mobs:leather", { + description = "Leather", + wield_image = "mobs_leather.png", + inventory_image = "mobs_leather.png", + stack_max = 64, +}) + +minetest.register_craftitem("mobs:rabbit_hide", { + description = "Rabbit Hide", + wield_image = "mobs_rabbit_hide.png", + inventory_image = "mobs_rabbit_hide.png", + stack_max = 64, +}) + +----------- +-- Crafting +----------- + +minetest.register_craft({ + output = "mobs:leather", + recipe = { + { "mobs:rabbit_hide", "mobs:rabbit_hide" }, + { "mobs:rabbit_hide", "mobs:rabbit_hide" }, + } +}) + +minetest.register_craft({ + output = "mobs:blaze_powder 2", + recipe = {{"mobs:blaze_rod"}}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "mobs:magma_cream", + recipe = {"mobs:blaze_powder", "mesecons_materials:glue"}, }) minetest.register_craft({ diff --git a/mods/mobs/sheep.lua b/mods/mobs/sheep.lua index 11e4faea5f..f018d159a1 100644 --- a/mods/mobs/sheep.lua +++ b/mods/mobs/sheep.lua @@ -12,7 +12,7 @@ mobs:register_mob("mobs:sheep", { armor = 100, drops = { {name = "mobs:meat_raw_sheep", - chance = 2, + chance = 1, min = 1, max = 2,}, }, diff --git a/mods/mobs/slime.lua b/mods/mobs/slime.lua index d42e27a2f7..af120419a1 100644 --- a/mods/mobs/slime.lua +++ b/mods/mobs/slime.lua @@ -29,8 +29,8 @@ mobs:register_mob("mobs:slime", { drops = { {name = "mesecons_materials:glue", chance = 1, - min = 1, - max = 4,}, + min = 0, + max = 2,}, }, armor = 100, drawtype = "front", diff --git a/mods/mobs/textures/mobs_blaze_powder.png b/mods/mobs/textures/mobs_blaze_powder.png new file mode 100644 index 0000000000..ce6ee61fc9 Binary files /dev/null and b/mods/mobs/textures/mobs_blaze_powder.png differ diff --git a/mods/mobs/textures/mobs_blaze_rod.png b/mods/mobs/textures/mobs_blaze_rod.png new file mode 100644 index 0000000000..466c775f1d Binary files /dev/null and b/mods/mobs/textures/mobs_blaze_rod.png differ diff --git a/mods/mobs/textures/mobs_feather.png b/mods/mobs/textures/mobs_feather.png new file mode 100644 index 0000000000..5fc423db23 Binary files /dev/null and b/mods/mobs/textures/mobs_feather.png differ diff --git a/mods/mobs/textures/mobs_ghast_tear.png b/mods/mobs/textures/mobs_ghast_tear.png new file mode 100644 index 0000000000..08369841d3 Binary files /dev/null and b/mods/mobs/textures/mobs_ghast_tear.png differ diff --git a/mods/mobs/textures/mobs_leather.png b/mods/mobs/textures/mobs_leather.png new file mode 100644 index 0000000000..8b60b82157 Binary files /dev/null and b/mods/mobs/textures/mobs_leather.png differ diff --git a/mods/mobs/textures/mobs_magma_cream.png b/mods/mobs/textures/mobs_magma_cream.png new file mode 100644 index 0000000000..b894227adc Binary files /dev/null and b/mods/mobs/textures/mobs_magma_cream.png differ diff --git a/mods/mobs/textures/mobs_nether_star.png b/mods/mobs/textures/mobs_nether_star.png new file mode 100644 index 0000000000..419280aa38 Binary files /dev/null and b/mods/mobs/textures/mobs_nether_star.png differ diff --git a/mods/mobs/textures/mobs_rabbit_foot.png b/mods/mobs/textures/mobs_rabbit_foot.png new file mode 100644 index 0000000000..0e773b1bdb Binary files /dev/null and b/mods/mobs/textures/mobs_rabbit_foot.png differ diff --git a/mods/mobs/textures/mobs_rabbit_hide.png b/mods/mobs/textures/mobs_rabbit_hide.png new file mode 100644 index 0000000000..98b74f9594 Binary files /dev/null and b/mods/mobs/textures/mobs_rabbit_hide.png differ diff --git a/mods/throwing/arrow.lua b/mods/throwing/arrow.lua index 5692798e56..2f05f04dcf 100644 --- a/mods/throwing/arrow.lua +++ b/mods/throwing/arrow.lua @@ -80,7 +80,15 @@ end minetest.register_entity("throwing:arrow_entity", THROWING_ARROW_ENTITY) --- FIXME: Replace paper with feather +minetest.register_craft({ + output = 'throwing:arrow 4', + recipe = { + {'default:flint'}, + {'default:stick'}, + {'mobs:feather'} + } +}) +-- FIXME: Helper recipe minetest.register_craft({ output = 'throwing:arrow 4', recipe = {