From 9e7e5277470ef6939a66414e521678f6c323799a Mon Sep 17 00:00:00 2001 From: Grizzly Adam <35204361+Grizzly-Adam@users.noreply.github.com> Date: Mon, 12 Mar 2018 17:10:30 -0500 Subject: [PATCH] Ruben Standard Implimented --- README.md | 6 +++- cooking.lua | 68 +++++++++++++++++++++--------------------- crafts.lua | 28 +++++++++--------- overrides.lua | 81 +-------------------------------------------------- 4 files changed, 54 insertions(+), 129 deletions(-) diff --git a/README.md b/README.md index ee0ebbf..ef99e2a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Your Dad's BBQ Mod ---For Minetest--- -v1.21 by Grizzly Adam +v1.22 by Grizzly Adam https://forum.minetest.net/viewtopic.php?f=9&t=19324 @@ -23,6 +23,10 @@ For more information about what is in this pack, check the file: description.txt New In This Version ------------------- +Changed food group names to meet the new Ruben Standard. + +New In Version 1.21 +------------------- Fixed "shadow" texture bug. Fixed wood pile bug, where items could not be placed in woodpile. Wood Pile can now store trees, wood planks, *wood slabs, *wood stairs, and sticks. diff --git a/cooking.lua b/cooking.lua index 68015cd..756624e 100644 --- a/cooking.lua +++ b/cooking.lua @@ -156,7 +156,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:beer", type = "shapeless", - recipe = {"bucket:bucket_water", "bbq:yeast", "farming:wheat", "group:sugar", "vessels:drinking_glass"}, + recipe = {"bucket:bucket_water", "bbq:yeast", "farming:wheat", "group:food_sugar", "vessels:drinking_glass"}, replacements = {{"bucket:bucket_water","bucket:bucket_empty"}}, }) @@ -164,7 +164,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:vinegar", type = "shapeless", - recipe = {"group:mother", "group:sugar", "bucket:bucket_water"}, + recipe = {"group:food_vinegarmother", "group:food_sugar", "bucket:bucket_water"}, replacements = {{"bucket:bucket_water","bucket:bucket_empty"}}, }) @@ -172,7 +172,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:lamb_kebab_raw 4", type = "shapeless", - recipe = {"group:pepper", "mobs:mutton_raw", "default:stick", "flowers:mushroom_brown", "group:onion"} + recipe = {"group:food_pepper", "mobs:mutton_raw", "default:stick", "flowers:mushroom_brown", "group:food_onion"} }) --Rack of Lamb Craft Recipe @@ -186,7 +186,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:leg_lamb_raw 2", type = "shapeless", - recipe = {"group:garlic_clove", "mobs:mutton_raw", "mobs:mutton_raw"} + recipe = {"group:food_garlic_clove", "mobs:mutton_raw", "mobs:mutton_raw"} }) --Ham Craft Recipe @@ -200,7 +200,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:pickled_peppers", type = "shapeless", - recipe = {"group:peppercorn", "group:pepper", "bbq:brine"} + recipe = {"group:food_peppercorn", "group:food_pepper", "bbq:brine"} }) --BBQ Chicken Craft Recipe @@ -214,21 +214,21 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:bbq_beef_ribs_raw 2", type = "shapeless", - recipe = {"bbq:bbq_sauce", "bbq:beef_raw", "group:pepper_ground"} + recipe = {"bbq:bbq_sauce", "bbq:beef_raw", "group:food_pepper_ground"} }) --Corned Beef Craft Recipe minetest.register_craft( { output = "bbq:corned_beef_raw", type = "shapeless", - recipe = {"group:peppercorn", "bbq:beef_raw","bbq:brine",} + recipe = {"group:food_peppercorn", "bbq:beef_raw","bbq:brine",} }) --BBQ Brisket Craft Recipe minetest.register_craft( { output = "bbq:brisket_raw 2", type = "shapeless", - recipe = {"bbq:bbq_sauce", "bbq:molasses", "bbq:beef_raw", "group:garlic_clove"} + recipe = {"bbq:bbq_sauce", "bbq:molasses", "bbq:beef_raw", "group:food_garlic_clove"} }) --Hot Wings Craft Recipe @@ -243,14 +243,14 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:cheese_steak 2", type = "shapeless", - recipe = {"farming:bread", "group:pepper", "bbq:beef", "group:cheese", "group:onion"} + recipe = {"farming:bread", "group:food_pepper", "bbq:beef", "group:food_cheese", "group:food_onion"} }) --Bacon Cheeseburger Craft Recipe minetest.register_craft( { output = "bbq:bacon_cheeseburger 3", type = "shapeless", - recipe = {"farming:bread", "bbq:bacon", "bbq:hamburger_patty", "group:cheese"} + recipe = {"farming:bread", "bbq:bacon", "bbq:hamburger_patty", "group:food_cheese"} }) --Hamburger Craft Recipe @@ -292,7 +292,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:grilled_pizza_raw 3", type = "shapeless", - recipe = {"group:cheese", "group:pepper", "bbq:grilled_tomato", "flowers:mushroom_brown", "bbq:sea_salt", "farming:wheat", "bbq:yeast"} + recipe = {"group:food_cheese", "group:food_pepper", "bbq:grilled_tomato", "flowers:mushroom_brown", "bbq:sea_salt", "farming:wheat", "bbq:yeast"} }) --Bacon Craft Recipe @@ -306,7 +306,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:london_broil_raw 2", type = "shapeless", - recipe = {"bbq:bacon", "group:garlic_clove", "bbq:beef_raw"} + recipe = {"bbq:bacon", "group:food_garlic_clove", "bbq:beef_raw"} }) --Beef Jerky Craft Recipe @@ -320,56 +320,56 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:pepper_steak_raw", type = "shapeless", - recipe = {"group:pepper_ground", "bbq:beef_raw", "group:pepper_ground"} + recipe = {"group:food_pepper_ground", "bbq:beef_raw", "group:food_pepper_ground"} }) --Stuffed Chop Craft Recipe minetest.register_craft( { output = "bbq:stuffed_chop_raw 3", type = "shapeless", - recipe = {"group:onion", "farming:bread", "flowers:mushroom_brown", "mobs:pork_raw", "default:apple"} + recipe = {"group:food_onion", "farming:bread", "flowers:mushroom_brown", "mobs:pork_raw", "default:apple"} }) --Stuffed Mushroom Craft Recipe minetest.register_craft( { output = "bbq:stuffed_mushroom_raw 2", type = "shapeless", - recipe = {"group:tomato", "farming:bread", "flowers:mushroom_brown"} + recipe = {"group:food_tomato", "farming:bread", "flowers:mushroom_brown"} }) --Veggie Kebab Craft Recipe minetest.register_craft( { output = "bbq:veggie_kebab_raw 2", type = "shapeless", - recipe = {"group:pepper", "group:potato", "group:tomato", "flowers:mushroom_brown", "default:stick"} + recipe = {"group:food_pepper", "group:food_potato", "group:food_tomato", "flowers:mushroom_brown", "default:stick"} }) --Veggie Packet Craft Recipe minetest.register_craft( { output = "bbq:veggie_packet_raw 2", type = "shapeless", - recipe = {"bbq:pepper_ground", "group:tomato", "group:potato", "group:corn", "bbq:foil"} + recipe = {"bbq:pepper_ground", "group:food_tomato", "group:food_potato", "group:food_corn", "bbq:foil"} }) --Portebello Steak Craft Recipe minetest.register_craft( { output = "bbq:portebello_steak_raw", type = "shapeless", - recipe = {"group:pepper_ground", "bbq:steak_sauce", "flowers:mushroom_brown"} + recipe = {"group:food_pepper_ground", "bbq:steak_sauce", "flowers:mushroom_brown"} }) --Stuffed Pepper Craft Recipe minetest.register_craft( { output = "bbq:stuffed_pepper_raw 3", type = "shapeless", - recipe = {"group:cheese", "farming:bread", "group:pepper"} + recipe = {"group:food_cheese", "farming:bread", "group:food_pepper"} }) --Grilled Corn Craft Recipe minetest.register_craft( { output = "bbq:grilled_corn_raw 2", type = "shapeless", - recipe = {"group:cheese", "bbq:paprika", "group:corn"} + recipe = {"group:food_cheese", "bbq:paprika", "group:food_corn"} }) --------------------- @@ -380,15 +380,15 @@ if minetest.registered_items["crops:tomato"] ~= nil then minetest.register_craft({ type = "shapeless", output = "bbq:tomato_sauce", - recipe = { "group:tomato" }, - replacements = {{"group:tomato","crops:tomato_seed"}} + recipe = { "group:food_tomato" }, + replacements = {{"group:food_tomato","crops:tomato_seed"}} }) else minetest.register_craft({ type = "shapeless", output = "bbq:tomato_sauce", - recipe = { "group:tomato" }, + recipe = { "group:food_tomato" }, }) end @@ -405,16 +405,16 @@ minetest.register_craft( { minetest.register_craft({ type = "shapeless", output = "bbq:garlic_clove 9", - recipe = { "group:garlic" } + recipe = { "group:food_garlic" } }) --Garlic Braid Craft Recipe minetest.register_craft({ output = "bbq:garlic_braid", recipe = { - {"group:garlic", "group:garlic", "group:garlic"}, - {"group:garlic", "group:garlic", "group:garlic"}, - {"group:garlic", "group:garlic", "group:garlic"} + {"group:food_garlic", "group:food_garlic", "group:food_garlic"}, + {"group:food_garlic", "group:food_garlic", "group:food_garlic"}, + {"group:food_garlic", "group:food_garlic", "group:food_garlic"} } }) @@ -422,21 +422,21 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = "bbq:garlic 9", - recipe = { "group:garlic_braid" } + recipe = { "group:food_garlic_braid" } }) --Ground Pepper Craft Recipe minetest.register_craft( { output = "bbq:pepper_ground", type = "shapeless", - recipe = {"group:peppercorn", "vessels:glass_bottle"} + recipe = {"group:food_peppercorn", "vessels:glass_bottle"} }) --Brine minetest.register_craft( { output = "bbq:brine", type = "shapeless", - recipe = {"bbq:sea_salt", "group:sugar", "bucket:bucket_water", "vessels:drinking_glass"}, + recipe = {"bbq:sea_salt", "group:food_sugar", "bucket:bucket_water", "vessels:drinking_glass"}, replacements = {{"bucket:bucket_water","bucket:bucket_empty"}}, }) @@ -469,7 +469,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:hot_sauce", type = "shapeless", - recipe = {"group:pepper_ground", "bucket:bucket_water", "bbq:paprika", "vessels:glass_bottle"}, + recipe = {"group:food_pepper_ground", "bucket:bucket_water", "bbq:paprika", "vessels:glass_bottle"}, replacements = {{"bucket:bucket_water","bucket:bucket_empty"}}, }) @@ -477,7 +477,7 @@ minetest.register_craft( { minetest.register_craft( { output = "bbq:bbq_sauce", type = "shapeless", - recipe = {"bbq:molasses", "group:sugar", "group:tomato_sauce", "bbq:liquid_smoke", "bbq:vinegar"}, + recipe = {"bbq:molasses", "group:food_sugar", "group:food_tomato_sauce", "bbq:liquid_smoke", "bbq:vinegar"}, replacements = {{"bbq:vinegar","bbq:vinegar_mother"}}, }) @@ -579,7 +579,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", output = "bbq:smoked_pepper", - recipe = "group:pepper", + recipe = "group:food_pepper", cooktime = 9, }) @@ -691,7 +691,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", output = "bbq:grilled_tomato", - recipe = "group:tomato", + recipe = "group:food_tomato", cooktime = 4, }) diff --git a/crafts.lua b/crafts.lua index 29c3325..44e037a 100644 --- a/crafts.lua +++ b/crafts.lua @@ -195,7 +195,7 @@ minetest.register_node("bbq:vinegar_mother", { paramtype = "light", paramtype2 = "facedir", tiles = {"bbq_vinegar_mother.png"}, - groups = {mother=1, vessel = 1, dig_immediate = 3, attached_node = 1}, + groups = {food_vinegarmother=1, vessel = 1, dig_immediate = 3, attached_node = 1}, sounds = default.node_sound_glass_defaults(), }) @@ -547,7 +547,7 @@ minetest.register_craftitem("bbq:pepper", { description = ("Pepper"), inventory_image = "bbq_pepper.png", on_use = minetest.item_eat(7), - groups = {pepper=1}, + groups = {food_pepper=1}, }) --Smoked Pepper @@ -562,19 +562,19 @@ minetest.register_craftitem("bbq:tomato", { description = ("Tomato"), inventory_image = "bbq_tomato.png", on_use = minetest.item_eat(3), - groups = {tomato=1}, + groups = {food_tomato=1}, }) minetest.register_craftitem("bbq:tomato_sauce", { description = ("Tomato Sauce"), inventory_image = "bbq_tomato_sauce.png", - groups = { tomato_sauce=1, vessel=1 }, + groups = { food_tomato_sauce=1, vessel=1 }, on_use = minetest.item_eat(2) }) minetest.register_craftitem("bbq:onion", { description = ("Onion"), - groups= {onion=1}, + groups= {food_onion=1}, inventory_image = "bbq_onion.png", on_use = minetest.item_eat(1) }) @@ -584,7 +584,7 @@ minetest.register_craftitem("bbq:garlic", { description = ("Garlic"), inventory_image = "bbq_garlic.png", on_use = minetest.item_eat(1), - groups = {garlic = 1}, + groups = {food_garlic = 1}, }) --Garlic Braid @@ -600,7 +600,7 @@ minetest.register_node("bbq:garlic_braid", { "bbq_garlic_braid_side.png^[transformFx","bbq_garlic_braid_side.png", "bbq_garlic_braid.png","bbq_garlic_braid.png" }, - groups = {garlic_braid=1, vessel = 1, dig_immediate = 3}, + groups = {food_garlic_braid=1, vessel = 1, dig_immediate = 3}, sounds = default.node_sound_leaves_defaults(), node_box = { type = "fixed", @@ -620,7 +620,7 @@ minetest.register_node("bbq:garlic_clove", { paramtype = "light", paramtype2 = "facedir", tiles = { "bbq_garlic_clove.png" }, - groups = { garlic_clove=1, snappy=3,flammable=3,flora=1,attached_node=1 }, + groups = { food_garlic_clove=1, snappy=3,flammable=3,flora=1,attached_node=1 }, }) @@ -629,7 +629,7 @@ minetest.register_craftitem("bbq:potato", { description = ("Potato"), inventory_image = "bbq_potato.png", on_use = minetest.item_eat(1), - groups = {potato=1}, + groups = {food_potato=1}, }) --Corn @@ -637,7 +637,7 @@ minetest.register_craftitem("bbq:corn", { description = ("Corn"), inventory_image = "bbq_corn.png", on_use = minetest.item_eat(2), - groups = {corn=1}, + groups = {food_corn=1}, }) --Grilled Tomato @@ -670,7 +670,7 @@ minetest.register_node("bbq:peppercorn", { paramtype2 = "facedir", drawtype = "plantlike", tiles = { "bbq_peppercorn.png" }, - groups = { peppercorn = 1, vessel=1, snappy=3,flammable=3,flora=1,attached_node=1 }, + groups = { food_peppercorn = 1, vessel=1, snappy=3,flammable=3,flora=1,attached_node=1 }, sounds = default.node_sound_leaves_defaults(), }) @@ -696,7 +696,7 @@ minetest.register_node("bbq:pepper_ground", { paramtype = "light", paramtype2 = "facedir", tiles = {"bbq_pepper_ground.png"}, - groups = {pepper_ground = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, + groups = {food_pepper_ground = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, sounds = default.node_sound_glass_defaults(), }) @@ -775,7 +775,7 @@ minetest.register_node("bbq:sugar", { paramtype2 = "facedir", drawtype = "plantlike", tiles = {"bbq_sugar.png"}, - groups = {vessel = 1, sugar=1, dig_immediate = 3, attached_node = 1}, + groups = {vessel = 1, food_sugar=1, dig_immediate = 3, attached_node = 1}, sounds = default.node_sound_glass_defaults(), on_use = minetest.item_eat(2), }) @@ -874,7 +874,7 @@ minetest.register_node("bbq:yeast", { paramtype2 = "facedir", drawtype = "plantlike", tiles = {"bbq_yeast.png"}, - groups = {mother=1, vessel = 1, dig_immediate = 3, attached_node = 1}, + groups = {food_vinegarmother=1, vessel = 1, dig_immediate = 3, attached_node = 1}, sounds = default.node_sound_glass_defaults(), }) diff --git a/overrides.lua b/overrides.lua index 87d2663..79a0623 100644 --- a/overrides.lua +++ b/overrides.lua @@ -87,91 +87,12 @@ minetest.override_item("crops:potato", { }) end -------------------------- ---Add food to Like Groups -------------------------- - ------CHECK FOR FOODS ADDON------------------------------- -if minetest.registered_items["food:tomato"] ~= nil then -minetest.override_item("food:tomato", { - groups = {tomato=1}, -}) -end - - -if minetest.registered_items["food:cheese"] ~= nil then -minetest.override_item("food:cheese", { - groups = {cheese=1}, -}) -end - -if minetest.registered_items["food:sugar"] ~= nil then -minetest.override_item("food:sugar", { - groups = {sugar=1}, -}) -end - - -if minetest.registered_items["food:potato"] ~= nil then -minetest.override_item("food:potato", { - groups = {potato=1}, -}) -end - -------------------------------- ----CHECK FOR FARMING REDO ADDON -------------------------------- -if minetest.registered_items["farming:chili_pepper"] ~= nil then -minetest.override_item("farming:chili_pepper", { - groups = {pepper=1}, -}) -end - -if minetest.registered_items["farming:sugar"] ~= nil then -minetest.override_item("farming:sugar", { - groups = {sugar=1}, -}) -end - -if minetest.registered_items["farming:tomato"] ~= nil then -minetest.override_item("farming:tomato", { - groups = {tomato=1}, -}) -end - - -if minetest.registered_items["farming:corn"] ~= nil then -minetest.override_item("farming:corn", { - groups = {corn=1}, -}) -end - - -if minetest.registered_items["farming:potato"] ~= nil then -minetest.override_item("farming:potato", { - groups = {potato=1}, -}) -end - ---------------------------------------------------------- - -if minetest.registered_items["mobs:honey"] ~= nil then -minetest.override_item("mobs:honey", { - groups = {sugar=1, honey=1}, -}) -end - -if minetest.registered_items["mobs:cheese"] ~= nil then -minetest.override_item("mobs:cheese", { - groups = {cheese=1}, -}) -end --------------------xdecor----------------------------- if minetest.registered_items["xdecor:honey"] ~= nil then minetest.override_item("xdecor:honey", { - groups = {sugar=1, honey=1}, + groups = {food_sugar=1, food_honey=1}, }) end