From 748458af78e2398d5440afc504be9571be438424 Mon Sep 17 00:00:00 2001 From: Harvels X Date: Wed, 5 Jan 2022 23:31:15 +0300 Subject: [PATCH] Rename methods AdvancementUtils; --- .../husksync/bukkit/util/PlayerSetter.java | 4 ++-- .../husksync/bukkit/util/nms/AdvancementUtils.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java index 0800b250..c9e18838 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java @@ -282,8 +282,8 @@ public class PlayerSetter { final Object playerAdvancements = AdvancementUtils.getPlayerAdvancements(player); // Clear - AdvancementUtils.clearPlayerAdvancementsMap(playerAdvancements); - AdvancementUtils.clearVisibleAdvancementsSet(playerAdvancements); + AdvancementUtils.clearPlayerAdvancements(playerAdvancements); + AdvancementUtils.clearVisibleAdvancements(playerAdvancements); advancementRecords.forEach(advancementRecord -> { NamespacedKey namespacedKey = Objects.requireNonNull( diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java index 0fa6908e..b9f696a3 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java @@ -15,7 +15,7 @@ public class AdvancementUtils { public final static Class PLAYER_ADVANCEMENT; private final static Field PLAYER_ADVANCEMENTS_MAP; - private final static Field PLAYER_VISIBLE_ADVANCEMENTS_SET; + private final static Field PLAYER_VISIBLE_SET; private final static Field PLAYER_ADVANCEMENTS; private final static Field CRITERIA_MAP; private final static Field CRITERIA_DATE; @@ -48,8 +48,8 @@ public class AdvancementUtils { PLAYER_ADVANCEMENTS_MAP = ThrowSupplier.get(() -> PLAYER_ADVANCEMENT.getDeclaredField("h")); PLAYER_ADVANCEMENTS_MAP.setAccessible(true); - PLAYER_VISIBLE_ADVANCEMENTS_SET = ThrowSupplier.get(() -> PLAYER_ADVANCEMENT.getDeclaredField("i")); - PLAYER_VISIBLE_ADVANCEMENTS_SET.setAccessible(true); + PLAYER_VISIBLE_SET = ThrowSupplier.get(() -> PLAYER_ADVANCEMENT.getDeclaredField("i")); + PLAYER_VISIBLE_SET.setAccessible(true); START_PROGRESS = ThrowSupplier.get(() -> PLAYER_ADVANCEMENT.getDeclaredMethod("a", ADVANCEMENT, ADVANCEMENT_PROGRESS)); START_PROGRESS.setAccessible(true); @@ -78,7 +78,7 @@ public class AdvancementUtils { } } - public static void clearPlayerAdvancementsMap(final Object playerAdvancement) { + public static void clearPlayerAdvancements(final Object playerAdvancement) { try { ((Map) PLAYER_ADVANCEMENTS_MAP.get(playerAdvancement)) .clear(); @@ -134,9 +134,9 @@ public class AdvancementUtils { } } - public static void clearVisibleAdvancementsSet(final Object playerAdvancements) { + public static void clearVisibleAdvancements(final Object playerAdvancements) { try { - ((Set) PLAYER_VISIBLE_ADVANCEMENTS_SET.get(playerAdvancements)) + ((Set) PLAYER_VISIBLE_SET.get(playerAdvancements)) .clear(); } catch (IllegalAccessException e) { throw new RuntimeException(e.getMessage(), e);