From 12013bba40fdf17cb6bf0e4f4c50512185a86d18 Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Tue, 26 May 2020 23:23:30 +0200
Subject: [PATCH] Fix color map selection in GUI

The order was broken, probably got scrambled in a merge.
---
 .../src/main/java/de/piegames/blockmap/color/BlockColorMap.java | 2 +-
 .../piegames/blockmap/gui/standalone/scene-worldsettings.fxml   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BlockMap-core/src/main/java/de/piegames/blockmap/color/BlockColorMap.java b/BlockMap-core/src/main/java/de/piegames/blockmap/color/BlockColorMap.java
index a298e239..5e45c780 100644
--- a/BlockMap-core/src/main/java/de/piegames/blockmap/color/BlockColorMap.java
+++ b/BlockMap-core/src/main/java/de/piegames/blockmap/color/BlockColorMap.java
@@ -41,7 +41,7 @@
 public class BlockColorMap {
 
 	public enum InternalColorMap {
-		DEFAULT("default"), OCEAN_GROUND("water"), NO_FOLIAGE("foliage"), CAVES("caves"), X_RAY("x-ray"), RAILS("rails");
+		DEFAULT("default"), CAVES("caves"), NO_FOLIAGE("foliage"), OCEAN_GROUND("water"), X_RAY("x-ray"), RAILS("rails");
 
 		private String fileName;
 
diff --git a/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/scene-worldsettings.fxml b/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/scene-worldsettings.fxml
index 5731c3e0..6f654120 100644
--- a/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/scene-worldsettings.fxml
+++ b/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/scene-worldsettings.fxml
@@ -51,6 +51,7 @@
 					GridPane.columnIndex="1">
 					<items>
 						<FXCollections fx:factory="observableArrayList">
+							<!-- Keep same order as in InternalColorMap -->
 							<String fx:value="Default" />
 							<String fx:value="Caves" />
 							<String fx:value="No foliage" />