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 e3f008bee..77d54c245 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_black.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_blue.png index 67304bb51..b6973b1f2 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_blue.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_brown.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_brown.png index 8aed844fe..f404f2cb7 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_brown.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_brown.png differ 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 index 971bc7bbe..a5c516d23 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_cyan.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_gray.png index cce379837..73d7084ad 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_gray.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_gray.png differ 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 5c3055f91..5f481a4b6 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_green.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_blue.png index bee98f510..d44826542 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_blue.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_blue.png differ 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 8be32f432..8a5ef8c07 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_gray.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_light_gray.png differ 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 6a4497aad..4b4272d50 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_lime.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_lime.png differ 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 26ca37206..989cb25dc 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_magenta.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_magenta.png differ 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 e0d92723b..4c1ae80a5 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_orange.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_orange.png differ 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 4216b8af9..27ea7a7bf 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_pink.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_pink.png differ 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 47a05d12c..bba6b6f4a 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_purple.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_purple.png differ 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 6891e1617..497a79a06 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_red.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_red.png differ 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 index 23207764b..c66c5f39f 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_yellow.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_yellow.png differ