diff --git a/rtmmp/mods/cotton_blocks/init.lua b/rtmmp/mods/cotton_blocks/init.lua index 2ad83e4..b5f4a41 100644 --- a/rtmmp/mods/cotton_blocks/init.lua +++ b/rtmmp/mods/cotton_blocks/init.lua @@ -37,80 +37,17 @@ minetest.register_craft({ {'flowers:cotton','flowers:cotton'}, } }) - -local addCBrecipe = function(new, first, second) - minetest.register_craft({ - output = new, - recipe = { - {first, "dye:" .. second}, - } - }) - - minetest.register_craft({ - output = new, - recipe = { - {"dye:".. second, "dye:" .. first}, - } - }) - - minetest.register_craft({ - output = new, - recipe = { - {first}, - {"dye:".. second}, - } - }) - - minetest.register_craft({ - output = new, - recipe = { - {"dye:".. second}, - {first}, - } - }) - - minetest.register_craft({ - output = new, - recipe = { - {"dye:".. second,""}, - {"",first}, - } - }) - - minetest.register_craft({ - output = new, - recipe = { - {first,""}, - {"","dye:".. second}, - } - }) - - minetest.register_craft({ - output = new, - recipe = { - {"","dye:".. second}, - {first,""}, - } - }) - - minetest.register_craft({ - output = new, - recipe = { - {"",first}, - {"dye:".. second,""}, - } - }) -end + for color, name in pairs(CB_NAMES_COLORS) do minetest.register_node("cotton_blocks:" .. color, { description = name, - tile_images = {"cb_" .. color .. ".png"}, - inventory_image = minetest.inventorycube("cb_" .. color .. ".png"), + tile_images = "cb_" .. color .. ".png", + inventory_image = "cb_" .. color .. ".png", is_ground_content = true, groups = {snappy=3, cotton=1}, sounds = default.node_sound_cotton_defaults(), stack_max = 128, }) - addCBrecipe("cotton_blocks:" .. color,"cotton_blocks:white",color) - addCBrecipe("cotton_blocks:white","cotton_blocks:" .. color,"white") + dye.add_dye_recipe("cotton_blocks:" .. color,"cotton_blocks:white",color) + dye.add_dye_recipe("cotton_blocks:white","cotton_blocks:" .. color,"white") end diff --git a/rtmmp/mods/dye/Color_spectrum.png b/rtmmp/mods/dye/Color_spectrum.png index 57e9986..4b27bd4 100644 Binary files a/rtmmp/mods/dye/Color_spectrum.png and b/rtmmp/mods/dye/Color_spectrum.png differ diff --git a/rtmmp/mods/dye/init.lua b/rtmmp/mods/dye/init.lua index 1ada0d5..5f09fab 100644 --- a/rtmmp/mods/dye/init.lua +++ b/rtmmp/mods/dye/init.lua @@ -1,5 +1,73 @@ --Colors mod for RTMMP + +-- Dye table for public funcs +dye = {} + +dye.add_dye_recipe = function(new, first, second) + minetest.register_craft({ + output = new, + recipe = { + {first, "dye:" .. second}, + } + }) + + minetest.register_craft({ + output = new, + recipe = { + {"dye:".. second, "dye:" .. first}, + } + }) + + minetest.register_craft({ + output = new, + recipe = { + {first}, + {"dye:".. second}, + } + }) + + minetest.register_craft({ + output = new, + recipe = { + {"dye:".. second}, + {first}, + } + }) + + minetest.register_craft({ + output = new, + recipe = { + {"dye:".. second,""}, + {"",first}, + } + }) + + minetest.register_craft({ + output = new, + recipe = { + {first,""}, + {"","dye:".. second}, + } + }) + + minetest.register_craft({ + output = new, + recipe = { + {"","dye:".. second}, + {first,""}, + } + }) + + minetest.register_craft({ + output = new, + recipe = { + {"",first}, + {"dye:".. second,""}, + } + }) +end + --Public colors for mods: DYE_COLORS = { 'white', diff --git a/rtmmp/mods/moarcraft_rtmmp/init.lua b/rtmmp/mods/moarcraft_rtmmp/init.lua index de052e0..ecfc21f 100644 --- a/rtmmp/mods/moarcraft_rtmmp/init.lua +++ b/rtmmp/mods/moarcraft_rtmmp/init.lua @@ -1,22 +1,3 @@ --- stone brick -minetest.register_craft({ - output = 'node "moarcraft_rtmmp:stone_brick" 4', - recipe = { - {'node "default:stone"','node "default:stone"'}, - {'node "default:stone"','node "default:stone"'}, - } -}) - -minetest.register_node("moarcraft_rtmmp:stone_brick", { - tile_images = {"default_stone.png^moarcraft_rtmmp_stone_brick.png"}, - paramtype = "mineral", - is_ground_content = true, - often_contains_mineral = true, -- Texture atlas hint - groups = {cracky=2}, - sounds = default.node_sound_stone_defaults(), - stack_max = 128, -}) - -- steel block fix minetest.register_craft({ output = 'default:steel_ingot 9', diff --git a/rtmmp/mods/stone_brick/depends.txt b/rtmmp/mods/stone_brick/depends.txt new file mode 100644 index 0000000..2717bef --- /dev/null +++ b/rtmmp/mods/stone_brick/depends.txt @@ -0,0 +1,2 @@ +default +dye diff --git a/rtmmp/mods/stone_brick/init.lua b/rtmmp/mods/stone_brick/init.lua new file mode 100644 index 0000000..3557d31 --- /dev/null +++ b/rtmmp/mods/stone_brick/init.lua @@ -0,0 +1,71 @@ +-- stone bricks + +local SB_NAMES_COLORS = { + ["white"] = "White stone brick", + ["light_gray"] = "Light-gray stone brick", + ["gray"] = "Gray stone brick", + ["black"] = "Black stone brick", + ["red"] = "Red stone brick", + ["orange"] = "Orange stone brick", + ["yellow"] = "Yellow stone brick", + ["lime"] = "Lime stone brick", + ["green"] = "Green stone brick", + ["light_blue"] = "Light-blue stone brick", + ["cyan"] = "Cyan stone brick", + ["blue"] = "Blue stone brick", + ["purple"] = "Purple stone brick", + ["magenta"] = "Magenta stone brick", + ["pink"] = "Pink stone brick", + ["brown"] = "Brown stone brick", +} + + +-- Stone brick +minetest.register_craft({ + output = 'node "stone_brick:stone_brick" 4', + recipe = { + {'node "default:stone"','node "default:stone"'}, + {'node "default:stone"','node "default:stone"'}, + } +}) +minetest.register_node("stone_brick:stone_brick", { + tile_images = {"default_stone.png^stone_brick_stone_brick.png"}, + paramtype = "mineral", + is_ground_content = true, + groups = {cracky=2, level=2}, + sounds = default.node_sound_stone_defaults(), + stack_max = 128, +}) + +-- Desert stone brick +minetest.register_craft({ + output = "stone_brick:desert_stone_brick 4", + recipe = { + {"default:desert_stone","default:desert_stone"}, + {"default:desert_stone","default:desert_stone"}, + } +}) +minetest.register_node("stone_brick:desert_stone_brick", { + tile_images = {"stone_brick_desert_stone.png"}, + paramtype = "mineral", + is_ground_content = true, + groups = {cracky=2, level=2}, + sounds = default.node_sound_stone_defaults(), + stack_max = 128, +}) + +-- Colored bricks: +for color, name in pairs(SB_NAMES_COLORS) do + local texture = "stone_brick_" .. color .. ".png" + minetest.register_node("stone_brick:" .. color .. "_stone_brick", { + description = name, + paramtype = "mineral", + tile_images = {texture}, + is_ground_content = true, + groups = {cracky=2, level=2}, + sounds = default.node_sound_cotton_defaults(), + stack_max = 128, + }) + dye.add_dye_recipe("stone_brick:" .. color .. "_stone_brick","stone_brick:stone_brick",color) + dye.add_dye_recipe("stone_brick:white","stone_brick:" .. color .. "_stone_brick","white") +end diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_black.png b/rtmmp/mods/stone_brick/textures/stone_brick_black.png new file mode 100644 index 0000000..9afe866 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_black.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_blue.png b/rtmmp/mods/stone_brick/textures/stone_brick_blue.png new file mode 100644 index 0000000..f79e8e5 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_blue.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_brown.png b/rtmmp/mods/stone_brick/textures/stone_brick_brown.png new file mode 100644 index 0000000..4e34880 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_brown.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_cyan.png b/rtmmp/mods/stone_brick/textures/stone_brick_cyan.png new file mode 100644 index 0000000..9bb57ab Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_cyan.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_desert_stone.png b/rtmmp/mods/stone_brick/textures/stone_brick_desert_stone.png new file mode 100644 index 0000000..e59a2dc Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_desert_stone.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_gray.png b/rtmmp/mods/stone_brick/textures/stone_brick_gray.png new file mode 100644 index 0000000..d4f49c0 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_gray.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_green.png b/rtmmp/mods/stone_brick/textures/stone_brick_green.png new file mode 100644 index 0000000..7a6423d Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_green.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_light_blue.png b/rtmmp/mods/stone_brick/textures/stone_brick_light_blue.png new file mode 100644 index 0000000..5667def Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_light_blue.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_light_gray.png b/rtmmp/mods/stone_brick/textures/stone_brick_light_gray.png new file mode 100644 index 0000000..0ba7fa7 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_light_gray.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_lime.png b/rtmmp/mods/stone_brick/textures/stone_brick_lime.png new file mode 100644 index 0000000..9b3dc09 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_lime.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_magenta.png b/rtmmp/mods/stone_brick/textures/stone_brick_magenta.png new file mode 100644 index 0000000..fb4d6fe Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_magenta.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_orange.png b/rtmmp/mods/stone_brick/textures/stone_brick_orange.png new file mode 100644 index 0000000..35f78ce Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_orange.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_pink.png b/rtmmp/mods/stone_brick/textures/stone_brick_pink.png new file mode 100644 index 0000000..6d93c25 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_pink.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_purple.png b/rtmmp/mods/stone_brick/textures/stone_brick_purple.png new file mode 100644 index 0000000..8bbf4e2 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_purple.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_red.png b/rtmmp/mods/stone_brick/textures/stone_brick_red.png new file mode 100644 index 0000000..1f17124 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_red.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_stone_brick.png b/rtmmp/mods/stone_brick/textures/stone_brick_stone_brick.png new file mode 100644 index 0000000..3b8e45b Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_stone_brick.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_white.png b/rtmmp/mods/stone_brick/textures/stone_brick_white.png new file mode 100644 index 0000000..ecec7d4 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_white.png differ diff --git a/rtmmp/mods/stone_brick/textures/stone_brick_yellow.png b/rtmmp/mods/stone_brick/textures/stone_brick_yellow.png new file mode 100644 index 0000000..0b33821 Binary files /dev/null and b/rtmmp/mods/stone_brick/textures/stone_brick_yellow.png differ