From b85df95bb226d6a2dd5acad410f4f57794e81733 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 29 Aug 2017 00:13:18 +0200 Subject: [PATCH] Add dummy nodes: Activator rail, detector rail --- mods/ENTITIES/mcl_minecarts/rails.lua | 80 ++++++++++++++++++ .../textures/mcl_minecarts_rail_activator.png | Bin 0 -> 285 bytes .../mcl_minecarts_rail_activator_powered.png | Bin 0 -> 281 bytes .../textures/mcl_minecarts_rail_detector.png | Bin 0 -> 319 bytes .../mcl_minecarts_rail_detector_powered.png | Bin 0 -> 321 bytes .../mcl_minecarts/textures/rail_detector.png | Bin 283 -> 0 bytes .../textures/rail_detector_powered.png | Bin 277 -> 0 bytes mods/MISC/mcl_wip/init.lua | 4 + tools/Texture_Conversion_Table.csv | 4 + 9 files changed, 88 insertions(+) create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_activator.png create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_activator_powered.png create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector.png create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector_powered.png delete mode 100644 mods/ENTITIES/mcl_minecarts/textures/rail_detector.png delete mode 100644 mods/ENTITIES/mcl_minecarts/textures/rail_detector_powered.png diff --git a/mods/ENTITIES/mcl_minecarts/rails.lua b/mods/ENTITIES/mcl_minecarts/rails.lua index 36f1d4317..ca1007716 100644 --- a/mods/ENTITIES/mcl_minecarts/rails.lua +++ b/mods/ENTITIES/mcl_minecarts/rails.lua @@ -76,6 +76,67 @@ register_rail("mcl_minecarts:golden_rail_on", ) +-- Activator rail (off) +register_rail("mcl_minecarts:activator_rail", + {"mcl_minecarts_rail_activator.png", "default_rail_curved.png^[colorize:#FF0000:96", "default_rail_t_junction.png^[colorize:#FF0000:96", "default_rail_crossing.png^[colorize:#FF0000:96"}, + { + description = "Activator Rail", + _doc_items_longdesc = "Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.", + _doc_items_usagehelp = railuse .. "\n" .. "To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.", + mesecons = { + conductor = { + state = mesecon.state.off, + onstate = "mcl_minecarts:activator_rail_on", + }, + }, + } +) + +-- Activator rail (on) +register_rail("mcl_minecarts:activator_rail_on", + {"mcl_minecarts_rail_activator_powered.png", "default_rail_curved.png^[colorize:#FF0000:128", "default_rail_t_junction.png^[colorize:#FF0000:128", "default_rail_crossing.png^[colorize:#FF0000:128"}, + { + _doc_items_create_entry = false, + mesecons = { + conductor = { + state = mesecon.state.on, + offstate = "mcl_minecarts:activator_rail", + }, + }, + }, + false +) + +-- Detector rail (off) +register_rail("mcl_minecarts:detector_rail", + {"mcl_minecarts_rail_detector.png", "default_rail_curved.png^[colorize:#FFFFFF:96", "default_rail_t_junction.png^[colorize:#FFFFFF:96", "default_rail_crossing.png^[colorize:#FFFFFF:96"}, + { + description = "Detector Rail", + _doc_items_longdesc = "Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.", + _doc_items_usagehelp = railuse .. "\n" .. "To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.", + mesecons = { + receptor = { + state = mesecon.state.off, + }, + }, + } +) + +-- Detector rail (on) +register_rail("mcl_minecarts:detector_rail_on", + {"mcl_minecarts_rail_detector_powered.png", "default_rail_curved.png^[colorize:#FFFFFF:128", "default_rail_t_junction.png^[colorize:#FFFFFF:128", "default_rail_crossing.png^[colorize:#FFFFFF:128"}, + { + _doc_items_create_entry = false, + mesecons = { + receptor = { + state = mesecon.state.on, + }, + }, + }, + false +) + + -- Crafting minetest.register_craft({ output = 'mcl_minecarts:rail 16', @@ -95,6 +156,25 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "mcl_minecarts:activator_rail 6", + recipe = { + {"mcl_core:iron_ingot", "mcl_core:stick", "mcl_core:iron_ingot"}, + {"mcl_core:iron_ingot", "mesecons_torch:mesecon_torch_on", "mcl_core:iron_ingot"}, + {"mcl_core:iron_ingot", "mcl_core:stick", "mcl_core:iron_ingot"}, + } +}) + +minetest.register_craft({ + output = "mcl_minecarts:detector_rail 6", + recipe = { + {"mcl_core:iron_ingot", "", "mcl_core:iron_ingot"}, + {"mcl_core:iron_ingot", "mesecons_pressureplates:pressure_plate_stone_off", "mcl_core:iron_ingot"}, + {"mcl_core:iron_ingot", "mesecons:redstone", "mcl_core:iron_ingot"}, + } +}) + + -- Aliases if minetest.get_modpath("doc") then doc.add_entry_alias("nodes", "mcl_minecarts:golden_rail", "nodes", "mcl_minecarts:golden_rail_on") diff --git a/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_activator.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_activator.png new file mode 100644 index 0000000000000000000000000000000000000000..15f2cdba6b4ee679079694ef87c19fec26d759bb GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmW!d_r6q7#KV~J#}<+{{R1P zYinB==3;7Us;sO$uQH)C%daNhC&}B|LP*F*Mn;W?$IwvEZxZuLkU=Fue!&d?|1DUSu#ZF!Xr3IEGX(CMO6aF)+EZsiiR|DEHR_iAuEJuhJ~aWhjbB}PePK(gcSdICsYm`c>d+a$~)`cFftbldGyX= zWKOTTa;k4-7Wa%95=t#4%l`@|Jn)LQ%zhd)m4U79`+tW8KN?@2&JQUU z=-ArY7KXW)nwlyrE6=M;=*;q~iT6qJwr*)`>g(w!FDcGWh|JB)vJevTk&#j3;qi5} ziu7|gG}PP6##zb0z#v`{# zPOnPrmyI!I6e_ebP-Qt}VW1dLe0KIC9Z?6<{5xCRjxS-Dwd2~Rz-3Jh5_|g%)glV= z*Ozx-)JyP{;`R&*DBo=??+iuR3T(d8Gt^N&xDIZpBjgi}Cd+X`JH}7=b#_O1@ znI^R?`i=U(-#gvEC;yV=|8Sepf>FJ8^NUHrhvaW~v!0&Dkh_rq6b`O_F6*2UngA-a BerW&z literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector_powered.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector_powered.png new file mode 100644 index 0000000000000000000000000000000000000000..289064f6dbf99efc3c503936d2df1dfddc9c9f7f GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU***jDQ@EB%}$8S&CAMQVw%p( zT)@O+XsCCrIpPrm1A}-;kY6yv|NjjCp#aYK&k!${a+ZOCVTz}VV@L&~u0QJ{XGNao zsDgbtcmA)?&gYHt5AvEB)bMF^#n__ORg0&TF@Les*ep{$BonZT$^xnbU7=CBNq%5Cg*s4%Pp^_0pcF z#ReMy1i>p3fPbK1OvPim;<-412dPrcS><8`F>u8d^Q;w&3R>@djMt%4Gy2lj^$oU? z=V&DTb<18d#u&Z70gB*Q*Y!9d1&o#3Bbw185>%C(v&ijH37n=Dtx$wwpSN%kE5!}+ h1$JTyUm&GC!2@LQ1ez;6XW9S&002ovPDHLkV1mE$V~YR) diff --git a/mods/ENTITIES/mcl_minecarts/textures/rail_detector_powered.png b/mods/ENTITIES/mcl_minecarts/textures/rail_detector_powered.png deleted file mode 100644 index ae1083d20879687b866f2b0144dc52a5cb7addeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmV+w0qXvVP)?XMN|NpfI-97hH z;UFRwdPbP&7qp*E#pBlFSq^ZPCe0kDECU4NiyrgTMu`3mI%(3pEX%q+VXNGiV?Iy7 znB}UZb%rcYpb}cwby)yKh}Gy3X6O-srjnT=qelZcnp#*z7>d2uf{$=g8ju|}u<#o& bK|SCOFkJ*l!m!=P00000NkvXXu0mjf@Gxd< diff --git a/mods/MISC/mcl_wip/init.lua b/mods/MISC/mcl_wip/init.lua index 730d5042d..67ea31e28 100644 --- a/mods/MISC/mcl_wip/init.lua +++ b/mods/MISC/mcl_wip/init.lua @@ -21,6 +21,10 @@ local wip_items = { "mcl_minecarts:chest_minecart", "mcl_minecarts:furnace_minecart", "mcl_minecarts:tnt_minecart", + "mcl_minecarts:detector_rail", + "mcl_minecarts:detector_rail_on", + "mcl_minecarts:activator_rail", + "mcl_minecarts:activator_rail_on", } for i=1,#wip_items do diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 6eec745e5..d1a8ea3ea 100644 --- a/tools/Texture_Conversion_Table.csv +++ b/tools/Texture_Conversion_Table.csv @@ -419,6 +419,10 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/blocks,rail_golden.png,/mods/ITEMS/mcl_minecarts/textures,carts_rail_pwr.png,,,,,, /assets/minecraft/textures/blocks,rail_normal_turned.png,/mods/ITEMS/mcl_minecarts/textures,default_rail_curved.png,,,,,, /assets/minecraft/textures/blocks,rail_normal.png,/mods/ITEMS/mcl_minecarts/textures,default_rail.png,,,,,, +/assets/minecraft/textures/blocks,rail_detector.png,/mods/ITEMS/mcl_minecarts/textures,mcl_minecarts_rail_detector.png,,,,,, +/assets/minecraft/textures/blocks,rail_detector_powered.png,/mods/ITEMS/mcl_minecarts/textures,mcl_minecarts_rail_detector_powered.png,,,,,, +/assets/minecraft/textures/blocks,rail_activator.png,/mods/ITEMS/mcl_minecarts/textures,mcl_minecarts_rail_activator.png,,,,,, +/assets/minecraft/textures/blocks,rail_activator_powered.png,/mods/ITEMS/mcl_minecarts/textures,mcl_minecarts_rail_activator_powered.png,,,,,, /assets/minecraft/textures/items,minecart_normal.png,/mods/ITEMS/mcl_minecarts/textures,mcl_minecarts_minecart_normal.png,,,,,, /assets/minecraft/textures/items,minecart_chest.png,/mods/ITEMS/mcl_minecarts/textures,mcl_minecarts_minecart_chest.png,,,,,, /assets/minecraft/textures/items,minecart_tnt.png,/mods/ITEMS/mcl_minecarts/textures,mcl_minecarts_minecart_tnt.png,,,,,,