From c66752bf112aca10e3432bb031bcb35e238bf44e Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 2 Dec 2022 23:01:22 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E6=9B=B4=E6=94=B9=E8=87=B3=20Java8=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- .../core/bukkit/command/lore/LoreCustomModelDataCommand.java | 3 ++- .../cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java | 3 ++- hamster-core-bukkit/src/main/resources/PageablePage.yml | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 548a252..4fd7443 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,8 @@ subprojects { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 // withJavadocJar() withSourcesJar() } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreCustomModelDataCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreCustomModelDataCommand.java index 9f2633f..f5dafc7 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreCustomModelDataCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreCustomModelDataCommand.java @@ -42,10 +42,11 @@ public class LoreCustomModelDataCommand extends ChildCommand { @SuppressWarnings("deprecation") @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if (!(sender instanceof Player player)) { + if (!(sender instanceof Player)) { CoreMessage.COMMAND_MUST_USED_BY_PLAYER.show(sender); return true; } + Player player = (Player) sender; ItemStack stack = player.getItemInHand(); if (BukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java index 975e204..aa15ff6 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java @@ -169,7 +169,8 @@ public class ButtonGroup { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ButtonGroup that)) return false; + if (o == null || getClass() != o.getClass()) return false; + ButtonGroup that = (ButtonGroup) o; return name.equals(that.name); } diff --git a/hamster-core-bukkit/src/main/resources/PageablePage.yml b/hamster-core-bukkit/src/main/resources/PageablePage.yml index 6fbaf9b..b9f7d1b 100644 --- a/hamster-core-bukkit/src/main/resources/PageablePage.yml +++ b/hamster-core-bukkit/src/main/resources/PageablePage.yml @@ -11,6 +11,8 @@ graphic: groups: default: '#': "barrier" + '<': "preview" + '>': "next" '1': "element" sounds: