feat: update function signature across codebase

This commit is contained in:
ineanto 2025-04-03 09:33:17 +02:00
parent 875a04a850
commit 1ce7fbe3f0
Signed by: ineanto
GPG key ID: E511F9CAA2F9CE84
7 changed files with 11 additions and 27 deletions

View file

@ -1,7 +1,7 @@
plugins { plugins {
id("java") id("java")
id("com.gradleup.shadow") version "8.3.2" 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" 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") url("https://download.luckperms.net/1575/bukkit/loader/LuckPerms-Bukkit-5.4.158.jar")
// 1.20.5 - latest testing // 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") minecraftVersion("1.21.4")

View file

@ -38,7 +38,7 @@ public class AppearanceManager {
profile.setName(defaultName); profile.setName(defaultName);
profile.setSkin(defaultName); profile.setSkin(defaultName);
final ActionResult result = update(true, true); final ActionResult result = update(true);
profile.setName(null); profile.setName(null);
profile.setSkin(null); profile.setSkin(null);
@ -47,7 +47,7 @@ public class AppearanceManager {
return result; return result;
} }
public ActionResult update(boolean skinChange, boolean reset) { public ActionResult update(boolean skinChange) {
final NickoProfile profile = getNickoProfile(); final NickoProfile profile = getNickoProfile();
final String displayName = profile.getName() == null ? player.getName() : profile.getName(); final String displayName = profile.getName() == null ? player.getName() : profile.getName();

View file

@ -11,8 +11,8 @@ import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.ineanto.nicko.appearance.AppearanceManager; import xyz.ineanto.nicko.appearance.AppearanceManager;
import xyz.ineanto.nicko.gui.PlayerCheckGUI; import xyz.ineanto.nicko.gui.PlayerCheckGUI;
import xyz.ineanto.nicko.gui.PlayerCheckGUIData; import xyz.ineanto.nicko.gui.PlayerCheckGUIData;
import xyz.ineanto.nicko.language.PlayerLanguage;
import xyz.ineanto.nicko.language.LanguageKey; import xyz.ineanto.nicko.language.LanguageKey;
import xyz.ineanto.nicko.language.PlayerLanguage;
import xyz.ineanto.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.ineanto.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.ineanto.nicko.storage.name.PlayerNameStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore;
@ -22,12 +22,9 @@ import xyz.xenondevs.invui.window.WindowManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Logger;
public class PlayerJoinListener implements Listener { public class PlayerJoinListener implements Listener {
private final Logger logger = Logger.getLogger("PlayerJoinListener"); @EventHandler(priority = EventPriority.LOWEST)
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final Nicko instance = Nicko.getInstance(); final Nicko instance = Nicko.getInstance();
@ -50,7 +47,7 @@ public class PlayerJoinListener implements Listener {
if (profile.hasData()) { if (profile.hasData()) {
final AppearanceManager appearanceManager = new AppearanceManager(player); final AppearanceManager appearanceManager = new AppearanceManager(player);
final boolean needsASkinChange = profile.getSkin() != null && !profile.getSkin().equals(player.getName()); 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()) { if (!actionResult.isError()) {
player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Restore.OK)); player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Restore.OK));
} else { } else {
@ -62,19 +59,6 @@ public class PlayerJoinListener implements Listener {
} }
}, () -> instance.getLogger().warning("Failed to load data for " + player.getName())); }, () -> 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<NickoProfile> 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<UUID> viewers = (ArrayList<UUID>) PlayerCheckGUIData.VIEWERS.clone(); @SuppressWarnings("unchecked") final ArrayList<UUID> viewers = (ArrayList<UUID>) PlayerCheckGUIData.VIEWERS.clone();
viewers.forEach(uuid -> { viewers.forEach(uuid -> {
final Player windowWatcher = Bukkit.getPlayer(uuid); final Player windowWatcher = Bukkit.getPlayer(uuid);

View file

@ -3,6 +3,7 @@ package xyz.ineanto.nicko.event;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import xyz.ineanto.nicko.Nicko; import xyz.ineanto.nicko.Nicko;
@ -18,7 +19,7 @@ import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class PlayerQuitListener implements Listener { public class PlayerQuitListener implements Listener {
@EventHandler @EventHandler(priority = EventPriority.LOWEST)
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final ActionResult result = Nicko.getInstance().getDataStore().saveData(player); final ActionResult result = Nicko.getInstance().getDataStore().saveData(player);

View file

@ -40,7 +40,7 @@ public class RandomSkinItem {
instance.getDataStore().updateCache(player.getUniqueId(), profile); instance.getDataStore().updateCache(player.getUniqueId(), profile);
final AppearanceManager appearanceManager = new AppearanceManager(player); final AppearanceManager appearanceManager = new AppearanceManager(player);
final ActionResult result = appearanceManager.update(true, false); final ActionResult result = appearanceManager.update(true);
if (!result.isError()) { if (!result.isError()) {
player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK)); player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK));
} else { } else {

View file

@ -63,7 +63,7 @@ public class PromptManager {
} }
private void update(boolean skinChange) { private void update(boolean skinChange) {
final ActionResult actionResult = appearanceManager.update(skinChange, false); final ActionResult actionResult = appearanceManager.update(skinChange);
if (!actionResult.isError()) { if (!actionResult.isError()) {
player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK)); player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Set.OK));
player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1f); player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1f);

View file

@ -13,7 +13,6 @@ public class NickoPluginLoader implements PluginLoader {
final MavenLibraryResolver resolver = new MavenLibraryResolver(); final MavenLibraryResolver resolver = new MavenLibraryResolver();
resolver.addRepository(new RemoteRepository.Builder("xenondevs", "default", "https://repo.xenondevs.xyz/releases/").build()); 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)); resolver.addDependency(new Dependency(new DefaultArtifact("xyz.xenondevs.invui:invui:pom:1.44"), null));
pluginClasspathBuilder.addLibrary(resolver); pluginClasspathBuilder.addLibrary(resolver);