diff --git a/build.gradle.kts b/build.gradle.kts index 868f042..33cddee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("java") id("com.gradleup.shadow") version "8.3.2" - id("xyz.jpenilla.run-paper") version "2.3.1" + id("xyz.jpenilla.run-paper") version "2.3.0" id("io.papermc.paperweight.userdev") version "2.0.0-beta.10" } @@ -98,7 +98,7 @@ tasks { url("https://download.luckperms.net/1575/bukkit/loader/LuckPerms-Bukkit-5.4.158.jar") // 1.20.5 - latest testing - //url("https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar") + url("https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar") } minecraftVersion("1.21.4") diff --git a/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java index 23bd447..3ef26ad 100644 --- a/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java +++ b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java @@ -38,7 +38,7 @@ public class AppearanceManager { profile.setName(defaultName); profile.setSkin(defaultName); - final ActionResult result = update(true, true); + final ActionResult result = update(true); profile.setName(null); profile.setSkin(null); @@ -47,7 +47,7 @@ public class AppearanceManager { return result; } - public ActionResult update(boolean skinChange, boolean reset) { + public ActionResult update(boolean skinChange) { final NickoProfile profile = getNickoProfile(); final String displayName = profile.getName() == null ? player.getName() : profile.getName(); diff --git a/src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java b/src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java index 28171f5..cdb2cd4 100644 --- a/src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java +++ b/src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java @@ -11,8 +11,8 @@ import xyz.ineanto.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.AppearanceManager; import xyz.ineanto.nicko.gui.PlayerCheckGUI; import xyz.ineanto.nicko.gui.PlayerCheckGUIData; -import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.ineanto.nicko.language.LanguageKey; +import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.ineanto.nicko.profile.NickoProfile; import xyz.ineanto.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore; @@ -22,12 +22,9 @@ import xyz.xenondevs.invui.window.WindowManager; import java.util.ArrayList; import java.util.Optional; import java.util.UUID; -import java.util.logging.Logger; public class PlayerJoinListener implements Listener { - private final Logger logger = Logger.getLogger("PlayerJoinListener"); - - @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) + @EventHandler(priority = EventPriority.LOWEST) public void onPlayerJoin(PlayerJoinEvent event) { final Player player = event.getPlayer(); final Nicko instance = Nicko.getInstance(); @@ -50,7 +47,7 @@ public class PlayerJoinListener implements Listener { if (profile.hasData()) { final AppearanceManager appearanceManager = new AppearanceManager(player); final boolean needsASkinChange = profile.getSkin() != null && !profile.getSkin().equals(player.getName()); - final ActionResult actionResult = appearanceManager.update(needsASkinChange, false); + final ActionResult actionResult = appearanceManager.update(needsASkinChange); if (!actionResult.isError()) { player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Restore.OK)); } else { @@ -62,19 +59,6 @@ public class PlayerJoinListener implements Listener { } }, () -> instance.getLogger().warning("Failed to load data for " + player.getName())); - for (Player online : Bukkit.getOnlinePlayers().stream().filter(op -> op.getUniqueId() != player.getUniqueId()).toList()) { - final Optional optionalOnlinePlayerProfile = dataStore.getData(online.getUniqueId()); - - optionalOnlinePlayerProfile.ifPresent(profile -> { - final AppearanceManager appearanceManager = new AppearanceManager(online); - final boolean needsASkinChange = profile.getSkin() != null && !profile.getSkin().equals(online.getName()); - final ActionResult actionResult = appearanceManager.update(needsASkinChange, false); - if (actionResult.isError()) { - logger.warning("Something wrong happened while updating players to joining player (" + actionResult.getErrorKey() + ")"); - } - }); - } - @SuppressWarnings("unchecked") final ArrayList viewers = (ArrayList) PlayerCheckGUIData.VIEWERS.clone(); viewers.forEach(uuid -> { final Player windowWatcher = Bukkit.getPlayer(uuid); diff --git a/src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java b/src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java index 10160a4..020790b 100644 --- a/src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java +++ b/src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java @@ -3,6 +3,7 @@ package xyz.ineanto.nicko.event; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; import xyz.ineanto.nicko.Nicko; @@ -18,7 +19,7 @@ import java.util.UUID; import java.util.stream.Collectors; public class PlayerQuitListener implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.LOWEST) public void onPlayerQuit(PlayerQuitEvent event) { final Player player = event.getPlayer(); final ActionResult result = Nicko.getInstance().getDataStore().saveData(player); diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java index 9f7b5e0..8f88b7c 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java @@ -40,7 +40,7 @@ public class RandomSkinItem { instance.getDataStore().updateCache(player.getUniqueId(), profile); final AppearanceManager appearanceManager = new AppearanceManager(player); - final ActionResult result = appearanceManager.update(true, false); + final ActionResult result = appearanceManager.update(true); if (!result.isError()) { player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK)); } else { diff --git a/src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java b/src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java index 6cccbb0..651b740 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java +++ b/src/main/java/xyz/ineanto/nicko/gui/prompt/PromptManager.java @@ -63,7 +63,7 @@ public class PromptManager { } private void update(boolean skinChange) { - final ActionResult actionResult = appearanceManager.update(skinChange, false); + final ActionResult actionResult = appearanceManager.update(skinChange); if (!actionResult.isError()) { player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK)); player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1f); diff --git a/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java b/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java index 096e9c7..647c1ca 100644 --- a/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java +++ b/src/main/java/xyz/ineanto/nicko/loader/NickoPluginLoader.java @@ -13,7 +13,6 @@ public class NickoPluginLoader implements PluginLoader { final MavenLibraryResolver resolver = new MavenLibraryResolver(); resolver.addRepository(new RemoteRepository.Builder("xenondevs", "default", "https://repo.xenondevs.xyz/releases/").build()); - resolver.addRepository(new RemoteRepository.Builder("codemc", "default", "https://repo.codemc.io/repository/maven-snapshots/").build()); resolver.addDependency(new Dependency(new DefaultArtifact("xyz.xenondevs.invui:invui:pom:1.44"), null)); pluginClasspathBuilder.addLibrary(resolver);