From 5b9bd1e6d649cfd72e07a7c2359f5723bec402b5 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 9 Apr 2021 19:26:20 +0100 Subject: [PATCH 1/3] add mochi --- food.lua | 22 ++++++++++++++++++++++ textures/farming_mochi.png | Bin 0 -> 212 bytes 2 files changed, 22 insertions(+) create mode 100644 textures/farming_mochi.png diff --git a/food.lua b/food.lua index 2a1c286..95b81c8 100644 --- a/food.lua +++ b/food.lua @@ -639,3 +639,25 @@ minetest.register_craft({ {"group:food_skillet", "farming:skillet"} } }) + +-- Mochi + +minetest.register_craftitem("farming:mochi", { + description = S("Mochi"), + inventory_image = "farming_mochi.png", + on_use = minetest.item_eat(3), + groups = {flammable = 2}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:mochi", + recipe = { + "group:food_mortar_pestle", "group:food_rice", "group:food_rice", + "group:food_sugar", "group:water_bucket" + }, + replacements = { + {"group:food_mortar_pestle", "farming:mortar_pestle"}, + {"group:water_bucket", "bucket:bucket_empty"} + } +}) diff --git a/textures/farming_mochi.png b/textures/farming_mochi.png new file mode 100644 index 0000000000000000000000000000000000000000..51e57eec8a2f3624c3a784a530141e921316e076 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=1UvcP&|%*1P<~i5cg2 zZmnFn`_A)iA8uZrw)gt4|9Ai2`TqaUw{5M@pYsBhGL{7S1v5B2yO9RuM0>h8hHzX@ zPH1Se47cgL2_ACl+g@B-eU=V&0dBQ(#BJ!JI{FI9m8^ Date: Fri, 9 Apr 2021 19:33:53 +0100 Subject: [PATCH 2/3] tweak mochi texture and recipe --- food.lua | 4 ++-- textures/farming_mochi.png | Bin 212 -> 212 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/food.lua b/food.lua index 95b81c8..a097e6c 100644 --- a/food.lua +++ b/food.lua @@ -654,10 +654,10 @@ minetest.register_craft({ output = "farming:mochi", recipe = { "group:food_mortar_pestle", "group:food_rice", "group:food_rice", - "group:food_sugar", "group:water_bucket" + "group:food_sugar", "bucket:bucket_river_water" }, replacements = { {"group:food_mortar_pestle", "farming:mortar_pestle"}, - {"group:water_bucket", "bucket:bucket_empty"} + {"bucket:bucket_river_water", "bucket:bucket_empty"} } }) diff --git a/textures/farming_mochi.png b/textures/farming_mochi.png index 51e57eec8a2f3624c3a784a530141e921316e076..7b3b2b57e63bc9ad0c27366950496551bcc4adf1 100644 GIT binary patch delta 149 zcmV;G0BZl#0n`DIBnT={OjJbxQ2>!CCx1}2o~Qr-00DGTPE!Ct=GbNc003A?L_t&t z*JEHnfK{s?G}rNR2QXtzd3gz#u^fp3kz#RiVd&^+0JAx^h6aHd-Ju}H%$W?WAO`2P zGy|s4Pz8p$X=%v}N=gh2(?ARmV1_XmjExN#kO2T3HW*>ECB{Ag0000OjJdYEGK`3=jROo0004WQchC`Pn(z>F#v7e@w$jt+(r5QF1r zr~;!4P^u?1G>Ab^kb$8U!~g-N&`<@4UL_?46aWCGWfKp<&<8*O0000 Date: Tue, 13 Apr 2021 20:50:19 +0100 Subject: [PATCH 3/3] reduce shapeless crafts --- food.lua | 101 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/food.lua b/food.lua index a097e6c..0e80826 100644 --- a/food.lua +++ b/food.lua @@ -117,9 +117,11 @@ minetest.register_node("farming:salt_crystal", { }, }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:salt 9", - recipe = {"farming:salt_crystal", "farming:mortar_pestle"}, + recipe = { + {"farming:salt_crystal", "farming:mortar_pestle"} + }, replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} }) @@ -211,9 +213,11 @@ minetest.register_craftitem("farming:garlic_bread", { }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:garlic_bread", - recipe = {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"} + recipe = { + {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"} + } }) --= Donuts (thanks to Bockwurst for making the donut images) @@ -270,11 +274,11 @@ minetest.register_craftitem("farming:porridge", { }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:porridge", recipe = { - "group:food_oats", "group:food_oats", "group:food_oats", - "group:food_oats", "group:food_bowl", "group:food_milk_glass" + {"group:food_oats", "group:food_oats", "group:food_oats"}, + {"group:food_oats", "group:food_bowl", "group:food_milk_glass"} }, replacements = { {"mobs:glass_milk", "vessels:drinking_glass"}, @@ -291,12 +295,12 @@ minetest.register_craftitem("farming:jaffa_cake", { }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:jaffa_cake", recipe = { - "farming:baking_tray", "group:food_egg", "group:food_sugar", - "group:food_flour", "group:food_cocoa", "group:food_orange", - "group:food_milk" + {"farming:baking_tray", "group:food_egg", "group:food_sugar"}, + {"group:food_flour", "group:food_cocoa", "group:food_orange"}, + {"group:food_milk", "", ""} }, replacements = { {"farming:baking_tray", "farming:baking_tray"}, @@ -314,10 +318,10 @@ minetest.register_craftitem("farming:apple_pie", { minetest.register_craft({ output = "farming:apple_pie", - type = "shapeless", +-- type = "shapeless", recipe = { - "group:food_flour", "group:food_sugar", - "group:food_apple", "group:food_baking_tray" + {"group:food_flour", "group:food_sugar", "group:food_apple"}, + {"", "group:food_baking_tray", ""} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) @@ -342,11 +346,10 @@ minetest.register_craftitem("farming:cactus_juice", { }) minetest.register_craft({ - output = "farming:cactus_juice 2", - type = "shapeless", + output = "farming:cactus_juice", +-- type = "shapeless", recipe = { - "vessels:drinking_glass", "vessels:drinking_glass", - "default:cactus", "farming:juicer" + {"default:cactus", "farming:juicer", "vessels:drinking_glass"} }, replacements = { {"group:food_juicer", "farming:juicer"} @@ -363,20 +366,18 @@ minetest.register_craftitem("farming:pasta", { minetest.register_craft({ output = "farming:pasta", - type = "shapeless", +-- type = "shapeless", recipe = { - "group:food_flour", "group:food_mixing_bowl", - "group:food_butter" + {"group:food_flour", "group:food_butter", "group:food_mixing_bowl"} }, replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}} }) minetest.register_craft({ output = "farming:pasta", - type = "shapeless", +-- type = "shapeless", recipe = { - "group:food_flour", "group:food_mixing_bowl", - "group:food_oil" + {"group:food_flour", "group:food_oil", "group:food_mixing_bowl"} }, replacements = { {"group:food_mixing_bowl", "farming:mixing_bowl"}, @@ -394,10 +395,10 @@ minetest.register_craftitem("farming:spaghetti", { minetest.register_craft({ output = "farming:spaghetti", - type = "shapeless", +-- type = "shapeless", recipe = { - "group:food_pasta", "group:food_saucepan", - "group:food_tomato", "group:food_garlic_clove", "group:food_garlic_clove" + {"group:food_pasta", "group:food_saucepan", "group:food_tomato"}, + {"group:food_garlic_clove", "group:food_garlic_clove", ""} }, replacements = {{"group:food_saucepan", "farming:saucepan"}} }) @@ -412,11 +413,11 @@ minetest.register_craftitem("farming:bibimbap", { minetest.register_craft({ output = "farming:bibimbap", - type = "shapeless", +-- type = "shapeless", recipe = { - "group:food_skillet", "group:food_bowl", "group:food_egg", "group:food_rice", - "group:food_chicken_raw", "group:food_cabbage", "group:food_carrot", - "group:food_chili_pepper" + {"group:food_skillet", "group:food_bowl", "group:food_egg"}, + {"group:food_rice", "group:food_chicken_raw", "group:food_cabbage"}, + {"group:food_carrot", "group:food_chili_pepper", ""} }, replacements = {{"group:food_skillet", "farming:skillet"}} }) @@ -441,12 +442,12 @@ minetest.register_craftitem("farming:burger", { }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:burger", recipe = { - "farming:bread", "group:food_meat", "group:food_cheese", - "group:food_tomato", "group:food_cucumber", "group:food_onion", - "group:food_lettuce" + {"farming:bread", "group:food_meat", "group:food_cheese"}, + {"group:food_tomato", "group:food_cucumber", "group:food_onion"}, + {"group:food_lettuce", "", ""} } }) @@ -464,7 +465,7 @@ minetest.register_craft({ recipe = { "group:food_bowl", "group:food_tomato", "group:food_cucumber", "group:food_lettuce", "group:food_oil" - }, + } }) -- Triple Berry Smoothie @@ -510,7 +511,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:potato_omelet", { description = S("Potato omelet"), inventory_image = "farming_potato_omelet.png", - on_use = minetest.item_eat(6, "farming:bowl"), + on_use = minetest.item_eat(6, "farming:bowl") }) minetest.register_craft({ @@ -549,11 +550,11 @@ minetest.register_craftitem("farming:flan", { }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:flan", recipe = { - "group:food_sugar", "group:food_milk", "farming:caramel", - "group:food_egg", "group:food_egg", "farming:vanilla_extract" + {"group:food_sugar", "group:food_milk", "farming:caramel"}, + {"group:food_egg", "group:food_egg", "farming:vanilla_extract"} }, replacements = { {"cucina_vegana:soy_milk", "vessels:drinking_glass"}, @@ -568,17 +569,17 @@ minetest.register_craftitem("farming:cheese_vegan", { description = S("Vegan Cheese"), inventory_image = "farming_cheese_vegan.png", on_use = minetest.item_eat(2), - groups = {food_cheese = 1, flammable = 2}, + groups = {food_cheese = 1, flammable = 2} }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:cheese_vegan", recipe = { - "farming:soy_milk", "farming:soy_milk", "farming:soy_milk", - "group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol", - "group:food_gelatin", "group:food_pot" + {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, + {"group:food_salt", "group:food_peppercorn", "farming:bottle_ethanol"}, + {"group:food_gelatin", "group:food_pot", ""} }, replacements = { {"farming:soy_milk", "vessels:drinking_glass 3"}, @@ -588,16 +589,16 @@ minetest.register_craft({ }) minetest.register_craft({ - type = "shapeless", +-- type = "shapeless", output = "farming:cheese_vegan", recipe = { - "farming:soy_milk", "farming:soy_milk", "farming:soy_milk", - "group:food_salt", "group:food_peppercorn", "group:food_lemon", - "group:food_gelatin", "group:food_pot" + {"farming:soy_milk", "farming:soy_milk", "farming:soy_milk"}, + {"group:food_salt", "group:food_peppercorn", "group:food_lemon"}, + {"group:food_gelatin", "group:food_pot", ""} }, replacements = { {"farming:soy_milk", "vessels:drinking_glass 3"}, - {"farming:pot", "farming:pot"}, + {"farming:pot", "farming:pot"} } })