fix: dedupe block colors

aresrpg · Dec 26, 2024 · 746e162 · 746e162
1 parent df0d286
commit 746e162
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/src/core/utils/terrain/blocks.js b/src/core/utils/terrain/blocks.js
@@ -1,6 +1,6 @@
 export const BLOCKS = {
   // Blocks
-  STONE: '#ababab',
+  STONE: '#ababab', // Original
   WET_SAND: '#8D795B',
   GOLDEN_SAND: '#D8B570',
   LIGHT_SAND: '#FBE8A6',
@@ -17,30 +17,36 @@ export const BLOCKS = {
 }
 
 export const SCHEMATICS_BLOCKS = {
-  jungle_log: '#8e684f',
-  gray_stained_glass_pane: '#b3b3b3',
-  smooth_quartz_slab: '#f2f2f2',
-  spruce_planks: '#8e684f',
-  andesite_stairs: '#ababab',
-  spruce_stairs: '#8e684f',
-  stone_stairs: '#ababab',
-  smooth_quartz_stairs: '#f2f2f2',
-  stone_bricks: '#ababab',
-  spruce_fence: '#8e684f',
+  jungle_log: '#8e684f', // Original
+  spruce_planks: '#8e684e', // Adjusted -1
+  jungle_wood: '#8e684d', // Adjusted -2
+  spruce_log: '#8e684c', // Adjusted -3
+  spruce_stairs: '#8e684b', // Adjusted -4
+  spruce_fence: '#8e684a', // Adjusted -5
+
+  gray_stained_glass_pane: '#b3b3b3', // Original
+  light_gray_wool: '#b3b3b2', // Adjusted -1
+  light_gray_concrete: '#b3b3b1', // Adjusted -2
+
+  smooth_quartz_slab: '#f2f2f2', // Original
+  smooth_quartz_stairs: '#f2f2f1', // Adjusted -1
+  smoorth_quartz: '#f2f2f0', // Adjusted -2
+  quartz_pillar: '#f2f2ef', // Adjusted -3
+
+  andesite_stairs: '#ababaa', // Adjusted -1 from STONE
+  stone_stairs: '#ababa9', // Adjusted -2 from STONE
+  stone_bricks: '#ababa8', // Adjusted -3 from STONE
+
   cyan_terracotta: '#546E7A',
   clay: '#9E9E9E',
-  light_gray_wool: '#b3b3b3',
-  jungle_leaves: '#4e8a3e',
-  jungle_wood: '#8e684f',
-  smoorth_quartz: '#f2f2f2',
-  quartz_pillar: '#f2f2f2',
+
+  jungle_leaves: '#4e8a3e', // Original
+  birch_leaves: '#4e8a3d', // Adjusted -1
+  azalea_leaves: '#4e8a3c', // Adjusted -2
+  large_fern: '#4e8a3b', // Adjusted -3
+
   prismarine_bricks: '#2e6c6c',
   nether_bricks: '#2e2e2e',
-  birch_leaves: '#4e8a3e',
-  spruce_log: '#8e684f',
-  light_gray_concrete: '#b3b3b3',
-  azalea_leaves: '#4e8a3e',
-  large_fern: '#4e8a3e',
   basalt: '#3B3B3B',
   granit: '#B0B0B0',
 }
diff --git a/src/core/utils/terrain/world_settings.js b/src/core/utils/terrain/world_settings.js
@@ -42,9 +42,9 @@ export const BLOCKS_COLOR_MAPPING = {
   [BlockType.HOLE]: 0x000000,
   [BlockType.BEDROCK]: 0xababab,
   [BlockType.WATER]: 0x74ccf4,
-  [BlockType.ICE]: 0x74ccf4,
+  [BlockType.ICE]: 0x74ccf5,
   [BlockType.MUD]: 0x795548,
-  [BlockType.TRUNK]: 0x795548,
+  [BlockType.TRUNK]: 0x795549,
   [BlockType.SAND]: 0xc2b280,
   [BlockType.GRASS]: 0x41980a,
   [BlockType.ROCK]: 0xababab,