From d305741be21e1c7c24460b76ee20370790e362e7 Mon Sep 17 00:00:00 2001
From: cola98765 <tpodole@gmail.com>
Date: Tue, 18 Jan 2022 11:29:01 +0100
Subject: [PATCH] resolved warnings. part 3

---
 .../worldGeneration/ExperimentalGenerator.java      |  5 ++---
 .../worldGeneration/WorldGenerationStep.java        | 13 ++-----------
 .../worldGeneration/WorldGeneratorWrapper.java      |  3 +--
 core                                                |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java
index bb29f89c6..4b852499c 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ExperimentalGenerator.java
@@ -113,11 +113,10 @@ public class ExperimentalGenerator extends AbstractExperimentalWorldGeneratorWra
 			targetStep = Steps.Surface; //Carvers or Surface???
 			break;
 		case FEATURES:
+		case FULL:
 			targetStep = Steps.Features;
 			break;
-		case FULL:
-			targetStep = Steps.Features; // TODO!
-			break;
+		// TODO!
 		default:
 			assert false;
 			return;
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java
index 75b194c28..81a6fa270 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java
@@ -492,33 +492,24 @@ public final class WorldGenerationStep {
 		}
 
 		switch (e.target) {
-		case Empty:
-			return;
 		case StructureStart:
-			generationMode = DistanceGenerationMode.NONE;
-			break;
 		case StructureReference:
 			generationMode = DistanceGenerationMode.NONE;
 			break;
 		case Biomes:
-			generationMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
-			break;
 		case Noise:
 			generationMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
 			break;
 		case Surface:
-			generationMode = DistanceGenerationMode.SURFACE;
-			break;
 		case Carvers:
 			generationMode = DistanceGenerationMode.SURFACE;
 			break;
 		case Features:
 			generationMode = DistanceGenerationMode.FEATURES;
 			break;
-		case LiquidCarvers:
-			return;
 		case Light:
-			return;
+		case LiquidCarvers:
+		case Empty:
 		default:
 			return;
 		}
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGeneratorWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGeneratorWrapper.java
index 978bbb497..9cbce4549 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGeneratorWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGeneratorWrapper.java
@@ -89,8 +89,6 @@ public class WorldGeneratorWrapper extends AbstractWorldGeneratorWrapper
     	
     	ChunkStatus targetStatus;
 		switch (generationMode) {
-		case NONE:
-			return;
 		case BIOME_ONLY:
 			targetStatus = ChunkStatus.BIOMES;
 			break;
@@ -106,6 +104,7 @@ public class WorldGeneratorWrapper extends AbstractWorldGeneratorWrapper
 		case FULL:
 			targetStatus = ChunkStatus.FULL;
 			break;
+		case NONE:
 		default:
 			return;
 		}
diff --git a/core b/core
index 6b6d011cd..546d60f1f 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 6b6d011cd5266cc76072dacbb2231d131dc863c7
+Subproject commit 546d60f1fc17cb175df10aee3742fa4a2d06a550