Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Update redstone trail textures

objects
Wuzzy 2017-07-21 17:37:59 +02:00
parent b5aa90b9d7
commit f24754453a
13 changed files with 37 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_off.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 459 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 448 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_off.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 391 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 383 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_off.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 211 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 203 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_off.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 456 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 448 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_dot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 168 B

BIN
mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

46
mods/ITEMS/REDSTONE/mesecons/wires.lua
View File

@ -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

45
tools/Texture_Conversion_Table.csv
View File

@ -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,,,,,,

1 Source path Source file Target path Target file xs ys xl yl xt yt
583 /assets/minecraft/textures/blocks repeater_off.png /mods/ITEMS/REDSTONE/mesecons_delayer/textures mesecons_delayer_off.png
584 /assets/minecraft/textures/blocks repeater_on.png /mods/ITEMS/REDSTONE/mesecons_delayer/textures mesecons_delayer_on.png
585 /assets/minecraft/textures/blocks noteblock.png /mods/ITEMS/REDSTONE/mesecons_noteblock/textures mesecons_noteblock.png
586 /assets/minecraft/textures/blocks command_block_back.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_commandblock/textures jeija_commandblock_off.png
587 /assets/minecraft/textures/blocks command_block_back.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_commandblock/textures jeija_commandblock_on.png
588 /assets/minecraft/textures/blocks redstone_lamp_off.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_lightstone/textures jeija_lightstone_gray_off.png
589 /assets/minecraft/textures/blocks redstone_lamp_on.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_lightstone/textures jeija_lightstone_gray_on.png
590 /assets/minecraft/textures/blocks daylight_detector_inverted_top.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_solarpanel/textures jeija_solar_panel_inverted.png
591 /assets/minecraft/textures/blocks daylight_detector_top.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_solarpanel/textures jeija_solar_panel.png
592 /assets/minecraft/textures/blocks daylight_detector_side.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_solarpanel/textures jeija_solar_panel_side.png
593 /assets/minecraft/textures/blocks redstone_torch_off.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_torch/textures jeija_torches_off.png
594 /assets/minecraft/textures/blocks redstone_torch_on.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_torch/textures jeija_torches_on.png
595 /assets/minecraft/textures/blocks lever.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_walllever/textures jeija_wall_lever.png
596 /assets/minecraft/textures/blocks piston_bottom.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_back.png
597 /assets/minecraft/textures/blocks piston_side.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_bottom.png
598 /assets/minecraft/textures/blocks piston_inner.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_on_front.png
599 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_back.png
600 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_bottom.png
601 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_front.png
602 /assets/minecraft/textures/blocks piston_top_sticky.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_front_sticky.png
603 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_left.png
604 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_right.png
605 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_top.png
606 /assets/minecraft/textures/blocks redstone_block.png /mods/ITEMS/REDSTONE/mesecons_textures/textures /mods/ITEMS/REDSTONE/mesecons_torch/textures redstone_redstone_block.png
607 /assets/minecraft/textures/items sign.png /mods/ITEMS/signs/textures default_sign.png
608 /assets/minecraft/textures/blocks glass_black.png /mods/ITEMS/xpanes/textures xpanes_pane_half_glass_black.png
609 /assets/minecraft/textures/blocks glass_blue.png /mods/ITEMS/xpanes/textures xpanes_pane_half_glass_blue.png
810 /assets/minecraft/textures/items empty_armor_slot_leggings.png /mods/HUD/mcl_inventory/textures mcl_inventory_empty_armor_slot_leggings.png
811 /assets/minecraft/textures/items empty_armor_slot_shield.png /mods/HUD/mcl_inventory/textures mcl_inventory_empty_armor_slot_shield.png
812 /assets/minecraft/textures/items knowledge_book.png /mods/HELP/mcl_craftguide/textures craftguide_book.png
813 /assets/minecraft/textures/blocks redstone_dust_dot.png /mods/ITEMS/REDSTONE/mesecons/textures redstone_redstone_dust_dot.png
814 /assets/minecraft/textures/blocks redstone_dust_line0.png /mods/ITEMS/REDSTONE/mesecons/textures redstone_redstone_dust_line0.png
815 /assets/minecraft/textures/blocks redstone_dust_line1.png /mods/ITEMS/REDSTONE/mesecons/textures redstone_redstone_dust_line1.png