diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_off.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_off.png deleted file mode 100644 index 0cd7c9ae8..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_off.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_on.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_on.png deleted file mode 100644 index 4e3a5faf8..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_on.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_off.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_off.png deleted file mode 100644 index 0a1a6a720..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_off.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_on.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_on.png deleted file mode 100644 index f78e418f1..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_on.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_off.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_off.png deleted file mode 100644 index 4b807085a..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_off.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_on.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_on.png deleted file mode 100644 index 4edd32bdf..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_on.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_off.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_off.png deleted file mode 100644 index 92437d1dc..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_off.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_on.png b/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_on.png deleted file mode 100644 index ef928db8c..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_on.png and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_dot.png b/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_dot.png new file mode 100644 index 000000000..d2e433833 Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_dot.png differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line0.png b/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line0.png new file mode 100644 index 000000000..3219df3c4 Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line0.png differ diff --git a/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line1.png b/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line1.png new file mode 100644 index 000000000..61ebb2c82 Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line1.png differ diff --git a/mods/ITEMS/REDSTONE/mesecons/wires.lua b/mods/ITEMS/REDSTONE/mesecons/wires.lua index 26e24c817..bdb7b6b4b 100644 --- a/mods/ITEMS/REDSTONE/mesecons/wires.lua +++ b/mods/ITEMS/REDSTONE/mesecons/wires.lua @@ -66,44 +66,24 @@ Read the help entries on the other redstone components to learn how redstone com if xmy == 1 then table.insert(nodebox, box_xmy) end if zmy == 1 then table.insert(nodebox, box_zmy) end + local ratio_off = 128 + local ratio_on = 192 + local crossing_off = "(redstone_redstone_dust_dot.png^redstone_redstone_dust_line0.png^(redstone_redstone_dust_line1.png^[transformR90))^[colorize:#FF0000:"..ratio_off + local crossing_on = "(redstone_redstone_dust_dot.png^redstone_redstone_dust_line0.png^(redstone_redstone_dust_line1.png^[transformR90))^[colorize:#FF0000:"..ratio_on + local straight0_off = "redstone_redstone_dust_line0.png^[colorize:#FF0000:"..ratio_off + local straight0_on = "redstone_redstone_dust_line0.png^[colorize:#FF0000:"..ratio_on + local straight1_off = "redstone_redstone_dust_line0.png^[colorize:#FF0000:"..ratio_off + local straight1_on = "redstone_redstone_dust_line0.png^[colorize:#FF0000:"..ratio_on + if adjx and adjz and (xp + zp + xm + zm > 2) then table.insert(nodebox, box_bump1) - tiles_off = { - "jeija_mesecon_crossing_off.png", - "jeija_mesecon_crossing_off.png", - "jeija_mesecon_off.png", - "jeija_mesecon_off.png", - "jeija_mesecon_off.png", - "jeija_mesecon_off.png" - } - tiles_on = { - "jeija_mesecon_crossing_on.png", - "jeija_mesecon_crossing_on.png", - "jeija_mesecon_on.png", - "jeija_mesecon_on.png", - "jeija_mesecon_on.png", - "jeija_mesecon_on.png" - } + tiles_off = { crossing_off, crossing_off, "blank.png", "blank.png", "blank.png", "blank.png" } + tiles_on = { crossing_on, crossing_on, "blank.png", "blank.png", "blank.png", "blank.png" } else table.insert(nodebox, box_center) - tiles_off = { - "jeija_mesecon_crossing_off.png", - "jeija_mesecon_crossing_off.png", - "jeija_mesecon_off.png", - "jeija_mesecon_off.png", - "jeija_mesecon_off.png", - "jeija_mesecon_off.png" - } - tiles_on = { - "jeija_mesecon_crossing_on.png", - "jeija_mesecon_crossing_on.png", - "jeija_mesecon_on.png", - "jeija_mesecon_on.png", - "jeija_mesecon_on.png", - "jeija_mesecon_on.png" - } + tiles_off = { crossing_off, crossing_off, straight0_off, straight1_off, straight0_off, straight1_off, } + tiles_on = { crossing_on, crossing_on, straight0_on, straight1_on, straight0_on, straight1_on, } end - if nodeid == "00000000" then nodebox = {-8/16, -.5, -1/16, 8/16, -.5+1/16, 1/16} end diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 6d7dd7dae..63df4a2e6 100644 --- a/tools/Texture_Conversion_Table.csv +++ b/tools/Texture_Conversion_Table.csv @@ -583,27 +583,27 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/blocks,repeater_off.png,/mods/ITEMS/REDSTONE/mesecons_delayer/textures,mesecons_delayer_off.png,,,,,, /assets/minecraft/textures/blocks,repeater_on.png,/mods/ITEMS/REDSTONE/mesecons_delayer/textures,mesecons_delayer_on.png,,,,,, /assets/minecraft/textures/blocks,noteblock.png,/mods/ITEMS/REDSTONE/mesecons_noteblock/textures,mesecons_noteblock.png,,,,,, -/assets/minecraft/textures/blocks,command_block_back.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_commandblock_off.png,,,,,, -/assets/minecraft/textures/blocks,command_block_back.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_commandblock_on.png,,,,,, -/assets/minecraft/textures/blocks,redstone_lamp_off.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_lightstone_gray_off.png,,,,,, -/assets/minecraft/textures/blocks,redstone_lamp_on.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_lightstone_gray_on.png,,,,,, -/assets/minecraft/textures/blocks,daylight_detector_inverted_top.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_solar_panel_inverted.png,,,,,, -/assets/minecraft/textures/blocks,daylight_detector_top.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_solar_panel.png,,,,,, -/assets/minecraft/textures/blocks,daylight_detector_side.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_solar_panel_side.png,,,,,, -/assets/minecraft/textures/blocks,redstone_torch_off.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_torches_off.png,,,,,, -/assets/minecraft/textures/blocks,redstone_torch_on.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_torches_on.png,,,,,, -/assets/minecraft/textures/blocks,lever.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,jeija_wall_lever.png,,,,,, -/assets/minecraft/textures/blocks,piston_bottom.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_back.png,,,,,, -/assets/minecraft/textures/blocks,piston_side.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_bottom.png,,,,,, -/assets/minecraft/textures/blocks,piston_inner.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_on_front.png,,,,,, -/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_pusher_back.png,,,,,, -/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_pusher_bottom.png,,,,,, -/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_pusher_front.png,,,,,, -/assets/minecraft/textures/blocks,piston_top_sticky.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_pusher_front_sticky.png,,,,,, -/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_pusher_left.png,,,,,, -/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_pusher_right.png,,,,,, -/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,mesecons_piston_pusher_top.png,,,,,, -/assets/minecraft/textures/blocks,redstone_block.png,/mods/ITEMS/REDSTONE/mesecons_textures/textures,redstone_redstone_block.png,,,,,, +/assets/minecraft/textures/blocks,command_block_back.png,/mods/ITEMS/REDSTONE/mesecons_commandblock/textures,jeija_commandblock_off.png,,,,,, +/assets/minecraft/textures/blocks,command_block_back.png,/mods/ITEMS/REDSTONE/mesecons_commandblock/textures,jeija_commandblock_on.png,,,,,, +/assets/minecraft/textures/blocks,redstone_lamp_off.png,/mods/ITEMS/REDSTONE/mesecons_lightstone/textures,jeija_lightstone_gray_off.png,,,,,, +/assets/minecraft/textures/blocks,redstone_lamp_on.png,/mods/ITEMS/REDSTONE/mesecons_lightstone/textures,jeija_lightstone_gray_on.png,,,,,, +/assets/minecraft/textures/blocks,daylight_detector_inverted_top.png,/mods/ITEMS/REDSTONE/mesecons_solarpanel/textures,jeija_solar_panel_inverted.png,,,,,, +/assets/minecraft/textures/blocks,daylight_detector_top.png,/mods/ITEMS/REDSTONE/mesecons_solarpanel/textures,jeija_solar_panel.png,,,,,, +/assets/minecraft/textures/blocks,daylight_detector_side.png,/mods/ITEMS/REDSTONE/mesecons_solarpanel/textures,jeija_solar_panel_side.png,,,,,, +/assets/minecraft/textures/blocks,redstone_torch_off.png,/mods/ITEMS/REDSTONE/mesecons_torch/textures,jeija_torches_off.png,,,,,, +/assets/minecraft/textures/blocks,redstone_torch_on.png,/mods/ITEMS/REDSTONE/mesecons_torch/textures,jeija_torches_on.png,,,,,, +/assets/minecraft/textures/blocks,lever.png,/mods/ITEMS/REDSTONE/mesecons_walllever/textures,jeija_wall_lever.png,,,,,, +/assets/minecraft/textures/blocks,piston_bottom.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_back.png,,,,,, +/assets/minecraft/textures/blocks,piston_side.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_bottom.png,,,,,, +/assets/minecraft/textures/blocks,piston_inner.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_on_front.png,,,,,, +/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_back.png,,,,,, +/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_bottom.png,,,,,, +/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_front.png,,,,,, +/assets/minecraft/textures/blocks,piston_top_sticky.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_front_sticky.png,,,,,, +/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_left.png,,,,,, +/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_right.png,,,,,, +/assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_top.png,,,,,, +/assets/minecraft/textures/blocks,redstone_block.png,/mods/ITEMS/REDSTONE/mesecons_torch/textures,redstone_redstone_block.png,,,,,, /assets/minecraft/textures/items,sign.png,/mods/ITEMS/signs/textures,default_sign.png,,,,,, /assets/minecraft/textures/blocks,glass_black.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_black.png,,,,,, /assets/minecraft/textures/blocks,glass_blue.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_blue.png,,,,,, @@ -810,3 +810,6 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/items,empty_armor_slot_leggings.png,/mods/HUD/mcl_inventory/textures,mcl_inventory_empty_armor_slot_leggings.png,,,,,, /assets/minecraft/textures/items,empty_armor_slot_shield.png,/mods/HUD/mcl_inventory/textures,mcl_inventory_empty_armor_slot_shield.png,,,,,, /assets/minecraft/textures/items,knowledge_book.png,/mods/HELP/mcl_craftguide/textures,craftguide_book.png,,,,,, +/assets/minecraft/textures/blocks,redstone_dust_dot.png,/mods/ITEMS/REDSTONE/mesecons/textures,redstone_redstone_dust_dot.png,,,,,, +/assets/minecraft/textures/blocks,redstone_dust_line0.png,/mods/ITEMS/REDSTONE/mesecons/textures,redstone_redstone_dust_line0.png,,,,,, +/assets/minecraft/textures/blocks,redstone_dust_line1.png,/mods/ITEMS/REDSTONE/mesecons/textures,redstone_redstone_dust_line1.png,,,,,,