From 3786c46b303e0dd3593176b8256917a9caabff24 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Mon, 4 Jul 2022 17:02:22 -0600 Subject: [PATCH 1/8] (Soul) Campfires Adds soul and nomal campfires. Code start and models from issue 505. Textures are all PixelPerfection. --- mods/ITEMS/mcl_campfires/init.lua | 128 +++++++++ mods/ITEMS/mcl_campfires/local/template.txt | 4 + mods/ITEMS/mcl_campfires/mod.conf | 3 + .../models/mcl_campfires_campfire.obj | 224 ++++++++++++++++ .../models/mcl_campfires_campfire1.mtl | 35 +++ .../models/mcl_campfires_campfire1.obj | 248 ++++++++++++++++++ .../models/mcl_campfires_campfire_lit.obj | 225 ++++++++++++++++ .../textures/mcl_campfires_campfire_fire.png | Bin 0 -> 533 bytes .../textures/mcl_campfires_campfire_inv.png | Bin 0 -> 544 bytes .../mcl_campfires_campfire_log_lit.png | Bin 0 -> 811 bytes .../textures/mcl_campfires_fire1.png | Bin 0 -> 889 bytes .../textures/mcl_campfires_log.png | Bin 0 -> 387 bytes .../mcl_campfires_soul_campfire_fire.png | Bin 0 -> 937 bytes .../mcl_campfires_soul_campfire_inv.png | Bin 0 -> 540 bytes .../mcl_campfires_soul_campfire_log_lit.png | Bin 0 -> 1112 bytes 15 files changed, 867 insertions(+) create mode 100644 mods/ITEMS/mcl_campfires/init.lua create mode 100644 mods/ITEMS/mcl_campfires/local/template.txt create mode 100644 mods/ITEMS/mcl_campfires/mod.conf create mode 100644 mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire.obj create mode 100644 mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.mtl create mode 100644 mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.obj create mode 100644 mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire_lit.obj create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_campfire_fire.png create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_campfire_inv.png create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_campfire_log_lit.png create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_fire1.png create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_log.png create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_soul_campfire_fire.png create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_soul_campfire_inv.png create mode 100644 mods/ITEMS/mcl_campfires/textures/mcl_campfires_soul_campfire_log_lit.png diff --git a/mods/ITEMS/mcl_campfires/init.lua b/mods/ITEMS/mcl_campfires/init.lua new file mode 100644 index 000000000..ac5fa22fc --- /dev/null +++ b/mods/ITEMS/mcl_campfires/init.lua @@ -0,0 +1,128 @@ +-- |||||||||||||||||||||||||||||||| +-- ||||||||||| CAMPFIRES |||||||||| +-- |||||||||||||||||||||||||||||||| + +-- TO-DO: +-- * Add Smoke Particles +-- * Add Spark Particles +-- * Add Cooking Meat +-- * Add Working Sounds + +S = minetest.get_translator(minetest.get_current_modname()) + +campfires = { +{ name = "Campfire", lightlevel = 15, techname = "campfire", damage = 1, drops = "mcl_core:charcoal_lump 2" }, +{ name = "Soul Campfire", lightlevel = 10, techname = "soul_campfire", damage = 2, drops = "mcl_blackstone:soul_soil" }, +} + +for _, campfire in pairs(campfires) do +-- Define Campfire + minetest.register_node("mcl_campfires:" .. campfire.techname, { + description = S(campfire.name), + _tt_help = S("Cooks food and keeps bees happy."), + _doc_items_longdesc = S("Campfires have multiple uses, including keeping bees happy, cooking raw meat and fish, and as a trap."), + inventory_image = "mcl_campfires_" .. campfire.techname .. "_inv.png", + drawtype = "mesh", + mesh = "mcl_campfires_campfire.obj", + tiles = {{name="mcl_campfires_log.png"},}, + groups = { handy=1, axey=1, material_wood=1, not_in_creative_inventory=1 }, + paramtype = "light", + paramtype2 = "facedir", + on_rightclick = function (pos, node, player, itemstack, pointed_thing) + if player:get_wielded_item():get_name() == "mcl_fire:flint_and_steel" then + node.name = "mcl_campfires:" .. campfire.techname .. "_lit" + minetest.set_node(pos, node) + end + end, + drop = campfire.drops, + _mcl_silk_touch_drop = {"mcl_campfires:" .. campfire.techname}, + mcl_sounds.node_sound_wood_defaults(), + selection_box = { + type = 'fixed', + fixed = {-.5, -.5, -.5, .5, -.05, .5}, --left, bottom, front, right, top + }, + collision_box = { + type = 'fixed', + fixed = {-.5, -.5, -.5, .5, -.05, .5}, + }, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + }) + + --Define Lit Campfire + minetest.register_node("mcl_campfires:" .. campfire.techname .. "_lit", { + description = S(campfire.name), + _tt_help = S("Cooks food and keeps bees happy."), + _doc_items_longdesc = S("Campfires have multiple uses, including keeping bees happy, cooking raw meat and fish, and as a trap."), + inventory_image = "mcl_campfires_" .. campfire.techname .. "_inv.png", + drawtype = "mesh", + mesh = "mcl_campfires_campfire_lit.obj", + tiles = {{ + name="mcl_campfires_" .. campfire.techname .. "_fire.png", + animation={ + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=2.0 + }}, + {name="mcl_campfires_" .. campfire.techname .. "_log_lit.png", + animation={ + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=2.0 + }} + }, + groups = { handy=1, axey=1, material_wood=1 }, + paramtype = "light", + paramtype2 = "facedir", + on_rightclick = function (pos, node, player, itemstack, pointed_thing) + if player:get_wielded_item():get_name():find("shovel") then + node.name = "mcl_campfires:" .. campfire.techname + minetest.set_node(pos, node) + end + end, + drop = campfire.drops, + _mcl_silk_touch_drop = {"mcl_campfires:" .. campfire.techname .. "_lit"}, + light_source = campfire.lightlevel, + mcl_sounds.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = {-.5, -.5, -.5, .5, -.05, .5}, --left, bottom, front, right, top + }, + collision_box = { + type = "fixed", + fixed = {-.5, -.5, -.5, .5, -.05, .5}, + }, + _mcl_blast_resistance = 2, + _mcl_hardness = 2, + damage_per_second = campfire.damage, + }) +end + +minetest.register_craft({ + output = "mcl_campfires:campfire_lit", + recipe = { + { "", "mcl_core:stick", "" }, + { "mcl_core:stick", "mcl_core:charcoal_lump", "mcl_core:stick" }, + { "group:tree", "group:tree", "group:tree" }, + } +}) + +minetest.register_craft({ + output = "mcl_campfires:soul_campfire_lit", + recipe = { + { "", "mcl_core:stick", "" }, + { "mcl_core:stick", "mcl_blackstone:soul_soil", "mcl_core:stick" }, + { "group:tree", "group:tree", "group:tree" }, + } +}) + +minetest.register_craft({ + output = "mcl_campfires:soul_campfire_lit", + recipe = { + { "", "mcl_core:stick", "" }, + { "mcl_core:stick", "mcl_nether:soul_sand", "mcl_core:stick" }, + { "group:tree", "group:tree", "group:tree" }, + } +}) diff --git a/mods/ITEMS/mcl_campfires/local/template.txt b/mods/ITEMS/mcl_campfires/local/template.txt new file mode 100644 index 000000000..04825b5f4 --- /dev/null +++ b/mods/ITEMS/mcl_campfires/local/template.txt @@ -0,0 +1,4 @@ +Campfire= +Soul Campfire= +Cooks food and keeps bees happy.= +Campfires have multiple uses, including keeping bees happy, cooking raw meat and fish, and as a trap.= \ No newline at end of file diff --git a/mods/ITEMS/mcl_campfires/mod.conf b/mods/ITEMS/mcl_campfires/mod.conf new file mode 100644 index 000000000..5c4b77dda --- /dev/null +++ b/mods/ITEMS/mcl_campfires/mod.conf @@ -0,0 +1,3 @@ +name = mcl_campfires +depends = mcl_sounds +author = PrairieWind, Gerold55 \ No newline at end of file diff --git a/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire.obj b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire.obj new file mode 100644 index 000000000..a559fdd4f --- /dev/null +++ b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire.obj @@ -0,0 +1,224 @@ +# Blender v2.78 (sub 0) OBJ File: '' +# www.blender.org +mtllib campfire.mtl +o nodebox4 +v 0.500000 -0.312500 0.250000 +v 0.500000 -0.312500 0.500000 +v 0.500000 -0.062500 0.500000 +v 0.500000 -0.062500 0.250000 +v -0.500000 -0.312500 0.250000 +v -0.500000 -0.312500 0.500000 +v -0.500000 -0.062500 0.500000 +v -0.500000 -0.062500 0.250000 +v 0.500000 -0.312500 0.500000 +v 0.500000 -0.062500 0.500000 +v -0.500000 -0.062500 0.500000 +v -0.500000 -0.312500 0.500000 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +usemtl none +s 1 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 5/5/1 6/6/1 7/7/1 8/8/1 +f 1/9/2 4/10/2 8/11/2 5/5/2 +f 1/9/3 2/12/3 6/13/3 5/5/3 +f 4/14/3 3/15/3 7/16/3 8/17/3 +f 9/18/2 10/19/2 11/20/2 12/21/2 +o nodebox4.001 +v 0.500000 -0.312500 -0.498288 +v 0.500000 -0.312500 -0.248288 +v 0.500000 -0.062500 -0.248288 +v 0.500000 -0.062500 -0.498288 +v -0.500000 -0.312500 -0.498288 +v -0.500000 -0.312500 -0.248288 +v -0.500000 -0.062500 -0.248288 +v -0.500000 -0.062500 -0.498288 +v 0.500000 -0.312500 -0.248288 +v 0.500000 -0.062500 -0.248288 +v -0.500000 -0.062500 -0.248288 +v -0.500000 -0.312500 -0.248288 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +usemtl none +s 1 +f 13/22/4 14/23/4 15/24/4 16/25/4 +f 17/26/4 18/27/4 19/28/4 20/29/4 +f 13/30/5 16/31/5 20/32/5 17/26/5 +f 13/30/6 14/33/6 18/34/6 17/26/6 +f 16/35/6 15/36/6 19/37/6 20/38/6 +f 21/39/5 22/40/5 23/41/5 24/42/5 +o nodebox3 +v 0.250000 -0.500000 -0.500000 +v 0.250000 -0.437500 -0.500000 +v -0.250000 -0.437500 -0.500000 +v -0.250000 -0.500000 -0.500000 +v 0.250000 -0.500000 0.500000 +v 0.250000 -0.437500 0.500000 +v -0.250000 -0.437500 0.500000 +v -0.250000 -0.500000 0.500000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vt 1.0000 0.1250 +vt 0.0000 0.1250 +vt 1.0000 0.0000 +vt 1.0000 0.1250 +vt 0.0000 0.1250 +vt 1.0000 0.5000 +vt 0.0000 0.5000 +vt 0.0001 0.0001 +vt 1.0000 0.0000 +vt 1.0000 0.5000 +vt 0.0000 0.5000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +usemtl none_NONE +s 1 +f 25/43/7 29/44/7 30/45/7 26/46/7 +f 28/47/7 32/48/7 31/49/7 27/50/7 +usemtl none +f 25/51/8 26/52/8 27/53/8 28/47/8 +f 29/54/8 30/55/8 31/56/8 32/48/8 +f 25/51/9 29/57/9 32/58/9 28/59/9 +f 26/46/9 30/60/9 31/61/9 27/62/9 +o nodebox4.003 +v -0.248335 -0.500045 0.508619 +v -0.498333 -0.500045 0.509533 +v -0.498334 -0.250045 0.509533 +v -0.248335 -0.250045 0.508619 +v -0.251992 -0.500045 -0.491375 +v -0.501991 -0.500045 -0.490460 +v -0.501991 -0.250045 -0.490460 +v -0.251992 -0.250045 -0.491375 +v -0.498333 -0.500045 0.509533 +v -0.498334 -0.250045 0.509533 +v -0.501991 -0.250045 -0.490460 +v -0.501991 -0.500045 -0.490460 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vn -0.0037 -0.0000 -1.0000 +vn -1.0000 0.0000 0.0037 +vn -0.0000 -1.0000 -0.0000 +usemtl none +s 1 +f 33/63/10 34/64/10 35/65/10 36/66/10 +f 37/67/10 38/68/10 39/69/10 40/70/10 +f 33/71/11 36/72/11 40/73/11 37/67/11 +f 33/71/12 34/74/12 38/75/12 37/67/12 +f 36/76/12 35/77/12 39/78/12 40/79/12 +f 41/80/11 42/81/11 43/82/11 44/83/11 +o nodebox4.002 +v 0.499948 -0.500045 0.505882 +v 0.249950 -0.500045 0.506796 +v 0.249950 -0.250045 0.506796 +v 0.499948 -0.250045 0.505882 +v 0.496291 -0.500045 -0.494111 +v 0.246293 -0.500045 -0.493197 +v 0.246293 -0.250045 -0.493197 +v 0.496291 -0.250045 -0.494111 +v 0.249950 -0.500045 0.506796 +v 0.249950 -0.250045 0.506796 +v 0.246293 -0.250045 -0.493197 +v 0.246293 -0.500045 -0.493197 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vn -0.0037 0.0000 -1.0000 +vn -1.0000 -0.0000 0.0037 +vn -0.0000 -1.0000 -0.0000 +usemtl none +s 1 +f 45/84/13 46/85/13 47/86/13 48/87/13 +f 49/88/13 50/89/13 51/90/13 52/91/13 +f 45/92/14 48/93/14 52/94/14 49/88/14 +f 45/92/15 46/95/15 50/96/15 49/88/15 +f 48/97/15 47/98/15 51/99/15 52/100/15 +f 53/101/14 54/102/14 55/103/14 56/104/14 diff --git a/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.mtl b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.mtl new file mode 100644 index 000000000..7355efe9f --- /dev/null +++ b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.mtl @@ -0,0 +1,35 @@ +# Blender MTL File: 'campfire.blend' +# Material Count: 3 + +newmtl Material.001 +Ns 96.078431 +Ka 1.000000 1.000000 1.000000 +Kd 0.640000 0.640000 0.640000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.000000 +d 1.000000 +illum 2 +map_Kd G:\minetest-0.4.16-win641\textures\Pixel Perfection v4.0\mcl_campfire_fire.png + +newmtl none +Ns 96.078431 +Ka 1.000000 1.000000 1.000000 +Kd 0.640000 0.640000 0.640000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.000000 +d 1.000000 +illum 2 +map_Kd \home\nathan\Downloads\mcl_campfire_log.png + +newmtl none_NONE +Ns 96.078431 +Ka 1.000000 1.000000 1.000000 +Kd 0.640000 0.640000 0.640000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.000000 +d 1.000000 +illum 2 +map_Kd \\home\\nathan\\Downloads\\mcl_campfire_log.png diff --git a/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.obj b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.obj new file mode 100644 index 000000000..92a377303 --- /dev/null +++ b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire1.obj @@ -0,0 +1,248 @@ +# Blender v2.78 (sub 0) OBJ File: 'campfire.blend' +# www.blender.org +mtllib campfire1.mtl +o nodebox4.005_nodebox4.006 +v 0.243779 -0.499707 -0.497529 +v 0.493779 -0.499707 -0.497421 +v 0.493779 -0.249707 -0.497421 +v 0.243779 -0.249707 -0.497529 +v 0.243349 -0.499707 0.502471 +v 0.493349 -0.499707 0.502578 +v 0.493349 -0.249707 0.502578 +v 0.243349 -0.249707 0.502471 +v 0.493779 -0.499707 -0.497421 +v 0.493779 -0.249707 -0.497421 +v 0.493349 -0.499707 0.502578 +v 0.493349 -0.249707 0.502578 +vt -0.0000 0.7500 +vt -0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt -0.0000 0.7500 +vt -0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt -0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt -0.0000 0.7500 +vn -0.0004 0.0000 1.0000 +vn 1.0000 -0.0000 0.0004 +vn -0.0000 -1.0000 0.0000 +usemtl none +s off +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 5/5/1 6/6/1 7/7/1 8/8/1 +f 1/9/2 4/10/2 8/11/2 5/5/2 +f 1/9/3 2/12/3 6/13/3 5/5/3 +f 4/14/3 3/15/3 7/16/3 8/17/3 +f 9/18/2 10/19/2 12/20/2 11/21/2 +o nodebox4.004_nodebox4.005 +v -0.500021 -0.499707 -0.497848 +v -0.250021 -0.499707 -0.497741 +v -0.250021 -0.249707 -0.497741 +v -0.500021 -0.249707 -0.497848 +v -0.500451 -0.499707 0.502152 +v -0.250451 -0.499707 0.502259 +v -0.250451 -0.249707 0.502259 +v -0.500451 -0.249707 0.502152 +v -0.250021 -0.499707 -0.497741 +v -0.250021 -0.249707 -0.497741 +v -0.250451 -0.499707 0.502259 +v -0.250451 -0.249707 0.502259 +vt -0.0000 0.7500 +vt -0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt -0.0000 0.7500 +vt -0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt -0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt -0.0000 0.7500 +vn -0.0004 0.0000 1.0000 +vn 1.0000 -0.0000 0.0004 +vn -0.0000 -1.0000 0.0000 +usemtl none +s off +f 13/22/4 14/23/4 15/24/4 16/25/4 +f 17/26/4 18/27/4 19/28/4 20/29/4 +f 13/30/5 16/31/5 20/32/5 17/26/5 +f 13/30/6 14/33/6 18/34/6 17/26/6 +f 16/35/6 15/36/6 19/37/6 20/38/6 +f 21/39/5 22/40/5 24/41/5 23/42/5 +o nodebox4.001_nodebox4.004 +v 0.500000 -0.312500 -0.493800 +v 0.500000 -0.312500 -0.243800 +v 0.500000 -0.062500 -0.243800 +v 0.500000 -0.062500 -0.493800 +v -0.500000 -0.312500 -0.493800 +v -0.500000 -0.312500 -0.243800 +v -0.500000 -0.062500 -0.243800 +v -0.500000 -0.062500 -0.493800 +v 0.500000 -0.312500 -0.243800 +v 0.500000 -0.062500 -0.243800 +v -0.500000 -0.312500 -0.243800 +v -0.500000 -0.062500 -0.243800 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.7500 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +usemtl none +s off +f 25/43/7 26/44/7 27/45/7 28/46/7 +f 29/47/7 30/48/7 31/49/7 32/50/7 +f 25/51/8 28/52/8 32/53/8 29/47/8 +f 25/51/9 26/54/9 30/55/9 29/47/9 +f 28/56/9 27/57/9 31/58/9 32/59/9 +f 33/60/8 34/61/8 36/62/8 35/63/8 +o Plane +v -0.311754 -0.438770 -0.196249 +v 0.276360 -0.438621 0.247948 +v -0.311276 0.135801 -0.196634 +v 0.276838 0.135950 0.247562 +v -0.274993 -0.438696 0.270317 +v 0.240407 -0.438696 -0.218656 +v -0.275322 0.135875 0.269969 +v 0.240077 0.135875 -0.219003 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt -0.0000 1.0000 +vn -0.6027 0.0010 0.7980 +vn 0.6883 0.0008 0.7255 +usemtl Material.001 +s off +f 37/64/10 38/65/10 40/66/10 39/67/10 +f 41/68/11 42/69/11 44/70/11 43/71/11 +o nodebox3 +v 0.250000 -0.500000 -0.500000 +v 0.250000 -0.500000 0.500000 +v 0.250000 -0.437500 0.500000 +v 0.250000 -0.437500 -0.500000 +v -0.250000 -0.500000 -0.500000 +v -0.250000 -0.500000 0.500000 +v -0.250000 -0.437500 0.500000 +v -0.250000 -0.437500 -0.500000 +vt 1.0000 0.0000 +vt 1.0000 0.0625 +vt 0.0000 0.0625 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vt 1.0000 0.0625 +vt 0.0000 0.0625 +vt 0.0000 0.0000 +vt 1.0000 0.4375 +vt 0.0000 0.4375 +vt 0.0001 0.0001 +vt 0.9999 0.0001 +vt 1.0000 0.5000 +vt 0.0000 0.5000 +vt 0.0001 0.0001 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vt 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +vn -1.0000 0.0000 0.0000 +usemtl none +s off +f 45/72/12 48/73/12 52/74/12 49/75/12 +f 46/76/12 47/77/12 51/78/12 50/79/12 +f 45/72/13 46/80/13 50/81/13 49/82/13 +f 48/83/13 47/84/13 51/85/13 52/86/13 +usemtl none_NONE +f 45/87/14 46/88/14 47/89/14 48/90/14 +f 49/75/14 50/79/14 51/91/14 52/92/14 +o nodebox4 +v 0.500000 -0.312500 0.250000 +v 0.500000 -0.312500 0.500000 +v 0.500000 -0.062500 0.500000 +v 0.500000 -0.062500 0.250000 +v -0.500000 -0.312500 0.250000 +v -0.500000 -0.312500 0.500000 +v -0.500000 -0.062500 0.500000 +v -0.500000 -0.062500 0.250000 +v 0.500000 -0.312500 0.500000 +v 0.500000 -0.062500 0.500000 +v -0.500000 -0.312500 0.500000 +v -0.500000 -0.062500 0.500000 +vt -0.0000 0.7500 +vt 0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt -0.0000 0.7500 +vt -0.0000 0.5000 +vt 0.2500 0.5000 +vt 0.2500 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt -0.0000 0.7500 +vt 1.0000 0.7500 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt -0.0000 0.7500 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +usemtl none +s off +f 53/93/15 54/94/15 55/95/15 56/96/15 +f 57/97/15 58/98/15 59/99/15 60/100/15 +f 53/101/16 56/102/16 60/103/16 57/97/16 +f 53/101/17 54/104/17 58/105/17 57/97/17 +f 56/106/17 55/107/17 59/108/17 60/109/17 +f 61/110/16 62/111/16 64/112/16 63/113/16 diff --git a/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire_lit.obj b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire_lit.obj new file mode 100644 index 000000000..a17acc05f --- /dev/null +++ b/mods/ITEMS/mcl_campfires/models/mcl_campfires_campfire_lit.obj @@ -0,0 +1,225 @@ +# Blender v2.79 (sub 7) OBJ File: 'campfire.blend' +# www.blender.org +o Plane +v -0.240246 -0.438696 -0.141059 +v 0.205043 -0.438696 0.192756 +v -0.239959 0.135875 -0.141442 +v 0.205331 0.135875 0.192373 +v -0.216088 -0.438696 0.214432 +v 0.181502 -0.438696 -0.162771 +v -0.216417 0.135875 0.214085 +v 0.181172 0.135875 -0.163119 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt -0.000000 1.000000 +vn -0.5998 0.0008 0.8001 +vn 0.6883 0.0008 0.7255 +g Plane_Plane_Material.001 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 5/5/2 6/6/2 8/7/2 7/8/2 +o nodebox3 +v 0.250000 -0.500000 -0.500000 +v 0.250000 -0.500000 0.500000 +v 0.250000 -0.437500 0.500000 +v 0.250000 -0.437500 -0.500000 +v -0.250000 -0.500000 -0.500000 +v -0.250000 -0.500000 0.500000 +v -0.250000 -0.437500 0.500000 +v -0.250000 -0.437500 -0.500000 +v 0.243779 -0.499707 -0.497529 +v 0.493779 -0.499707 -0.497421 +v 0.493779 -0.249707 -0.497421 +v 0.243779 -0.249707 -0.497529 +v 0.243349 -0.499707 0.502471 +v 0.493349 -0.499707 0.502579 +v 0.493349 -0.249707 0.502578 +v 0.243349 -0.249707 0.502471 +v 0.493779 -0.499707 -0.497421 +v 0.493779 -0.249707 -0.497421 +v 0.493349 -0.499707 0.502579 +v 0.493349 -0.249707 0.502578 +v -0.500021 -0.499707 -0.497848 +v -0.250021 -0.499707 -0.497741 +v -0.250021 -0.249707 -0.497741 +v -0.500021 -0.249707 -0.497848 +v -0.500451 -0.499707 0.502152 +v -0.250451 -0.499707 0.502259 +v -0.250451 -0.249707 0.502259 +v -0.500451 -0.249707 0.502152 +v -0.250021 -0.499707 -0.497741 +v -0.250021 -0.249707 -0.497741 +v -0.250451 -0.499707 0.502259 +v -0.250451 -0.249707 0.502259 +v 0.500000 -0.312500 -0.493800 +v 0.500000 -0.312500 -0.243800 +v 0.500000 -0.062500 -0.243800 +v 0.500000 -0.062500 -0.493800 +v -0.500000 -0.312500 -0.493800 +v -0.500000 -0.312500 -0.243800 +v -0.500000 -0.062500 -0.243800 +v -0.500000 -0.062500 -0.493800 +v 0.500000 -0.312500 -0.243800 +v 0.500000 -0.062500 -0.243800 +v -0.500000 -0.312500 -0.243800 +v -0.500000 -0.062500 -0.243800 +v 0.500000 -0.312500 0.250000 +v 0.500000 -0.312500 0.500000 +v 0.500000 -0.062500 0.500000 +v 0.500000 -0.062500 0.250000 +v -0.500000 -0.312500 0.250000 +v -0.500000 -0.312500 0.500000 +v -0.500000 -0.062500 0.500000 +v -0.500000 -0.062500 0.250000 +v 0.500000 -0.312500 0.500000 +v 0.500000 -0.062500 0.500000 +v -0.500000 -0.312500 0.500000 +v -0.500000 -0.062500 0.500000 +vt 0.999982 0.000018 +vt 1.000000 0.062500 +vt 0.000000 0.062500 +vt 0.000018 0.000018 +vt 0.999982 0.000018 +vt 1.000000 0.062500 +vt 0.000000 0.062500 +vt 0.000018 0.000018 +vt 1.000000 0.437500 +vt 0.000000 0.437500 +vt 0.000071 0.000071 +vt 0.999929 0.000071 +vt 1.000000 0.500000 +vt 0.000000 0.500000 +vt 0.000071 0.000071 +vt -0.000000 0.750000 +vt -0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt -0.000000 0.750000 +vt -0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.750000 +vt -0.000000 0.750000 +vt -0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt -0.000000 0.750000 +vt -0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.750000 +vt 0.000000 0.750000 +vt 0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt 0.000000 0.750000 +vt 0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.750000 +vt -0.000000 0.750000 +vt 0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt -0.000000 0.750000 +vt -0.000000 0.500000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.750000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +vn -0.0004 0.0000 1.0000 +vn 1.0000 -0.0000 0.0004 +vn -1.0000 0.0000 0.0000 +g nodebox3_nodebox3_none +s off +f 9/9/3 12/10/3 16/11/3 13/12/3 +f 10/13/3 11/14/3 15/15/3 14/16/3 +f 9/9/4 10/17/4 14/18/4 13/19/4 +f 12/20/4 11/21/4 15/22/4 16/23/4 +f 17/24/5 18/25/5 19/26/5 20/27/5 +f 21/28/5 22/29/5 23/30/5 24/31/5 +f 17/32/6 20/33/6 24/34/6 21/28/6 +f 17/32/4 18/35/4 22/36/4 21/28/4 +f 20/37/4 19/38/4 23/39/4 24/40/4 +f 25/41/6 26/42/6 28/43/6 27/44/6 +f 29/45/5 30/46/5 31/47/5 32/48/5 +f 33/49/5 34/50/5 35/51/5 36/52/5 +f 29/53/6 32/54/6 36/55/6 33/49/6 +f 29/53/4 30/56/4 34/57/4 33/49/4 +f 32/58/4 31/59/4 35/60/4 36/61/4 +f 37/62/6 38/63/6 40/64/6 39/65/6 +f 41/66/7 42/67/7 43/68/7 44/69/7 +f 45/70/7 46/71/7 47/72/7 48/73/7 +f 41/74/3 44/75/3 48/76/3 45/70/3 +f 41/74/4 42/77/4 46/78/4 45/70/4 +f 44/79/4 43/80/4 47/81/4 48/82/4 +f 49/83/3 50/84/3 52/85/3 51/86/3 +f 53/87/7 54/88/7 55/89/7 56/90/7 +f 57/91/7 58/92/7 59/93/7 60/94/7 +f 53/95/3 56/96/3 60/97/3 57/91/3 +f 53/95/4 54/98/4 58/99/4 57/91/4 +f 56/100/4 55/101/4 59/102/4 60/103/4 +f 61/104/3 62/105/3 64/106/3 63/107/3 +g nodebox3_nodebox3_none_NONE +f 9/108/7 10/109/7 11/110/7 12/111/7 +f 13/12/7 14/16/7 15/112/7 16/113/7 diff --git a/mods/ITEMS/mcl_campfires/textures/mcl_campfires_campfire_fire.png b/mods/ITEMS/mcl_campfires/textures/mcl_campfires_campfire_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..d1288ec9d8eed37ece9dcc02db81f1c867fca841 GIT binary patch literal 533 zcmV+w0_y#VP)#P3$`zP_=*Z=?k0d!JMQvg8b*k%9#00Cl4 zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jd3>2Q3&^Ph9r^00C`D zL_t(I%axSfio+lfMn^^1%luI2Wf~EBnT-f}jG_p>PAh?Z?9I+-c9S;C?%d>Hj5+;g zQUHJfa`mt;QSOP`7C3+*5ZuxxSx*Q|Uc!jb+VGCgGbw{VHp=XjVz^sZnpEe%$>qRcIER>Ow zL$!mqq0R&3D6&p_k$q;e_RHJ5pTNv1_UO~U@DcEj$|KHs%wERx9fSuC3ADkZDqp^@ zhQ_%4$ZcAoiKSos@A0gSyGeu6?XOxc-T7?b1iIlT>0QQ#5U?Yu}9~m-+Nxe zHtKNW7W8)iRIuG~Wy{pK(lq(lKgCaSp5E~Qc>KaIUJznCjZ%IP0U`{O$s5%3dty(l#fPH iFl%}_uT=ickNpWeIjzlmgNgP40000<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%hhNHDpIvQUCw~sYygZR9HvtmP<-qK@f%;+(h;ek)Rj@K2QW z9LmP#s4lN;)!ErkK?Fn3i49u(yc(nrd<&3`v_nO{w)`qdVj^%w15O0UAcFY%IQ63% ze2|O1YZL(a{?%c}PjG7i1!d`!0oXDR5E-J9LKKH&6*zK2g0ba!p^E@yHUL0|gU%8K z!(+n-Uwonk7zKz7>I7yonezYN2lm<92b7O2CcehrK45STl9N^-^@H{SuTnk-L#J<4 z@P76I{k?b}*eB;$J^XPf-Y#w%L@@N6k1vltaghv=jZEBcz&Ai3$XkjZxV8^)BtX6c z`O`KCHmYeY=jiYd0Kh%jAe^lQ6qIGAoE4juz-O6CChh}H17UNh+9Lp&4S<2+ptD55 z4j3PN@rf2-6d6%U@Wx3%SPL8)ZoJ`fC#Ezb*|2*5xLpkw}&)xmQL p#3x#Cst6Dn)CtUFvU_>8-T^Ov;kHotZAbtB002ovPDHLkV1k~NUfcix literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_campfires/textures/mcl_campfires_fire1.png b/mods/ITEMS/mcl_campfires/textures/mcl_campfires_fire1.png new file mode 100644 index 0000000000000000000000000000000000000000..865d6e3e0e1a16ef63b1aca42c0de707aa4683b5 GIT binary patch literal 889 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 Date: Mon, 4 Jul 2022 20:15:00 -0600 Subject: [PATCH 2/8] Added Campfire to Fisherman Villager Trades --- mods/ENTITIES/mobs_mc/villager.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index e447192c3..af517a990 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -136,8 +136,7 @@ local professions = { { { { "mcl_fishing:fish_raw", 6, 15,}, E1 }, { { "mcl_fishing:salmon_raw", 6, 6, "mcl_core:emerald", 1, 1 },{ "mcl_fishing:salmon_cooked", 6, 6 } }, - -- FIXME missing campfire - -- {{ "mcl_core:emerald", 1, 2 },{"mcl_campfires:campfire",1,1} }, + { { "mcl_core:emerald", 1, 2 },{"mcl_campfires:campfire_lit",1,1} }, }, { { { "mcl_fishing:salmon_raw", 6, 13,}, E1 }, From 5de3c7977c0f87de98fc8ba9a979e4fb41b9d2ff Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Tue, 5 Jul 2022 11:54:14 -0600 Subject: [PATCH 3/8] Campfire Inventory Textures by RandomLegoBrick --- .../textures/mcl_campfires_campfire_inv.png | Bin 544 -> 534 bytes .../mcl_campfires_soul_campfire_inv.png | Bin 540 -> 531 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_campfires/textures/mcl_campfires_campfire_inv.png b/mods/ITEMS/mcl_campfires/textures/mcl_campfires_campfire_inv.png index 2b13fde6355e5630e79ee72ef0468bfc6a7160a9..6d8ee3c06fb1bba53403dc4405607f1c1f1e23e6 100644 GIT binary patch delta 508 zcmVpGt4TybR5(wyk*n|oI8Vm z)zxH#8EHd_MrA{AOx(R9vH{))e-=`nYocQ2--&F^oLV_#=J?uPV zGj;)A#A{?UKjs=2r1$4ePJJS?DT|+RUrP?CXOx+1kNQzk7y};b{ljXA}m>Ns4 za5&6nA3ONE)_-hj^yn3f?f~NPxYdM{$lR(p(CJsOoVr6kpT|Z_{_^3bSA)M%`y%z^O%UXA`}X7Gj%s#G85RV7w}wq=TMT}h{$Lq&=ho7 z$YwAwPeoY{GtG(aHn=2_*A`!^5PpU6pB=DORPl2Df4_~d(ZOzLBJ;-W3G%y+)|7H0000U;qFCtw}^dR5;7ElTT|CK^Vq=v)Rpt>~0BLNDeI?JQM{% z7LPf|LVLIg8CKw0)7Jz-aQlq@l@$edI%zj3M~zdpnuYAVmG^+{W~7kq*PyGeu6?XOx zc-T7?b1iIlTz~oCIK(#UJh4aTq~Cj9!#3)0;}-OG|5UKuab?TYxY9KF*gwTja-QDt z0C@buX1WLP`u!JPzIiKV8QfiO%VX~cwxzRwION*u5?&BuJB?C)5CX7&IAk290Bmlw z<;+5yWdQUC5iL_=9Hj(tO6QRzN>U8HN|+S1OpX2^B7cZeYN~oZgSxKr;j1_Ew$`*! z5PbS}!g!L<8~Oxs+1=1J!ZbYt=)Y(c6jmBbNGYjl3RP9GY#B5SgQ_N|s%2z;l=FQY zoB{kvOjby;JSR$0B;`#CA;=2JD4dj!Mo}_j52|PKi&3l81_5c6?07*qo IM6N<$g1+nK2mk;8 diff --git a/mods/ITEMS/mcl_campfires/textures/mcl_campfires_soul_campfire_inv.png b/mods/ITEMS/mcl_campfires/textures/mcl_campfires_soul_campfire_inv.png index 0706d6628a7bd7453f9bf878bf10992be0a27188..88c7a6e4c77392461c1ac5e0494ce505c06d822a 100644 GIT binary patch delta 492 zcmVuwXoXO0+@4k1=J@*a%6@SvvnK09qkj>Z<5iKo# zBh(T^UM^Q#iZnTBJSc5!a=x8@L^u-R+IKVw&_NQBR#pY_S+fevgu2b_E1CqfNJ!#t z{!U(7oyo;dWBfS6ou&c({RmIba;>pDJ8OVsM$Apd#g&#pG#bU;;!?e{MJ5MrlM|f# zd_E)+3Fh*L$bUiAf!;0^TgeOxg#uD*>t8NzaA6*~Tn>Ri026(799*Zde{v!52>1DC z_}iVhye(ih7GxJhrta2DWD@r3MZAduT}qwkab-Gq1Qv*o#6-Z;hH^zm$lC!S z1Y8aoiru*5*Ea#hA=TH#l8#g+i{ta8AwU=(9TF8?hhnoq)EUSIlAyamssCW z=jCYUCCFAsjRQJU#rj3?!I7Cb2t>l;d}tSbEdBHnZx;{jUI z6`qvfTr7Y`Do(R;s)Y}&7R=1x-M(|8x>#BL10sGuEG^C{KL~NGDo^e`z>~6gymR9k zj#UNV@rzgD1b<*@aZc53gXx;hyY?ZyWXPMfrvO}EzRS@az{~9p&tJb4g@v2*v+9%o z182fybFa&lOOyCPNYic5bQ}0V2*BoEmwuE2aBE>!0q6j6mI2T{h^X5J{U{}fQ??ea z5+x~?Std+I)NO Date: Tue, 5 Jul 2022 12:07:03 -0600 Subject: [PATCH 4/8] Fixed Crafting Recipes --- mods/ITEMS/mcl_campfires/init.lua | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mods/ITEMS/mcl_campfires/init.lua b/mods/ITEMS/mcl_campfires/init.lua index ac5fa22fc..957182743 100644 --- a/mods/ITEMS/mcl_campfires/init.lua +++ b/mods/ITEMS/mcl_campfires/init.lua @@ -104,7 +104,7 @@ minetest.register_craft({ output = "mcl_campfires:campfire_lit", recipe = { { "", "mcl_core:stick", "" }, - { "mcl_core:stick", "mcl_core:charcoal_lump", "mcl_core:stick" }, + { "mcl_core:stick", "group:coal", "mcl_core:stick" }, { "group:tree", "group:tree", "group:tree" }, } }) @@ -113,16 +113,7 @@ minetest.register_craft({ output = "mcl_campfires:soul_campfire_lit", recipe = { { "", "mcl_core:stick", "" }, - { "mcl_core:stick", "mcl_blackstone:soul_soil", "mcl_core:stick" }, - { "group:tree", "group:tree", "group:tree" }, - } -}) - -minetest.register_craft({ - output = "mcl_campfires:soul_campfire_lit", - recipe = { - { "", "mcl_core:stick", "" }, - { "mcl_core:stick", "mcl_nether:soul_sand", "mcl_core:stick" }, + { "mcl_core:stick", "group:soul_block", "mcl_core:stick" }, { "group:tree", "group:tree", "group:tree" }, } }) From 67494f8905d496c7a59932ab8c65956f766f27ec Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Tue, 5 Jul 2022 15:38:54 -0600 Subject: [PATCH 5/8] Added Burning Players and Entities to Campfires. --- mods/ITEMS/mcl_campfires/init.lua | 33 +++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/mods/ITEMS/mcl_campfires/init.lua b/mods/ITEMS/mcl_campfires/init.lua index 957182743..fbe871e60 100644 --- a/mods/ITEMS/mcl_campfires/init.lua +++ b/mods/ITEMS/mcl_campfires/init.lua @@ -8,11 +8,11 @@ -- * Add Cooking Meat -- * Add Working Sounds -S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_translator(minetest.get_current_modname()) -campfires = { -{ name = "Campfire", lightlevel = 15, techname = "campfire", damage = 1, drops = "mcl_core:charcoal_lump 2" }, -{ name = "Soul Campfire", lightlevel = 10, techname = "soul_campfire", damage = 2, drops = "mcl_blackstone:soul_soil" }, +local campfires = { + { name = "Campfire", lightlevel = 15, techname = "campfire", damage = 1, drops = "mcl_core:charcoal_lump 2" }, + { name = "Soul Campfire", lightlevel = 10, techname = "soul_campfire", damage = 2, drops = "mcl_blackstone:soul_soil" }, } for _, campfire in pairs(campfires) do @@ -25,7 +25,7 @@ for _, campfire in pairs(campfires) do drawtype = "mesh", mesh = "mcl_campfires_campfire.obj", tiles = {{name="mcl_campfires_log.png"},}, - groups = { handy=1, axey=1, material_wood=1, not_in_creative_inventory=1 }, + groups = { handy=1, axey=1, material_wood=1, not_in_creative_inventory=1, campfire=1, }, paramtype = "light", paramtype2 = "facedir", on_rightclick = function (pos, node, player, itemstack, pointed_thing) @@ -73,7 +73,7 @@ for _, campfire in pairs(campfires) do length=2.0 }} }, - groups = { handy=1, axey=1, material_wood=1 }, + groups = { handy=1, axey=1, material_wood=1, campfire=1, lit_campfire=1 }, paramtype = "light", paramtype2 = "facedir", on_rightclick = function (pos, node, player, itemstack, pointed_thing) @@ -117,3 +117,24 @@ minetest.register_craft({ { "group:tree", "group:tree", "group:tree" }, } }) + +local etime = 0 +minetest.register_globalstep(function(dtime) + etime = dtime + etime + if etime < 0.5 then return end + etime = 0 + for _,pl in pairs(minetest.get_connected_players()) do + local n = minetest.find_node_near(pl:get_pos(),0.4,{"group:lit_campfire"},true) + if n then + mcl_burning.set_on_fire(pl, 5) + end + end + for _,ent in pairs(minetest.luaentities) do + if ent.object:get_pos() and ent.is_mob then + local n = minetest.find_node_near(ent.object:get_pos(),0.4,{"group:lit_campfire"},true) + if n then + mcl_burning.set_on_fire(ent.object, 5) + end + end + end +end) From f0241bbf6ad3d8ebd5900827a7ecd1395a04d983 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Tue, 5 Jul 2022 16:01:41 -0600 Subject: [PATCH 6/8] Added extinghuishing sound when extenguished with a shovel. --- mods/ITEMS/mcl_campfires/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_campfires/init.lua b/mods/ITEMS/mcl_campfires/init.lua index fbe871e60..b4ff7d559 100644 --- a/mods/ITEMS/mcl_campfires/init.lua +++ b/mods/ITEMS/mcl_campfires/init.lua @@ -80,6 +80,7 @@ for _, campfire in pairs(campfires) do if player:get_wielded_item():get_name():find("shovel") then node.name = "mcl_campfires:" .. campfire.techname minetest.set_node(pos, node) + minetest.sound_play("fire_extinguish_flame", {pos = pos, gain = 0.25, max_hear_distance = 16}, true) end end, drop = campfire.drops, From 3c2633ee2c534682134b0e63bff649cd4a9dc874 Mon Sep 17 00:00:00 2001 From: cora Date: Wed, 6 Jul 2022 04:17:39 +0200 Subject: [PATCH 7/8] Simplify my own mess... remove code dupe i'll fix this in cauldrons too, promise --- mods/ITEMS/mcl_campfires/init.lua | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/mods/ITEMS/mcl_campfires/init.lua b/mods/ITEMS/mcl_campfires/init.lua index b4ff7d559..e51ec9f54 100644 --- a/mods/ITEMS/mcl_campfires/init.lua +++ b/mods/ITEMS/mcl_campfires/init.lua @@ -119,23 +119,27 @@ minetest.register_craft({ } }) +local function burn_in_campfire(obj) + local p = obj:get_pos() + if p then + local n = minetest.find_node_near(p,0.4,{"group:lit_campfire"},true) + if n then + mcl_burning.set_on_fire(obj, 5) + end + end +end + local etime = 0 minetest.register_globalstep(function(dtime) etime = dtime + etime if etime < 0.5 then return end etime = 0 for _,pl in pairs(minetest.get_connected_players()) do - local n = minetest.find_node_near(pl:get_pos(),0.4,{"group:lit_campfire"},true) - if n then - mcl_burning.set_on_fire(pl, 5) - end + burn_in_campfire(pl) end for _,ent in pairs(minetest.luaentities) do - if ent.object:get_pos() and ent.is_mob then - local n = minetest.find_node_near(ent.object:get_pos(),0.4,{"group:lit_campfire"},true) - if n then - mcl_burning.set_on_fire(ent.object, 5) - end + if ent.is_mob then + burn_in_campfire(ent.object) end end end) From 0ecffaf47275184d6c6c73ce3c855fc32630aec7 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Wed, 6 Jul 2022 16:38:38 -0600 Subject: [PATCH 8/8] Added README.md file to mcl_campfires --- mods/ITEMS/mcl_campfires/README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 mods/ITEMS/mcl_campfires/README.md diff --git a/mods/ITEMS/mcl_campfires/README.md b/mods/ITEMS/mcl_campfires/README.md new file mode 100644 index 000000000..8747aa7e3 --- /dev/null +++ b/mods/ITEMS/mcl_campfires/README.md @@ -0,0 +1,21 @@ +mcl_campfires +=============== +Adds the campfire and its soul variant. + +License of code +--------------- +See the main MineClone 2 README.md file. +Authors: +Gerold55 - Code Start + Models? +PrairieWind - Improved and Cleaned Up Code, and added the soul campfire and crafting recipes. +cora - Added burning damage. + +License of media +---------------- +See the main MineClone 2 README.md file for license on most of the textures. + +For the following textures: +mcl_campfires_campfire_inv.png +mcl_campfires_soul_campfire_inv.png +License: CC0 1.0 Universal (CC0 1.0) +Author: RandomLegoBrick