Rename wool mod to mcl_wool

This commit is contained in:
Wuzzy 2017-01-30 15:25:24 +01:00
parent bd436aa9b0
commit fe283986ba
25 changed files with 16 additions and 16 deletions

View File

@ -1,3 +1,2 @@
default default
mcl_wool
wool

View File

@ -1,3 +1,3 @@
default default
bucket bucket
wool mcl_wool

View File

@ -1,8 +1,8 @@
-- minetest/wool/init.lua -- minetest/wool/init.lua
-- Backwards compatibility with jordach's 16-color wool mod -- Backwards compatibility with jordach's 16-color wool mod
minetest.register_alias("wool:dark_blue", "wool:blue") minetest.register_alias("mcl_wool:dark_blue", "wool:blue")
minetest.register_alias("wool:gold", "wool:yellow") minetest.register_alias("mcl_wool:gold", "wool:yellow")
local wool = {} local wool = {}
-- This uses a trick: you can first define the recipes using all of the base -- 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 desc = row[3]
local craft_color_group = row[4] local craft_color_group = row[4]
-- Node Definition -- Node Definition
minetest.register_node("wool:"..name, { minetest.register_node("mcl_wool:"..name, {
description = desc.." Wool", description = desc.." Wool",
stack_max = 64, stack_max = 64,
is_ground_content = false, 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}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=1,wool=1,building_block=1},
sounds = default.node_sound_defaults(), sounds = default.node_sound_defaults(),
}) })
minetest.register_node("wool:"..name.."_carpet", { minetest.register_node("mcl_wool:"..name.."_carpet", {
description = desc.." Carpet", description = desc.." Carpet",
walkable = false, walkable = false,
is_ground_content = false, is_ground_content = false,
@ -63,12 +63,12 @@ for _, row in ipairs(wool.dyes) do
-- Crafting from dye and white wool -- Crafting from dye and white wool
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = 'wool:'..name, output = 'mcl_wool:'..name,
recipe = {'group:dye,'..craft_color_group, 'group:wool'}, recipe = {'group:dye,'..craft_color_group, 'group:wool'},
}) })
minetest.register_craft({ minetest.register_craft({
output = 'wool:'..name..'_carpet 3', output = 'mcl_wool:'..name..'_carpet 3',
recipe = {{'wool:'..name, 'wool:'..name}}, recipe = {{'mcl_wool:'..name, 'mcl_wool:'..name}},
}) })
end end
end end

1
mods/mcl_wool/mod.conf Normal file
View File

@ -0,0 +1 @@
name = mcl_wool

View File

Before

Width:  |  Height:  |  Size: 565 B

After

Width:  |  Height:  |  Size: 565 B

View File

Before

Width:  |  Height:  |  Size: 652 B

After

Width:  |  Height:  |  Size: 652 B

View File

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 566 B

View File

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 639 B

View File

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 518 B

View File

Before

Width:  |  Height:  |  Size: 672 B

After

Width:  |  Height:  |  Size: 672 B

View File

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 639 B

View File

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 669 B

After

Width:  |  Height:  |  Size: 669 B

View File

Before

Width:  |  Height:  |  Size: 577 B

After

Width:  |  Height:  |  Size: 577 B

View File

Before

Width:  |  Height:  |  Size: 690 B

After

Width:  |  Height:  |  Size: 690 B

View File

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 653 B

View File

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 676 B

View File

Before

Width:  |  Height:  |  Size: 626 B

After

Width:  |  Height:  |  Size: 626 B

View File

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 663 B

View File

@ -26,7 +26,7 @@ mobs:register_mob("mobs_mc:sheep", {
chance = 1, chance = 1,
min = 1, min = 1,
max = 2,}, max = 2,},
{name = "wool:white", {name = "mcl_wool:white",
chance = 1, chance = 1,
min = 1, min = 1,
max = 1,}, max = 1,},
@ -90,9 +90,9 @@ mobs:register_mob("mobs_mc:sheep", {
minetest.sound_play("shears", {pos = pos}) minetest.sound_play("shears", {pos = pos})
pos.y = pos.y + 0.5 pos.y = pos.y + 0.5
if not self.color then 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 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 end
self.object:set_properties({ self.object:set_properties({
textures = {"sheep_sheared.png"}, textures = {"sheep_sheared.png"},
@ -116,7 +116,7 @@ print(item:get_name(), minetest.get_item_group(item:get_name(), "dye"))
chance = 1, chance = 1,
min = 1, min = 1,
max = 2,}, max = 2,},
{name = "wool:"..self.color, {name = "mcl_wool:"..self.color,
chance = 1, chance = 1,
min = 1, min = 1,
max = 1,}, max = 1,},

View File

@ -126,7 +126,7 @@ mobs:register_mob("mobs_mc:villager", {
{"mobs:rotten_flesh 40", "default:clay_lump 1"}, {"mobs:rotten_flesh 40", "default:clay_lump 1"},
{"default:gold_ingot 10", "default:clay_lump 1"}, {"default:gold_ingot 10", "default:clay_lump 1"},
{"farming:cotton 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"}, {"farming:pumpkin 8", "default:clay_lump 1"},
{"default:clay_lump 1", "mobs:beef_cooked 5"}, {"default:clay_lump 1", "mobs:beef_cooked 5"},