diff --git a/mods/ITEMS/REDSTONE/mesecons_button/init.lua b/mods/ITEMS/REDSTONE/mesecons_button/init.lua index fd765eded..0ea6b2c30 100644 --- a/mods/ITEMS/REDSTONE/mesecons_button/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_button/init.lua @@ -225,8 +225,8 @@ local woods = { { "junglewood", "mcl_core:junglewood", "default_junglewood.png", S("Jungle Button") }, { "mangrove_wood", "mcl_mangrove:mangrove_wood", "mcl_mangrove_planks.png", S("Mangrove Button") }, - { "crimson_hyphae_wood", "mcl_crimson:crimson_hyphae_wood", "crimson_hyphae_wood.png", S("Crimson Button") }, - { "warped_hyphae_wood", "mcl_crimson:warped_hyphae_wood", "warped_hyphae_wood.png", S("Warped Button") }, + { "crimson_hyphae_wood", "mcl_crimson:crimson_hyphae_wood", "mcl_crimson_hyphae_wood.png", S("Crimson Button") }, + { "warped_hyphae_wood", "mcl_crimson:warped_hyphae_wood", "mcl_crimson_warped_hyphae_wood.png", S("Warped Button") }, } for w=1, #woods do diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua index 9248e693e..b257be816 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua @@ -223,8 +223,8 @@ local woods = { { "junglewood", "mcl_core:junglewood", "default_junglewood.png", S("Jungle Pressure Plate") }, { "mangrove_wood", "mcl_mangrove:mangrove_wood", "mcl_mangrove_planks.png", S("Mangrove Pressure Plate") }, - { "crimson_hyphae_wood", "mcl_crimson:crimson_hyphae_wood", "crimson_hyphae_wood.png", S("Crimson Pressure Plate") }, - { "warped_hyphae_wood", "mcl_crimson:warped_hyphae_wood", "warped_hyphae_wood.png", S("Warped Pressure Plate") }, + { "crimson_hyphae_wood", "mcl_crimson:crimson_hyphae_wood", "mcl_crimson_hyphae_wood.png", S("Crimson Pressure Plate") }, + { "warped_hyphae_wood", "mcl_crimson:warped_hyphae_wood", "mcl_crimson_warped_hyphae_wood.png", S("Warped Pressure Plate") }, } for w=1, #woods do diff --git a/mods/ITEMS/mcl_crimson/init.lua b/mods/ITEMS/mcl_crimson/init.lua index 241d76ee6..ee98ba84b 100644 --- a/mods/ITEMS/mcl_crimson/init.lua +++ b/mods/ITEMS/mcl_crimson/init.lua @@ -152,8 +152,8 @@ minetest.register_node("mcl_crimson:twisting_vines", { if abovenode.name == node.name and (not mcl_core.check_vines_supported(above, abovenode)) then minetest.registered_nodes[node.name].on_dig(above, node, digger) end - end, - + end, + drop = { max_items = 1, items = { @@ -220,7 +220,7 @@ minetest.register_node("mcl_crimson:weeping_vines", { end return itemstack end, - + on_dig = function(pos, node, digger) local below = vector.offset(pos,0,-1,0) local belownode = minetest.get_node(below) @@ -228,7 +228,7 @@ minetest.register_node("mcl_crimson:weeping_vines", { if belownode.name == node.name and (not mcl_core.check_vines_supported(below, belownode)) then minetest.registered_nodes[node.name].on_dig(below, node, digger) end - end, + end, drop = { max_items = 1, items = { @@ -328,10 +328,10 @@ minetest.register_node("mcl_crimson:warped_hyphae", { _doc_items_longdesc = S("The stem of a warped hyphae"), _doc_items_hidden = false, tiles = { - "warped_hyphae.png", - "warped_hyphae.png", + "mcl_crimson_warped_hyphae.png", + "mcl_crimson_warped_hyphae.png", { - image="warped_hyphae_side.png", + image="mcl_crimson_warped_hyphae_side.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0} }, }, @@ -347,12 +347,12 @@ minetest.register_node("mcl_crimson:warped_hyphae", { minetest.register_node("mcl_crimson:warped_nylium", { description = S("Warped Nylium"), tiles = { - "warped_nylium.png", + "mcl_crimson_warped_nylium.png", "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png^warped_nylium_side.png", - "mcl_nether_netherrack.png^warped_nylium_side.png", - "mcl_nether_netherrack.png^warped_nylium_side.png", - "mcl_nether_netherrack.png^warped_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_warped_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_warped_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_warped_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_warped_nylium_side.png", }, is_ground_content = true, drop = "mcl_nether:netherrack", @@ -370,7 +370,7 @@ minetest.register_node("mcl_crimson:warped_hyphae_bark", { _doc_items_longdesc = S("This is a decorative block surrounded by the bark of an hyphae."), tiles = { { - image="warped_hyphae_side.png", + image="mcl_crimson_warped_hyphae_side.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0} }, }, @@ -428,7 +428,7 @@ minetest.register_craft({ minetest.register_node("mcl_crimson:warped_hyphae_wood", { description = S("Warped Hyphae Wood"), - tiles = {"warped_hyphae_wood.png"}, + tiles = {"mcl_crimson_warped_hyphae_wood.png"}, groups = {handy = 5,axey = 1, flammable = 3, wood=1,building_block = 1, material_wood = 1, fire_encouragement = 5, fire_flammability = 20}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_hardness = 2, @@ -456,9 +456,9 @@ minetest.register_node("mcl_crimson:crimson_fungus", { _tt_help = S("Crimson fungus is a mushroom found in the nether's crimson forest."), _doc_items_longdesc = S("Crimson fungus is a mushroom found in the nether's crimson forest."), drawtype = "plantlike", - tiles = { "farming_crimson_fungus.png" }, - inventory_image = "farming_crimson_fungus.png", - wield_image = "farming_crimson_fungus.png", + tiles = { "mcl_farming_crimson_fungus.png" }, + inventory_image = "mcl_farming_crimson_fungus.png", + wield_image = "mcl_farming_crimson_fungus.png", sunlight_propagates = true, paramtype = "light", walkable = false, @@ -488,7 +488,7 @@ minetest.register_node("mcl_crimson:crimson_fungus", { mcl_flowerpots.register_potted_flower("mcl_crimson:crimson_fungus", { name = "crimson fungus", desc = S("Crimson Fungus"), - image = "farming_crimson_fungus.png", + image = "mcl_farming_crimson_fungus.png", }) minetest.register_node("mcl_crimson:crimson_roots", { @@ -522,10 +522,10 @@ minetest.register_node("mcl_crimson:crimson_hyphae", { _doc_items_longdesc = S("The stem of a crimson hyphae"), _doc_items_hidden = false, tiles = { - "crimson_hyphae.png", - "crimson_hyphae.png", + "mcl_crimson_hyphae.png", + "mcl_crimson_hyphae.png", { - image="crimson_hyphae_side.png", + image="mcl_crimson_hyphae_side.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0} }, }, @@ -545,7 +545,7 @@ minetest.register_node("mcl_crimson:crimson_hyphae_bark", { _doc_items_longdesc = S("This is a decorative block surrounded by the bark of an hyphae."), tiles = { { - image="crimson_hyphae_side.png", + image="mcl_crimson_hyphae_side.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0} }, }, @@ -603,7 +603,7 @@ minetest.register_craft({ minetest.register_node("mcl_crimson:crimson_hyphae_wood", { description = S("Crimson Hyphae Wood"), - tiles = {"crimson_hyphae_wood.png"}, + tiles = {"mcl_crimson_hyphae_wood.png"}, groups = {handy = 5, axey = 1, wood = 1, building_block = 1, material_wood = 1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_hardness = 2, @@ -612,12 +612,12 @@ minetest.register_node("mcl_crimson:crimson_hyphae_wood", { minetest.register_node("mcl_crimson:crimson_nylium", { description = S("Crimson Nylium"), tiles = { - "crimson_nylium.png", + "mcl_crimson_nylium.png", "mcl_nether_netherrack.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", - "mcl_nether_netherrack.png^crimson_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_nylium_side.png", + "mcl_nether_netherrack.png^mcl_crimson_nylium_side.png", }, groups = {pickaxey = 1, building_block = 1, material_stone = 1}, sounds = mcl_sounds.node_sound_stone_defaults(), @@ -676,7 +676,7 @@ mcl_doors:register_trapdoor("mcl_crimson:crimson_trapdoor", { _doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), _doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."), tile_front = "mcl_crimson_crimson_trapdoor.png", - tile_side = "crimson_hyphae_wood.png", + tile_side = "mcl_crimson_hyphae_wood.png", wield_image = "mcl_crimson_crimson_trapdoor.png", groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, @@ -714,7 +714,7 @@ mcl_doors:register_trapdoor("mcl_crimson:warped_trapdoor", { _doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), _doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."), tile_front = "mcl_crimson_warped_trapdoor.png", - tile_side = "warped_hyphae_wood.png", + tile_side = "mcl_crimson_mcl_crimson_warped_hyphae_wood.png", wield_image = "mcl_crimson_warped_trapdoor.png", groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, diff --git a/mods/ITEMS/mcl_mobitems/init.lua b/mods/ITEMS/mcl_mobitems/init.lua index ab6c48d5d..eeec953a2 100644 --- a/mods/ITEMS/mcl_mobitems/init.lua +++ b/mods/ITEMS/mcl_mobitems/init.lua @@ -413,7 +413,7 @@ minetest.register_craftitem("mcl_mobitems:glow_ink_sac", { description = S("Glow Ink Sac"), _doc_items_longdesc = S("Use it to craft the Glow Item Frame."), _doc_items_usagehelp = S("Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame."), - inventory_image = "mobs_mc_glow_ink_sac.png", + inventory_image = "mcl_mobitems_glow_ink_sac.png", groups = { craftitem = 1 }, }) diff --git a/textures/crimson_hyphae.png b/textures/mcl_crimson_hyphae.png similarity index 100% rename from textures/crimson_hyphae.png rename to textures/mcl_crimson_hyphae.png diff --git a/textures/crimson_hyphae_side.png b/textures/mcl_crimson_hyphae_side.png similarity index 100% rename from textures/crimson_hyphae_side.png rename to textures/mcl_crimson_hyphae_side.png diff --git a/textures/crimson_hyphae_wood.png b/textures/mcl_crimson_hyphae_wood.png similarity index 100% rename from textures/crimson_hyphae_wood.png rename to textures/mcl_crimson_hyphae_wood.png diff --git a/textures/crimson_nylium.png b/textures/mcl_crimson_nylium.png similarity index 100% rename from textures/crimson_nylium.png rename to textures/mcl_crimson_nylium.png diff --git a/textures/crimson_nylium_side.png b/textures/mcl_crimson_nylium_side.png similarity index 100% rename from textures/crimson_nylium_side.png rename to textures/mcl_crimson_nylium_side.png diff --git a/textures/stripped_crimson_stem.png b/textures/mcl_crimson_stripped_crimson_stem.png similarity index 100% rename from textures/stripped_crimson_stem.png rename to textures/mcl_crimson_stripped_crimson_stem.png diff --git a/textures/warped_hyphae.png b/textures/mcl_crimson_warped_hyphae.png similarity index 100% rename from textures/warped_hyphae.png rename to textures/mcl_crimson_warped_hyphae.png diff --git a/textures/warped_hyphae_side.png b/textures/mcl_crimson_warped_hyphae_side.png similarity index 100% rename from textures/warped_hyphae_side.png rename to textures/mcl_crimson_warped_hyphae_side.png diff --git a/textures/warped_hyphae_wood.png b/textures/mcl_crimson_warped_hyphae_wood.png similarity index 100% rename from textures/warped_hyphae_wood.png rename to textures/mcl_crimson_warped_hyphae_wood.png diff --git a/textures/warped_hyphae_wood_2nd.png b/textures/mcl_crimson_warped_hyphae_wood_2nd.png similarity index 100% rename from textures/warped_hyphae_wood_2nd.png rename to textures/mcl_crimson_warped_hyphae_wood_2nd.png diff --git a/textures/warped_nylium.png b/textures/mcl_crimson_warped_nylium.png similarity index 100% rename from textures/warped_nylium.png rename to textures/mcl_crimson_warped_nylium.png diff --git a/textures/warped_nylium_side.png b/textures/mcl_crimson_warped_nylium_side.png similarity index 100% rename from textures/warped_nylium_side.png rename to textures/mcl_crimson_warped_nylium_side.png diff --git a/textures/farming_crimson_fungus.png b/textures/mcl_farming_crimson_fungus.png similarity index 100% rename from textures/farming_crimson_fungus.png rename to textures/mcl_farming_crimson_fungus.png diff --git a/textures/mobs_mc_glow_ink_sac.png b/textures/mcl_mobitems_glow_ink_sac.png similarity index 100% rename from textures/mobs_mc_glow_ink_sac.png rename to textures/mcl_mobitems_glow_ink_sac.png