From 15f2960e34e4395287ab783b560883ad45a4b866 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Wed, 3 Jun 2020 19:57:04 +0200
Subject: [PATCH] Remove legacy village schematic

---
 mods/MAPGEN/mcl_structures/init.lua           |  19 +++---------------
 .../locale/mcl_structures.de.tr               |   1 -
 .../locale/mcl_structures.es.tr               |   1 -
 .../locale/mcl_structures.fr.tr               |   1 -
 .../schematics/mcl_structures_village.mts     | Bin 3473 -> 0 bytes
 5 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 mods/MAPGEN/mcl_structures/schematics/mcl_structures_village.mts

diff --git a/mods/MAPGEN/mcl_structures/init.lua b/mods/MAPGEN/mcl_structures/init.lua
index 083f9539e..f59fc6dd9 100644
--- a/mods/MAPGEN/mcl_structures/init.lua
+++ b/mods/MAPGEN/mcl_structures/init.lua
@@ -36,9 +36,7 @@ mcl_structures.call_struct = function(pos, struct_style, rotation)
 	if not rotation then
 		rotation = "random"
 	end
-	if struct_style == "village" then
-		return mcl_structures.generate_village(pos, rotation)
-	elseif struct_style == "desert_temple" then
+	if struct_style == "desert_temple" then
 		return mcl_structures.generate_desert_temple(pos, rotation)
 	elseif struct_style == "desert_well" then
 		return mcl_structures.generate_desert_well(pos, rotation)
@@ -61,14 +59,6 @@ mcl_structures.call_struct = function(pos, struct_style, rotation)
 	end
 end
 
-mcl_structures.generate_village = function(pos)
-	-- No generating for the moment, only place it :D
-	-- TODO: Do complete overhaul of the algorithm
-	local newpos = {x=pos.x,y=pos.y-1,z=pos.z}
-	local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_village.mts"
-	return minetest.place_schematic(newpos, path, "random", nil, true)
-end
-
 mcl_structures.generate_desert_well = function(pos)
 	local newpos = {x=pos.x,y=pos.y-2,z=pos.z}
 	local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_desert_well.mts"
@@ -482,7 +472,7 @@ end
 
 -- Debug command
 minetest.register_chatcommand("spawnstruct", {
-	params = "desert_temple | desert_well | igloo | village | witch_hut | boulder | ice_spike_small | ice_spike_large | fossil | end_exit_portal | end_portal_shrine",
+	params = "desert_temple | desert_well | igloo | witch_hut | boulder | ice_spike_small | ice_spike_large | fossil | end_exit_portal | end_portal_shrine",
 	description = S("Generate a pre-defined structure near your position."),
 	privs = {debug = true},
 	func = function(name, param)
@@ -493,10 +483,7 @@ minetest.register_chatcommand("spawnstruct", {
 		pos = vector.round(pos)
 		local errord = false
 		local message = S("Structure placed.")
-		if param == "village" then
-			mcl_structures.generate_village(pos)
-			message = S("Village built. WARNING: Villages are experimental and might have bugs.")
-		elseif param == "desert_temple" then
+		if param == "desert_temple" then
 			mcl_structures.generate_desert_temple(pos)
 		elseif param == "desert_well" then
 			mcl_structures.generate_desert_well(pos)
diff --git a/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr b/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr
index e701b7879..3245b934c 100644
--- a/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr
+++ b/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr
@@ -1,7 +1,6 @@
 # textdomain: mcl_structures
 Generate a pre-defined structure near your position.=Erzeugt ein vordefiniertes Gebäude in Ihrer Nähe.
 Structure placed.=Gebäude platziert.
-Village built. WARNING: Villages are experimental and might have bugs.=Dorf gebaut. ACHTUNG: Dörfer sind experimentell und können fehlerhaft sein.
 Error: No structure type given. Please use “/spawnstruct <type>”.=Fehler: Kein Gebäudetyp angegeben. Bitte benutzen Sie „/spawnstruct <Typ>“.
 Error: Unknown structure type. Please use “/spawnstruct <type>”.=Fehler: Unbekannter Gebäudetyp. Bitte benutzen Sie „/spawnstruct <Typ>“.
 Use /help spawnstruct to see a list of avaiable types.=Benutzen Sie „/help spawnstruct“, um eine Liste der vorhandenen Typen zu sehen.
diff --git a/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr b/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr
index ae909b9c4..d73d81466 100644
--- a/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr
+++ b/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr
@@ -1,7 +1,6 @@
 # textdomain: mcl_structures
 Generate a pre-defined structure near your position.=Genere una estructura predefinida cerca de su posición.
 Structure placed.=Estructura colocada.
-Village built. WARNING: Villages are experimental and might have bugs.=Pueblo construido. ADVERTENCIA: los pueblos son experimentales y pueden tener errores.
 Error: No structure type given. Please use “/spawnstruct <type>”.=Error: no se especifica ningún tipo de estructura. Utilice "/spawnstruct <Tipo>".
 Error: Unknown structure type. Please use “/spawnstruct <type>”.=Error: tipo de estructura desconocido. Utilice "/spawnstruct <Tipo>".
 Use /help spawnstruct to see a list of avaiable types.=Utiliza "/help spawnstruct" para ver una lista de los tipos disponibles.
diff --git a/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr b/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr
index 7c1ba2723..74f5282ef 100644
--- a/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr
+++ b/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr
@@ -1,7 +1,6 @@
 # textdomain: mcl_structures
 Generate a pre-defined structure near your position.=Générez une structure prédéfinie près de votre position.
 Structure placed.=Structure placée.
-Village built. WARNING: Villages are experimental and might have bugs.=Village construit. AVERTISSEMENT: les villages sont expérimentaux et peuvent avoir des bugs.
 Error: No structure type given. Please use “/spawnstruct <type>”.=Erreur: Aucun type de structure indiqué. Veuillez utiliser "/spawnstruct <type>".
 Error: Unknown structure type. Please use “/spawnstruct <type>”.=Erreur: Type de structure inconnu. Veuillez utiliser "/spawnstruct <type>".
 Use /help spawnstruct to see a list of avaiable types.=Utilisez /help spawnstruct pour voir une liste des types disponibles.
diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_village.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_village.mts
deleted file mode 100644
index cda9bbba994a4c133cd90374a428b22d8db27fa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3473
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
AEdT%j