From 2846100497e582a77e65aa9d0b67e1c04e332a88 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Sun, 6 Nov 2022 23:04:50 +0100
Subject: [PATCH] Increases java version to 16

---
 pom.xml                                       | 22 +++++++++++++++-
 .../minstrel/command/MinstrelCommand.java     | 26 ++++++++-----------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0419761..657f763 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <description>Adds a minstrel trait to Citizens NPCs</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>16</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -40,6 +40,20 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <filters>
+                                <filter>
+                                    <artifact>net.knarcraft:knarlib</artifact>
+                                    <includes>
+                                        <include>net/knarcraft/knarlib/**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <excludes>
+                                        <exclude>*.MF</exclude>
+                                        <exclude>*.yml</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>
@@ -75,6 +89,12 @@
             <version>1.19.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.knarcraft</groupId>
+            <artifactId>knarlib</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>net.citizensnpcs</groupId>
             <artifactId>citizens-main</artifactId>
diff --git a/src/main/java/net/knarcraft/minstrel/command/MinstrelCommand.java b/src/main/java/net/knarcraft/minstrel/command/MinstrelCommand.java
index 54df7e2..eea23aa 100644
--- a/src/main/java/net/knarcraft/minstrel/command/MinstrelCommand.java
+++ b/src/main/java/net/knarcraft/minstrel/command/MinstrelCommand.java
@@ -24,20 +24,15 @@ public class MinstrelCommand implements CommandExecutor {
             return false;
         }
 
-        switch (args[0].toLowerCase()) {
-            case "addsong":
-                return new AddSongCommand(minstrelTrait).onCommand(sender, command, label, args);
-            case "removesong":
-                return new RemoveSongCommand(minstrelTrait).onCommand(sender, command, label, args);
-            case "listsongs":
-                return new ListSongsCommand(minstrelTrait).onCommand(sender, command, label, args);
-            case "pitch":
-                return updatePitch(minstrelTrait, args.length > 1 ? args[1] : null, args.length > 2 &&
-                        Boolean.parseBoolean(args[2]), sender);
-            case "volume":
-                return updateVolume(minstrelTrait, args.length > 1 ? args[1] : null, args.length > 2 &&
-                        Boolean.parseBoolean(args[2]), sender);
-        }
+        return switch (args[0].toLowerCase()) {
+            case "addsong" -> new AddSongCommand(minstrelTrait).onCommand(sender, command, label, args);
+            case "removesong" -> new RemoveSongCommand(minstrelTrait).onCommand(sender, command, label, args);
+            case "listsongs" -> new ListSongsCommand(minstrelTrait).onCommand(sender, command, label, args);
+            case "pitch" -> updatePitch(minstrelTrait, args.length > 1 ? args[1] : null, args.length > 2 &&
+                    Boolean.parseBoolean(args[2]), sender);
+            case "volume" -> updateVolume(minstrelTrait, args.length > 1 ? args[1] : null, args.length > 2 &&
+                    Boolean.parseBoolean(args[2]), sender);
+            default -> false;
         
         /* Sub-commands:
             AddSong category identifier duration (remember to run play again)
@@ -53,7 +48,8 @@ public class MinstrelCommand implements CommandExecutor {
             AddSong playlist category identifier duration
             Play playlist - Plays the specified playlist at the executor's location
          */
-        return false;
+        };
+
     }
 
     /**