From 474a19a30b27a0c19c7dda3d0e526bb1a12ec7f8 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 26 Oct 2023 18:52:30 +0700 Subject: [PATCH] Make painter table reflect reality (real life colors are mixed subtractively) --- .../entity/decorative/PainterBlockEntity.kt | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt index c5272967c..3e7c38a25 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt @@ -187,30 +187,10 @@ class PainterBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryDe } val MIXING = immutableMap { - put(Mixer(DyeColor.WHITE, immutableList(DyeColor.RED, DyeColor.GREEN, DyeColor.BLUE))) - put(Mixer(DyeColor.LIGHT_GRAY, immutableList(DyeColor.BLACK, DyeColor.WHITE, DyeColor.WHITE))) - put(Mixer(DyeColor.GRAY, immutableList(DyeColor.BLACK, DyeColor.WHITE))) - put(Mixer(DyeColor.ORANGE, immutableList(DyeColor.YELLOW, DyeColor.RED))) - put(Mixer(DyeColor.LIME, immutableList(DyeColor.GREEN, DyeColor.WHITE))) - put(Mixer(DyeColor.LIGHT_BLUE, immutableList(DyeColor.BLUE, DyeColor.WHITE))) - put(Mixer(DyeColor.CYAN, immutableList(DyeColor.BLUE, DyeColor.GREEN))) - put(Mixer(DyeColor.PURPLE, immutableList(DyeColor.BLUE, DyeColor.RED))) - - put(Mixer( - DyeColor.MAGENTA, - immutableList(DyeColor.PURPLE, DyeColor.PINK), - immutableList(DyeColor.RED, DyeColor.RED, DyeColor.BLUE, DyeColor.WHITE), - immutableList(DyeColor.PINK, DyeColor.RED, DyeColor.BLUE) - )) - - put(Mixer(DyeColor.PINK, immutableList(DyeColor.RED, DyeColor.WHITE))) - + put(Mixer(DyeColor.BLACK, immutableList(DyeColor.CYAN, DyeColor.MAGENTA, DyeColor.YELLOW))) put(Mixer(DyeColor.RED, immutableList(DyeColor.MAGENTA, DyeColor.YELLOW))) put(Mixer(DyeColor.GREEN, immutableList(DyeColor.CYAN, DyeColor.YELLOW))) put(Mixer(DyeColor.BLUE, immutableList(DyeColor.CYAN, DyeColor.MAGENTA))) - put(Mixer(DyeColor.BLACK, immutableList(DyeColor.CYAN, DyeColor.MAGENTA, DyeColor.YELLOW))) - put(Mixer(DyeColor.YELLOW, immutableList(DyeColor.RED, DyeColor.GREEN))) - put(Mixer(DyeColor.BROWN, immutableList(DyeColor.MAGENTA, DyeColor.YELLOW, DyeColor.BLACK))) } const val MAX_STORAGE = 256