From 952f9f2b2897668224f580b45fd1634254a4d159 Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Thu, 23 May 2019 15:29:04 -0400
Subject: update farming, moreblocks, and moreores

---
 farming/init.lua        |  2 +-
 moreblocks/CHANGELOG.md |  6 +++++-
 moreblocks/crafting.lua | 10 ++++++----
 moreores/CHANGELOG.md   |  3 +++
 moreores/init.lua       | 51 +++++++++++++------------------------------------
 moreores/mod.conf       |  2 +-
 6 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/farming/init.lua b/farming/init.lua
index a19c2df..38626ba 100644
--- a/farming/init.lua
+++ b/farming/init.lua
@@ -269,7 +269,7 @@ end
 
 minetest.after(0, function()
 
-	for _, node_def in ipairs(minetest.registered_nodes) do
+	for _, node_def in pairs(minetest.registered_nodes) do
 		register_plant_node(node_def)
 	end
 end)
diff --git a/moreblocks/CHANGELOG.md b/moreblocks/CHANGELOG.md
index 6199159..217536c 100644
--- a/moreblocks/CHANGELOG.md
+++ b/moreblocks/CHANGELOG.md
@@ -14,9 +14,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
+- The minimum supported Minetest version is now 5.0.0.
 - Stairs+ nodes now emit one light level less compared to full nodes to make up
   for their smaller visual size.
-- The minimum supported Minetest version is now 5.0.0.
+
+### Fixed
+
+- Fixed a recipe conflict that made Centered Wooden Tiles impossible to craft.
 
 ## [1.3.0] - 2019-03-23
 
diff --git a/moreblocks/crafting.lua b/moreblocks/crafting.lua
index 468667d..0655391 100644
--- a/moreblocks/crafting.lua
+++ b/moreblocks/crafting.lua
@@ -36,19 +36,21 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "moreblocks:wood_tile_center 9",
+	output = "moreblocks:wood_tile 9",
 	recipe = {
 		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "moreblocks:wood_tile", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
 		{"group:wood", "group:wood", "group:wood"},
 	}
 })
 
+-- This must be registered after `moreblocks:wood_tile` to avoid recipe conflicts,
+-- since `moreblocks:wood_tile` is part of `group:wood`
 minetest.register_craft({
-	output = "moreblocks:wood_tile 9",
+	output = "moreblocks:wood_tile_center 9",
 	recipe = {
 		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "moreblocks:wood_tile", "group:wood"},
 		{"group:wood", "group:wood", "group:wood"},
 	}
 })
diff --git a/moreores/CHANGELOG.md b/moreores/CHANGELOG.md
index 1363aba..e07b99e 100644
--- a/moreores/CHANGELOG.md
+++ b/moreores/CHANGELOG.md
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 
 - The minimum supported Minetest version is now 5.0.0.
+- Copper rails are now registered using functions from the `carts` mod,
+  making them interoperate seamlessly with default rails.
+  - Copper rails can no longer be placed in the air.
 
 ## [1.1.0] - 2019-03-23
 
diff --git a/moreores/init.lua b/moreores/init.lua
index d3b1cc0..839c370 100644
--- a/moreores/init.lua
+++ b/moreores/init.lua
@@ -329,45 +329,20 @@ else
 end
 
 -- Copper rail (unique node)
-minetest.register_node("moreores:copper_rail", {
-	description = S("Copper Rail"),
-	drawtype = "raillike",
-	tiles = {
-		"moreores_copper_rail.png",
-		"moreores_copper_rail_curved.png",
-		"moreores_copper_rail_t_junction.png",
-		"moreores_copper_rail_crossing.png",
-	},
-	inventory_image = "moreores_copper_rail.png",
-	wield_image = "moreores_copper_rail.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			-1/2,
-			-1/2,
-			-1/2,
-			1/2,
-			-1/2 + 1/16,
-			1/2,
-		},
-	},
-	sounds = default_metal_sounds,
-	groups = {bendy = 2, snappy = 1, dig_immediate = 2, rail = 1, connect_to_raillike = 1},
-	mesecons = {
-		effector = {
-			action_on = function(pos, node)
-				minetest.get_meta(pos):set_string("cart_acceleration", "0.5")
-			end,
-
-			action_off = function(pos, node)
-				minetest.get_meta(pos):set_string("cart_acceleration", "0")
-			end,
+if minetest.get_modpath("carts") then
+	carts:register_rail("moreores:copper_rail", {
+		description = S("Copper Rail"),
+		tiles = {
+			"moreores_copper_rail.png",
+			"moreores_copper_rail_curved.png",
+			"moreores_copper_rail_t_junction.png",
+			"moreores_copper_rail_crossing.png",
 		},
-	},
-})
+		inventory_image = "moreores_copper_rail.png",
+		wield_image = "moreores_copper_rail.png",
+		groups = carts:get_rail_groups(),
+	}, {})
+end
 
 minetest.register_craft({
 	output = "moreores:copper_rail 24",
diff --git a/moreores/mod.conf b/moreores/mod.conf
index 2b96161..04a353a 100644
--- a/moreores/mod.conf
+++ b/moreores/mod.conf
@@ -1,4 +1,4 @@
 name = moreores
 description = Adds new ore types.
 depends = default
-optional_depends = farming,intllib,mg
+optional_depends = carts,farming,intllib,mg
-- 
cgit v1.2.3