From b93a2a8f5fc342855b4fdba233ffe544b0e815d5 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Thu, 16 Feb 2017 20:15:43 +0100
Subject: [PATCH] Move rail to mcl_minecarts

---
 mods/CORE/mcl_core/crafting.lua               |   9 ------
 mods/CORE/mcl_core/nodes.lua                  |  19 -----------
 mods/ITEMS/mcl_minecarts/rails.lua            |  30 +++++++++++++++++-
 .../mcl_minecarts}/textures/default_rail.png  | Bin
 .../textures/default_rail_crossing.png        | Bin
 .../textures/default_rail_curved.png          | Bin
 .../textures/default_rail_t_junction.png      | Bin
 7 files changed, 29 insertions(+), 29 deletions(-)
 rename mods/{CORE/mcl_core => ITEMS/mcl_minecarts}/textures/default_rail.png (100%)
 rename mods/{CORE/mcl_core => ITEMS/mcl_minecarts}/textures/default_rail_crossing.png (100%)
 rename mods/{CORE/mcl_core => ITEMS/mcl_minecarts}/textures/default_rail_curved.png (100%)
 rename mods/{CORE/mcl_core => ITEMS/mcl_minecarts}/textures/default_rail_t_junction.png (100%)

diff --git a/mods/CORE/mcl_core/crafting.lua b/mods/CORE/mcl_core/crafting.lua
index c180b689d6..d5be94c217 100644
--- a/mods/CORE/mcl_core/crafting.lua
+++ b/mods/CORE/mcl_core/crafting.lua
@@ -408,15 +408,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'mcl_core:rail 16',
-	recipe = {
-		{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
-		{'mcl_core:iron_ingot', 'mcl_core:stick', 'mcl_core:iron_ingot'},
-		{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
-	}
-})
-
 minetest.register_craft({
 	output = 'mcl_core:haybale',
 	recipe = {
diff --git a/mods/CORE/mcl_core/nodes.lua b/mods/CORE/mcl_core/nodes.lua
index c079f06220..85e9031d02 100644
--- a/mods/CORE/mcl_core/nodes.lua
+++ b/mods/CORE/mcl_core/nodes.lua
@@ -988,25 +988,6 @@ mcl_core.add_glass( "Magenta Stained Glass",  "basecolor_magenta", "magenta")
 mcl_core.add_glass( "Purple Stained Glass",  "excolor_violet", "purple")
 mcl_core.add_glass( "Cyan Stained Glass",  "basecolor_cyan", "cyan")
 
-minetest.register_node("mcl_core:rail", {
-	description = "Rail",
-	drawtype = "raillike",
-	tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
-	is_ground_content = false,
-	inventory_image = "default_rail.png",
-	wield_image = "default_rail.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	stack_max = 64,
-	groups = {cracky=3,oddly_breakable_by_hand=3,attached_node=1,rail=1,connect_to_raillike=1,dig_by_water=1,transport=1},
-	sounds = mcl_sounds.node_sound_defaults(),
-})
-
 minetest.register_node("mcl_core:ladder", {
 	description = "Ladder",
 	drawtype = "signlike",
diff --git a/mods/ITEMS/mcl_minecarts/rails.lua b/mods/ITEMS/mcl_minecarts/rails.lua
index f3975b1cdc..d3afe48bc0 100644
--- a/mods/ITEMS/mcl_minecarts/rails.lua
+++ b/mods/ITEMS/mcl_minecarts/rails.lua
@@ -1,5 +1,33 @@
--- Speed up
+-- Normal rail
+minetest.register_node("mcl_minecarts:rail", {
+	description = "Rail",
+	drawtype = "raillike",
+	tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
+	is_ground_content = false,
+	inventory_image = "default_rail.png",
+	wield_image = "default_rail.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	stack_max = 64,
+	groups = {cracky=3,oddly_breakable_by_hand=3,attached_node=1,rail=1,connect_to_raillike=1,dig_by_water=1,transport=1},
+	sounds = mcl_sounds.node_sound_defaults(),
+})
 
+minetest.register_craft({
+	output = 'mcl_minecarts:rail 16',
+	recipe = {
+		{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
+		{'mcl_core:iron_ingot', 'mcl_core:stick', 'mcl_core:iron_ingot'},
+		{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
+	}
+})
+
+-- Rail to speed up
 minetest.register_node("mcl_minecarts:golden_rail", {
 	description = "Powered Rail",
 	drawtype = "raillike",
diff --git a/mods/CORE/mcl_core/textures/default_rail.png b/mods/ITEMS/mcl_minecarts/textures/default_rail.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_rail.png
rename to mods/ITEMS/mcl_minecarts/textures/default_rail.png
diff --git a/mods/CORE/mcl_core/textures/default_rail_crossing.png b/mods/ITEMS/mcl_minecarts/textures/default_rail_crossing.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_rail_crossing.png
rename to mods/ITEMS/mcl_minecarts/textures/default_rail_crossing.png
diff --git a/mods/CORE/mcl_core/textures/default_rail_curved.png b/mods/ITEMS/mcl_minecarts/textures/default_rail_curved.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_rail_curved.png
rename to mods/ITEMS/mcl_minecarts/textures/default_rail_curved.png
diff --git a/mods/CORE/mcl_core/textures/default_rail_t_junction.png b/mods/ITEMS/mcl_minecarts/textures/default_rail_t_junction.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_rail_t_junction.png
rename to mods/ITEMS/mcl_minecarts/textures/default_rail_t_junction.png