From f24754453a88a0caff56ccfcb71819598d0bdd6c Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 21 Jul 2017 17:37:59 +0200 Subject: [PATCH] Update redstone trail textures --- .../textures/jeija_mesecon_crossing_off.png | Bin 459 -> 0 bytes .../textures/jeija_mesecon_crossing_on.png | Bin 448 -> 0 bytes .../textures/jeija_mesecon_curved_off.png | Bin 391 -> 0 bytes .../textures/jeija_mesecon_curved_on.png | Bin 383 -> 0 bytes .../mesecons/textures/jeija_mesecon_off.png | Bin 211 -> 0 bytes .../mesecons/textures/jeija_mesecon_on.png | Bin 203 -> 0 bytes .../textures/jeija_mesecon_t_junction_off.png | Bin 456 -> 0 bytes .../textures/jeija_mesecon_t_junction_on.png | Bin 448 -> 0 bytes .../textures/redstone_redstone_dust_dot.png | Bin 0 -> 150 bytes .../textures/redstone_redstone_dust_line0.png | Bin 0 -> 168 bytes .../textures/redstone_redstone_dust_line1.png | Bin 0 -> 166 bytes mods/ITEMS/REDSTONE/mesecons/wires.lua | 46 +++++------------- tools/Texture_Conversion_Table.csv | 45 +++++++++-------- 13 files changed, 37 insertions(+), 54 deletions(-) delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_off.png delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_crossing_on.png delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_off.png delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_curved_on.png delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_off.png delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_on.png delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_off.png delete mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/jeija_mesecon_t_junction_on.png create mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_dot.png create mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line0.png create mode 100644 mods/ITEMS/REDSTONE/mesecons/textures/redstone_redstone_dust_line1.png 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 0cd7c9ae8afc68599327fe38d165ad4bca701679..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmV;+0W|)JP)AmOw|Ni%$a|OeA>U0zkKml$C12I|0!91em>u2%?uu&imBv$}&AQT0l z&|i>=3XVlaQA_q&m@sZeqi{_peg%Qp8ZavbtbiCRaNg|#;Co&OVmK^h7i`$8%>oC- zbFZg>oU~dBu$W9j5UK!j)$iw`K-~FOUXXQFBW=O5;|QQ1z7N3bVj+NP$QY4u+D*MK zfPQ+O0J;i-_+lbI!9`%*gv9X=l348;Pf|w`&Webno02#h^g||cR;ef;$F8dYFS8i{ z7u9NbF3jf}r3BEUQfZsHCK=dCkYDy>x$ns+v3J?db?`2DY_|dQeYphSy3r6o-=-ce}&$-UsOTu!YO_y%Bmj?_!A7v=x}002ovPDHLkV1h)U B#5@21 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 4e3a5faf8bc58f3f5f45d0b6b4fe4bb23b492e46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG8UuVnTtT$9cC(I7hpz5K z1B1CHCMzv0)>&F^w6@-4ZN1sXX1lHJ4qMxO_Vx!H9S?bU9P;!$?B{npJp4>*>bcz9 zi)CdM3=CBa40Q|)4Gauz3=ESP80IlBEMQ<*#=x+GfngN`!x{#LO$-cM7#I#QFdSiE zIK{wlhk@Y>1H(TChJS*B4c#8!7#JADN`m}?8L$Gy6Fk=#7#MDNx;TbNNY)-a9d^h; z#P#4~?q3-!tZxNg4BAybi4BAGyw^u6V zTIY)HjGON5x^DmT&Bu5*pMLs!!~E@AGeeU-t6%O#{st^==YAOyB>O-8QMU=SgkK&Drp7 zZ*JJ?qbq$((l%E{&J|ml5p(YKRwe(RrE5K|ht5?By&Br}V2X(00*)J95{o&GbtMEG eNpRh9vDyA@yLfWbD*q&q=RIBhT-G@yGywqYnxoJF 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 0a1a6a720c63e30189d046af46cfd6fb8545b49d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGN&|dCTp1V`8nv~Xb#x{g z7|b;>S!!;+(!ye+we==z>&-ScJ8W$aI65Bk@Hp(}cP=;gLSfHjCd^39arxt>K!-*>W#@A2gqTY^|P>KNAV%1gMy7Q)LRu$wJ+_Vd{E+_%gu2Wp$P ze&=P`>OVoj;oUNg(>k-&_S@ZAv?ukZ$<=)Yo!)Q69;rUwQQ*3u*G$RaR)(O!DnZ5@ s8kUU*Jeg7*8q_({8J6qr`**&Q`IIy7=~wR^?tuK`>FVdQ&MBb@0MZGQO#lD@ 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 f78e418f1ae770e7e395c30552825fdfac349b73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG@&kNATp1V`8nv~Xb#x{g z7|b;>S!!;+(!ye+we==z>&-ScJ8W$aI65Bk@Hp(}cP=;gLSfj!0?Zg^S`d{ zHIKkw3=9l{B|(0{4Cvsn?Adn=3=Hc$T^vI!PQSf)TByl@hc!TC;q^sMmGNGh>;M0E z6VEv!dFa&Ko8Qj(&SE*Zzb@$JEIp-&&8njF=FU!kFMn9k<4*RsItwP>DbJ5R`T1kZ ztbi_tgZu)f*LizxHFYUCypbx2jr_K^IG0C&;XCKKyXF(N7#`GZ+^zX)m&P*9JpTH? z`&~)1ZbjTUa4gUs&D5iMk3U|=l?@(X4FfkWAB8yOfFl001;Lp07OCp0uHQDF;Nu&hOG!n8KE zhJ~!ot+S+NHE8T|P;fM!Vi2MsSkxY6xNBNbNjCFE7AMw=yu7aFAtJs9SYy4}cP;c> x)N;nat-Q*zEuVAN#1_G%OqR#2${dAmW(@C3gwkW1_VI&k^>p=fS?83{1OPV3K8pYV 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 4edd32bdf8e61208b517a1799e2bab91cedece93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8q5(c3t_%ze8?CK3SzB+m zvDs>4vy6dZ1p~uf-K?n$3=FI#L4LsuAaE#~Z6gB%LxQJ^V~B)g=s`nXXG0N|gG)bf z3vc)$(Bj1LV~MlC$v=uqJZ8;(sDCgmS$A53u37WigMJ&tZXevWk!3djweGpiUk?W5 zh<&TuP`yDXN9-F{S#xRP<_#jZk4EK~P3ztIr-rdnQb5~#Zr3)Dou00KF6*2UngDsW BL`47q 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 92437d1dcf499aed3b539dabb45af7822c645969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmV;(0XP1MP)}^%4kG0J&*4kD`F-d?znRBM7#>ko6MAK@=&#+juO1YLYP`3CCTrD1d&3 zp#VCKW0Ou~8EygVS!~y)y4N*B%3Ms=3@`D2sW0_aI5vzocCGqAVgzU!9Wzo|2>stUlS%Ghz{DIi{z-*KN0000KGUr7#P|Z7$z|=%wu3!z`(GKfnfy$!x{#LO$-cM7#I#QFdSiE zIK{wlhk@Y>1H(TChJS*BR{z*U85kJEOM?7@8L)%BlLHbM7#Oa5x;TbdoL)NFyZDfS zKy&afk2Ohht=IfI*4|KS{P4d%L0=|8qKyB=tNgId*(+DQbD1zzWr6@BQwYP+rd6y{ zIom2OF6!JU*eEeugK7HdI(_E)=bJyoT>HF7wtx0>ho5tg7Z&gNKX3K4(*k1mEZ^6w z&GwL*q>$gR{(<GPwF^tI#SF?V++coFXNe_4@d^RYFJ-4)F7DGpS zNzJ$1-PWzYUW(QJzc;T;kz;zny8;3IpU>=46jW!s9JrM-^@7ymuTI@E3w$ngFAjbG d^pjoAM}9>EG2t&?eY!xN_jL7hS?83{1OSU)rVjuB 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 0000000000000000000000000000000000000000..d2e433833c059b4ba101e7c042e986ee9dc938c0 GIT binary patch literal 150 zcmV;H0BQe;P)G{l+uQ#WvH=~V7;y05K`zy3o?^#gMR?b>XY0?0&SpJ0-*-l z;q 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,,,,,,