diff --git a/mods/beds/depends.txt b/mods/beds/depends.txt index f098279c9..7f2081be3 100644 --- a/mods/beds/depends.txt +++ b/mods/beds/depends.txt @@ -1,3 +1,2 @@ -default - -wool +default +mcl_wool diff --git a/mods/farming/depends.txt b/mods/farming/depends.txt index 0b8ebe024..907f9a5c8 100644 --- a/mods/farming/depends.txt +++ b/mods/farming/depends.txt @@ -1,3 +1,3 @@ default bucket -wool +mcl_wool diff --git a/mods/wool/README.txt b/mods/mcl_wool/README.txt similarity index 100% rename from mods/wool/README.txt rename to mods/mcl_wool/README.txt diff --git a/mods/wool/credit.txt b/mods/mcl_wool/credit.txt similarity index 100% rename from mods/wool/credit.txt rename to mods/mcl_wool/credit.txt diff --git a/mods/wool/depends.txt b/mods/mcl_wool/depends.txt similarity index 100% rename from mods/wool/depends.txt rename to mods/mcl_wool/depends.txt diff --git a/mods/wool/init.lua b/mods/mcl_wool/init.lua similarity index 88% rename from mods/wool/init.lua rename to mods/mcl_wool/init.lua index 90bb219bd..869b63104 100644 --- a/mods/wool/init.lua +++ b/mods/mcl_wool/init.lua @@ -1,8 +1,8 @@ -- minetest/wool/init.lua -- Backwards compatibility with jordach's 16-color wool mod -minetest.register_alias("wool:dark_blue", "wool:blue") -minetest.register_alias("wool:gold", "wool:yellow") +minetest.register_alias("mcl_wool:dark_blue", "wool:blue") +minetest.register_alias("mcl_wool:gold", "wool:yellow") local wool = {} -- This uses a trick: you can first define the recipes using all of the base @@ -33,7 +33,7 @@ for _, row in ipairs(wool.dyes) do local desc = row[3] local craft_color_group = row[4] -- Node Definition - minetest.register_node("wool:"..name, { + minetest.register_node("mcl_wool:"..name, { description = desc.." Wool", stack_max = 64, is_ground_content = false, @@ -41,7 +41,7 @@ for _, row in ipairs(wool.dyes) do groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=1,wool=1,building_block=1}, sounds = default.node_sound_defaults(), }) - minetest.register_node("wool:"..name.."_carpet", { + minetest.register_node("mcl_wool:"..name.."_carpet", { description = desc.." Carpet", walkable = false, is_ground_content = false, @@ -63,12 +63,12 @@ for _, row in ipairs(wool.dyes) do -- Crafting from dye and white wool minetest.register_craft({ type = "shapeless", - output = 'wool:'..name, + output = 'mcl_wool:'..name, recipe = {'group:dye,'..craft_color_group, 'group:wool'}, }) minetest.register_craft({ - output = 'wool:'..name..'_carpet 3', - recipe = {{'wool:'..name, 'wool:'..name}}, + output = 'mcl_wool:'..name..'_carpet 3', + recipe = {{'mcl_wool:'..name, 'mcl_wool:'..name}}, }) end end diff --git a/mods/mcl_wool/mod.conf b/mods/mcl_wool/mod.conf new file mode 100644 index 000000000..2a4f86800 --- /dev/null +++ b/mods/mcl_wool/mod.conf @@ -0,0 +1 @@ +name = mcl_wool diff --git a/mods/wool/textures/wool_black.png b/mods/mcl_wool/textures/wool_black.png similarity index 100% rename from mods/wool/textures/wool_black.png rename to mods/mcl_wool/textures/wool_black.png diff --git a/mods/wool/textures/wool_blue.png b/mods/mcl_wool/textures/wool_blue.png similarity index 100% rename from mods/wool/textures/wool_blue.png rename to mods/mcl_wool/textures/wool_blue.png diff --git a/mods/wool/textures/wool_brown.png b/mods/mcl_wool/textures/wool_brown.png similarity index 100% rename from mods/wool/textures/wool_brown.png rename to mods/mcl_wool/textures/wool_brown.png diff --git a/mods/wool/textures/wool_cyan.png b/mods/mcl_wool/textures/wool_cyan.png similarity index 100% rename from mods/wool/textures/wool_cyan.png rename to mods/mcl_wool/textures/wool_cyan.png diff --git a/mods/wool/textures/wool_dark_grey.png b/mods/mcl_wool/textures/wool_dark_grey.png similarity index 100% rename from mods/wool/textures/wool_dark_grey.png rename to mods/mcl_wool/textures/wool_dark_grey.png diff --git a/mods/wool/textures/wool_green.png b/mods/mcl_wool/textures/wool_green.png similarity index 100% rename from mods/wool/textures/wool_green.png rename to mods/mcl_wool/textures/wool_green.png diff --git a/mods/wool/textures/wool_grey.png b/mods/mcl_wool/textures/wool_grey.png similarity index 100% rename from mods/wool/textures/wool_grey.png rename to mods/mcl_wool/textures/wool_grey.png diff --git a/mods/wool/textures/wool_light_blue.png b/mods/mcl_wool/textures/wool_light_blue.png similarity index 100% rename from mods/wool/textures/wool_light_blue.png rename to mods/mcl_wool/textures/wool_light_blue.png diff --git a/mods/wool/textures/wool_lime.png b/mods/mcl_wool/textures/wool_lime.png similarity index 100% rename from mods/wool/textures/wool_lime.png rename to mods/mcl_wool/textures/wool_lime.png diff --git a/mods/wool/textures/wool_magenta.png b/mods/mcl_wool/textures/wool_magenta.png similarity index 100% rename from mods/wool/textures/wool_magenta.png rename to mods/mcl_wool/textures/wool_magenta.png diff --git a/mods/wool/textures/wool_orange.png b/mods/mcl_wool/textures/wool_orange.png similarity index 100% rename from mods/wool/textures/wool_orange.png rename to mods/mcl_wool/textures/wool_orange.png diff --git a/mods/wool/textures/wool_pink.png b/mods/mcl_wool/textures/wool_pink.png similarity index 100% rename from mods/wool/textures/wool_pink.png rename to mods/mcl_wool/textures/wool_pink.png diff --git a/mods/wool/textures/wool_red.png b/mods/mcl_wool/textures/wool_red.png similarity index 100% rename from mods/wool/textures/wool_red.png rename to mods/mcl_wool/textures/wool_red.png diff --git a/mods/wool/textures/wool_violet.png b/mods/mcl_wool/textures/wool_violet.png similarity index 100% rename from mods/wool/textures/wool_violet.png rename to mods/mcl_wool/textures/wool_violet.png diff --git a/mods/wool/textures/wool_white.png b/mods/mcl_wool/textures/wool_white.png similarity index 100% rename from mods/wool/textures/wool_white.png rename to mods/mcl_wool/textures/wool_white.png diff --git a/mods/wool/textures/wool_yellow.png b/mods/mcl_wool/textures/wool_yellow.png similarity index 100% rename from mods/wool/textures/wool_yellow.png rename to mods/mcl_wool/textures/wool_yellow.png diff --git a/mods/mobs_mc/sheep.lua b/mods/mobs_mc/sheep.lua index 415704b5c..9621e70ed 100644 --- a/mods/mobs_mc/sheep.lua +++ b/mods/mobs_mc/sheep.lua @@ -26,7 +26,7 @@ mobs:register_mob("mobs_mc:sheep", { chance = 1, min = 1, max = 2,}, - {name = "wool:white", + {name = "mcl_wool:white", chance = 1, min = 1, max = 1,}, @@ -90,9 +90,9 @@ mobs:register_mob("mobs_mc:sheep", { minetest.sound_play("shears", {pos = pos}) pos.y = pos.y + 0.5 if not self.color then - minetest.add_item(pos, ItemStack("wool:white "..math.random(1,3))) + minetest.add_item(pos, ItemStack("mcl_wool:white "..math.random(1,3))) else - minetest.add_item(pos, ItemStack("wool:"..self.color.." "..math.random(1,3))) + minetest.add_item(pos, ItemStack("mcl_wool:"..self.color.." "..math.random(1,3))) end self.object:set_properties({ textures = {"sheep_sheared.png"}, @@ -116,7 +116,7 @@ print(item:get_name(), minetest.get_item_group(item:get_name(), "dye")) chance = 1, min = 1, max = 2,}, - {name = "wool:"..self.color, + {name = "mcl_wool:"..self.color, chance = 1, min = 1, max = 1,}, diff --git a/mods/mobs_mc/villager.lua b/mods/mobs_mc/villager.lua index 7906a41e3..962934b64 100644 --- a/mods/mobs_mc/villager.lua +++ b/mods/mobs_mc/villager.lua @@ -126,7 +126,7 @@ mobs:register_mob("mobs_mc:villager", { {"mobs:rotten_flesh 40", "default:clay_lump 1"}, {"default:gold_ingot 10", "default:clay_lump 1"}, {"farming:cotton 10", "default:clay_lump 1"}, - {"wool:white 15", "default:clay_lump 1"}, + {"mcl_wool:white 15", "default:clay_lump 1"}, {"farming:pumpkin 8", "default:clay_lump 1"}, {"default:clay_lump 1", "mobs:beef_cooked 5"},