Merge branch 'master' into mud

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 },

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

mods/ITEMS/mcl_campfires/init.lua

@@ -0,0 +1,145 @@
+-- ||||||||||||||||||||||||||||||||
+-- ||||||||||| CAMPFIRES ||||||||||
+-- ||||||||||||||||||||||||||||||||
+
+-- TO-DO:
+-- * Add Smoke Particles
+-- * Add Spark Particles
+-- * Add Cooking Meat
+-- * Add Working Sounds
+
+local S = minetest.get_translator(minetest.get_current_modname())
+
+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
+-- 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, campfire=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, campfire=1, lit_campfire=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)
+				minetest.sound_play("fire_extinguish_flame", {pos = pos, gain = 0.25, max_hear_distance = 16}, true)
+			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", "group:coal", "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", "group:soul_block", "mcl_core:stick" },
+		{ "group:tree", "group:tree", "group:tree" },
+	}
+})
+
+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
+		burn_in_campfire(pl)
+	end
+	for _,ent in pairs(minetest.luaentities) do
+		if ent.is_mob then
+			burn_in_campfire(ent.object)
+		end
+	end
+end)

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.=

mods/ITEMS/mcl_campfires/mod.conf

@@ -0,0 +1,3 @@
+name = mcl_campfires
+depends = mcl_sounds
+author = PrairieWind, Gerold55

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

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

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

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

mods/ITEMS/mcl_stonecutter/README.md

@@ -0,0 +1,17 @@
+mcl_stonecutter
+===============
+Adds the stonecutter block. Used to cut stone like materials into stairs, slabs, etc. Also used as the Stone Mason Villager's jobsite.
+
+License of code
+---------------
+See the main MineClone 2 README.md file.
+Author: PrairieWind
+
+License of media
+----------------
+mcl_stonecutter_bottom.png
+mcl_stonecutter_side.png
+mcl_stonecutter_top.png
+mcl_stonecutter_saw.png
+License: CC0 1.0 Universal (CC0 1.0)
+Author: RandomLegoBrick

mods/ITEMS/mcl_stonecutter/init.lua

@@ -0,0 +1,57 @@
+--|||||||||||||||||||||||
+--||||| STONECUTTER |||||
+--|||||||||||||||||||||||
+
+-- TO-DO:
+-- * Add GUI
+
+local S = minetest.get_translator(minetest.get_current_modname())
+
+minetest.register_node("mcl_stonecutter:stonecutter", {
+	description = S("Stone Cutter"),
+	_tt_help = S("Used to cut stone like materials."),
+	_doc_items_longdesc = S("Stonecutters are used to create stairs and slabs from stone like materials. It is also the jobsite for the Stone Mason Villager."),
+	tiles = {
+		"mcl_stonecutter_top.png",
+		"mcl_stonecutter_bottom.png",
+		"mcl_stonecutter_side.png",
+		"mcl_stonecutter_side.png",
+		{name="mcl_stonecutter_saw.png", 
+		animation={
+			type="vertical_frames", 
+			aspect_w=16, 
+			aspect_h=16, 
+			length=1
+		}},
+		{name="mcl_stonecutter_saw.png", 
+		animation={
+			type="vertical_frames", 
+			aspect_w=16, 
+			aspect_h=16, 
+			length=1
+		}}
+	},
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = { pickaxey=1, material_stone=1 },
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, 0.0625, 0.5}, -- NodeBox1
+			{-0.4375, 0.0625, 0, 0.4375, 0.5, 0}, -- NodeBox2
+		}
+	},
+	_mcl_blast_resistance = 3.5,
+	_mcl_hardness = 3.5,
+	sounds = mcl_sounds.node_sound_stone_defaults(),
+})
+
+minetest.register_craft({
+	output = "mcl_stonecutter:stonecutter",
+	recipe = {
+		{ "", "", "" },
+		{ "", "mcl_core:iron_ingot", "" },
+		{ "mcl_core:stone", "mcl_core:stone", "mcl_core:stone" },
+	}
+})

mods/ITEMS/mcl_stonecutter/locale/template.txt

@@ -0,0 +1,3 @@
+Stone Cutter=
+Used to cut stone like materials.=
+Stonecutters are used to create stairs and slabs from stone like materials. It is also the jobsite for the Stone Mason Villager.=

mods/ITEMS/mcl_stonecutter/mod.conf

@@ -0,0 +1,4 @@
+name = mcl_stonecutter
+author = PrairieWind
+description = This mod adds a stonecutter, which is used to cut stone like materials, and used as the jobsite for the Stone Mason Villager.
+depends = mcl_sounds

mods/MAPGEN/tsm_railcorridors/init.lua

@@ -1122,14 +1122,8 @@ mcl_structures.register_structure("mineshaft",{
 			p.y = mcl_vars.mg_overworld_min + 5
 		end
 		if p.y > -10 then return true end
-		local p1 = vector.offset(p,-def.sidelen,-def.sidelen,-def.sidelen)
-		local p2 = vector.offset(p,def.sidelen,def.sidelen,def.sidelen)
-		minetest.emerge_area(p1, p2, function(blockpos, action, calls_remaining, param)
-			if calls_remaining ~= 0 then return end
-			--minetest.log("lol")
-			InitRandomizer(blockseed)
-			create_corridor_system(p, pr)
-		end)
+		InitRandomizer(blockseed)
+		create_corridor_system(p, pr)
 		return true
 	end,