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 000000000..e3f008bee Binary files /dev/null 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 new file mode 100644 index 000000000..67304bb51 Binary files /dev/null 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 new file mode 100644 index 000000000..8aed844fe Binary files /dev/null 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 new file mode 100644 index 000000000..971bc7bbe Binary files /dev/null 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 new file mode 100644 index 000000000..cce379837 Binary files /dev/null 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 new file mode 100644 index 000000000..5c3055f91 Binary files /dev/null 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 new file mode 100644 index 000000000..bee98f510 Binary files /dev/null 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 new file mode 100644 index 000000000..8be32f432 Binary files /dev/null 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 new file mode 100644 index 000000000..6a4497aad Binary files /dev/null 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 new file mode 100644 index 000000000..26ca37206 Binary files /dev/null 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 new file mode 100644 index 000000000..e0d92723b Binary files /dev/null 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 new file mode 100644 index 000000000..4216b8af9 Binary files /dev/null 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 new file mode 100644 index 000000000..47a05d12c Binary files /dev/null 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 new file mode 100644 index 000000000..6891e1617 Binary files /dev/null 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 new file mode 100644 index 000000000..23207764b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/minecart_cargo_crate_yellow.png differ