From 86cbf25e0bc2b0550c6b28c1d51231880653f670 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Fri, 7 Jul 2023 10:44:16 -0400 Subject: [PATCH] update deps to 1.20 --- pom.xml | 8 ++++++-- .../tylermurphy/hideAndSeek/command/Join.java | 17 ----------------- .../hideAndSeek/command/util/CommandGroup.java | 2 +- src/main/resources/plugin.yml | 2 +- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 629289f..0515362 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 net.tylermurphy KenshinsHideAndSeek - 1.7.3 + 1.7.4 Hide and Seek Plugin @@ -47,6 +47,10 @@ *:* META-INF/** + org/sqlite/native/Mac/** + org/sqlite/native/Linux-Android/** + org/sqlite/native/Linux/ppc64/** + org/sqlite/native/Linux/armv7/** @@ -120,7 +124,7 @@ com.github.cryptomorin XSeries - 9.3.1 + 9.4.0 me.clip diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java index 0c01265..3e724fb 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java @@ -2,13 +2,11 @@ package net.tylermurphy.hideAndSeek.command; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.command.util.ICommand; -import net.tylermurphy.hideAndSeek.configuration.Maps; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import java.util.List; -import java.util.stream.Collectors; import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix; import static net.tylermurphy.hideAndSeek.configuration.Localization.message; @@ -29,18 +27,6 @@ public class Join implements ICommand { sender.sendMessage(errorPrefix + message("GAME_INGAME")); return; } - if(args.length > 0) { - if(Main.getInstance().getBoard().size() > 0) { - sender.sendMessage(errorPrefix + message("LOBBY_IN_USE")); - return; - } - net.tylermurphy.hideAndSeek.configuration.Map map = Maps.getMap(args[0]); - if(map == null) { - sender.sendMessage(errorPrefix + message("INVALID_MAP")); - return; - } - Main.getInstance().getGame().setCurrentMap(map); - } Main.getInstance().getGame().join(player); } @@ -57,9 +43,6 @@ public class Join implements ICommand { } public List autoComplete(@NotNull String parameter, @NotNull String typed) { - if(parameter.equals("*map")) { - return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList()); - } return null; } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java index 80e531e..9bfdd0e 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java @@ -51,7 +51,7 @@ public class CommandGroup { if (data == null) { player.sendMessage( - String.format("%s%sKenshin's Hide and Seek %s(%s1.7.3%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) + + String.format("%s%sKenshin's Hide and Seek %s(%s1.7.4%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) + String.format("%sAuthor: %s[KenshinEto]\n", ChatColor.GRAY, ChatColor.WHITE) + String.format("%sHelp Command: %s/hs %shelp", ChatColor.GRAY, ChatColor.AQUA, ChatColor.WHITE) ); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7be1ed6..dc8cab1 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: KenshinsHideAndSeek main: net.tylermurphy.hideAndSeek.Main -version: 1.7.3 +version: 1.7.4 author: KenshinEto load: STARTUP api-version: 1.13