Updated MinetestForFun Game

- Moved farming and screwdriver into MinetestForFun Game
 - Updated files (mostly `is_ground_content`)
 - Removed weird partial copy of jukebox in MinetestForFun Game

minetestforfun_game/mods/beds/api.lua

@@ -7,6 +7,7 @@ function beds.register_bed(name, def)
 		tiles = def.tiles.bottom,
 		paramtype = "light",
 		paramtype2 = "facedir",
+		is_ground_content = false,
 		stack_max = 1,
 		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1},
 		sounds = default.node_sound_wood_defaults(),
@@ -87,6 +88,7 @@ function beds.register_bed(name, def)
 		tiles = def.tiles.top,
 		paramtype = "light",
 		paramtype2 = "facedir",
+		is_ground_content = false,
 		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
 		sounds = default.node_sound_wood_defaults(),
 		node_box = {

minetestforfun_game/mods/default/craftitems.lua

@@ -5,7 +5,7 @@ minetest.register_craftitem("default:stick", {
 	stack_max = 1000,
 	inventory_image = "default_stick.png",
 	wield_image = "default_stick.png^[transformR90",
-	groups = {stick = 1},
+	groups = {stick=1},
 })
 
 minetest.register_craftitem("default:paper", {
@@ -159,8 +159,8 @@ minetest.register_craftitem("default:bronze_ingot", {
 minetest.register_craftitem("default:gold_ingot", {
 	description = "Gold Ingot",
 	wield_scale = {x = 1, y = 1, z = 2},
-	inventory_image = "default_gold_ingot.png",
 	groups = {ingot = 1},
+	inventory_image = "default_gold_ingot.png"
 })
 
 minetest.register_craftitem("default:mese_crystal_fragment", {

minetestforfun_game/mods/default/legacy.lua

@@ -22,4 +22,4 @@ LAVA_VISC = minetest.registered_nodes["default:lava_source"].liquid_viscosity
 LIGHT_MAX = default.LIGHT_MAX
 
 -- Formspecs
-default.gui_survival_form = default.gui_survival_form
+default.gui_suvival_form = default.gui_survival_form

minetestforfun_game/mods/default/mapgen.lua

@@ -785,7 +785,7 @@ function default.register_decorations()
 			octaves = 3,
 			persist = 0.6
 		},
-		biomes = {"grassland"},
+		biomes = {"default:grassland"},
 		y_min = -31000,
 		y_max = 31000,
 		decoration = "flowers:tulip",
@@ -974,7 +974,7 @@ elseif mg_params.mgname == "v6" then
 	default.register_ores()
 elseif mg_params.mgname == "v7" then
 	default.register_biomes()
-	default.register_ores()
+	default.register_decorations()
 end
 
 
@@ -1027,7 +1027,7 @@ function default.generate_nyancats(minp, maxp, seed)
 			local y0 = pr:next(minp.y, maxp.y)
 			local z0 = pr:next(minp.z, maxp.z)
 			local p0 = {x=x0, y=y0, z=z0}
-			default.make_nyancat(p0, pr:next(0,3), 10)
+			default.make_nyancat(p0, pr:next(0,3), pr:next(10,15))
 		end
 	end
 end

minetestforfun_game/mods/default/nodes.lua

@@ -186,7 +186,7 @@ minetest.register_node("default:cobble", {
 	description = "Cobblestone",
 	tiles = {"default_cobble.png"},
 	is_ground_content = true,
-	groups = {cracky = 3, stone = 2},
+	groups = {cracky=3, stone=2},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -248,6 +248,7 @@ minetest.register_node("default:desert_cobble", {
 minetest.register_node("default:desert_stonebrick", {
 	description = "Desert Stone Brick",
 	tiles = {"default_desert_stone_brick.png"},
+	is_ground_content = false,
 	groups = {cracky=2, stone=1},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -292,6 +293,7 @@ minetest.register_node("default:obsidian_cooled", {
 minetest.register_node("default:obsidianbrick", {
 	description = "Obsidian Brick",
 	tiles = {"default_obsidian_brick.png"},
+	is_ground_content = false,
 	sounds = default.node_sound_stone_defaults(),
 	groups = {cracky=1,level=2},
 })
@@ -517,6 +519,7 @@ minetest.register_node("default:tree", {
 minetest.register_node("default:wood", {
 	description = "Wooden Planks",
 	tiles = {"default_wood.png"},
+	is_ground_content = false,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -616,6 +619,7 @@ minetest.register_node("default:jungletree", {
 minetest.register_node("default:junglewood", {
 	description = "Junglewood Planks",
 	tiles = {"default_junglewood.png"},
+	is_ground_content = false,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -682,6 +686,7 @@ minetest.register_node("default:pinetree", {
 minetest.register_node("default:pinewood", {
 	description = "Pinewood Planks",
 	tiles = {"default_pinewood.png"},
+	is_ground_content = false,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -1872,7 +1877,8 @@ minetest.register_node("default:bookshelf", {
 		local stack = inv:get_stack(from_list, from_index)
 		local to_stack = inv:get_stack(to_list, to_index)
 		if to_list == "books" then
-			if stack:get_name() == "default:book" and to_stack:is_empty() then
+			if minetest.get_item_group(stack:get_name(), "book") ~= 0
+					and to_stack:is_empty() then
 				return 1
 			else
 				return 0
@@ -2139,6 +2145,7 @@ minetest.register_node("default:cloud", {
 	description = "Cloud",
 	sunlight_propagates = true,
 	tiles = {"default_cloud.png"},
+	is_ground_content = false,
 	sounds = default.node_sound_defaults(),
 	groups = {not_in_creative_inventory=1},
 })

minetestforfun_game/mods/doors/init.lua

@@ -194,6 +194,7 @@ function doors.register_door(name, def)
 		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1].."^[transformfx"},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		is_ground_content = false,
 		drop = name,
 		drawtype = "nodebox",
 		node_box = {
@@ -231,6 +232,7 @@ function doors.register_door(name, def)
 		tiles = {tt[2], tt[2], tt[2], tt[2], tt[1], tt[1].."^[transformfx"},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		is_ground_content = false,
 		drop = "",
 		drawtype = "nodebox",
 		node_box = {
@@ -268,6 +270,7 @@ function doors.register_door(name, def)
 		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1].."^[transformfx", tb[1]},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		is_ground_content = false,
 		drop = name,
 		drawtype = "nodebox",
 		node_box = {
@@ -305,6 +308,7 @@ function doors.register_door(name, def)
 		tiles = {tt[2], tt[2], tt[2], tt[2], tt[1].."^[transformfx", tt[1]},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		is_ground_content = false,
 		drop = "",
 		drawtype = "nodebox",
 		node_box = {
@@ -461,6 +465,7 @@ function doors.register_trapdoor(name, def)
 	def.drawtype = "nodebox"
 	def.paramtype = "light"
 	def.paramtype2 = "facedir"
+	def.is_ground_content = false
 
 	local def_opened = table.copy(def)
 	local def_closed = table.copy(def)

minetestforfun_game/mods/farming/depends.txt

@@ -1,2 +1,2 @@
 default
-wool
+wool

minetestforfun_game/mods/farming/init.lua

@@ -505,5 +505,8 @@ farming.register_plant("farming:cotton", {
 	description = "Cotton seed",
 	inventory_image = "farming_cotton_seed.png",
 	steps = 8,
+	minlight = 13,
+	maxlight = default.LIGHT_MAX,
+	fertility = {"grassland", "desert"}
 })
 --]]