From d18a4968d7f0eae20d65f4111d589f7df960ecb7 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 11 Aug 2024 17:08:59 -0700
Subject: [PATCH] Minor improvements from SonarCloud

---
 .../bentobox/skygrid/generators/SkyGridChunks.java    | 11 ++++-------
 .../java/world/bentobox/skygrid/SettingsTest.java     |  5 +----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/world/bentobox/skygrid/generators/SkyGridChunks.java b/src/main/java/world/bentobox/skygrid/generators/SkyGridChunks.java
index b67c9db..a4d8135 100644
--- a/src/main/java/world/bentobox/skygrid/generators/SkyGridChunks.java
+++ b/src/main/java/world/bentobox/skygrid/generators/SkyGridChunks.java
@@ -116,13 +116,10 @@ private void setBlock(BlockProbability prob, int x, int y, int z, List<SkyGridBl
         }
         // Convert to deep
         if (y < 0) {
-            if (blockMat == Material.STONE) {
-                blockMat = Material.DEEPSLATE;
-
-            } else if (blockMat == Material.COBBLESTONE) {
-                blockMat = Material.COBBLED_DEEPSLATE;
-            } else {
-                blockMat = Enums.getIfPresent(Material.class, "DEEPSLATE_" + blockMat.name()).or(blockMat);
+            switch (blockMat) {
+            case STONE -> blockMat = Material.DEEPSLATE;
+            case COBBLESTONE -> blockMat = Material.COBBLED_DEEPSLATE;
+            default -> blockMat = Enums.getIfPresent(Material.class, "DEEPSLATE_" + blockMat.name()).or(blockMat);
             }
         }
 
diff --git a/src/test/java/world/bentobox/skygrid/SettingsTest.java b/src/test/java/world/bentobox/skygrid/SettingsTest.java
index bdafe0b..9a1a26f 100644
--- a/src/test/java/world/bentobox/skygrid/SettingsTest.java
+++ b/src/test/java/world/bentobox/skygrid/SettingsTest.java
@@ -27,11 +27,8 @@ public class SettingsTest {
 
     private Settings s;
 
-    /**
-     * @throws java.lang.Exception
-     */
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         s = new Settings();
     }