Increases java version to 16

This commit is contained in:
Kristian Knarvik 2022-11-06 23:04:50 +01:00
parent 05781ff15e
commit 2846100497
2 changed files with 32 additions and 16 deletions

22
pom.xml
View File

@ -13,7 +13,7 @@
<description>Adds a minstrel trait to Citizens NPCs</description> <description>Adds a minstrel trait to Citizens NPCs</description>
<properties> <properties>
<java.version>1.8</java.version> <java.version>16</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@ -40,6 +40,20 @@
</goals> </goals>
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom> <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> </configuration>
</execution> </execution>
</executions> </executions>
@ -75,6 +89,12 @@
<version>1.19.2-R0.1-SNAPSHOT</version> <version>1.19.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.knarcraft</groupId>
<artifactId>knarlib</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-main</artifactId> <artifactId>citizens-main</artifactId>

View File

@ -24,20 +24,15 @@ public class MinstrelCommand implements CommandExecutor {
return false; return false;
} }
switch (args[0].toLowerCase()) { return switch (args[0].toLowerCase()) {
case "addsong": case "addsong" -> new AddSongCommand(minstrelTrait).onCommand(sender, command, label, args);
return new AddSongCommand(minstrelTrait).onCommand(sender, command, label, args); case "removesong" -> new RemoveSongCommand(minstrelTrait).onCommand(sender, command, label, args);
case "removesong": case "listsongs" -> new ListSongsCommand(minstrelTrait).onCommand(sender, command, label, args);
return new RemoveSongCommand(minstrelTrait).onCommand(sender, command, label, args); case "pitch" -> updatePitch(minstrelTrait, args.length > 1 ? args[1] : null, args.length > 2 &&
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); Boolean.parseBoolean(args[2]), sender);
case "volume": case "volume" -> updateVolume(minstrelTrait, args.length > 1 ? args[1] : null, args.length > 2 &&
return updateVolume(minstrelTrait, args.length > 1 ? args[1] : null, args.length > 2 &&
Boolean.parseBoolean(args[2]), sender); Boolean.parseBoolean(args[2]), sender);
} default -> false;
/* Sub-commands: /* Sub-commands:
AddSong category identifier duration (remember to run play again) AddSong category identifier duration (remember to run play again)
@ -53,7 +48,8 @@ public class MinstrelCommand implements CommandExecutor {
AddSong playlist category identifier duration AddSong playlist category identifier duration
Play playlist - Plays the specified playlist at the executor's location Play playlist - Plays the specified playlist at the executor's location
*/ */
return false; };
} }
/** /**