From 494cb61bd4b434b9f3c54e6218ff9623ff815869 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Thu, 29 Sep 2022 03:17:19 +0300 Subject: [PATCH] generated colored cargo crate minecarts, un-kot omnipresent pattern drive and copy opacity from source texture in the colorizer --- colorizer.js | 6 ++++++ .../mc/otm/datagen/items/ItemModels.kt | 6 +++++- .../textures/item/minecart_cargo_crate_black.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_blue.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_brown.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_cyan.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_gray.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_green.png | Bin 0 -> 523 bytes .../item/minecart_cargo_crate_light_blue.png | Bin 0 -> 523 bytes .../item/minecart_cargo_crate_light_gray.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_lime.png | Bin 0 -> 523 bytes .../item/minecart_cargo_crate_magenta.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_orange.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_pink.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_purple.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_red.png | Bin 0 -> 523 bytes .../textures/item/minecart_cargo_crate_yellow.png | Bin 0 -> 523 bytes 17 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_black.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_blue.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_brown.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_cyan.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_gray.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_green.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_blue.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_gray.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_lime.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_magenta.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_orange.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_pink.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_purple.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_red.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_yellow.png diff --git a/colorizer.js b/colorizer.js index 537ccf946..09f02334a 100644 --- a/colorizer.js +++ b/colorizer.js @@ -85,6 +85,9 @@ async function size(path) { `xc:rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`, '-compose', 'Multiply', '-composite', + `${root_main}${texture}.png`, + '-compose', 'copy-opacity', + '-composite', `${basedir}/${last.replace(/_colorless/, '').replace(/_white/, '')}_${name}.png`]) magick.stdout.pipe(process.stdout) @@ -130,6 +133,9 @@ async function size(path) { `xc:rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`, '-compose', 'Multiply', '-composite', + `${root_main}${textureColor}.png`, + '-compose', 'copy-opacity', + '-composite', ')', `${root_main}${textureOverlay}.png`, diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 150eaf21f..2d25e6ef6 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -76,7 +76,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.QUANTUM_BATTERY_CREATIVE) provider.generated(MItems.PATTERN_DRIVE_CREATIVE) - provider.KOT(MItems.PATTERN_DRIVE_CREATIVE2) + provider.generated(MItems.PATTERN_DRIVE_CREATIVE2) provider.generated(MItems.MATTER_DUST) @@ -107,4 +107,8 @@ fun addItemModels(provider: MatteryItemModelProvider) { for (item in MItems.EXOSUIT_INVENTORY_UPGRADES) { provider.generatedStrict(item, "exosuit_inventory_upgrade") } + + for ((color, item) in MItems.CARGO_CRATE_MINECARTS) { + provider.generated(item) + } } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_black.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f008beec4b055019d0b4027ce9ce33cf16fc79 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>t<7cfK3d3)IP2 z666=m;PC858iH2?+KOFVsD*`IOBh?}V% zNY_{g6sqxbaSV~T9NQPjcSM21g|#G=>&CtRTeNTG&6+DQx$?7}MrwPryUpRRzu>JbSO3Wf8>$R^|0(ZrVg4wH&-e_w*CndIz zr{c!K$7kMgPO?avlUMcD`2l+y?*pewj=I;raj)z5eGO-+dARVeCD0wJC9V-ADTyVi zR>?)FK#IZ0z{p6~z*5)9BE-np%Fx`()Ii(7z{14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a> zguuW+Q&ZFW`g#rRdV42lWgYz~(`Pg^cc$kTuUxl2JFjTol4YEnT>t<7|JncQGEgUD zNswPKgTu2MX&_FLx4Vnrqph~PfE>;OkH}&M2EIce%qXhi)c_P^FY)wsWq-ygBW|X8 zAYEe}P^iY!#W6(Ua%^89-w_247uJ$gt{eCMZ_&P$H*2oM8ma9ar?g$p_^j8O zy7QE?hWFh5+q@~0&Zm3TT6*c+e&OV?!1n7OD=~|Ztk=F;3EUMc3TCf9dZVrNoRru; zo{Ad_AD?;0ImsevPF~ep=LhUmOyu?mbgZgq$HN4 zS|t~y0x1R~10y3{14~^aix4AYD?@WDQv+=S11kfAoNe(lQ8eV{r(~v8;?^Mh`nf7l qg9hA&lFZ!H;*!MN0yI6QCRWDg5KDw^SQY{GFnGH9xvX14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>t<7m*KJq1nOig z3GxeOaCmkj4a7 zq-(4L3e|YJIEF}Ej_nKNJEFkh!djBbb>rUuE!wy8X3dqDT>05fBelKbl(x$mpY>W( zcb;S_B`E;*ZOD~<s< zQ*mSA<1_C#Cs`!T$*X$n{D8fU_kmL-N8M}RxYzajzJ{~ZJY4wK66g-q64!{5l*E!$ ztK_0oAjM#0U}U6gV5w_l5n^O)WoT|?YM^akU}a#Cvn_rmiiX_$l+3hB+!|zGKUW26 p(16=el9`)YT#}eufTqXP#LCzlVu{cV%Oap222WQ%mvv4FO#t!GqzM23 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..971bc7bbe153c42b597892c414a78f1895fab0a5 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>t<7-{;OkH}&M2EIce%qXhi)c_P^FY)wsWq-ygBW|X8 zAYEe}P^iY!#W6(Ua%^89-w_247uJ$gt{eCMZ_&P$H*2oM8ma9ar?g$p_^j8O zy7QE?hWFh5+q@~0&Zm3TT6*c+e&OV?!1n7OD=~|Ztk=F;3EUMc3TCf9dZVrNoRru; zo{Ad_AD?;0ImsevPF~ep=LhUmOyu?mbgZgq$HN4 zS|t~y0x1R~10y3{14~^aix4AYD?@WDQv+=S11kfAoNe(lQ8eV{r(~v8;?^Mh`nf7l qg9hA&lFZ!H;*!MN0yI6QCRWDg5KDw^SQY{GFnGH9xvX14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>t<7SMs|q2Gq$| z666=m;PC858iH2?+KOFVsD*`IOBh?}Ww zPmr(x3e|YJIEF}Ej_nKNJEFkh!djBbb>rUuE!wy8X3dqDT>05fBelKbl(x$mpY>W( zcb;S_B`E;*ZOD~<s< zQ*mSA<1_C#Cs`!T$*X$n{D8fU_kmL-N8M}RxYzajzJ{~ZJY4wK66g-q64!{5l*E!$ ztK_0oAjM#0U}U6gV5w_l5n^O)WoT|?YM^akU}a#Cvn_rmiiX_$l+3hB+!|zGKUW26 q(16=el9`)YT#}eufTqXP#LCzVV#${EM#q497(8A5T-G@yGywqoC#1Ik literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_green.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_green.png new file mode 100644 index 0000000000000000000000000000000000000000..5c3055f915cb2f2e284e14f3e4ac2d9814c893bf GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>t<7SB#rw4b;h4 z666=m;PC858iH2?+KOFVsD*`IOBh?}V% zNY_{g6sqxbaSV~T9NQPjcSM21g|#G=>&CtRTeNTG&6+DQx$?7}MrwPryUpRRzu>JbSO3Wf8>$R^|0(ZrVg4wH&-e_w*CndIz zr{c!K$7kMgPO?avlUMcD`2l+y?*pewj=I;raj)z5eGO-+dARVeCD0wJC9V-ADTyVi zR>?)FK#IZ0z{p6~z*5)9BE-np%Fx`()Ii(7z{14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>+AI=Z?<=GR@Tv|rRctjR6Fz_7$VMb96uLhtXdx@v7EBiA}8F4d} z?FkYVK%p8>7sn8Z%dvfdd`A>GTv$s|xo+J1zeW32-mJM2lPf>lX{5GyoYHnVdsTn8s2mJZ}X;1I-l-UYw4wP`-PLo0^6^Dti&urvR?aYC2&`)D44za=#944b5dga zcq(oze0=5|=Ol}yIeArYogc8b@jh^>tyEJBQotqjerObxUR46F*uOK q4H|G8N-}d(i%Sx73()kKnphc|K`hy_-sl)m4}+(xpUXO@geCwlB&Tx# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..8be32f432379b35bf811ce1a5cc3f38a8a934464 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>t<7x6aur3)IP2 z666=m;PC858iH2?+KOFVsD*`IOBh?}Ww zPmr(x3e|YJIEF}Ej_nKNJEFkh!djBbb>rUuE!wy8X3dqDT>05fBelKbl(x$mpY>W( zcb;S_B`E;*ZOD~<s< zQ*mSA<1_C#Cs`!T$*X$n{D8fU_kmL-N8M}RxYzajzJ{~ZJY4wK66g-q64!{5l*E!$ ztK_0oAjM#0U}U6gV5w_l5n^O)WoT|?YM^akU}a#Cvn_rmiiX_$l+3hB+!|zGKUW26 q(16=el9`)YT#}eufTqXP#LCzVV#${EM#q497(8A5T-G@yGywo>{iZ14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>8ma9ar?g$p_^j8O zy7QE?hWFh5+q@~0&Zm3TT6*c+e&OV?!1n7OD=~|Ztk=F;3EUMc3TCf9dZVrNoRru; zo{Ad_AD?;0ImsevPF~ep=LhUmOyu?mbgZgq$HN4 zS|t~y0x1R~10y3{14~^aix4AYD?@WDQv+=S11kfAoNe(lQ8eV{r(~v8;?^Mh`nf7l qg9hA&lFZ!H;*!MN0yI6QCRWB~5KFeKH#!E?!{F)a=d#Wzp$PyVn5NGF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..26ca372063c7f351fd389e587767e7dd78a14373 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>+2^Q_uD%;E9>Y_nLeYTxidY#c;&kF*?C3tmMr7sB%E{-7*mt*?^`Hm=XxUiO_a^1N1e~b35yjgQ4CRcv8(@1UaIHm1!#%I0O z)SaiCHN5Bc-{wu3bUxjy*3wJo_6sME1-4)RSczGLWWDy)O5mLnHp#t7+4t?14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>p-21 zB|(0{3=Yq3q=7g|-tI1fkG9(G0&+MDJR*x382Ao>Fr%o3R|8Oxy~NYkmHio~jJTP~ z_5=wFpiqsci(`ny<=DPJz9R}8F03V~TsQ9h-=cjhZ`NFi$(5h&G*a6;PHDTG@ma4m zb>}H(4ez=Aw|P@0olp0wwe-@t{ldv(f$i5nR$>+*S+9My61Xc?6wF?I^hR6jIVrJy zJQX(H&JWnzcpo@ba@4){jeA|c?`t?q&BKL%ErIS(Epd$~Nl7e8 zwMs5Z1yT$~21Z7@29~-;79mE)R)*$QrUu#u237_JIoslAqG-s?PsvQH#H~U0^>bCA q1`W6kC7HRY#U+Wk1!#IqO{|Q~AeL-dZ*&Z(hr!d;&t;ucLK6V8FsI%C literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_pink.png new file mode 100644 index 0000000000000000000000000000000000000000..4216b8af9a52fddfb18b5edd6ace973e095dfe4d GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>+25`cH28SE9>Y_nLeYTxidY#c;&kF*?C3tmMr7sB%E{-7*mt*?^`Hm=XxUiO_a^1N1e~b35yjgQ4CRcv8(@1UaIHm1!#%I0O z)SaiCHN5Bc-{wu3bUxjy*3wJo_6sME1-4)RSczGLWWDy)O5mLnHp#t7+4t?hyO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..47a05d12c1e98fbd99a255abdf971619d9f71b74 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>{ z34wuurlzL#_4P6G-S$q-$~yW}rq5_-?o7`wUb$|4c3#oECCfNDx&HtEFUgp<2&j{> zB*-tA!Qt7BG!Q4r+ucR*(N^1CKn`btM`SSr1K%MKW)#)%Y5)qdmw5WRvOnXL5jRuW zo*-cX6sqxbaSV~T9NQPjcSM21g|#G=>&CtRTeNTG&6+DQx$?7}MrwPryUpRRzu>JbSO3Wf8>$R^|0(ZrVg4wH&-e_w*CndIz zr{c!K$7kMgPO?avlUMcD`2l+y?*pewj=I;raj)z5eGO-+dARVeCD0wJC9V-ADTyVi zR>?)FK#IZ0z{p6~z*5)9BE-np%Fx`()Ii(7z{14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>t<77j_BC0P18c z3GxeOaCmkj4a7 zq-(4L3e|YJIEF}Ej_nKNJEFkh!djBbb>rUuE!wy8X3dqDT>05fBelKbl(x$mpY>W( zcb;S_B`E;*ZOD~<s< zQ*mSA<1_C#Cs`!T$*X$n{D8fU_kmL-N8M}RxYzajzJ{~ZJY4wK66g-q64!{5l*E!$ ztK_0oAjM#0U}U6gV5w_l5n^O)WoT|?YM^akU}a#Cvn_rmiiX_$l+3hB+!|zGKUW26 p(16=el9`)YT#}eufTqXP#LCzlVu{cV%Oap222WQ%mvv4FO#pxHq-+2H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..23207764b16ea5d70bbf197cc1bad097dfb260f4 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>+4S}lCyVmR@Tv?NMQuI$e^WyH-? zwkJqf0EKEiT^vIsF30u-@*Pp&aA7S;<+^e2{}%0Ad9&t9Os@QFr;*y;aZ20ejL&+l zsXI?OYk1G?zs;L6>3q6Zt)-XF?H5iS3v9psu@bWg$$IUpmB3xGqG0ywqc_@G&q;~x z_Y9229YYB9RYKdz^NlIc# zs#S7PDv)9@GB7gIHL%n*vIsFUwlXxgGBwaPFt9Q($k`S@6GcOAeoAIqC2kF}ub-;| qHE6(XD9OxCEiOsSEkM&_YGP$<2C-zzdZS}NJq(_%elF{r5}E)+HmEKD literal 0 HcmV?d00001