From c33991c1dcccc239be9fd0181d9174e336f1c12b Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 14 Feb 2017 02:33:58 +0100 Subject: [PATCH] Rename mcl_dropper to mcl_droppers --- .../{mcl_dropper => mcl_droppers}/depends.txt | 0 .../{mcl_dropper => mcl_droppers}/init.lua | 34 +++++++++--------- ...mcl_droppers_dropper_front_horizontal.png} | Bin .../mcl_droppers_dropper_front_vertical.png} | Bin .../textures/mcl_droppers_fnt_dropper.png} | Bin mods/redstone/mesecons_mvps/init.lua | 6 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) rename mods/redstone/{mcl_dropper => mcl_droppers}/depends.txt (100%) rename mods/redstone/{mcl_dropper => mcl_droppers}/init.lua (81%) rename mods/redstone/{mcl_dropper/textures/mcl_dropper_dropper_front_horizontal.png => mcl_droppers/textures/mcl_droppers_dropper_front_horizontal.png} (100%) rename mods/redstone/{mcl_dropper/textures/mcl_dropper_dropper_front_vertical.png => mcl_droppers/textures/mcl_droppers_dropper_front_vertical.png} (100%) rename mods/redstone/{mcl_dropper/textures/mcl_dropper_fnt_dropper.png => mcl_droppers/textures/mcl_droppers_fnt_dropper.png} (100%) diff --git a/mods/redstone/mcl_dropper/depends.txt b/mods/redstone/mcl_droppers/depends.txt similarity index 100% rename from mods/redstone/mcl_dropper/depends.txt rename to mods/redstone/mcl_droppers/depends.txt diff --git a/mods/redstone/mcl_dropper/init.lua b/mods/redstone/mcl_droppers/init.lua similarity index 81% rename from mods/redstone/mcl_dropper/init.lua rename to mods/redstone/mcl_droppers/init.lua index f554139298..8bba6ff496 100644 --- a/mods/redstone/mcl_dropper/init.lua +++ b/mods/redstone/mcl_droppers/init.lua @@ -1,7 +1,7 @@ --[[ This mod registers 3 nodes: -- One node for the horizontal-facing dropper (mcl_dropper:dropper) -- One node for the upwards-facing droppers (mcl_dropper:dropper_up) -- One node for the downwards-facing droppers (mcl_dropper:dropper_down) +- One node for the horizontal-facing dropper (mcl_droppers:dropper) +- One node for the upwards-facing droppers (mcl_droppers:dropper_up) +- One node for the downwards-facing droppers (mcl_droppers:dropper_down) 3 node definitions are needed because of the way the textures are defined. All node definitions share a lot of code, so this is the reason why there @@ -14,7 +14,7 @@ local setup_dropper = function(pos) local form = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_inventory_9_slots.png]".. mcl_core.inventory_header.. - "image[3,-0.2;5,0.75;mcl_dropper_fnt_dropper.png]".. + "image[3,-0.2;5,0.75;mcl_droppers_fnt_dropper.png]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[current_name;main;3,0.5;3,3;]".. @@ -50,11 +50,11 @@ local dropperdef = { local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local droppos - if node.name == "mcl_dropper:dropper" then + if node.name == "mcl_droppers:dropper" then droppos = vector.subtract(pos, minetest.facedir_to_dir(node.param2)) - elseif node.name == "mcl_dropper:dropper_up" then + elseif node.name == "mcl_droppers:dropper_up" then droppos = {x=pos.x, y=pos.y+1, z=pos.z} - elseif node.name == "mcl_dropper:dropper_down" then + elseif node.name == "mcl_droppers:dropper_down" then droppos = {x=pos.x, y=pos.y-1, z=pos.z} end local dropnode = minetest.get_node(droppos) @@ -99,9 +99,9 @@ horizontal_def.after_place_node = function(pos, placer, itemstack, pointed_thing -- When placed up and down, convert node to up/down dropper if pointed_thing.above.y < pointed_thing.under.y then - minetest.swap_node(pos, {name = "mcl_dropper:dropper_down"}) + minetest.swap_node(pos, {name = "mcl_droppers:dropper_down"}) elseif pointed_thing.above.y > pointed_thing.under.y then - minetest.swap_node(pos, {name = "mcl_dropper:dropper_up"}) + minetest.swap_node(pos, {name = "mcl_droppers:dropper_up"}) end -- Else, the normal facedir logic applies @@ -109,42 +109,42 @@ end horizontal_def.tiles = { "default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png", "default_furnace_side.png", - "default_furnace_side.png", "mcl_dropper_dropper_front_horizontal.png" + "default_furnace_side.png", "mcl_droppers_dropper_front_horizontal.png" } horizontal_def.paramtype2 = "facedir" horizontal_def.groups = {cracky=2,container=2} -minetest.register_node("mcl_dropper:dropper", horizontal_def) +minetest.register_node("mcl_droppers:dropper", horizontal_def) -- Down dropper local down_def = table.copy(dropperdef) down_def.description = "Downwards-Facing Dropper" down_def.after_place_node = setup_dropper down_def.tiles = { - "default_furnace_top.png", "mcl_dropper_dropper_front_vertical.png", + "default_furnace_top.png", "mcl_droppers_dropper_front_vertical.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png" } down_def.groups = {cracky=2,container=2,not_in_creative_inventory=1} -down_def.drop = "mcl_dropper:dropper" -minetest.register_node("mcl_dropper:dropper_down", down_def) +down_def.drop = "mcl_droppers:dropper" +minetest.register_node("mcl_droppers:dropper_down", down_def) -- Up dropper -- The up dropper is almost identical to the down dropper, it only differs in textures up_def = table.copy(down_def) up_def.description = "Upwards-Facing Dropper" up_def.tiles = { - "mcl_dropper_dropper_front_vertical.png", "default_furnace_bottom.png", + "mcl_droppers_dropper_front_vertical.png", "default_furnace_bottom.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png" } -minetest.register_node("mcl_dropper:dropper_up", up_def) +minetest.register_node("mcl_droppers:dropper_up", up_def) -- Ladies and gentlemen, I present to you: the crafting recipe! minetest.register_craft({ - output = 'mcl_dropper:dropper', + output = 'mcl_droppers:dropper', recipe = { {"mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble",}, {"mcl_core:cobble", "", "mcl_core:cobble",}, diff --git a/mods/redstone/mcl_dropper/textures/mcl_dropper_dropper_front_horizontal.png b/mods/redstone/mcl_droppers/textures/mcl_droppers_dropper_front_horizontal.png similarity index 100% rename from mods/redstone/mcl_dropper/textures/mcl_dropper_dropper_front_horizontal.png rename to mods/redstone/mcl_droppers/textures/mcl_droppers_dropper_front_horizontal.png diff --git a/mods/redstone/mcl_dropper/textures/mcl_dropper_dropper_front_vertical.png b/mods/redstone/mcl_droppers/textures/mcl_droppers_dropper_front_vertical.png similarity index 100% rename from mods/redstone/mcl_dropper/textures/mcl_dropper_dropper_front_vertical.png rename to mods/redstone/mcl_droppers/textures/mcl_droppers_dropper_front_vertical.png diff --git a/mods/redstone/mcl_dropper/textures/mcl_dropper_fnt_dropper.png b/mods/redstone/mcl_droppers/textures/mcl_droppers_fnt_dropper.png similarity index 100% rename from mods/redstone/mcl_dropper/textures/mcl_dropper_fnt_dropper.png rename to mods/redstone/mcl_droppers/textures/mcl_droppers_fnt_dropper.png diff --git a/mods/redstone/mesecons_mvps/init.lua b/mods/redstone/mesecons_mvps/init.lua index c500ad79ce..bf4c8b283a 100644 --- a/mods/redstone/mesecons_mvps/init.lua +++ b/mods/redstone/mesecons_mvps/init.lua @@ -135,9 +135,9 @@ mesecon:register_mvps_stopper("mcl_furnaces:furnace") mesecon:register_mvps_stopper("mcl_furnaces:furnace_active") mesecon:register_mvps_stopper("mcl_hoppers:hopper") mesecon:register_mvps_stopper("mcl_hoppers:hopper_side") -mesecon:register_mvps_stopper("mcl_dropper:dropper") -mesecon:register_mvps_stopper("mcl_dropper:dropper_up") -mesecon:register_mvps_stopper("mcl_dropper:dropper_down") +mesecon:register_mvps_stopper("mcl_droppers:dropper") +mesecon:register_mvps_stopper("mcl_droppers:dropper_up") +mesecon:register_mvps_stopper("mcl_droppers:dropper_down") mesecon:register_mvps_stopper("mcl_jukebox:jukebox") mesecon:register_mvps_stopper("mobs:spawner") mesecon:register_mvps_stopper("mesecons_commandblock:commandblock_off")