Modifie le craft des rails de cuivre

- [mod frame](https://github.com/minetest-mods/frame)

.luacheckrc

@@ -25,7 +25,9 @@ stds.minetest = {
 }
 
 read_globals = {
+	"carts",
 	"farming",
+	"frame",
 	"intllib",
 	"mg",
 }

.pre-commit-config.yaml

@@ -1,9 +1,14 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v2.3.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
 
       - id: mixed-line-ending
         args: [--fix=lf]
+
+  - repo: https://github.com/Calinou/pre-commit-luacheck
+    rev: v1.0.0
+    hooks:
+      - id: luacheck

.travis.yml

@@ -1,15 +1,16 @@
-language: generic
+dist: bionic
+language: python
 
-addons:
-  apt:
-    packages:
-    - luarocks
+python:
+  - 3.7.1
 
 install:
-  - pyenv global 3.6.3
-  - pip3 install --user pre-commit
+  - sudo apt-get update -qq
+  - sudo apt-get install -qqq luarocks
+  - pip3 install pre-commit
   - luarocks install --local luacheck
 
 script:
-  - $HOME/.local/bin/pre-commit run --all-files
-  - $HOME/.luarocks/bin/luacheck .
+  # All linters are run with pre-commit hooks
+  - export PATH="$HOME/.luarocks/bin:$PATH"
+  - pre-commit run --all-files

CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.0] - 2019-11-25
+
+### Added
+
+- More Ores nodes/items/tools can now be placed in item frames
+  from the [`frame`](https://github.com/minetest-mods/frame) mod.
+- Polish translation.
+
+### 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
 
 ### Added
@@ -36,5 +51,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial versioned release.
 
-[Unreleased]: https://github.com/minetest-mods/moreores/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/moreores/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/minetest-mods/moreores/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/minetest-mods/moreores/compare/v1.0.0...v1.1.0

README.md

@@ -60,9 +60,9 @@ on that line.
 
 ## Version compatibility
 
-More Ores is currently primarily tested with Minetest 0.4.17.
+More Ores is currently primarily tested with Minetest 5.1.0.
 It may or may not work with newer or older versions. Issues arising in older
-versions than 0.4.17 will generally not be fixed.
+versions than 5.0.0 will generally not be fixed.
 
 ## License
 

depends.txt

@@ -1,3 +0,0 @@
-default
-mg?
-farming?

description.txt

@@ -1 +0,0 @@
-Adds new Ore types.

init.lua

@@ -23,6 +23,9 @@ if minetest.get_modpath("mg") then
 	dofile(modpath .. "/mg.lua")
 end
 
+-- `frame` support
+local use_frame = minetest.get_modpath("frame")
+
 local default_stone_sounds = default.node_sound_stone_defaults()
 local default_metal_sounds = default.node_sound_metal_defaults()
 
@@ -89,6 +92,10 @@ local function add_ore(modname, description, mineral_name, oredef)
 			sounds = default_stone_sounds,
 			drop = lump_item,
 		})
+
+		if use_frame then
+			frame.register(modname .. ":mineral_" .. mineral_name)
+		end
 	end
 
 	if oredef.makes.block then
@@ -112,6 +119,9 @@ local function add_ore(modname, description, mineral_name, oredef)
 				}
 			})
 		end
+		if use_frame then
+			frame.register(block_item)
+		end
 	end
 
 	if oredef.makes.lump then
@@ -127,6 +137,9 @@ local function add_ore(modname, description, mineral_name, oredef)
 				recipe = lump_item,
 			})
 		end
+		if use_frame then
+			frame.register(lump_item)
+		end
 	end
 
 	if oredef.makes.ingot then
@@ -135,6 +148,9 @@ local function add_ore(modname, description, mineral_name, oredef)
 			inventory_image = img_base .. "_ingot.png",
 		})
 		minetest.register_alias(mineral_name .. "_ingot", ingot)
+		if use_frame then
+			frame.register(ingot)
+		end
 	end
 
 	if oredef.makes.chest then
@@ -195,28 +211,19 @@ local function add_ore(modname, description, mineral_name, oredef)
 
 		local fulltool_name = tool_base .. tool_name .. tool_post
 
-		if tool_name == "hoe" and minetest.get_modpath("farming") then
-			tdef.max_uses = tooldef.uses
-			tdef.description = S("%s Hoe"):format(S(description))
-			farming.register_hoe(fulltool_name, tdef)
-		end
+		minetest.register_tool(fulltool_name, tdef)
 
-		-- Hoe registration is handled above.
-		-- There are no crafting recipes for hoes, as they have been
-		-- deprecated from Minetest Game:
-		-- https://github.com/minetest/minetest_game/commit/9c459e77a
-		if tool_name ~= "hoe" then
-			minetest.register_tool(fulltool_name, tdef)
-
-			if oredef.makes.ingot then
-				minetest.register_craft({
-					output = fulltool_name,
-					recipe = get_recipe(ingot, tool_name)
-				})
-			end
+		if oredef.makes.ingot then
+			minetest.register_craft({
+				output = fulltool_name,
+				recipe = get_recipe(ingot, tool_name)
+			})
 		end
 
 		minetest.register_alias(tool_name .. tool_post, fulltool_name)
+		if use_frame then
+			frame.register(fulltool_name)
+		end
 	end
 end
 
@@ -235,9 +242,6 @@ local oredefs = {
 			pick = {
 				cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
 			},
-			hoe = {
-				uses = 300,
-			},
 			shovel = {
 				crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
 			},
@@ -268,9 +272,6 @@ local oredefs = {
 			pick = {
 				cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2}
 			},
-			hoe = {
-				uses = 1000,
-			},
 			shovel = {
 				crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2},
 			},
@@ -329,52 +330,27 @@ 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,
+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",
 		},
-	},
-	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,
-		},
-	},
-})
+		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",
+	output = "moreores:copper_rail 18",
 	recipe = {
+		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
 		{"default:copper_ingot", "", "default:copper_ingot"},
-		{"default:copper_ingot", "group:stick", "default:copper_ingot"},
-		{"default:copper_ingot", "", "default:copper_ingot"},
+		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
 	},
 })
 
@@ -382,7 +358,3 @@ for orename, def in pairs(oredefs) do
 	-- Register everything
 	add_ore("moreores", def.description, orename, def)
 end
-
-if minetest.settings:get_bool("log_mods") then
-	minetest.log("action", S("[moreores] loaded."))
-end

locale/pl.txt

@@ -0,0 +1,21 @@
+# Translation by mat9117
+
+[moreores] loaded. = [moreores] załadowano.
+
+%s Ore = %s Ruda
+%s Lump = %s Bryłka
+%s Ingot = %s Sztabka
+%s Block = %s Blok
+%s Pickaxe = %s Kilof
+%s Shovel = %s Łopatka
+%s Axe = %s Siekiera
+%s Sword = %s Miecz
+
+Copper = Miedź
+Tin = Cyna
+Bronze = Brąz
+Silver = Srebro
+Gold = Złoto
+Mithril = Mithril
+
+Copper Rail = Miedziany tor

mod.conf

@@ -1 +1,4 @@
 name = moreores
+description = Adds new ore types.
+depends = default
+optional_depends = carts,frame,intllib,mg