Rename mod: wool → hades_cloth

GROUPS.md

@@ -27,7 +27,7 @@ Node identities:
 
 * `colwood`: Colored wooden planks
 * `claybricks`: Clay bricks
-* `wool`: Cloth
+* `cloth`: Cloth
 
 * `carpet`: Carpet
 * `table`: Table

mods/bags/init.lua

@@ -145,8 +145,8 @@ minetest.register_craft({
 	output = "bags:small",
 	recipe = {
         {"", "hades_farming:string", ""},
-        {"group:wool", "group:wool", "group:wool"},
+        {"group:cloth", "group:cloth", "group:cloth"},
-        {"group:wool", "group:wool", "group:wool"},
+        {"group:cloth", "group:cloth", "group:cloth"},
     },
 })
 minetest.register_craft({

mods/columnia/columnia.lua

@@ -21,7 +21,7 @@ if not groups then
 end
 groups.not_in_creative_inventory = 1
 groups.wood = nil
-groups.wool = nil
+groups.cloth = nil
 groups.stone = nil
 groups.claybricks = nil
 groups.colwood = nil

mods/gluncarp/init.lua

@@ -2,13 +2,13 @@ local S = minetest.get_translator("gluncarp")
 
 gluncarp = {}
 
----more wool
+---more cloth
 minetest.register_node("gluncarp:wool_blackgold", {
 	description = S("Black Cloth with Gold"),
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	tiles = {"gluncarp_wool_blackgold.png"},
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,cloth=1},
 	sounds = hades_sounds.node_sound_cloth_defaults(),
 })
 	
@@ -16,7 +16,7 @@ minetest.register_node("gluncarp:wool_blackgold", {
 minetest.register_craft({
 	type = "shapeless",
 	output = 'gluncarp:wool_blackgold',
-	recipe = {'wool:black','hades_core:gold_ingot'},
+	recipe = {'hades_cloth:black','hades_core:gold_ingot'},
 })
 
 dofile(minetest.get_modpath("gluncarp").."/machines.lua")

mods/gluncarp/machines.lua

@@ -105,6 +105,7 @@ minetest.register_node("gluncarp:machine", {
 			"listring[current_name;res]")
 		meta:set_string("infotext", S("Carpet workstation"))
 		local inv = meta:get_inventory()
+		-- Input slot (called "wool" for historic reasons only)
 		inv:set_size("wool", 1)
 		inv:set_size("res", 1)
 	end,
@@ -124,30 +125,30 @@ minetest.register_node("gluncarp:machine", {
 			end
 		end
 
-		local woolstack = inv:get_stack("wool", 1)
+		local clothstack = inv:get_stack("wool", 1)
-		local woolname = woolstack:get_name()
+		local clothname = clothstack:get_name()
 		local resstack = inv:get_stack("res", 1)
 ----------------------------------------------------------------------
 --Register Items
 ----------------------------------------------------------------------
 		for col=1,#colors do
 			local color = colors[col]
-			if woolname == "wool:"..color then
+			if clothname == "cloth:"..color then
 				material = color
 				count = 4
-			elseif woolname == "gluncarp:wool_"..color then
+			elseif clothname == "gluncarp:wool_"..color then
 				material = color
 				count = 4
-			elseif woolname == "stairs:slab_"..color then
+			elseif clothname == "stairs:slab_"..color then
 				material = color
 				count = 2
-			elseif woolname == "stairs:stair_"..color then
+			elseif clothname == "stairs:stair_"..color then
 				material = color
 				count = 3
-			elseif woolname == "stairs:stair_in_"..color then
+			elseif clothname == "stairs:stair_in_"..color then
 				material = color
 				count = 4
-			elseif woolname == "stairs:stair_out_"..color then
+			elseif clothname == "stairs:stair_out_"..color then
 				material = color
 				count = 4
 			end
@@ -170,8 +171,8 @@ minetest.register_node("gluncarp:machine", {
 				end
 			end
 			if success then
-				woolstack:take_item()
+				clothstack:take_item()
-				inv:set_stack("wool", 1, woolstack)
+				inv:set_stack("wool", 1, clothstack)
 			end
 		end            
 	end,

mods/hades_beds/beds.lua

@@ -45,7 +45,7 @@ hades_beds.register_bed("hades_beds:fancy_bed", {
 	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
 	recipe = {
 		{"", "", "group:stick"},
-		{"wool:red", "wool:red", "wool:white"},
+		{"cloth:red", "cloth:red", "cloth:white"},
 		{"group:wood", "group:wood", "group:wood"},
 	}, 
 })
@@ -79,7 +79,7 @@ hades_beds.register_bed("hades_beds:bed", {
 	},
 	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
 	recipe = {
-		{"group:wool", "group:wool", "group:wool"},
+		{"group:cloth", "group:cloth", "group:cloth"},
 		{"group:wood", "group:wood", "group:wood"}
 	}, 
 

mods/hades_beds/mod.conf

@@ -1,2 +1,2 @@
 name = hades_beds
-depends = hades_sounds, wool
+depends = hades_sounds, hades_cloth

mods/hades_cloth/README.txt

@@ -1,7 +1,7 @@
-Minetest 0.4 mod: wool
+hades_cloth
-======================
+===========
 
-Mostly backward-compatible with jordach's 16-color wool mod.
+Adds cloth blocks of varying colors, derived from Minetest Game’s wool mod.
 
 License of source code:
 -----------------------

mods/hades_cloth/init.lua

@@ -1,16 +1,10 @@
-local S = minetest.get_translator("wool")
+local S = minetest.get_translator("hades_cloth")
 
--- minetest/wool/init.lua
+local hades_cloth = {}
-
--- Backwards compatibility with jordach's 16-color wool mod
-minetest.register_alias("wool:dark_blue", "wool:blue")
-minetest.register_alias("wool:gold", "wool:yellow")
-
-local wool = {}
 -- This uses a trick: you can first define the recipes using all of the base
 -- colors, and then some recipes using more specific colors for a few non-base
 -- colors available. When crafting, the last recipes will be checked first.
-wool.dyes = {
+hades_cloth.dyes = {
 	{"white",      S("White Cloth"),      nil},
 	{"grey",       S("Grey Cloth"),       "basecolor_grey"},
 	{"black",      S("Black Cloth"),      "basecolor_black"},
@@ -28,23 +22,39 @@ wool.dyes = {
 	{"dark_green", S("Dark Green Cloth"), "unicolor_dark_green"},
 }
 
-for _, row in ipairs(wool.dyes) do
+for _, row in ipairs(hades_cloth.dyes) do
 	local name = row[1]
 	local desc = row[2]
 	local craft_color_group = row[3]
 	-- Node Definition
-	minetest.register_node("wool:"..name, {
+	minetest.register_node("hades_cloth:"..name, {
 		description = desc,
 		tiles = {"wool_"..name..".png"},
-		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,hades_cloth=1},
 		sounds = hades_sounds.node_sound_cloth_defaults(),
 		is_ground_content = false,
 	})
-	-- Crafting from dye and white wool
+	-- Crafting from dye and white hades_cloth
 	minetest.register_craft({
 		type = "shapeless",
-		output = 'wool:'..name,
+		output = 'hades_cloth:'..name,
-		recipe = {'dye:'..name, 'group:wool'},
+		recipe = {'dye:'..name, 'group:cloth'},
 	})
 end
 
+-- Legacy aliases
+minetest.register_alias("wool:white", "hades_cloth:white")
+minetest.register_alias("wool:grey", "hades_cloth:grey")
+minetest.register_alias("wool:black", "hades_cloth:black")
+minetest.register_alias("wool:red", "hades_cloth:red")
+minetest.register_alias("wool:yellow", "hades_cloth:yellow")
+minetest.register_alias("wool:green", "hades_cloth:green")
+minetest.register_alias("wool:cyan", "hades_cloth:cyan")
+minetest.register_alias("wool:blue", "hades_cloth:blue")
+minetest.register_alias("wool:magenta", "hades_cloth:magenta")
+minetest.register_alias("wool:orange", "hades_cloth:orange")
+minetest.register_alias("wool:violet", "hades_cloth:violet")
+minetest.register_alias("wool:brown", "hades_cloth:brown")
+minetest.register_alias("wool:pink", "hades_cloth:pink")
+minetest.register_alias("wool:dark_grey", "hades_cloth:dark_grey")
+minetest.register_alias("wool:dark_green", "hades_cloth:dark_green")

mods/hades_cloth/locale/hades_cloth.de.tr

@@ -1,4 +1,4 @@
-# textdomain: wool
+# textdomain: hades_cloth
 White Cloth=Weißer Stoff
 Grey Cloth=Grauer Stoff
 Black Cloth=Schwarzer Stoff

mods/hades_cloth/locale/template.txt

@@ -1,4 +1,4 @@
-# textdomain: wool
+# textdomain: hades_cloth
 White Cloth=
 Grey Cloth=
 Black Cloth=

mods/hades_cloth/mod.conf

@@ -1,2 +1,2 @@
-name = wool
+name = hades_cloth
 depends = hades_sounds

mods/hades_craftguide/init.lua

@@ -10,7 +10,7 @@ local recipes_cache = {}
 local usages_cache = {}
 
 local group_stereotypes = {
-	wool	     = "wool:white",
+	cloth	     = "hades_cloth:white",
 	dye	     = "dye:white",
 	vessel	     = "vessels:glass_bottle",
 	coal	     = "hades_core:coal_lump",
@@ -40,7 +40,7 @@ local group_stereotypes = {
 }
 
 local group_names = {
-	wool         = S("Any cloth"),
+	cloth        = S("Any cloth"),
 	dye	     = S("Any dye"),
 	vessel	     = S("Any vessel"),
 	coal	     = S("Any coal lump"),

mods/hades_farming/mod.conf

@@ -1,2 +1,2 @@
 name = hades_farming
-depends = hades_sounds, hades_core, hades_seeds, hades_grass, wool
+depends = hades_sounds, hades_core, hades_seeds, hades_grass, hades_cloth

mods/hades_farming/register.lua

@@ -76,7 +76,7 @@ minetest.register_craftitem("hades_farming:cotton", {
 	inventory_image = "hades_farming_cotton.png",
 })
 minetest.register_craft({
-	output = "wool:white",
+	output = "hades_cloth:white",
 	recipe = {
 		{"hades_farming:cotton", "hades_farming:cotton"},
 		{"hades_farming:cotton", "hades_farming:cotton"},

mods/hades_furniture/crafting.lua

@@ -177,7 +177,7 @@
 		output = 'hades_furniture:armchair 2',
 		recipe = {
 			{ 'group:wood',''},
-			{ 'group:wood','wool:black' },
+			{ 'group:wood','hades_cloth:black' },
 			{ 'group:wood','group:wood' },
 		},
 	})
@@ -186,7 +186,7 @@
 		output = 'hades_furniture:armchair_white 2',
 		recipe = {
 			{ 'group:wood',''},
-			{ 'group:wood','wool:white' },
+			{ 'group:wood','hades_cloth:white' },
 			{ 'group:wood','group:wood' },
 		},
 	})
@@ -195,7 +195,7 @@
 		output = 'hades_furniture:armchair_blue 2',
 		recipe = {
 			{ 'group:wood',''},
-			{ 'group:wood','wool:blue' },
+			{ 'group:wood','hades_cloth:blue' },
 			{ 'group:wood','group:wood' },
 		},
 	})
@@ -204,7 +204,7 @@
 		output = 'hades_furniture:armchair_brown 2',
 		recipe = {
 			{ 'group:wood',''},
-			{ 'group:wood','wool:brown' },
+			{ 'group:wood','hades_cloth:brown' },
 			{ 'group:wood','group:wood' },
 		},
 	})
@@ -213,7 +213,7 @@
 		output = 'hades_furniture:armchair_red 2',
 		recipe = {
 			{ 'group:wood',''},
-			{ 'group:wood','wool:red' },
+			{ 'group:wood','hades_cloth:red' },
 			{ 'group:wood','group:wood' },
 		},
 	})
@@ -222,7 +222,7 @@
 		output = 'hades_furniture:armchair_dark_green 2',
 		recipe = {
 			{ 'group:wood',''},
-			{ 'group:wood','wool:dark_green' },
+			{ 'group:wood','hades_cloth:dark_green' },
 			{ 'group:wood','group:wood' },
 		},
 	})

mods/hades_movement/init.lua

@@ -106,7 +106,7 @@ minetest.register_tool("hades_movement:jump_dampener", {
 minetest.register_craft({
 	output = "hades_movement:jump_dampener",
 	recipe = {
-		{"group:wool","","group:wool"},
+		{"group:cloth","","group:cloth"},
 		{"hades_core:tin_ingot","","hades_core:tin_ingot"},
 	},
 })

mods/hades_wardrobes/init.lua

@@ -30,7 +30,7 @@ minetest.register_craft({
 	output = "hades_wardrobes:wardrobe",
 	recipe = {
 		{"group:wood","group:wood","group:wood"},
-		{"group:wool","group:wool","group:wool"},
+		{"group:cloth","group:cloth","group:cloth"},
 		{"group:wood","group:wood","group:wood"},
 	},
 })

mods/mobs/api.txt

@@ -316,8 +316,7 @@ for each mob.
    'self.child_texture' contains mob child texture when growing up
    'self.base_texture'  contains current skin texture which was randomly
                         selected from textures list
-   'self.gotten'        this is used for obtaining milk from cow and wool from
+   'self.gotten'        this is used for obtaining resource from mob, like milk from cow
-                        sheep
    'self.horny'         when animal fed enough it is set to true and animal can
                         breed with same animal
    'self.hornytimer'    background timer that controls breeding functions and

mods/mobs/readme.MD

@@ -15,7 +15,6 @@ Crafts:
  - Nametag (paper, black dye, string) can be used right-click on a tamed mob to give them a name.
  - Nets can be used to right-click tamed mobs to pick them up and place inside inventory as a spawn egg.
  - Magic Lasso is similar to nets but with a better chance of picking up larger mobs.
- - Shears are used to right-click sheep and return 1-3 wool.
  - Protection Rune lets you protect tamed mobs from harm by other players
  - Mob Fence and Fence Top (to stop mobs escaping/glitching through fences)
 

mods/mobs_hades/README.txt

@@ -1,34 +1 @@
--= MOBS-MOD for MINETEST =-
+This mod contains the mobs for Hades Revisited.
-by PilzAdam, KrupnovPavel, Zeg9 and TenPlus1
-
-This mod contains the following additions:
-
-- Giant Spiders (found in desert caves, drop string when killed)
-- Bee's (found around flowers, drop honey when killed, right-click to pick up, also Beehives)
-- Chicken (lays eggs, added fried egg, raw & cooked chicken, right-click to pick up)
-- Cow (right-click with empty bucket to get bucket of milk, feed 8 wheat to replenish milk)
-- Sheep (right-click for wool, feed 8 wheat to replenish wool)
-- Warthog (the local pig that gives raw and cooked port)
-- Rats (right-click to pick up and place, cook for a tasty treat)
-- Sand, Dirt, Stone, Tree Monsters, Oerkki and Dungeon Masters as standard
-- Lava Flan, Mese Monsters added to spice things up a bit
-- Cook milk in furnace to get cheese wedge, 9 wedges make 1 cheese block
-
-..with the following new features:
-
-- Hitting a mob has knock-back effect like in minecraft, and with blood effect
-- Mobs float in water, so monsters can still chase you
-- Mobs can die from falling from a height
-- Mobs have better health and drops
-- Hitting a mob also puts them into fight mode (apart from animals)
-- Compatible with Ethereal mod, mobs now spawn on ethereal worlds
-
-Changelog:
-
-0.7 - mob.protected switch added to api.lua, when set to 1 mobs no longer spawn in protected areas, also bug fixes
-0.6 - Api now supports multi-textured mobs, e.g oerkki, dungeon master, rats and chickens have random skins when spawning (sheep fix TODO), also new Honey block
-0.5 - Mobs now float in water, die from falling, and some code improvements
-0.4 - Dungeon Masters and Mese Monsters have much better aim due to shoot_offset, also they can both shoot through nodes that aren't walkable (flowers, grass etc) plus new sheep sound :)
-0.3 - Added LOTT's Spider mob, made Cobwebs, added KPavel's Bee with Honey and Beehives (made texture), Warthogs now have sound and can be tamed, taming of shaved sheep or milked cow with 8 wheat so it will not despawn, many bug fixes :)
-0.2 - Cooking bucket of milk into cheese now returns empty bucket
-0.1 - Initial Release

mods/stairs/register.lua

@@ -859,7 +859,7 @@ stairs.register_stair_and_slab_and_step("straw", "hades_farming:straw",
 
 -- cloth
 
-stairs.register_stair_and_slab_and_step("white", "wool:white",
+stairs.register_stair_and_slab_and_step("white", "hades_cloth:white",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("White Cloth Stair"),
@@ -870,7 +870,7 @@ stairs.register_stair_and_slab_and_step("white", "wool:white",
 		S("Outer White Cloth Step"),
 		S("Inner White Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("grey", "wool:grey",
+stairs.register_stair_and_slab_and_step("grey", "hades_cloth:grey",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Grey Cloth Stair"),
@@ -881,7 +881,7 @@ stairs.register_stair_and_slab_and_step("grey", "wool:grey",
 		S("Outer Grey Cloth Step"),
 		S("Inner Grey Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("black", "wool:black",
+stairs.register_stair_and_slab_and_step("black", "hades_cloth:black",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Black Cloth Stair"),
@@ -892,7 +892,7 @@ stairs.register_stair_and_slab_and_step("black", "wool:black",
 		S("Outer Black Cloth Step"),
 		S("Inner Black Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("red", "wool:red",
+stairs.register_stair_and_slab_and_step("red", "hades_cloth:red",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Red Cloth Stair"),
@@ -903,7 +903,7 @@ stairs.register_stair_and_slab_and_step("red", "wool:red",
 		S("Outer Red Cloth Step"),
 		S("Inner Red Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("yellow", "wool:yellow",
+stairs.register_stair_and_slab_and_step("yellow", "hades_cloth:yellow",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Yellow Cloth Stair"),
@@ -914,7 +914,7 @@ stairs.register_stair_and_slab_and_step("yellow", "wool:yellow",
 		S("Outer Yellow Cloth Step"),
 		S("Inner Yellow Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("green", "wool:green",
+stairs.register_stair_and_slab_and_step("green", "hades_cloth:green",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Green Cloth Stair"),
@@ -925,7 +925,7 @@ stairs.register_stair_and_slab_and_step("green", "wool:green",
 		S("Outer Green Cloth Step"),
 		S("Inner Green Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("cyan", "wool:cyan",
+stairs.register_stair_and_slab_and_step("cyan", "hades_cloth:cyan",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Cyan Cloth Stair"),
@@ -936,7 +936,7 @@ stairs.register_stair_and_slab_and_step("cyan", "wool:cyan",
 		S("Outer Cyan Cloth Step"),
 		S("Inner Cyan Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("blue", "wool:blue",
+stairs.register_stair_and_slab_and_step("blue", "hades_cloth:blue",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Blue Cloth Stair"),
@@ -947,7 +947,7 @@ stairs.register_stair_and_slab_and_step("blue", "wool:blue",
 		S("Outer Blue Cloth Step"),
 		S("Inner Blue Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("magenta", "wool:magenta",
+stairs.register_stair_and_slab_and_step("magenta", "hades_cloth:magenta",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Magenta Cloth Stair"),
@@ -958,7 +958,7 @@ stairs.register_stair_and_slab_and_step("magenta", "wool:magenta",
 		S("Outer Magenta Cloth Step"),
 		S("Inner Magenta Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("orange", "wool:orange",
+stairs.register_stair_and_slab_and_step("orange", "hades_cloth:orange",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Orange Cloth Stair"),
@@ -969,7 +969,7 @@ stairs.register_stair_and_slab_and_step("orange", "wool:orange",
 		S("Outer Orange Cloth Step"),
 		S("Inner Orange Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("violet", "wool:violet",
+stairs.register_stair_and_slab_and_step("violet", "hades_cloth:violet",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Violet Cloth Stair"),
@@ -980,7 +980,7 @@ stairs.register_stair_and_slab_and_step("violet", "wool:violet",
 		S("Outer Violet Cloth Step"),
 		S("Inner Violet Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("brown", "wool:brown",
+stairs.register_stair_and_slab_and_step("brown", "hades_cloth:brown",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Brown Cloth Stair"),
@@ -991,7 +991,7 @@ stairs.register_stair_and_slab_and_step("brown", "wool:brown",
 		S("Outer Brown Cloth Step"),
 		S("Inner Brown Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("pink", "wool:pink",
+stairs.register_stair_and_slab_and_step("pink", "hades_cloth:pink",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Pink Cloth Stair"),
@@ -1002,7 +1002,7 @@ stairs.register_stair_and_slab_and_step("pink", "wool:pink",
 		S("Outer Pink Cloth Step"),
 		S("Inner Pink Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("dark_grey", "wool:dark_grey",
+stairs.register_stair_and_slab_and_step("dark_grey", "hades_cloth:dark_grey",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Dark Grey Cloth Stair"),
@@ -1013,7 +1013,7 @@ stairs.register_stair_and_slab_and_step("dark_grey", "wool:dark_grey",
 		S("Outer Dark Grey Cloth Step"),
 		S("Inner Dark Grey Cloth Step"))
 
-stairs.register_stair_and_slab_and_step("dark_green", "wool:dark_green",
+stairs.register_stair_and_slab_and_step("dark_green", "hades_cloth:dark_green",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		nil,
 		S("Dark Green Cloth Stair"),