diff --git a/build.gradle b/build.gradle index 08f92e1..8b48dc9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id("com.gradleup.shadow") version "9.2.2" + id("com.gradleup.shadow") version "9.3.1" } group 'net.mackenziemolloy.shopguiplus.sellgui' @@ -8,15 +8,15 @@ version '1.1.8' java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(8) } - sourceCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = sourceCompatibility } repositories { - mavenLocal() + mavenLocal() mavenCentral() maven { url = 'https://repo.papermc.io/repository/maven-public/' } @@ -24,14 +24,14 @@ repositories { maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url = 'https://repo.codemc.org/repository/maven-public/' } maven { url = 'https://jitpack.io/' } - maven { url = "https://repo.tcoded.com/releases"} + maven { url = "https://repo.tcoded.com/releases" } } dependencies { - compileOnly "org.spigotmc:spigot-api:1.21.8-R0.1-SNAPSHOT" - compileOnly 'com.github.brcdev-minecraft:shopgui-api:3.0.0' + compileOnly "org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT" + compileOnly "com.github.brcdev-minecraft:shopgui-api:3.2.0" implementation "dev.triumphteam:triumph-gui:3.1.13" - implementation 'org.bstats:bstats-bukkit:3.1.0' + implementation "org.bstats:bstats-bukkit:3.1.0" implementation "com.tcoded:FoliaLib:0.5.1" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e11132..37f78a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/net/mackenziemolloy/shopguiplus/sellgui/command/CommandSellGUI.java b/src/main/java/net/mackenziemolloy/shopguiplus/sellgui/command/CommandSellGUI.java index 78da7f3..1cf2e85 100644 --- a/src/main/java/net/mackenziemolloy/shopguiplus/sellgui/command/CommandSellGUI.java +++ b/src/main/java/net/mackenziemolloy/shopguiplus/sellgui/command/CommandSellGUI.java @@ -105,11 +105,16 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command } String sub = args[0].toLowerCase(Locale.US); - return switch (sub) { - case "rl", "reload" -> commandReload(sender); - case "debug", "dump" -> commandDebug(sender); - default -> false; - }; + switch (sub) { + case "rl": + case "reload": + return commandReload(sender); + case "debug": + case "dump": + return commandDebug(sender); + default: + return false; + } } private boolean commandReload(CommandSender sender) { @@ -129,7 +134,8 @@ private boolean commandReload(CommandSender sender) { else if (this.plugin.fileLogger == null) this.plugin.initLogger(); sendMessage(sender, "reloaded_config"); - if (sender instanceof Player player) { + if (sender instanceof Player) { + Player player = (Player) sender; PlayerHandler.playSound(player, "success"); } }); @@ -174,9 +180,12 @@ private boolean commandDebug(CommandSender sender) { String message = String.format(Locale.US, pastedDumpMsg, pasteUrl); Bukkit.getConsoleSender().sendMessage(message); - if (sender instanceof Player) sender.sendMessage(message); + if (sender instanceof Player) { + sender.sendMessage(message); + } - if (sender instanceof Player player) { + if (sender instanceof Player) { + Player player = (Player) sender; PlayerHandler.playSound(player, "success"); } } catch (IOException ex) { @@ -188,11 +197,13 @@ private boolean commandDebug(CommandSender sender) { } private boolean commandBase(CommandSender sender) { - if (!(sender instanceof Player player)) { + if (!(sender instanceof Player)) { sender.sendMessage(ChatColor.RED + "Only players can execute this command."); return true; } + Player player = (Player) sender; + if (!player.hasPermission("sellgui.use")) { sendMessage(player, "no_permission"); return true; @@ -576,7 +587,8 @@ private void sendMessage(CommandSender sender, String path, @Nullable Function