Restore previous water block colour

chao930815 · Aug 21, 2023 · 16230f9 · 16230f9
1 parent 20b8dbe
commit 16230f9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...src/main/java/org/pepsoft/worldpainter/biomeschemes/AbstractMinecraft1_20BiomeScheme.java b/...src/main/java/org/pepsoft/worldpainter/biomeschemes/AbstractMinecraft1_20BiomeScheme.java
@@ -29,7 +29,7 @@ public final int getColour(int biome, ColourScheme colourScheme) {
             case BIOME_RIVER:
             case BIOME_DEEP_OCEAN:
             case BIOME_DEEP_WARM_OCEAN:
-                return colourScheme.getColour(WATER);
+                return 0xff3f76e4;
             case BIOME_LUKEWARM_OCEAN:
             case BIOME_DEEP_LUKEWARM_OCEAN:
                 return 0xff45adf2;

diff --git a/...er/WPCore/src/main/java/org/pepsoft/worldpainter/biomeschemes/Minecraft1_17BiomeInfo.java b/...er/WPCore/src/main/java/org/pepsoft/worldpainter/biomeschemes/Minecraft1_17BiomeInfo.java
@@ -24,7 +24,7 @@ public int getColour(int biome, ColourScheme colourScheme) {
             case BIOME_RIVER:
             case BIOME_DEEP_OCEAN:
             case BIOME_DEEP_WARM_OCEAN:
-                return colourScheme.getColour(WATER);
+                return 0xff3f76e4;
             case BIOME_LUKEWARM_OCEAN:
             case BIOME_DEEP_LUKEWARM_OCEAN:
                 return 0xff45adf2;

diff --git a/WorldPainter/WPCore/src/main/resources/org/pepsoft/minecraft/mc-materials.csv b/WorldPainter/WPCore/src/main/resources/org/pepsoft/minecraft/mc-materials.csv
@@ -862,7 +862,7 @@ minecraft:warped_stem,,axis:e[x;y;z],15,false,false,false,false,false,false,,tru
 minecraft:warped_trapdoor,,"open:b,facing:e[north;south;west;east],powered:b,half:e[top;bottom],waterlogged:b",0,false,false,false,false,false,false,,false,false,0,false,false,ff2f776f,warped_trapdoor.png
 minecraft:warped_wall_sign,,"facing:e[north;south;west;east],waterlogged:b",0,false,false,false,false,false,true,minecraft:sign,false,false,0,false,false,ff2b6863,warped_planks.png
 minecraft:warped_wart_block,,,15,false,false,false,false,false,false,,false,false,0,true,false,ff167779,warped_wart_block.png
-minecraft:water,,level:i[0-15],3,false,false,false,true,false,false,,false,false,0,true,false,ff3f76e4,wiki
+minecraft:water,,level:i[0-15],3,false,false,false,true,false,false,,false,false,0,true,false,ff3148f4,old default
 minecraft:water_cauldron,,level:i[1-3],0,false,false,false,false,false,false,,false,false,0,false,false,,
 minecraft:waxed_copper_block,,,15,false,false,false,false,false,false,,false,false,0,false,false,,
 minecraft:waxed_cut_copper,,,0,false,false,false,false,false,false,,false,false,0,false,false,,