From 1b2cc9a65804c7b39ab8a055d5eeb5b972b357cc Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:17:39 -0500 Subject: [PATCH] made the cable insulation texture grayscale --- .../muramasa/antimatter/pipe/BlockCable.java | 17 +++++++++-------- .../textures/block/pipe/cable_huge.png | Bin 723 -> 4747 bytes .../textures/block/pipe/cable_large.png | Bin 736 -> 4852 bytes .../textures/block/pipe/cable_normal.png | Bin 729 -> 4930 bytes .../textures/block/pipe/cable_side.png | Bin 654 -> 4927 bytes .../textures/block/pipe/cable_small.png | Bin 727 -> 4986 bytes .../textures/block/pipe/cable_tiny.png | Bin 720 -> 5016 bytes .../textures/block/pipe/cable_vtiny.png | Bin 720 -> 5016 bytes 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java b/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java index 4817e32dd..aa7b9e78e 100644 --- a/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java +++ b/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java @@ -32,6 +32,7 @@ public class BlockCable> extends BlockPipe { + public static final int INSULATION_COLOR = 0x404040; public final boolean insulated; public BlockCable(T type, PipeSize size, boolean insulated) { @@ -40,12 +41,12 @@ public BlockCable(T type, PipeSize size, boolean insulated) { String prefix = insulated ? "cable" : "wire"; this.side = new Texture(Ref.ID, "block/pipe/" + prefix + "_side"); this.faces = new Texture[]{ - new Texture(Ref.ID, "block/pipe/" + prefix + "_vtiny"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_tiny"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_small"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_normal"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_large"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_huge") + new Texture(Ref.ID, "block/pipe/" + "wire_vtiny"), + new Texture(Ref.ID, "block/pipe/" + "wire_tiny"), + new Texture(Ref.ID, "block/pipe/" + "wire_small"), + new Texture(Ref.ID, "block/pipe/" + "wire_normal"), + new Texture(Ref.ID, "block/pipe/" + "wire_large"), + new Texture(Ref.ID, "block/pipe/" + "wire_huge") }; } @@ -71,7 +72,7 @@ public int getBlockColor(BlockState state, @Nullable BlockGetter world, @Nullabl if (!(state.getBlock() instanceof BlockCable) && world == null || pos == null) return -1; BlockEntityPipe pipe = getTilePipe(world, pos); if (insulated && pipe != null && pipe.getPipeColor() != -1 && i == 0) return pipe.getPipeColor(); - if (insulated) return i == 1 ? getRGB() : -1; + if (insulated) return i == 1 ? getRGB() : i == 0 ? INSULATION_COLOR : -1; return i == 0 || i == 1 ? getRGB() : -1; } @@ -80,7 +81,7 @@ public int getItemColor(ItemStack stack, @Nullable Block block, int i) { if (insulated && stack.getTag() != null && stack.getTag().contains(Ref.KEY_PIPE_TILE_COLOR) && i == 0){ return stack.getTag().getInt(Ref.KEY_PIPE_TILE_COLOR); } - return insulated ? i == 1 ? getRGB() : -1 : getRGB(); + return insulated ? i == 1 ? getRGB() : i == 0 ? INSULATION_COLOR : -1 : getRGB(); } @Override diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_huge.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_huge.png index d353e3ba59e97735fd46bcb8d26dd02b76106a02..52345490daa22c45f222c5178e830aaad2d551fa 100644 GIT binary patch literal 4747 zcmeHKdsGuw8lQkgK%v-mJ**Xt0TkFyGLv_PL=?g!lqi*efbMoDnF)*}nUD-5pt#7( ziVv`sQyukf<^IFMXRnaTy?d_u28Ji7FTWUsT6$do#DOPbM|=7_CF@)=HC0= z-~HY1{_c0bWR@q-j`#DO=nFxRpDsZ=7t{f4@%94WQy#y-LDfp8>&!Y`1mq1m0LdE# z@mLHfydiB5o+so9Y!#rq2HGr!EfaaKaP>;ie!Z{#9%zU4Vc0n+&ja!UbuB1j&>j!! z4?&@p^{#akwAsg-`{1Ji3iSHxc%43(FBYPRP@)7Qh**lDVoZYY#bOLaF_{Fc&)YKS z5zExQY*{7nuZ)U`N!G>0@a+!TOj$?>a@Q8E(Im9Y46JCYON@>1&kq=PKKXe%cO#7p(ec!creEd=AM||(+#mY!!cyq$?w$Snk=&jr@ zTNbtTIGzOYr4dOD%^k&cH_h1kfQEyq=#Q01T)++$EIGGs?T+z_PhZz~EIzj4`!`-R zN5ya6&=eRDu>AIU#M3_-yGpl{+JD zX{)gHG~whL|cV8K^sY-+iGVI3{pqA?YJq2WcWrhi?V414-Xv^@F_wgm?zUC zdV36+O(hgM$dtm_22){=ST~g~7R>PFs~vkalE=P?bt0 zLc}7m7zPN~Szu#uH*9kTvlP7?TGDB9P{BmVN^*PWhiQt;YyODB1~8u?XcqDI4LWh zMT+dUEN*}m9GjJ_(+I>uWYCgq!5K4{pb;cdwmkRXfPu1-DGbi4i7F&AIVx4461h|= zkx2(ZX{5smB9Z0fawj*!9t#FG1BAudI0Xcp9qa{*agaDeI}9{!(Fg{z?!d4fTqgo& za4pV|fOH@a8~XDwjL0yg*L{{wPZN~6;D4dn%fnX#JUH?M$_dsl;7q+YDuvAL?e%so z6nB;QeC|?UxT$vwPCTC^I6nbb?~o}Qw`Gwad-R2Czn%JpP>>S}r5qs%SWX&2G$~Ly zY?K&{FsVdQxm1oy#A4-eb|-CST)2arl?8MJT7mH7exdkb+(Cs8N4v5~_7s3%Fe-*6 z$bSkZ>f5l0%^CeWR*U{i6Ez1Il4QWVUK>bWAQy@Tl3|}_Y})x1pT4vB6;}Y%Ba6J0 zz9Vvt$n{bRycBpOx<=%BDFt2%JQ7|1H@SQVU#CbL_!r~?FH46XXJ>;KEidDn@mlB- zbRBvakrx;aEI#&x3?~HnpI{5`w_%CJz&M)G>0?LV8#~2wj4UYulS7b4m`*#(pgdR8 z`cK>6?NG({^)EiflLD!5q%5!+ZTgmpsWX4Ka(RaOr!$^MwiZm8{LsU!&baFN^o;kJ zlXYeL-mqD=x1w9NyW9P)-t|~=wkL7^{D;$Wa;kD`g%|3|C#(t%@kxD4rJ>gzTys3P zurX7wz7)Lq?GumptlPB7Yi3~Fq^XAcn=ah9yjvX6aG)`6Z- zzv`sXhtbRutdH{cS%>$c3VcmZ>QzyrycrWA^KcM-6kgebHDQ; z?_}&1oD(O8Y`grgO)0|nZ~Xj8q^@3Up^w!kFSvW_hlsp}**#qWP)kB<_EU4g!Q#k? zQ_E&bCr(?msO`p=i_1Hk)6-TNBJ}q%*OiufdDu^zh>Xwk;>WL;ql${$YX5W4rN_x} z+oz5hM!;_`|MNebC1p8x6Kn` SiHRVLAYJTi?VjjAmHZnx5u9ZJ delta 699 zcmV;s0!00bCDR3vB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mFXLc-YlNc?YvYy=rZXd`d}A)9%Bq1@H-J_qwOnt$o4?yBxFn$0H0<0-;0 zMyJz(;|}1uJ_dsjy%!6^;TXOjpxyok(`+M(MjAUBO>`NS)yHHqhwZomBG5;=+Q71G zxL%;(Ac*yUxy&$|rLb*B&lqcXo-YJ5tk@>+B|<1qPdc21vE5*Oq{A-??ny+eMl@biiS$+s9s;Q hrfIGZiE)-?<1ePIen&TgS(g9+002ovPDHLkV1j9tIm-Y5 diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_large.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_large.png index 9b24c0a20129a90a8689222c444f03104f27755d..85a47f067843825a5ffa6921bbc8fe58b3fb1dd4 100644 GIT binary patch literal 4852 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 delta 705 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 delta 629 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 B5EcLc delta 703 zcmV;w0zm!xCf5a!B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNHDpIvQUCw~NJ&IN zR5(vXQ`vIbKoHbtVJ?9Hp#$9)x;gAXs+>P|9?4t$3zP04E`L94X|+4k)7>*`EEWsN z^Gc#95zDf~^$y~BfgBEzYLW&lqd?egJ@@oKA1J@MN>uA}NtL$)zk?B-&Ve1cylO zWoep{B$?ioRevJ}kvz{=#Ow8^(jwjQ^a{`)!UFrfBmHoZ1`J{(57@Wuh`fUsCJ-4w zt$AKbRdur6+Ui45G`Mr&%|>OGRSTdqJV>>O0t7*%T4*4t9_wB%mm6pnPx`x^f|X^b z(q^-nCeuh4z8O4V1yT*eR8cc@<@d*jJRX0r9=e~;=YKHT*DfXShf)Y^d?zQUQcK^T z#e>UC{QLQ-i$G+P!|b{l!zHRn7prL9Zs0iM+hLJS7xm^XxSYynOR2i721?XQ@_g5!qD2L174Ad}# zGfp<7$soFYyZ=J(`49T_AnUcIcl3z#d5$@Vb^1s%L*;RN#eShIXxJA37iEyyFkJOZ zwwS~fUYUu}JZXQ~6+V^bTsB5|s=+Z_%=eMqDk$Ekw4 lsyEQ8T{i-t)i~RBCvA{LP= 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 delta 696 zcmV;p0!RIrC(s3uB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNHDpIvQUCw~K}keG zR5(vXQ`eH(KoHbtkp%(?1(XxYggb+)&Y$l4g>m;#_#U=EyMH@99cGR7dM!m!OB|vS-tt3gVck{f|WjM}J%CZsH^HIdYQ2OB}j^m0S zL|Pn0seX6eDCcu8uIuR@?;1f60^lr{%O?(e+3yc1N+n4Psj3cz4%QKuBNPv^F-=L+ zT+gby6@y5=AAcy~{r+2Nk?wT)0O&7agX7VaVZ2ET1__Es{O`I6btf@QAo2pW7DXj> z-OJ(Ns1Ie?;>?3LdzD$$9e}RzAk!ua5Qed8p@F1&ZU(vC9-vvi=-ak}RaLLjmdm9U z(?}1#8Qfq8QjMZaQFEl?I`;qKqrI2aY6YVMO(}&xlz+lAhxsN$Wboxj$N9Sq!!2h+fpkZ$SF3KRYalGp<*4O6+V_4Oz1KvGXPZ%4qq*kVB7>z1~h_5oH44y!Nz8!4~aCBBvVjN^&(ny?fVG; eo!)aCSN;K^JMyma_1-A}0000