From 7797a95d8993911d599b0795de7a16e1be819d46 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Sun, 22 Jan 2023 01:57:24 +0800
Subject: [PATCH] =?UTF-8?q?perf(bukkit):=20=E4=BC=98=E5=8C=96=20gui=20?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=A3=B0=E9=9F=B3=E6=92=AD=E6=94=BE=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hamster-core-bukkit/build.gradle              |  6 +++---
 .../core/bukkit/page/handler/PageHandler.java | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/hamster-core-bukkit/build.gradle b/hamster-core-bukkit/build.gradle
index 5ce6c40..4618bb3 100644
--- a/hamster-core-bukkit/build.gradle
+++ b/hamster-core-bukkit/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude group: "com.google.code.gson"
     }
 
-    shade 'net.kyori:adventure-platform-bukkit:4.1.2'
+//    shade 'net.kyori:adventure-platform-bukkit:4.1.2'
     compileOnly('net.milkbowl.vault:VaultAPI:1.7') { transitive = false }
     compileOnly('org.black_ixx:playerpoints:2.1.3') { transitive = false }
     compileOnly("com.comphenix.protocol:ProtocolLib-API:4.4.0") { transitive = false }
@@ -43,7 +43,7 @@ processResources {
 }
 
 tasks.compileJava.dependsOn(":hamster-core-common:build")
-tasks.create("shadowJar", Jar) {
+tasks.register("shadowJar", Jar) {
     dependsOn("jar")
     from([
             tasks.jar.outputs.files.collect {
@@ -57,7 +57,7 @@ tasks.create("shadowJar", Jar) {
 }
 tasks.build.dependsOn(shadowJar)
 
-tasks.create("oldJar", Jar) {
+tasks.register("oldJar", Jar) {
     dependsOn("jar")
     setClassifier("Old")
     from([
diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java
index ea785a2..d524f6f 100644
--- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java
+++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java
@@ -54,13 +54,22 @@ public abstract class PageHandler implements InventoryHolder {
     }
 
     public void onPlayButtonSound(@NotNull ClickType clickType, @NotNull InventoryAction action, int index) {
-        PageConfig config = getPageConfig();
-        Sound sound = config.getButtonSound(getButtonGroup().getButtonName(index));
-        sound = sound == null ? config.getButtonSound("default") : sound;
-        if (sound == null) {
+        if (!(player instanceof Player)) {
             return;
         }
-        if (!(player instanceof Player)) {
+        PageConfig config = getPageConfig();
+        String buttonName = getButtonGroup().getButtonName(index);
+        Sound sound = config.getButtonSound(buttonName);
+        if (sound == null) {
+            switch (buttonName) {
+                case "empty":
+                case "barrier":
+                    break;
+                default:
+                    sound = config.getButtonSound("default");
+            }
+        }
+        if (sound == null) {
             return;
         }
         ((Player) player).playSound(player.getLocation(), sound, 1, 1);