diff --git a/mods/Cars/carts/rails.lua b/mods/Cars/carts/rails.lua index 9b7a5a0..60afe12 100644 --- a/mods/Cars/carts/rails.lua +++ b/mods/Cars/carts/rails.lua @@ -30,15 +30,15 @@ minetest.register_alias("carts:rail", "carts:railwhite") carts:register_rail("carts:rail" .. color, { description = color .. "rail", -inventory_image = "carts_rail_straight_pwr.png^[colorize:#"..colour..":70", -wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "carts_rail_straight_pwr.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, tiles = { "carts_rail_straight_pwr.png^[colorize:#"..colour..":70", "carts_rail_curved_pwr.png^[colorize:#"..colour..":70", "carts_rail_t_junction_pwr.png^[colorize:#"..colour..":70", -"carts_rail_crossing_pwr.png^[colorize:#"..colour..":70" + "carts_rail_crossing_pwr.png^[colorize:#"..colour..":70" }, groups = carts:get_rail_groups(), -}, {acceleration = 5}) + }, {acceleration = 5}) end diff --git a/mods/Decorations/abritorch/torches.lua b/mods/Decorations/abritorch/torches.lua index 109f70a..5d1aeae 100644 --- a/mods/Decorations/abritorch/torches.lua +++ b/mods/Decorations/abritorch/torches.lua @@ -32,8 +32,8 @@ local enable_ceiling = true minetest.register_craftitem("abritorch:torch_" .. name, { description = desc.." Torch", inventory_image = "torch.png^[colorize:#"..colour..":70", - wield_image = "color_hand" .. name .. ".png", - wield_scale = {x=1,y=1,z=0.5}, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, liquids_pointable = false, on_place = function(itemstack, placer, pointed_thing) local above = pointed_thing.above @@ -62,8 +62,8 @@ local enable_ceiling = true minetest.register_node("abritorch:floor_"..name, { description = desc.." Torch", inventory_image = "torch.png^[colorize:#"..colour..":70", - wield_image = "color_hand" .. name .. ".png", - wield_scale = {x=1,y=1,z=0.5}, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, drawtype = "mesh", mesh = "torch_floor.obj", tiles = { @@ -87,8 +87,8 @@ local enable_ceiling = true minetest.register_node("abritorch:wall_"..name, { inventory_image = "torch.png^[colorize:#"..colour..":70", - wield_image = "color_hand" .. name .. ".png", - wield_scale = {x=1,y=1,z=0.5}, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, drawtype = "mesh", mesh = "torch_wall.obj", tiles = { diff --git a/mods/Decorations/beacon/init.lua b/mods/Decorations/beacon/init.lua index d78efbb..edd107a 100644 --- a/mods/Decorations/beacon/init.lua +++ b/mods/Decorations/beacon/init.lua @@ -32,9 +32,9 @@ for i in ipairs(source_list) do --code for "unactivated beacon" minetest.register_node("beacon:empty", { description = "Unactivated Beacon", - wield_image = "color_handwhite.png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, - inventory_image = 'beaconoff.png^[colorize:#'..colour..':70', + inventory_image = 'beaconoff.png^[colorize:#'..colour..':70', tiles = {"color_white.png", "default_glass.png"}, light_source = 3, groups = {cracky=3,oddly_breakable_by_hand=3}, @@ -43,11 +43,11 @@ minetest.register_node("beacon:empty", { minetest.register_node("beacon:off" .. color , { description = "Beacon" .. color, drawtype = "mesh", - light_source = 13, + light_source = 13, mesh = "block_in_block.obj", - wield_image = "color_hand" .. color .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, - inventory_image = 'beaconoff.png^[colorize:#'..colour..':70', + inventory_image = 'beaconoff.png^[colorize:#'..colour..':70', tiles = {"color_white.png^[colorize:#"..colour..":70","default_glass.png"}, paramtype = "light", is_ground_content = false, @@ -69,11 +69,11 @@ on_destruct = function(pos) minetest.register_node("beacon:" .. color , { description = "Beacon" .. color, drawtype = "mesh", - light_source = 13, + light_source = 13, mesh = "block_in_block.obj", - wield_image = "color_hand" .. color .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, - inventory_image = 'beaconon.png^[colorize:#'..colour..':70', + inventory_image = 'beaconon.png^[colorize:#'..colour..':70', tiles = {"color_white.png^[colorize:#"..colour..":70", "default_glass.png"}, paramtype = "light", is_ground_content = false, diff --git a/mods/Decorations/beds/init.lua b/mods/Decorations/beds/init.lua index 68053b0..b9a7836 100644 --- a/mods/Decorations/beds/init.lua +++ b/mods/Decorations/beds/init.lua @@ -20,9 +20,9 @@ local colour2 = beds_list[i][3] description = beddesc, drawtype = "nodebox", tiles = {"color_white.png^[colorize:#"..colour2..":70", "color_orange.png", "color_orange.png", "color_orange.png", "color_orange.png", "color_orange.png"}, -wield_image = "color_hand" .. colour .. ".png", - wield_scale = {x=1,y=1,z=0.5}, -inventory_image = "beds.png^[colorize:#".. colour2 .. ":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour2..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "beds.png^[colorize:#".. colour2 .. ":70", paramtype = "light", paramtype2 = "facedir", stack_max = 1, @@ -95,7 +95,7 @@ inventory_image = "beds.png^[colorize:#".. colour2 .. ":70", tiles = {"beds_bed_top_top.png^[colorize:#"..colour2..":70", "color_orange.png", "color_orange.png", "color_orange.png", "color_orange.png", "color_orange.png"}, paramtype = "light", paramtype2 = "facedir", -wield_image = "color_hand" .. colour .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour2..":70)", wield_scale = {x=1,y=1,z=0.5}, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, sounds = default.node_sound_wood_defaults(), diff --git a/mods/Decorations/castle_gates/gates.lua b/mods/Decorations/castle_gates/gates.lua index db16753..5890d21 100644 --- a/mods/Decorations/castle_gates/gates.lua +++ b/mods/Decorations/castle_gates/gates.lua @@ -36,9 +36,9 @@ minetest.register_node("castle_gates:herse" .. color, { drawtype = "nodebox", description = S("Portcullis Bars"), groups = {castle_gate = 1, choppy = 1, flow_through = 1}, - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "cgherse.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "cgherse.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, sounds = default.node_sound_wood_defaults(), paramtype = "light", @@ -62,10 +62,10 @@ minetest.register_node("castle_gates:door" ..color ,{ drawtype = "nodebox", description = S("Gate Door Edge"), groups = {choppy = 1, castle_gate = 1}, - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "cgdoor.png^[colorize:#"..colour..":70", - tiles = {"color_white.png^[colorize:#"..colour..":70"}, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "cgdoor.png^[colorize:#"..colour..":70", + tiles = {"color_white.png^[colorize:#"..colour..":70"}, sounds = default.node_sound_wood_defaults(), paramtype = "light", paramtype2 = "facedir", @@ -85,9 +85,9 @@ minetest.register_node("castle_gates:door" ..color ,{ minetest.register_node("castle_gates:border" ..color , { drawtype = "nodebox", description = S("Gate Door With Hinge"), - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "cgborder.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "cgborder.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, sounds = default.node_sound_wood_defaults(), paramtype = "light", diff --git a/mods/Decorations/castle_shields/init.lua b/mods/Decorations/castle_shields/init.lua index 54676db..67bb074 100644 --- a/mods/Decorations/castle_shields/init.lua +++ b/mods/Decorations/castle_shields/init.lua @@ -41,7 +41,7 @@ castle_shields.register_shield = function(name, desc, background_color, foregrou minetest.register_node(minetest.get_current_modname()..":"..name, { description = desc, tiles = {tile_side, tile_side, tile_side, tile_side, "color_black.png", tile_front}, - wield_image = "color_hand" .. color .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "inv"..mask..".png^[colorize:#"..colour..":70", drawtype="nodebox", diff --git a/mods/Decorations/comboblock/init.lua b/mods/Decorations/comboblock/init.lua index 1f39565..a48dfb5 100644 --- a/mods/Decorations/comboblock/init.lua +++ b/mods/Decorations/comboblock/init.lua @@ -55,7 +55,7 @@ for k,v1 in pairs(comboblock.index) do paramtype = "light", paramtype2 = "facedir", drawtype = "mesh", - mesh = "test.obj", + mesh = "test.obj", sounds = v1_def.sounds, groups = v1_groups, drop = v1, diff --git a/mods/Decorations/factory_bridges/nodes.lua b/mods/Decorations/factory_bridges/nodes.lua index e3ba9e1..0bd5582 100644 --- a/mods/Decorations/factory_bridges/nodes.lua +++ b/mods/Decorations/factory_bridges/nodes.lua @@ -33,9 +33,9 @@ minetest.register_node(FB.NAME..":stair" .. color, { paramtype = "light", paramtype2 = "facedir", groups = {cracky = 2}, - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "fbstair.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "fbstair.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, node_box = {type = "fixed", fixed = FB.MODELS.C00}, }) @@ -46,9 +46,9 @@ minetest.register_node(FB.NAME..":trap1" .. color, { paramtype = "light", paramtype2 = "facedir", groups = {cracky = 2}, - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "fbtrap.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "fbtrap.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, node_box = {type = "fixed", fixed = FB.MODELS.D00}, on_rightclick = function(pos, node, player, itemstack, pointed_thing) @@ -62,9 +62,9 @@ minetest.register_node(FB.NAME..":trap2" .. color, { paramtype = "light", paramtype2 = "facedir", groups = {cracky=2, not_in_creative_inventory = 1}, - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "fbtrap.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "fbtrap.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, node_box = {type = "fixed", fixed = FB.MODELS.D01}, on_rightclick = function(pos, node, player, itemstack, pointed_thing) @@ -80,9 +80,9 @@ minetest.register_node(FB.NAME..":ladder" .. color, { paramtype2 = "facedir", climbable = true, groups = {cracky = 2}, - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "fbladder.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "fbladder.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, node_box = {type = "fixed", fixed = FB.MODELS.S00}, }) diff --git a/mods/Decorations/flags/init.lua b/mods/Decorations/flags/init.lua index 16da766..508d7fe 100644 --- a/mods/Decorations/flags/init.lua +++ b/mods/Decorations/flags/init.lua @@ -30,9 +30,9 @@ minetest.register_node("flags:" ..name, { description = ("Flag"), drawtype = "torchlike", visual_scale = 3.0, - wield_image = "color_hand" .. name .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "flag.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "flag.png^[colorize:#"..colour..":70", tiles = {"flags.png^[colorize:#"..colour..":70"}, use_texture_alpha = true, paramtype = "light", diff --git a/mods/Decorations/flowers/init.lua b/mods/Decorations/flowers/init.lua index 038ae83..b1dc2bb 100644 --- a/mods/Decorations/flowers/init.lua +++ b/mods/Decorations/flowers/init.lua @@ -27,13 +27,13 @@ for i in ipairs(source_list) do inventory_image = 'flowers.png^[colorize:#'..colour..':70', sunlight_propagates = true, paramtype = 'light', - description = desc .. " Flower color", - wield_image = "color_hand" .. name .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - groups = {snappy = 2, choppy = 2, wool = 2}, - oddly_breakable_by_hand = 1, - dig_immediate = 3, - waving = 1, + description = desc .. " Flower color", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + groups = {snappy = 2, choppy = 2, wool = 2}, + oddly_breakable_by_hand = 1, + dig_immediate = 3, + waving = 1, walkable = false, buildable_to = true, sounds = default.node_sound_leaves_defaults(), diff --git a/mods/Decorations/hdb/init.lua b/mods/Decorations/hdb/init.lua index d482d49..e8e4d11 100644 --- a/mods/Decorations/hdb/init.lua +++ b/mods/Decorations/hdb/init.lua @@ -33,51 +33,51 @@ for i in ipairs(source_list) do minetest.register_node("hdb:frigo" .. color, { description = "frigo" .. color, - drawtype = "mesh", + drawtype = "mesh", mesh = "hdb_frigo.obj", -tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, + tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, inventory_image = 'frigo.png^[colorize:#'..colour..':70', - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - paramtype = "light", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + paramtype = "light", paramtype2 = "facedir", -collision_box = armoire_cbox, - selection_box = armoire_cbox, - groups = {cracky=3, oddly_breakable_by_hand=2}, + collision_box = armoire_cbox, + selection_box = armoire_cbox, + groups = {cracky=3, oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node, }) minetest.register_node("hdb:bench" .. color, { description = "bench" .. color, - drawtype = "mesh", + drawtype = "mesh", mesh = "hdb_bench.obj", - tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, + tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, inventory_image = 'bench.png^[colorize:#'..colour..':70', - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - paramtype = "light", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + paramtype = "light", paramtype2 = "facedir", -collision_box = bench_cbox, - selection_box = bench_cbox, - groups = {cracky=3, oddly_breakable_by_hand=2}, + collision_box = bench_cbox, + selection_box = bench_cbox, + groups = {cracky=3, oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node, }) minetest.register_node("hdb:armoire" .. color, { description = "armoire" .. color, - drawtype = "mesh", + drawtype = "mesh", mesh = "hdb_armoire.obj", - tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, + tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, inventory_image = 'armoire.png^[colorize:#'..colour..':70', - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - paramtype = "light", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + paramtype = "light", paramtype2 = "facedir", -collision_box = armoire_cbox, - selection_box = armoire_cbox, - groups = {cracky=3, oddly_breakable_by_hand=2}, + collision_box = armoire_cbox, + selection_box = armoire_cbox, + groups = {cracky=3, oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node, }) @@ -86,32 +86,32 @@ collision_box = armoire_cbox, minetest.register_node("hdb:desk" .. color, { description = "Desk" .. color, - drawtype = "mesh", + drawtype = "mesh", mesh = "hdb_desk.obj", - tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, + tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, inventory_image = 'desk.png^[colorize:#'..colour..':70', - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - paramtype = "light", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + paramtype = "light", paramtype2 = "facedir", -collision_box = desk_cbox, - selection_box = desk_cbox, - groups = {cracky=3, oddly_breakable_by_hand=2}, + collision_box = desk_cbox, + selection_box = desk_cbox, + groups = {cracky=3, oddly_breakable_by_hand=2}, sounds = default.node_sound_stone_defaults(), on_place = minetest.rotate_node, }) minetest.register_node("hdb:computer" .. color , { description = "Computer" .. color, -inventory_image = 'computer.png^[colorize:#'..colour..':70', - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, + inventory_image = 'computer.png^[colorize:#'..colour..':70', + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, drawtype = "mesh", mesh = "hdb_pc.obj", -tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, + tiles = {"color_white.png^[colorize:#"..colour..":70","color_" ..color2.. ".png", "color_" ..color2.. ".png", "color_white.png^[colorize:#"..colour..":70"}, paramtype = "light", paramtype2 = "facedir", - groups = {cracky=3, oddly_breakable_by_hand=2}, + groups = {cracky=3, oddly_breakable_by_hand=2}, sounds = default.node_sound_stone_defaults(), on_place = minetest.rotate_node, }) diff --git a/mods/Decorations/ma_pops_furniture/nodes.lua b/mods/Decorations/ma_pops_furniture/nodes.lua index afde400..6140052 100644 --- a/mods/Decorations/ma_pops_furniture/nodes.lua +++ b/mods/Decorations/ma_pops_furniture/nodes.lua @@ -18,15 +18,15 @@ for i in ipairs (chair_table) do local name = chair_table[i][1] local material = chair_table[i][2] local invimg = chair_table[i][3] - local colour = chair_table[i][4] + local colour = chair_table[i][4] minetest.register_node('ma_pops_furniture:chair_'..material, { description = name, drawtype = 'nodebox', -wield_image = "color_hand" .. material .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "chair.png^[colorize:#"..colour..":70", - tiles = {"color_white.png^[colorize:#"..colour..":70"}, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "chair.png^[colorize:#"..colour..":70", + tiles = {"color_white.png^[colorize:#"..colour..":70"}, groups = {choppy=2, oddly_breakably_by_hand=2, furniture=1, flammable=1}, paramtype = 'light', paramtype2 = 'facedir', @@ -65,15 +65,15 @@ for i in ipairs (table_table) do local name = table_table[i][1] local material = table_table[i][2] local invimg = table_table[i][3] - local colour = table_table[i][4] + local colour = table_table[i][4] minetest.register_node('ma_pops_furniture:table_'..material, { description = name, -wield_image = "color_hand" .. material .. ".png", -wield_scale = {x=1,y=1,z=0.5}, -inventory_image = "table.png^[colorize:#"..colour..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "table.png^[colorize:#"..colour..":70", drawtype = 'nodebox', - tiles = {"color_white.png^[colorize:#"..colour..":70"}, + tiles = {"color_white.png^[colorize:#"..colour..":70"}, groups = {snappy = 2, oddly_breakable_by_hand = 2, furniture = 1, flammable = 1}, paramtype = 'light', paramtype2 = 'facedir', @@ -107,15 +107,15 @@ for i in ipairs (chair2_table) do local name = chair2_table[i][1] local material = chair2_table[i][2] local invimg = chair2_table[i][3] - local colour = chair2_table[i][4] + local colour = chair2_table[i][4] minetest.register_node('ma_pops_furniture:chair2_'..material, { description = name, drawtype = 'nodebox', -wield_image = "color_hand" .. material .. ".png", -wield_scale = {x=1,y=1,z=0.5}, -inventory_image = "sofas.png^[colorize:#"..colour..":70", -tiles = {"color_white.png^[colorize:#"..colour..":70"}, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "sofas.png^[colorize:#"..colour..":70", + tiles = {"color_white.png^[colorize:#"..colour..":70"}, groups = {choppy=2, oddly_breakably_by_hand=2, furniture=1, flammable=1}, paramtype = 'light', paramtype2 = 'facedir', diff --git a/mods/Decorations/signs_lib/init.lua b/mods/Decorations/signs_lib/init.lua index 472dad0..95ccf16 100644 --- a/mods/Decorations/signs_lib/init.lua +++ b/mods/Decorations/signs_lib/init.lua @@ -688,22 +688,22 @@ if enable_colored_metal_signs then -- array : color, translated color, default text color local sign_colors = { - {"green", S("green"), "f", color3}, - {"yellow", S("yellow"), "0", color7}, - {"red", S("red"), "f", color6}, - {"white", S("white"), "4", color4}, - {"black", S("black"), "0", color1}, - {"orange", S("orange"), "0", color5}, - {"blue", S("blue"), "f", color2}, - {"pink", S("pink"), "f", color8}, + {"green", S("green"), "f", color3}, + {"yellow", S("yellow"), "0", color7}, + {"red", S("red"), "f", color6}, + {"white", S("white"), "4", color4}, + {"black", S("black"), "0", color1}, + {"orange", S("orange"), "0", color5}, + {"blue", S("blue"), "f", color2}, + {"pink", S("pink"), "f", color8}, } for i, color in ipairs(sign_colors) do minetest.register_node(":signs:sign_wall_"..color[1], { description = S("Sign (@1, metal)", color[2]), - inventory_image = "signs.png^[colorize:#"..color[4]..":70", - wield_image = "color_hand" .. color[1] .. ".png", - wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "signs.png^[colorize:#"..color[4]..":70", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color[4]..":70)", + wield_scale = {x=1,y=1,z=0.5}, node_placement_prediction = "", paramtype = "light", sunlight_propagates = true, @@ -854,146 +854,6 @@ minetest.register_lbm({ -- locked sign -minetest.register_craft({ - output = "locked_sign:sign_wall_locked", - recipe = { - {default_sign}, - {"default:steel_ingot"}, - }, -}) - --- craft recipes for the metal signs -if enable_colored_metal_signs then - - minetest.register_craft( { - output = "signs:sign_wall_green", - recipe = { - { "dye:dark_green", "dye:white", "dye:dark_green" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_green 2", - recipe = { - { "dye:dark_green", "dye:white", "dye:dark_green" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_yellow", - recipe = { - { "dye:yellow", "dye:black", "dye:yellow" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_yellow 2", - recipe = { - { "dye:yellow", "dye:black", "dye:yellow" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_red", - recipe = { - { "dye:red", "dye:white", "dye:red" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_red 2", - recipe = { - { "dye:red", "dye:white", "dye:red" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_white_red", - recipe = { - { "dye:white", "dye:red", "dye:white" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_white_red 2", - recipe = { - { "dye:white", "dye:red", "dye:white" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_white_black", - recipe = { - { "dye:white", "dye:black", "dye:white" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_white_black 2", - recipe = { - { "dye:white", "dye:black", "dye:white" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_orange", - recipe = { - { "dye:orange", "dye:black", "dye:orange" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_orange 2", - recipe = { - { "dye:orange", "dye:black", "dye:orange" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_blue", - recipe = { - { "dye:blue", "dye:white", "dye:blue" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_blue 2", - recipe = { - { "dye:blue", "dye:white", "dye:blue" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_brown", - recipe = { - { "dye:brown", "dye:white", "dye:brown" }, - { "", default_sign_metal, "" } - }, - }) - - minetest.register_craft( { - output = "signs:sign_wall_brown 2", - recipe = { - { "dye:brown", "dye:white", "dye:brown" }, - { "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" } - }, - }) -end - if minetest.settings:get("log_mods") then minetest.log("action", S("[MOD] signs loaded")) end diff --git a/mods/Decorations/trampoline/init.lua b/mods/Decorations/trampoline/init.lua index 77c98ca..e2aafc3 100644 --- a/mods/Decorations/trampoline/init.lua +++ b/mods/Decorations/trampoline/init.lua @@ -13,9 +13,9 @@ color8 = minetest.setting_get("color8") or "FF69B4" local source_list = { {"black", "Color1", color1, 40, 36, 33}, - {"blue", "Color2", color2, 0, 0, 255}, - {"green", "Color3", color3, 0, 255, 0}, - {"white", "Color4", color4, 245, 245, 245}, + {"blue", "Color2", color2, 0, 0, 255}, + {"green", "Color3", color3, 0, 255, 0}, + {"white", "Color4", color4, 245, 245, 245}, {"orange", "Color5", color5, 255, 97, 3}, {"red", "Color6", color6, 255, 0, 0}, {"yellow", "Color7", color7, 255, 255, 0}, @@ -32,8 +32,8 @@ for i in ipairs(source_list) do minetest.register_node("trampoline:"..color, { description = desc.."Trampoline", - inventory_image = 'trampo.png^[colorize:#'..colour..':70', - wield_image = "color_hand" .. color .. ".png", + inventory_image = 'trampo.png^[colorize:#'..colour..':70', + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, tiles = {"trampoline.png^[colorize:#"..colour..":70", "trampoline.png^[colorize:#"..colour..":70", "trampoline_sides.png^[colorize:#"..colour..":70"}, groups = {cracky=3, oddly_breakable_by_hand=1, fall_damage_add_percent=-100, bouncy=99}, diff --git a/mods/Nodes/carpet/init.lua b/mods/Nodes/carpet/init.lua index d3deb6a..3cd99d7 100644 --- a/mods/Nodes/carpet/init.lua +++ b/mods/Nodes/carpet/init.lua @@ -17,19 +17,19 @@ for i = 1, #dyes do local name, desc, colour = unpack(dyes[i]) minetest.register_node("carpet:" .. name, { - -description = desc .. " Carpet color", + + description = desc .. " Carpet color", drawtype = "raillike", tiles = {"color_white.png^[colorize:#"..colour..":70"}, - wield_image = "color_hand" .. name .. ".png", - inventory_image = "carpets.png^[colorize:#"..colour..":70", - wield_scale = {x=1,y=1,z=0.5}, - paramtype = "light", - is_ground_content = true, - walkable = false, - buildable_to = true, - selection_box = { - type = "fixed", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + inventory_image = "carpets.png^[colorize:#"..colour..":70", + wield_scale = {x=1,y=1,z=0.5}, + paramtype = "light", + is_ground_content = true, + walkable = false, + buildable_to = true, + selection_box = { + type = "fixed", fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, }, diff --git a/mods/Nodes/color/init.lua b/mods/Nodes/color/init.lua index 3b9f9e6..4aa7acf 100644 --- a/mods/Nodes/color/init.lua +++ b/mods/Nodes/color/init.lua @@ -32,7 +32,7 @@ for i in ipairs(source_list) do inventory_image = "blocks.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, is_ground_content = true, groups = {snappy = 2, choppy = 2, wool = 2}, diff --git a/mods/Nodes/color/textures/color_handblack.png b/mods/Nodes/color/textures/color_handblack.png deleted file mode 100644 index 356c56c..0000000 Binary files a/mods/Nodes/color/textures/color_handblack.png and /dev/null differ diff --git a/mods/Nodes/color/textures/color_handblue.png b/mods/Nodes/color/textures/color_handblue.png deleted file mode 100644 index b314209..0000000 Binary files a/mods/Nodes/color/textures/color_handblue.png and /dev/null differ diff --git a/mods/Nodes/color/textures/color_handgreen.png b/mods/Nodes/color/textures/color_handgreen.png deleted file mode 100644 index b03934e..0000000 Binary files a/mods/Nodes/color/textures/color_handgreen.png and /dev/null differ diff --git a/mods/Nodes/color/textures/color_handorange.png b/mods/Nodes/color/textures/color_handorange.png deleted file mode 100644 index 17998f2..0000000 Binary files a/mods/Nodes/color/textures/color_handorange.png and /dev/null differ diff --git a/mods/Nodes/color/textures/color_handpink.png b/mods/Nodes/color/textures/color_handpink.png deleted file mode 100644 index fc39c53..0000000 Binary files a/mods/Nodes/color/textures/color_handpink.png and /dev/null differ diff --git a/mods/Nodes/color/textures/color_handred.png b/mods/Nodes/color/textures/color_handred.png deleted file mode 100644 index 40f1f0b..0000000 Binary files a/mods/Nodes/color/textures/color_handred.png and /dev/null differ diff --git a/mods/Nodes/color/textures/color_handwhite2.png b/mods/Nodes/color/textures/color_handwhite2.png new file mode 100644 index 0000000..7edd8ee Binary files /dev/null and b/mods/Nodes/color/textures/color_handwhite2.png differ diff --git a/mods/Nodes/color/textures/color_handyellow.png b/mods/Nodes/color/textures/color_handyellow.png deleted file mode 100644 index aab471c..0000000 Binary files a/mods/Nodes/color/textures/color_handyellow.png and /dev/null differ diff --git a/mods/Nodes/doors/init.lua b/mods/Nodes/doors/init.lua index 1422d17..5d14265 100644 --- a/mods/Nodes/doors/init.lua +++ b/mods/Nodes/doors/init.lua @@ -472,7 +472,7 @@ doors.register("door_" .. name , { alpha = 200, tiles = {"doors_door_white.png^[colorize:#"..colour..":70"}, description = name .. "Door", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "doors.png^[colorize:#"..colour..":70", groups = {cracky=3}, @@ -672,7 +672,7 @@ doors.register_trapdoor("doors:trapdoor_" .. name , { description = "Trapdoor", tile_front = "color_white.png^[colorize:#"..colour..":70", tile_side = "color_white.png^[colorize:#"..colour..":70", - wield_image = "color_hand" .. name ..".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "trapdoor.png^[colorize:#"..colour..":70", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1}, diff --git a/mods/Nodes/fence/init.lua b/mods/Nodes/fence/init.lua index c68bbda..26acc44 100644 --- a/mods/Nodes/fence/init.lua +++ b/mods/Nodes/fence/init.lua @@ -23,7 +23,7 @@ for i in ipairs(source_list) do minetest.register_node("fence:" .. name, { description = desc .. " Fence ", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", inventory_image = "fence.png^[colorize:#"..colour..":70", wield_scale = {x=1,y=1,z=0.5}, tiles = {"color_white.png^[colorize:#"..colour..":70"}, diff --git a/mods/Nodes/fullpipe/init.lua b/mods/Nodes/fullpipe/init.lua index 4c76ed6..fae52ad 100644 --- a/mods/Nodes/fullpipe/init.lua +++ b/mods/Nodes/fullpipe/init.lua @@ -5,20 +5,20 @@ fullpipe = {} -function fullpipe.register_pipe_border(subname, recipeitem, groups, images, description, inventorys, sounds) +function fullpipe.register_pipe_border(subname, recipeitem, groups, images, description, inventorys, wieldcolors, sounds) minetest.register_node("fullpipe:border_" .. subname, { - wield_image = "color_hand" .. subname .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = inventorys, - description = description, - drawtype = "nodebox", - tiles = images, - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = true, - groups = groups, - sounds = sounds, - node_box = { + wield_image = wieldcolors, + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = inventorys, + description = description, + drawtype = "nodebox", + tiles = images, + paramtype = "light", + paramtype2 = "facedir", + is_ground_content = true, + groups = groups, + sounds = sounds, + node_box = { type = "fixed", fixed = { {-0.25, -0.5, -0.25, 0.25, 0.5, 0.25}, @@ -31,9 +31,9 @@ function fullpipe.register_pipe_border(subname, recipeitem, groups, images, desc end -function fullpipe.register_pipe_block(subname, recipeitem, groups, images, description, inventorys, sounds) +function fullpipe.register_pipe_block(subname, recipeitem, groups, images, description, inventorys, wieldcolors, sounds) minetest.register_node("fullpipe:block_" .. subname, { - wield_image = "color_hand" .. subname .. ".png", + wield_image = wieldcolors, wield_scale = {x=1,y=1,z=0.5}, inventory_image = inventorys, description = description, @@ -85,6 +85,7 @@ fullpipe.register_pipe("" .. name .. "", "color:" .. name, desc .. "FullPipe Block", "fullpipeborder.png^[colorize:#"..colour..":70", "fullpipe.png^[colorize:#"..colour..":70", + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", default.node_sound_stone_defaults() ) diff --git a/mods/Nodes/glass/init.lua b/mods/Nodes/glass/init.lua index fafd949..b5aec6d 100644 --- a/mods/Nodes/glass/init.lua +++ b/mods/Nodes/glass/init.lua @@ -22,7 +22,7 @@ minetest.register_node("glass:" .. name , { drawtype = "glasslike", tiles = {"whiteglass.png^[colorize:#"..colour..":70"}, inventory_image = "windows.png^[colorize:#"..colour..":70", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, paramtype = "light", use_texture_alpha = true, diff --git a/mods/Nodes/light/init.lua b/mods/Nodes/light/init.lua index 13a63b3..02549f8 100644 --- a/mods/Nodes/light/init.lua +++ b/mods/Nodes/light/init.lua @@ -13,7 +13,7 @@ for i = 1, #dyes do minetest.register_node("light:" .. name, { description = desc .. " light", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "lights.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, diff --git a/mods/Nodes/pkarcs/init.lua b/mods/Nodes/pkarcs/init.lua index 21315c7..7434032 100644 --- a/mods/Nodes/pkarcs/init.lua +++ b/mods/Nodes/pkarcs/init.lua @@ -53,7 +53,7 @@ local name = source_list[i][1] sounds = default.node_sound_defaults(), oddly_breakable_by_hand = 1, dig_immediate = 3, - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "arc.png^[colorize:#"..colour..":70", @@ -128,7 +128,7 @@ local name = source_list[i][1] sounds = default.node_sound_defaults(), oddly_breakable_by_hand = 1, dig_immediate = 3, -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "arcout.png^[colorize:#"..colour..":70", @@ -221,7 +221,7 @@ wield_image = "color_hand" .. name .. ".png", sounds = default.node_sound_defaults(), oddly_breakable_by_hand = 1, dig_immediate = 3, - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "arcin.png^[colorize:#"..colour..":70", diff --git a/mods/Nodes/slope/init.lua b/mods/Nodes/slope/init.lua index dc06f29..b2e4abd 100644 --- a/mods/Nodes/slope/init.lua +++ b/mods/Nodes/slope/init.lua @@ -111,7 +111,7 @@ for i in ipairs(source_list) do minetest.register_node("slope:edge_glass_" .. name, { description = desc .. "glass edge", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "edge.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -128,7 +128,7 @@ minetest.register_node("slope:edge_glass_" .. name, { minetest.register_node("slope:edgecorner_glass_" .. name, { description = desc .. "edge", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "edgecorner.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -145,7 +145,7 @@ minetest.register_node("slope:edgecorner_glass_" .. name, { minetest.register_node("slope:slope_glass_"..name, { description = desc.. " slope", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "triangle.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -166,7 +166,7 @@ minetest.register_node("slope:slope_glass_"..name, { minetest.register_node("slope:ocorner_glass_"..name, { description = desc.." slope (outer corner)", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cornera.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -186,7 +186,7 @@ minetest.register_node("slope:slope_glass_"..name, { }) minetest.register_node("slope:icorner_glass_"..name, { description = desc.." slope (inner corner)", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cornerb.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -207,7 +207,7 @@ minetest.register_node("slope:slope_glass_"..name, { minetest.register_node("slope:slopelong_glass_"..name, { description = desc.." long slope", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "long.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -228,7 +228,7 @@ minetest.register_node("slope:slope_glass_"..name, { minetest.register_node("slope:cylinder_glass_"..name, { description = desc.." cylinder", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cylinder.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -247,7 +247,7 @@ minetest.register_node("slope:slope_glass_"..name, { minetest.register_node("slope:cone_glass_"..name, { description = desc.." cone", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cone.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -268,7 +268,7 @@ minetest.register_node("slope:slope_glass_"..name, { minetest.register_node("slope:sphere_glass_"..name, { description = desc.." sphere", - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "sphere.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -289,7 +289,7 @@ minetest.register_node("slope:slope_glass_"..name, { minetest.register_node("slope:edge_" .. name, { description = desc .. "edge", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "edge.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -304,7 +304,7 @@ inventory_image = "edge.png^[colorize:#"..colour..":70", minetest.register_node("slope:edgecorner_" .. name, { description = desc .. "edge", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "edgecorner.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -319,7 +319,7 @@ inventory_image = "edgecorner.png^[colorize:#"..colour..":70", minetest.register_node("slope:slope_"..name, { description = desc.. " slope", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "triangle.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -338,7 +338,7 @@ inventory_image = "triangle.png^[colorize:#"..colour..":70", minetest.register_node("slope:ocorner_"..name, { description = desc.." slope (outer corner)", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cornera.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -356,7 +356,7 @@ inventory_image = "cornera.png^[colorize:#"..colour..":70", }) minetest.register_node("slope:icorner_"..name, { description = desc.." slope (inner corner)", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cornerb.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -375,7 +375,7 @@ inventory_image = "cornerb.png^[colorize:#"..colour..":70", minetest.register_node("slope:slopelong_"..name, { description = desc.." long slope", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "long.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -394,7 +394,7 @@ inventory_image = "long.png^[colorize:#"..colour..":70", minetest.register_node("slope:cylinder_"..name, { description = desc.." cylinder", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cylinder.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -411,7 +411,7 @@ inventory_image = "cylinder.png^[colorize:#"..colour..":70", minetest.register_node("slope:cone_"..name, { description = desc.." cone", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "cone.png^[colorize:#"..colour..":70", drawtype = "mesh", @@ -430,7 +430,7 @@ inventory_image = "cone.png^[colorize:#"..colour..":70", minetest.register_node("slope:sphere_"..name, { description = desc.." sphere", -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "sphere.png^[colorize:#"..colour..":70", drawtype = "mesh", diff --git a/mods/Nodes/stairs/init.lua b/mods/Nodes/stairs/init.lua index 8ddaa73..ddcbdaf 100644 --- a/mods/Nodes/stairs/init.lua +++ b/mods/Nodes/stairs/init.lua @@ -45,11 +45,11 @@ end -- Register stairs. -- Node will be called stairs:stair_ -function stairs.register_stair(subname, recipeitem, groups, images, description, sounds, html) +function stairs.register_stair(subname, recipeitem, groups, images, description, sounds, html, wieldcolors) groups.stair = 1 minetest.register_node(":stairs:stair_" .. subname, { description = description, - wield_image = "color_hand" .. subname .. ".png", + wield_image = wieldcolors, wield_scale = {x=1,y=1,z=0.5}, drawtype = "mesh", inventory_image = "stairs.png^[colorize:#".. html ..":70", @@ -134,11 +134,11 @@ local slab_trans_dir = {[0] = 8, 0, 2, 1, 3, 4} -- Register slabs. -- Node will be called stairs:slab_ -function stairs.register_slab(subname, recipeitem, groups, images, description, sounds, html) +function stairs.register_slab(subname, recipeitem, groups, images, description, sounds, html, wieldcolors) groups.slab = 1 minetest.register_node(":stairs:slab_" .. subname, { description = description, - wield_image = "color_hand" .. subname .. ".png", + wield_image = wieldcolors, wield_scale = {x=1,y=1,z=0.5}, inventory_image = "slabs.png^[colorize:#".. html ..":70", drawtype = "nodebox", @@ -266,9 +266,9 @@ end -- Nodes will be called stairs:{stair,slab}_ function stairs.register_stair_and_slab(subname, recipeitem, - groups, images, desc_stair, desc_slab, sounds, html) - stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds, html) - stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds, html) + groups, images, desc_stair, desc_slab, sounds, html, wieldcolors) + stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds, html, wieldcolors) + stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds, html, wieldcolors) end -- Register default stairs and slabs @@ -281,7 +281,8 @@ stairs.register_stair_and_slab( "Blue Stair", "Blue Slab", default.node_sound_wood_defaults(), - color2 + color2, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color2..":70)" ) stairs.register_stair_and_slab( @@ -292,7 +293,8 @@ stairs.register_stair_and_slab( "Red Stair", "Red Slab", default.node_sound_wood_defaults(), - color6 + color6, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color6..":70)" ) stairs.register_stair_and_slab( @@ -303,7 +305,8 @@ stairs.register_stair_and_slab( "White Stair", "White Slab", default.node_sound_wood_defaults(), - color4 + color4, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color4..":70)" ) stairs.register_stair_and_slab( @@ -314,7 +317,8 @@ stairs.register_stair_and_slab( "Black Stair", "Black Slab", default.node_sound_wood_defaults(), - color1 + color1, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color1..":70)" ) stairs.register_stair_and_slab( @@ -325,7 +329,8 @@ stairs.register_stair_and_slab( "Green Stair", "Green Slab", default.node_sound_wood_defaults(), - color3 + color3, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color3..":70)" ) stairs.register_stair_and_slab( @@ -336,7 +341,8 @@ stairs.register_stair_and_slab( "Yellow Stair", "Yellow Slab", default.node_sound_wood_defaults(), - color7 + color7, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color7..":70)" ) stairs.register_stair_and_slab( @@ -347,7 +353,8 @@ stairs.register_stair_and_slab( "Orange Stair", "Orange Slab", default.node_sound_wood_defaults(), - color5 + color5, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color5..":70)" ) stairs.register_stair_and_slab( @@ -358,5 +365,6 @@ stairs.register_stair_and_slab( "Pink Stair", "Pink Slab", default.node_sound_wood_defaults(), - color8 + color8, + "color_handwhite.png^(color_handwhite2.png^[colorize:#"..color8..":70)" ) diff --git a/mods/Nodes/water/init.lua b/mods/Nodes/water/init.lua index e16d150..49503e5 100644 --- a/mods/Nodes/water/init.lua +++ b/mods/Nodes/water/init.lua @@ -51,7 +51,7 @@ for i in ipairs(source_list) do diggable = false, buildable_to = true, is_ground_content = false, - wield_image = "color_hand" .. name .. ".png", + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "waters.png^[colorize:#"..colour..":70", drop = "", @@ -92,7 +92,7 @@ for i in ipairs(source_list) do }, }, alpha = 200, -inventory_image = "waters.png^[colorize:#"..colour..":70", + inventory_image = "waters.png^[colorize:#"..colour..":70", paramtype = "light", paramtype2 = "flowingliquid", walkable = false, diff --git a/mods/Trees/modpack.txt b/mods/Trees/modpack.txt new file mode 100644 index 0000000..e69de29 diff --git a/mods/Decorations/trees/README.md b/mods/Trees/trees/README.md similarity index 100% rename from mods/Decorations/trees/README.md rename to mods/Trees/trees/README.md diff --git a/mods/Decorations/trees/depends.txt b/mods/Trees/trees/depends.txt similarity index 100% rename from mods/Decorations/trees/depends.txt rename to mods/Trees/trees/depends.txt diff --git a/mods/Decorations/trees/init.lua b/mods/Trees/trees/init.lua similarity index 87% rename from mods/Decorations/trees/init.lua rename to mods/Trees/trees/init.lua index fed6ecc..39f2a56 100644 --- a/mods/Decorations/trees/init.lua +++ b/mods/Trees/trees/init.lua @@ -28,14 +28,13 @@ for i in ipairs(source_list) do minetest.register_node("trees:big_cactus_" .. name, { description = desc .. " color", - - paramtype = "light", - drawtype = "mesh", - mesh = "cactus.obj", -visual_scale = 4, -wield_image = "color_hand" .. name .. ".png", -wield_scale = {x=1,y=1,z=0.5}, -inventory_image = "color_white.png^[colorize:#"..colour..":70", + paramtype = "light", + drawtype = "mesh", + mesh = "cactus.obj", + visual_scale = 4, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "color_white.png^[colorize:#"..colour..":70", tiles = { "color_white.png^[colorize:#"..colour..":70", @@ -66,7 +65,7 @@ minetest.register_node("trees:big_" .. name, { drawtype = "mesh", mesh = "tree.obj", visual_scale = 4, -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "bigtrees.png^[colorize:#"..colour..":70", @@ -103,7 +102,7 @@ minetest.register_node("trees:normal_" .. name, { drawtype = "mesh", mesh = "tree.obj", visual_scale = 2, -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "normaltrees.png^[colorize:#"..colour..":70", @@ -140,7 +139,7 @@ minetest.register_node("trees:small_" .. name, { drawtype = "mesh", mesh = "tree.obj", visual_scale = 1, -wield_image = "color_hand" .. name .. ".png", +wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, inventory_image = "smalltrees.png^[colorize:#"..colour..":70", diff --git a/mods/Decorations/trees/license.txt b/mods/Trees/trees/license.txt similarity index 100% rename from mods/Decorations/trees/license.txt rename to mods/Trees/trees/license.txt diff --git a/mods/Decorations/trees/models/License.txt b/mods/Trees/trees/models/License.txt similarity index 100% rename from mods/Decorations/trees/models/License.txt rename to mods/Trees/trees/models/License.txt