From fa2ffe02d410d44a75151e819dc9cabfe229dcc9 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Thu, 29 Sep 2022 04:04:08 +0300 Subject: [PATCH] =?UTF-8?q?DBotThePony=20=E2=80=94=20=D0=A1=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D1=8F,=20=D0=B2=204:01=20=D0=9F=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=BE=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=B5=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D1=83=D1=80=D1=8B=20?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D1=8E=D1=82=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D0=BF=D1=80=D0=BE=D0=B7=D1=80?= =?UTF-8?q?=D0=B0=D1=87=D0=BD=D0=BE=D1=81=D1=82=D1=8C,=20=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D1=83=D1=87=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=89?= =?UTF-8?q?=D1=8C,=20=D1=82=D0=BE=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B1=D1=8B=D0=BB=D0=BE=20=D0=B1=D1=8B=20=D0=B2=D1=8B=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20-channel=20rgb=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=20-compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- colorizer.js | 8 ++------ .../item/minecart_cargo_crate_black.png | Bin 523 -> 523 bytes .../textures/item/minecart_cargo_crate_blue.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_brown.png | Bin 523 -> 523 bytes .../textures/item/minecart_cargo_crate_cyan.png | Bin 523 -> 523 bytes .../textures/item/minecart_cargo_crate_gray.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_green.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_light_blue.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_light_gray.png | Bin 523 -> 523 bytes .../textures/item/minecart_cargo_crate_lime.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_magenta.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_orange.png | Bin 523 -> 523 bytes .../textures/item/minecart_cargo_crate_pink.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_purple.png | Bin 523 -> 523 bytes .../textures/item/minecart_cargo_crate_red.png | Bin 523 -> 523 bytes .../item/minecart_cargo_crate_yellow.png | Bin 523 -> 523 bytes 16 files changed, 2 insertions(+), 6 deletions(-) diff --git a/colorizer.js b/colorizer.js index 09f02334a..1498b36d0 100644 --- a/colorizer.js +++ b/colorizer.js @@ -83,11 +83,9 @@ async function size(path) { `${root_main}${texture}.png`, '-size', `${width}x${height}`, `xc:rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`, + '-channel', 'rgb', '-compose', 'Multiply', '-composite', - `${root_main}${texture}.png`, - '-compose', 'copy-opacity', - '-composite', `${basedir}/${last.replace(/_colorless/, '').replace(/_white/, '')}_${name}.png`]) magick.stdout.pipe(process.stdout) @@ -131,11 +129,9 @@ async function size(path) { `${root_main}${textureColor}.png`, '-size', `${width}x${height}`, `xc:rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`, + '-channel', 'rgb', '-compose', 'Multiply', '-composite', - `${root_main}${textureColor}.png`, - '-compose', 'copy-opacity', - '-composite', ')', `${root_main}${textureOverlay}.png`, 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 index e3f008beec4b055019d0b4027ce9ce33cf16fc79..77d54c245b0e001cda285fa985d298e124302734 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_O!Yvz#=4CUxfm5JLX3>9Oiiqe&9w~-tPBi1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_O!Yvz#=4CUxfm5JLX3>9Oiiqe&9w~-tPBi1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_O!Yvz#=4CUxfm5JLX3>9Oiiqe&9w~-tPBi1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_O!Yvz#=4CUxfm5JLX3>9Oiiqe&9w~-tPBi1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A 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 index 5c3055f915cb2f2e284e14f3e4ac2d9814c893bf..5f481a4b6d9ac6a79b08ba4dcc34efc4a0a5a72f 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_O!Yvz#=4CUxfm5JLX3>9Oiiqe&9w~-tPBi1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A 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 index 8be32f432379b35bf811ce1a5cc3f38a8a934464..8a5ef8c07e2cc642a732f203e14328d71d8d15f6 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_lime.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_lime.png index 6a4497aad14d7f40b75dbeb875cffccce8e5d785..4b4272d50980f3196ccfe0f8e42cf8ed138ade71 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A 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 index 26ca372063c7f351fd389e587767e7dd78a14373..989cb25dc2729684bec2cc449b4cd68ec337f594 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_orange.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_orange.png index e0d92723b9b757eac0970789d04e69ac2694c0ae..4c1ae80a5de3229b70d3370855579865cf630d35 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A 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 index 4216b8af9a52fddfb18b5edd6ace973e095dfe4d..27ea7a7bf6228a238d99337bccc526453d64083d 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A 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 index 47a05d12c1e98fbd99a255abdf971619d9f71b74..bba6b6f4ad08b9ba61c7bf0d8ec1f58aeacc4f9a 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_red.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_red.png index 6891e1617ee9b412fee3bda3d8748df0aec83917..497a79a0653296912fc01fe46c978a7e1dea9daf 100644 GIT binary patch delta 52 zcmeBX>1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_O!Yvz#=4CUxfm5JLX3>9Oiiqe&9w~-tPBi1LU5lS7t~N%PVh{i_=vaxp4ch8P%H85mia7-}0BSQ!{-+_O|>00K`}KbLh* G2~7Z~lMea- delta 52 zcmeBX>1LU5lS4+_Ol5n5gvG{(T#O19Ax6elrY2U#X4(b@Rt5%J)*BsT00K`}KbLh* G2~7ZwW)A8A