diff --git a/GROUPS.md b/GROUPS.md index 07dd800e27..87714b09d6 100644 --- a/GROUPS.md +++ b/GROUPS.md @@ -144,6 +144,10 @@ These groups are used mostly for informational purposes * `container=1`: Other/unspecified container type * `spawn_egg=1`: Spawn egg +* `pressure_plate=1`: Pressure plate (unspecified material) +* `pressure_plate=2`: Wooden pressure plate +* `pressure_plate=3`: Stone pressure plate + * `plant=1`: Plant or part of a plant * `double_plant`: Part of a double-sized plant. 1 = lower part, 2 = upper part diff --git a/mods/ITEMS/REDSTONE/mesecons_alias/init.lua b/mods/ITEMS/REDSTONE/mesecons_alias/init.lua index a27d1a5b7e..111a4b1c9a 100644 --- a/mods/ITEMS/REDSTONE/mesecons_alias/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_alias/init.lua @@ -1,9 +1,5 @@ -- This file registers aliases for the /give /giveme commands. -minetest.register_alias("mesecons:removestone", "mesecons_random:removestone") -minetest.register_alias("mesecons:power_plant", "mesecons_powerplant:power_plant") -minetest.register_alias("mesecons:powerplant", "mesecons_powerplant:power_plant") -minetest.register_alias("mesecons:meselamp", "mesecons_lamp:lamp_off") minetest.register_alias("mesecons:mesecon", "mesecons:wire_00000000_off") minetest.register_alias("mesecons:object_detector", "mesecons_detector:object_detector_off") minetest.register_alias("mesecons:wireless_inverter", "mesecons_wireless:wireless_inverter_on") @@ -12,18 +8,18 @@ minetest.register_alias("mesecons:wireless_transmitter", "mesecons_wireless:wire minetest.register_alias("mesecons:switch", "mesecons_switch:mesecon_switch_off") minetest.register_alias("mesecons:button", "mesecons_button:button_off") minetest.register_alias("mesecons:piston", "mesecons_pistons:piston_normal_off") -minetest.register_alias("mesecons:blinky_plant", "mesecons_blinkyplant:blinky_plant_off") minetest.register_alias("mesecons:mesecon_torch", "mesecons_torch:mesecon_torch_on") minetest.register_alias("mesecons:torch", "mesecons_torch:mesecon_torch_on") -minetest.register_alias("mesecons:hydro_turbine", "mesecons_hydroturbine:hydro_turbine_off") minetest.register_alias("mesecons:pressure_plate_stone", "mesecons_pressureplates:pressure_plate_stone_off") minetest.register_alias("mesecons:pressure_plate_wood", "mesecons_pressureplates:pressure_plate_wood_off") +minetest.register_alias("mesecons:pressure_plate_birchwood", "mesecons_pressureplates:pressure_plate_birchwood_off") +minetest.register_alias("mesecons:pressure_plate_acaciawood", "mesecons_pressureplates:pressure_plate_acaciawood_off") +minetest.register_alias("mesecons:pressure_plate_darkwood", "mesecons_pressureplates:pressure_plate_darkwood_off") +minetest.register_alias("mesecons:pressure_plate_sprucewood", "mesecons_pressureplates:pressure_plate_sprucewood_off") +minetest.register_alias("mesecons:pressure_plate_junglewood", "mesecons_pressureplates:pressure_plate_junglewood_off") minetest.register_alias("mesecons:mesecon_socket", "mesecons_temperest:mesecon_socket_off") minetest.register_alias("mesecons:mesecon_inverter", "mesecons_temperest:mesecon_inverter_on") -minetest.register_alias("mesecons:movestone", "mesecons_movestones:movestone") -minetest.register_alias("mesecons:sticky_movestone", "mesecons_movestones:sticky_movestone") minetest.register_alias("mesecons:noteblock", "mesecons_noteblock:noteblock") -minetest.register_alias("mesecons:microcontroller", "mesecons_microcontroller:microcontroller0000") minetest.register_alias("mesecons:delayer", "mesecons_delayer:delayer_off_1") minetest.register_alias("mesecons:solarpanel", "mesecons_solarpanel:solar_panel_off") diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua index 4423c8971e..519598f036 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua @@ -157,20 +157,36 @@ function mesecon.register_pressure_plate(basename, description, textures_off, te end end -mesecon.register_pressure_plate( - "mesecons_pressureplates:pressure_plate_wood", - "Wooden Pressure Plate", - {"default_wood.png"}, - {"default_wood.png"}, - "default_wood.png", - nil, - {{"group:wood", "group:wood"}}, - mcl_sounds.node_sound_wood_defaults(), - {axey=1, material_wood=1}, - nil, - "A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.") +local woods = { + { "wood", "mcl_core:wood", "default_wood.png", "Oak Pressure Plate" }, + { "acaciawood", "mcl_core:acaciawood", "default_acacia_wood.png", "Acacia Pressure Plate" }, + { "birchwood", "mcl_core:birchwood", "mcl_core_planks_birch.png", "Birch Pressure Plate" }, + { "darkwood", "mcl_core:darkwood", "mcl_core_planks_big_oak.png", "Dark Oak Pressure Plate" }, + { "sprucewood", "mcl_core:sprucewood", "mcl_core_planks_spruce.png", "Spruce Pressure Plate" }, + { "junglewood", "mcl_core:junglewood", "default_junglewood.png", "Jungle Pressure Plate" }, +} +for w=1, #woods do + mesecon.register_pressure_plate( + "mesecons_pressureplates:pressure_plate_"..woods[w][1], + woods[w][4], + {woods[w][3]}, + {woods[w][3]}, + woods[w][3], + nil, + {{woods[w][2], woods[w][2]}}, + mcl_sounds.node_sound_wood_defaults(), + {axey=1, material_wood=1,pressure_plate=2}, + nil, + "A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.") + minetest.register_craft({ + type = "fuel", + recipe = "mesecons_pressureplates:pressure_plate_"..woods[w][1].."_off", + burntime = 15 + }) + +end mesecon.register_pressure_plate( "mesecons_pressureplates:pressure_plate_stone", @@ -181,13 +197,8 @@ mesecon.register_pressure_plate( nil, {{"mcl_core:stone", "mcl_core:stone"}}, mcl_sounds.node_sound_stone_defaults(), - {pickaxey=1, material_stone=1}, + {pickaxey=1, material_stone=1, pressure_plate=3}, { player = true, mob = true }, "A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else.") -minetest.register_craft({ - type = "fuel", - recipe = "mesecons_pressureplates:pressure_plate_wood_off", - burntime = 15 -})