From 30aacbedd2d9916b012995e272352edf437594dd Mon Sep 17 00:00:00 2001 From: SergiFerry Date: Fri, 12 Aug 2022 19:08:57 +0200 Subject: [PATCH 1/2] Player NPC 2022.8 RC --- src/dev/sergiferry/playernpc/api/NPC.java | 2631 +++++++++++++----- src/dev/sergiferry/playernpc/api/NPCLib.java | 156 +- 2 files changed, 2112 insertions(+), 675 deletions(-) diff --git a/src/dev/sergiferry/playernpc/api/NPC.java b/src/dev/sergiferry/playernpc/api/NPC.java index e87839c..7394e78 100644 --- a/src/dev/sergiferry/playernpc/api/NPC.java +++ b/src/dev/sergiferry/playernpc/api/NPC.java @@ -10,11 +10,12 @@ import dev.sergiferry.playernpc.PlayerNPCPlugin; import dev.sergiferry.playernpc.nms.craftbukkit.NMSCraftItemStack; import dev.sergiferry.playernpc.nms.craftbukkit.NMSCraftScoreboard; -import dev.sergiferry.playernpc.nms.minecraft.NMSEntity; -import dev.sergiferry.playernpc.nms.minecraft.NMSEntityPlayer; -import dev.sergiferry.playernpc.nms.minecraft.NMSPacketPlayOutEntityDestroy; -import dev.sergiferry.playernpc.nms.minecraft.NMSPacketPlayOutSpawnEntity; +import dev.sergiferry.playernpc.nms.minecraft.*; +import dev.sergiferry.playernpc.nms.spigot.NMSFileConfiguration; +import dev.sergiferry.playernpc.nms.spigot.NMSFileUtils; +import dev.sergiferry.playernpc.nms.spigot.NMSPlayer; import dev.sergiferry.playernpc.utils.ColorUtils; +import dev.sergiferry.playernpc.utils.MathUtils; import dev.sergiferry.playernpc.utils.StringUtils; import dev.sergiferry.playernpc.utils.TimerUtils; import dev.sergiferry.spigot.nms.craftbukkit.NMSCraftPlayer; @@ -37,33 +38,46 @@ import net.minecraft.world.scores.Scoreboard; import net.minecraft.world.scores.ScoreboardTeam; import net.minecraft.world.scores.ScoreboardTeamBase; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang.Validate; import org.apache.commons.lang.reflect.FieldUtils; +import org.apache.logging.log4j.util.TriConsumer; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.data.type.Slab; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.entity.Entity; import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.scheduler.BukkitTask; import org.bukkit.util.Vector; +import org.mineskin.MineskinClient; +import org.mineskin.SkinOptions; +import org.mineskin.data.MineskinException; +import org.mineskin.data.Skin; import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.imageio.ImageIO; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; +import java.lang.reflect.InvocationTargetException; +import java.net.HttpURLConnection; import java.net.URL; import java.util.*; +import java.util.List; +import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; @@ -206,36 +220,57 @@ public void setCollidable(boolean collidable) { } public void setSkin(@Nonnull String texture, @Nonnull String signature){ - setSkin(new NPC.Skin(texture, signature)); + setSkin(null, texture, signature); } - public void setSkin(@Nullable String playerName, Consumer finishAction){ + public void setSkin(@Nullable String skinName, @Nonnull String texture, @Nonnull String signature){ + if(skinName == null) setSkin(NPC.Skin.Custom.createCustomSkin(getPlugin(), texture, signature)); + else setSkin(NPC.Skin.Custom.createCustomSkin(getPlugin(), skinName, texture, signature)); + } + + public void setSkin(@Nullable String playerName, Consumer finishAction){ if(playerName == null){ - setSkin(Skin.STEVE); + setSkin(Skin.Minecraft.STEVE); return; } - NPC.Skin.fetchSkinAsync(playerName, (skin) -> { + NPC.Skin.Minecraft.fetchSkinAsync(getPlugin(), playerName, (skin) -> { setSkin(skin); if(finishAction != null) getPlugin().getServer().getScheduler().runTask(getPlugin(), ()-> finishAction.accept(skin)); }); } + public void setMineSkin(Skin.MineSkin skin){ + setSkin(skin); + } + + public void setMineSkin(@Nonnull String id, boolean forceDownload, Consumer finishAction){ + Validate.notNull(id); + NPC.Skin.MineSkin.fetchSkinAsync(getPlugin(), id, false, (skin) -> { + setMineSkin(skin); + if(finishAction != null) getPlugin().getServer().getScheduler().runTask(getPlugin(), ()-> finishAction.accept(skin)); + }); + } + + public void setMineSkin(@Nonnull String id, Consumer finishAction){ + setMineSkin(id, false, finishAction); + } + public void setSkin(@Nullable String playerName){ - setSkin(playerName, (Consumer) null); + setSkin(playerName, (Consumer) null); } public void setSkin(@Nullable Player playerSkin){ if(playerSkin == null){ - setSkin(Skin.STEVE); + setSkin(Skin.Minecraft.STEVE); return; } Validate.isTrue(playerSkin.isOnline(), "Failed to set NPC skin. Player must be online."); - setSkin(playerSkin.getName(), (Consumer) null); + setSkin(playerSkin.getName(), (Consumer) null); } - public void setSkin(@Nullable Player playerSkin, Consumer finishAction){ + public void setSkin(@Nullable Player playerSkin, Consumer finishAction){ if(playerSkin == null){ - setSkin(Skin.STEVE); + setSkin(Skin.Minecraft.STEVE); return; } Validate.isTrue(playerSkin.isOnline(), "Failed to set NPC skin. Player must be online."); @@ -413,37 +448,67 @@ public void resetInteractCooldown(){ setInteractCooldown(NPC.Attributes.getDefaultInteractCooldown()); } - public Interact.Actions.Custom addCustomClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull BiConsumer customAction){ return (Interact.Actions.Custom) addClickAction(new Interact.Actions.Custom(this, clickType,customAction)); } + public Interact.Actions.CustomAction addCustomClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull BiConsumer customAction){ return (Interact.Actions.CustomAction) addClickAction(new Interact.Actions.CustomAction(this, clickType,customAction)); } + + public Interact.Actions.CustomAction addCustomClickAction(@Nonnull BiConsumer customAction){ return addCustomClickAction(Interact.ClickType.EITHER, customAction); } + + public Interact.Actions.Player.SendChatMessage addMessageClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String... message){ return (Interact.Actions.Player.SendChatMessage) addClickAction(new Interact.Actions.Player.SendChatMessage(this, clickType, message)); } + + public Interact.Actions.Player.SendChatMessage addMessageClickAction(@Nonnull String... message){ return addMessageClickAction(Interact.ClickType.EITHER, message); } + + public Interact.Actions.Player.PerformCommand addRunPlayerCommandClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String command){ return (Interact.Actions.Player.PerformCommand) addClickAction(new Interact.Actions.Player.PerformCommand(this, clickType, command)); } + + public Interact.Actions.Player.PerformCommand addRunPlayerCommandClickAction(@Nonnull String command){ return addRunPlayerCommandClickAction(Interact.ClickType.EITHER, command); } + + public Interact.Actions.Console.PerformCommand addRunConsoleCommandClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String command){ return (Interact.Actions.Console.PerformCommand) addClickAction(new Interact.Actions.Console.PerformCommand(this, clickType, command)); } - public Interact.Actions.Custom addCustomClickAction(@Nonnull BiConsumer customAction){ return addCustomClickAction(Interact.ClickType.EITHER, customAction); } + public Interact.Actions.Console.PerformCommand addRunConsoleCommandClickAction(@Nonnull String command){ return addRunConsoleCommandClickAction(Interact.ClickType.EITHER, command); } - public Interact.Actions.Message addMessageClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String... message){ return (Interact.Actions.Message) addClickAction(new Interact.Actions.Message(this, clickType, message)); } + public Interact.Actions.Player.ConnectBungeeServer addConnectBungeeServerClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String server){ return (Interact.Actions.Player.ConnectBungeeServer) addClickAction(new Interact.Actions.Player.ConnectBungeeServer(this, clickType, server)); } - public Interact.Actions.Message addMessageClickAction(@Nonnull String... message){ return addMessageClickAction(Interact.ClickType.EITHER, message); } + public Interact.Actions.Player.ConnectBungeeServer addConnectBungeeServerClickAction(@Nonnull String server){ return addConnectBungeeServerClickAction(Interact.ClickType.EITHER, server); } - public Interact.Actions.PlayerCommand addRunPlayerCommandClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String command){ return (Interact.Actions.PlayerCommand) addClickAction(new Interact.Actions.PlayerCommand(this, clickType, command)); } + public Interact.Actions.Player.SendActionBarMessage addActionBarMessageClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String message){ return (Interact.Actions.Player.SendActionBarMessage) addClickAction(new Interact.Actions.Player.SendActionBarMessage(this, clickType, message)); } - public Interact.Actions.PlayerCommand addRunPlayerCommandClickAction(@Nonnull String command){ return addRunPlayerCommandClickAction(Interact.ClickType.EITHER, command); } + public Interact.Actions.Player.SendActionBarMessage addActionBarMessageClickAction(@Nonnull String message){ return addActionBarMessageClickAction(Interact.ClickType.EITHER, message); } - public Interact.Actions.ConsoleCommand addRunConsoleCommandClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String command){ return (Interact.Actions.ConsoleCommand) addClickAction(new Interact.Actions.ConsoleCommand(this, clickType, command)); } + public Interact.Actions.Player.SendTitleMessage addTitleMessageClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String title, @Nonnull String subtitle, int fadeIn, int stay, int fadeOut){ return (Interact.Actions.Player.SendTitleMessage) addClickAction(new Interact.Actions.Player.SendTitleMessage(this, clickType, title, subtitle, fadeIn, stay, fadeOut)); } - public Interact.Actions.ConsoleCommand addRunConsoleCommandClickAction(@Nonnull String command){ return addRunConsoleCommandClickAction(Interact.ClickType.EITHER, command); } + public Interact.Actions.Player.SendTitleMessage addTitleMessageClickAction(@Nonnull String title, @Nonnull String subtitle, int fadeIn, int stay, int fadeOut){ return addTitleMessageClickAction(Interact.ClickType.EITHER, title, subtitle, fadeIn, stay, fadeOut); } - public Interact.Actions.BungeeServer addConnectBungeeServerClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String server){ return (Interact.Actions.BungeeServer) addClickAction(new Interact.Actions.BungeeServer(this, clickType, server)); } + public Interact.Actions.Player.TeleportToLocation addTeleportToLocationClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull Location location){ return (Interact.Actions.Player.TeleportToLocation) addClickAction(new Interact.Actions.Player.TeleportToLocation(this, clickType, location)); } - public Interact.Actions.BungeeServer addConnectBungeeServerClickAction(@Nonnull String server){ return addConnectBungeeServerClickAction(Interact.ClickType.EITHER, server); } + public Interact.Actions.Player.TeleportToLocation addTeleportToLocationClickAction(@Nonnull Location location){ return addTeleportToLocationClickAction(Interact.ClickType.EITHER, location); } - public Interact.Actions.ActionBar addActionBarMessageClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String message){ return (Interact.Actions.ActionBar) addClickAction(new Interact.Actions.ActionBar(this, clickType, message)); } + public Interact.Actions.SetCustomData addSetCustomDataClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String key, @Nullable String value) { return (Interact.Actions.SetCustomData) addClickAction(new Interact.Actions.SetCustomData(this, clickType, key, value)); } - public Interact.Actions.ActionBar addActionBarMessageClickAction(@Nonnull String message){ return addActionBarMessageClickAction(Interact.ClickType.EITHER, message); } + public Interact.Actions.SetCustomData addSetCustomDataClickAction(@Nonnull String key, @Nullable String value) { return addSetCustomDataClickAction(Interact.ClickType.EITHER, key, value); } - public Interact.Actions.Title addTitleMessageClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull String title, @Nonnull String subtitle, int fadeIn, int stay, int fadeOut){ return (Interact.Actions.Title) addClickAction(new Interact.Actions.Title(this, clickType, title, subtitle, fadeIn, stay, fadeOut)); } + public Interact.Actions.Player.GiveItem addGivePlayerItemClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull ItemStack itemStack) { return (Interact.Actions.Player.GiveItem) addClickAction(new Interact.Actions.Player.GiveItem(this, clickType, itemStack)); } - public Interact.Actions.Title addTitleMessageClickAction(@Nonnull String title, @Nonnull String subtitle, int fadeIn, int stay, int fadeOut){ return addTitleMessageClickAction(Interact.ClickType.EITHER, title, subtitle, fadeIn, stay, fadeOut); } + public Interact.Actions.Player.GiveItem addGivePlayerItemClickAction(@Nonnull ItemStack itemStack) { return addGivePlayerItemClickAction(Interact.ClickType.EITHER, itemStack); } - public Interact.Actions.TeleportToLocation addTeleportToLocationClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull Location location){ return (Interact.Actions.TeleportToLocation) addClickAction(new Interact.Actions.TeleportToLocation(this, clickType, location)); } + public Interact.Actions.Player.OpenWorkbench addOpenWorkbenchClickAction(@Nullable NPC.Interact.ClickType clickType) { return (Interact.Actions.Player.OpenWorkbench) addClickAction(new Interact.Actions.Player.OpenWorkbench(this, clickType)); } - public Interact.Actions.TeleportToLocation addTeleportToLocationClickAction(@Nonnull Location location){ return addTeleportToLocationClickAction(Interact.ClickType.EITHER, location); } + public Interact.Actions.Player.OpenWorkbench addOpenWorkbenchClickAction() { return addOpenWorkbenchClickAction(Interact.ClickType.EITHER); } + + @Deprecated + public Interact.Actions.Player.OpenEnchanting addOpenEnchantingClickAction(@Nullable NPC.Interact.ClickType clickType) { return (Interact.Actions.Player.OpenEnchanting) addClickAction(new Interact.Actions.Player.OpenEnchanting(this, clickType)); } + + @Deprecated + public Interact.Actions.Player.OpenEnchanting addOpenEnchantingClickAction() { return addOpenEnchantingClickAction(Interact.ClickType.EITHER); } + + public Interact.Actions.Player.OpenBook addOpenBookClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull ItemStack book) { return (Interact.Actions.Player.OpenBook) addClickAction(new Interact.Actions.Player.OpenBook(this, clickType, book)); } + + public Interact.Actions.Player.OpenBook addOpenBookClickAction(@Nonnull ItemStack book) { return addOpenBookClickAction(Interact.ClickType.EITHER, book); } + + public Interact.Actions.PlayAnimation addPlayAnimationClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull Animation animation) { return (Interact.Actions.PlayAnimation) addClickAction(new Interact.Actions.PlayAnimation(this, clickType, animation)); } + + public Interact.Actions.PlayAnimation addPlayAnimationClickAction(@Nonnull Animation animation) { return addPlayAnimationClickAction(Interact.ClickType.EITHER, animation); } + + public Interact.Actions.Player.PlaySound addPlayerPlaySoundClickAction(@Nullable NPC.Interact.ClickType clickType, @Nonnull Sound sound) { return (Interact.Actions.Player.PlaySound) addClickAction(new Interact.Actions.Player.PlaySound(this, clickType, sound)); } + + public Interact.Actions.Player.PlaySound addPlayerPlaySoundClickAction(@Nonnull Sound sound) { return addPlayerPlaySoundClickAction(Interact.ClickType.EITHER, sound); } public void resetClickActions(@Nonnull NPC.Interact.ClickType clickType){ Validate.notNull(clickType, "Click type cannot be null"); @@ -714,7 +779,9 @@ public NPCLib.PluginManager getPluginManager() { return pluginManager; } - protected List getClickActions() { return clickActions; } + public List getClickActions() { return clickActions.stream().collect(Collectors.toList()); } + + public Integer getClickActionsSize() { return clickActions.size(); } public List getClickActions(@Nonnull NPC.Interact.ClickType clickType){ return this.clickActions.stream().filter(x-> x.getClickType() != null && x.getClickType().equals(clickType)).collect(Collectors.toList()); } @@ -757,8 +824,12 @@ public void create(){ WorldServer worldServer = NMSCraftWorld.getWorldServer(super.world); GameProfile gameProfile = new GameProfile(gameProfileID, getReplacedCustomName()); entityPlayer = NMSEntityPlayer.newEntityPlayer(server, worldServer, gameProfile); + if(entityPlayer == null){ + gameProfile = new GameProfile(gameProfileID, ChatColor.stripColor(getReplacedCustomName())); + entityPlayer = NMSEntityPlayer.newEntityPlayer(server, worldServer, gameProfile); + } Validate.notNull(entityPlayer, "Error at NMSEntityPlayer"); - entityPlayer.a(super.x, super.y, super.z, super.yaw, super.pitch);//setLocation + NMSEntity.setLocation(entityPlayer, super.x, super.y, super.z, super.yaw, super.pitch); this.npcHologram = new NPC.Hologram(this, player); updateSkin(); updatePose(); @@ -914,8 +985,8 @@ public void lookAt(float yaw, float pitch){ } super.yaw = yaw; //yRot super.pitch = pitch; //xRot - entityPlayer.o(yaw); //setYRot - entityPlayer.p(pitch); //setXRot + NMSEntity.setYRot(entityPlayer, yaw); + NMSEntity.setXRot(entityPlayer, pitch); } /* @@ -1010,16 +1081,14 @@ protected void updateLocation(Player player){ protected void updateScoreboard(Player player){ GameProfile gameProfile = NMSEntityPlayer.getGameProfile(entityPlayer); - Scoreboard scoreboard = null; - try{ scoreboard = (Scoreboard) NMSCraftScoreboard.getCraftScoreBoardGetHandle().invoke(NMSCraftScoreboard.getCraftScoreBoardClass().cast(player.getScoreboard())); }catch (Exception e){} - Validate.notNull(scoreboard, "Error at NMSCraftScoreboard"); - ScoreboardTeam scoreboardTeam = scoreboard.f(getShortUUID()) == null ? new ScoreboardTeam(scoreboard, getShortUUID()) : scoreboard.f(getShortUUID()); - scoreboardTeam.a(ScoreboardTeamBase.EnumNameTagVisibility.b); //EnumNameTagVisibility.NEVER - scoreboardTeam.a(getGlowingColor().getEnumChatFormat()); //setColor - ScoreboardTeamBase.EnumTeamPush var1 = ScoreboardTeamBase.EnumTeamPush.b; //EnumTeamPush.NEVER - if(isCollidable()) var1 = ScoreboardTeamBase.EnumTeamPush.a; //EnumTeamPush.ALWAYS - scoreboardTeam.a(var1); //setTeamPush - scoreboard.a(gameProfile.getName(), scoreboardTeam); //setPlayerTeam + Scoreboard scoreboard = NMSCraftScoreboard.getScoreboard(player); + ScoreboardTeam scoreboardTeam = NMSScoreboard.getTeam(scoreboard, getShortUUID()) == null ? new ScoreboardTeam(scoreboard, getShortUUID()) : NMSScoreboard.getTeam(scoreboard, getShortUUID()); + NMSScoreboard.setNameTagVisibility(scoreboardTeam, NMSScoreboard.nameTagVisibility_NEVER); + NMSScoreboard.setTeamColor(scoreboardTeam, getGlowingColor().getEnumChatFormat()); + ScoreboardTeamBase.EnumTeamPush var1 = NMSScoreboard.teamPush_NEVER; + if(isCollidable()) var1 = NMSScoreboard.teamPush_ALWAYS; + NMSScoreboard.setTeamPush(scoreboardTeam, var1); + NMSScoreboard.setPlayerTeam(scoreboard, gameProfile.getName(), scoreboardTeam); NMSCraftPlayer.sendPacket(player, PacketPlayOutScoreboardTeam.a(scoreboardTeam, true)); NMSCraftPlayer.sendPacket(player, PacketPlayOutScoreboardTeam.a(scoreboardTeam, false)); } @@ -1027,7 +1096,7 @@ protected void updateScoreboard(Player player){ @Override protected void updatePlayerRotation(){ if(entityPlayer == null) return; - NMSCraftPlayer.sendPacket(player, new PacketPlayOutEntity.PacketPlayOutEntityLook(NMSEntityPlayer.getEntityID(entityPlayer), (byte) ((super.yaw * 256 / 360)), (byte) ((super.pitch * 256 / 360)), false)); + NMSCraftPlayer.sendPacket(player, new PacketPlayOutEntity.PacketPlayOutEntityLook(NMSEntity.getEntityID(entityPlayer), (byte) ((super.yaw * 256 / 360)), (byte) ((super.pitch * 256 / 360)), false)); NMSCraftPlayer.sendPacket(player, new PacketPlayOutEntityHeadRotation(entityPlayer, (byte) (super.yaw * 256 / 360))); } @@ -1039,7 +1108,7 @@ protected void updateSkin(){ protected void updatePose(){ if(getPose().equals(NPC.Pose.SLEEPING)) entityPlayer.e(new BlockPosition(super.x, super.y, super.z)); - entityPlayer.b(getPose().getEntityPose()); + NMSEntity.setPose(entityPlayer, getPose().getEntityPose()); } protected void move(double x, double y, double z){ @@ -1058,12 +1127,12 @@ protected void movePacket(double x, double y, double z) { Validate.isTrue(x < 8); Validate.isTrue(y < 8); Validate.isTrue(z < 8); - NMSCraftPlayer.sendPacket(player, new PacketPlayOutEntity.PacketPlayOutRelEntityMove(NMSEntityPlayer.getEntityID(entityPlayer), (short)(x * 4096), (short)(y * 4096), (short)(z * 4096), true)); + NMSCraftPlayer.sendPacket(player, new PacketPlayOutEntity.PacketPlayOutRelEntityMove(NMSEntity.getEntityID(entityPlayer), (short)(x * 4096), (short)(y * 4096), (short)(z * 4096), true)); } protected void updateMetadata() { - DataWatcher dataWatcher = NMSEntityPlayer.getDataWatcher(entityPlayer); - entityPlayer.i(isGlowing()); + DataWatcher dataWatcher = NMSEntity.getDataWatcher(entityPlayer); + NMSEntity.setGlowingTag(entityPlayer, isGlowing()); Map> map = null; try{ map = (Map>) FieldUtils.readDeclaredField(dataWatcher, "f", true); } catch (IllegalAccessException e){} if(map == null) return; @@ -1080,7 +1149,7 @@ protected void updateMetadata() { bitMaskIndex = (byte) 0x01; if(isOnFire()) b = (byte) (b | bitMaskIndex); else b = (byte) (b & ~(1 << bitMaskIndex)); - dataWatcher.b(DataWatcherRegistry.a.a(0), b); + NMSDataWatcher.set(dataWatcher, DataWatcherRegistry.a.a(0), b); // //Player b = 0x00; @@ -1093,9 +1162,9 @@ protected void updateMetadata() { if(parts.isVisible(Skin.Part.LEFT_PANTS)) b = (byte) (b | 0x10); if(parts.isVisible(Skin.Part.RIGHT_PANTS)) b = (byte) (b | 0x20); if(parts.isVisible(Skin.Part.HAT)) b = (byte) (b | 0x40); - dataWatcher.b(DataWatcherRegistry.a.a(17), b); + NMSDataWatcher.set(dataWatcher, DataWatcherRegistry.a.a(17), b); // - PacketPlayOutEntityMetadata metadataPacket = new PacketPlayOutEntityMetadata(NMSEntityPlayer.getEntityID(entityPlayer), dataWatcher, true); + PacketPlayOutEntityMetadata metadataPacket = new PacketPlayOutEntityMetadata(NMSEntity.getEntityID(entityPlayer), dataWatcher, true); NMSCraftPlayer.sendPacket(player, metadataPacket); } @@ -1111,7 +1180,7 @@ protected void updateEquipment(){ Validate.notNull(craftItem, "Error at NMSCraftItemStack"); equipment.add(new Pair(nmsSlot, craftItem)); } - PacketPlayOutEntityEquipment packet = new PacketPlayOutEntityEquipment(NMSEntityPlayer.getEntityID(entityPlayer), equipment); + PacketPlayOutEntityEquipment packet = new PacketPlayOutEntityEquipment(NMSEntity.getEntityID(entityPlayer), equipment); NMSCraftPlayer.sendPacket(player, packet); } @@ -1148,7 +1217,7 @@ private void hideToPlayer(){ NMSCraftPlayer.sendPacket(player, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.e, entityPlayer)); //EnumPlayerInfoAction.REMOVE_PLAYER shownOnTabList = false; } - NMSCraftPlayer.sendPacket(player, NMSPacketPlayOutEntityDestroy.createPacket(NMSEntityPlayer.getEntityID(entityPlayer))); + NMSCraftPlayer.sendPacket(player, NMSPacketPlayOutEntityDestroy.createPacket(NMSEntity.getEntityID(entityPlayer))); if(npcHologram != null) npcHologram.hide(); hiddenToPlayer = true; } @@ -1328,7 +1397,7 @@ public void addPlayer(@Nonnull Player player, boolean ignoreVisibilityRequiremen Validate.notNull(player, "Cannot add a null Player"); if(players.containsKey(player)) return; if(!ignoreVisibilityRequirement && !meetsVisibilityRequirement(player)) return; - NPC.Personal personal = getNPCLib().generatePlayerPersonalNPC(player, getPlugin(), getPlugin().getName().toLowerCase() + "." + "global_" + getSimpleCode(), getLocation()); + NPC.Personal personal = getNPCLib().generatePlayerPersonalNPC(player, getPlugin(), getNPCLib().getFormattedName(getPlugin(), "global_" + getSimpleCode()), getLocation()); personal.global = this; players.put(player, personal); if(!selectedPlayers.contains(player.getName())) selectedPlayers.add(player.getName()); @@ -1594,7 +1663,7 @@ private void updateAttributes(Player player){ NPC.Attributes A = getAttributes(); NPC.Attributes cA = getCustomAttributes(player); personal.updateGlobalLocation(this); - if(ownPlayerSkin && (personal.getSkin().getPlayerName() == null || !personal.getSkin().getPlayerName().equals(player.getName()))) personal.setSkin(player, skin -> personal.forceUpdate()); + if(ownPlayerSkin && (personal.getSkin().getType().equals(Skin.Type.CUSTOM) || !((Skin.Minecraft) personal.getSkin()).getPlayerName().equals(player.getName()))) personal.setSkin(player, skin -> personal.forceUpdate()); else personal.setSkin(cA.skin != null ? cA.skin : A.skin); personal.setSkinParts(cA.skinParts != null ? cA.skinParts : A.skinParts); personal.setCollidable(cA.collidable != null ? cA.collidable : A.collidable); @@ -1859,13 +1928,17 @@ public void load(){ if(config.contains("skin.custom.enabled") && config.getBoolean("skin.custom.enabled") && config.contains("skin.custom.texture") && config.contains("skin.custom.signature")){ String texture = config.getString("skin.custom.texture"); String signature = config.getString("skin.custom.signature"); + String skinName = null; + if(config.contains("skin.custom.name")) config.getString("skin.custom.name"); if(signature.length() < 684 || texture.length() == 0){ - texture = Skin.STEVE.getTexture(); - signature = Skin.STEVE.getSignature(); + texture = Skin.Minecraft.STEVE.getTexture(); + signature = Skin.Minecraft.STEVE.getSignature(); + skinName = null; } global.setSkin(texture, signature); } else if(config.contains("skin.player")) global.setSkin(config.getString("skin.player"), skin -> global.forceUpdate()); + else if(config.contains("skin.mineskin")) global.setMineSkin(config.getString("skin.mineskin"), mineSkin -> global.forceUpdate()); if(config.contains("hologram.text")){ List lines = config.getStringList("hologram.text"); if(lines != null && lines.size() > 0){ @@ -1905,42 +1978,86 @@ public void load(){ } if(config.getConfigurationSection("interact.actions") != null){ for(String keys : config.getConfigurationSection("interact.actions").getKeys(false)){ - Interact.Actions.Type actionType = Interact.Actions.Type.valueOf(config.getString("interact.actions." + keys + ".type")); - Interact.ClickType clickType = Interact.ClickType.valueOf(config.getString("interact.actions." + keys + ".click")); - if(actionType.equals(Interact.Actions.Type.SEND_MESSAGE)){ - List message = config.getStringList("interact.actions." + keys + ".messages"); - String[] messages = new String[message.size()]; - for(int i = 0; i < message.size(); i++) messages[i] = message.get(i).replaceAll("&", "§"); - global.addMessageClickAction(clickType, messages); - } - else if(actionType.equals(Interact.Actions.Type.SEND_ACTIONBAR_MESSAGE)){ - String message = config.getString("interact.actions." + keys + ".message").replaceAll("&", "§"); - global.addActionBarMessageClickAction(clickType, message); - } - else if(actionType.equals(Interact.Actions.Type.CONNECT_BUNGEE_SERVER)){ - String server = config.getString("interact.actions." + keys + ".server"); - global.addConnectBungeeServerClickAction(clickType, server); - } - else if(actionType.equals(Interact.Actions.Type.RUN_CONSOLE_COMMAND)){ - String command = config.getString("interact.actions." + keys + ".command"); - global.addRunConsoleCommandClickAction(clickType, command); - } - else if(actionType.equals(Interact.Actions.Type.RUN_PLAYER_COMMAND)){ - String command = config.getString("interact.actions." + keys + ".command"); - global.addRunPlayerCommandClickAction(clickType, command); - } - else if(actionType.equals(Interact.Actions.Type.SEND_TITLE_MESSAGE)){ - String title = config.getString("interact.actions." + keys + ".title").replaceAll("&", "§"); - String subtitle = config.getString("interact.actions." + keys + ".subtitle").replaceAll("&", "§"); - Integer fadeIn = config.getInt("interact.actions." + keys + ".fadeIn"); - Integer stay = config.getInt("interact.actions." + keys + ".stay"); - Integer fadeOut = config.getInt("interact.actions." + keys + ".fadeOut"); - global.addTitleMessageClickAction(clickType, title, subtitle, fadeIn, stay, fadeOut); - } - else if(actionType.equals(Interact.Actions.Type.TELEPORT_TO_LOCATION)){ - Location location1 = config.getLocation("interact.actions." + keys + ".location"); - global.addTeleportToLocationClickAction(clickType, location1); + try{ + Interact.ClickAction clickAction = null; + Interact.Actions.Type actionType = null; + String stringType = config.getString("interact.actions." + keys + ".type"); + try{ actionType = Interact.Actions.Type.valueOf( stringType); } catch (Exception e){} + if(actionType == null){ try{ actionType = Interact.Actions.LegacyType.valueOf(stringType).type; Bukkit.getConsoleSender().sendMessage("§8- §eLegacy click action " + stringType + " type was found. Fixing it..."); } catch (Exception e) {} } + if(actionType == null){ throw new IllegalArgumentException(stringType + " type of action is not valid."); } + Interact.ClickType clickType = Interact.ClickType.valueOf(config.getString("interact.actions." + keys + ".click")); + if(actionType.equals(Interact.Actions.Type.PLAYER_SEND_CHAT_MESSAGE)){ + List message = config.getStringList("interact.actions." + keys + ".messages"); + String[] messages = new String[message.size()]; + for(int i = 0; i < message.size(); i++) messages[i] = message.get(i).replaceAll("&", "§"); + clickAction = global.addMessageClickAction(clickType, messages); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_SEND_ACTIONBAR_MESSAGE)){ + String message = config.getString("interact.actions." + keys + ".message").replaceAll("&", "§"); + clickAction = global.addActionBarMessageClickAction(clickType, message); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_CONNECT_BUNGEE_SERVER)){ + String server = config.getString("interact.actions." + keys + ".server"); + clickAction = global.addConnectBungeeServerClickAction(clickType, server); + } + else if(actionType.equals(Interact.Actions.Type.CONSOLE_PERFORM_COMMAND)){ + String command = config.getString("interact.actions." + keys + ".command"); + clickAction = global.addRunConsoleCommandClickAction(clickType, command); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_PERFORM_COMMAND)){ + String command = config.getString("interact.actions." + keys + ".command"); + clickAction = global.addRunPlayerCommandClickAction(clickType, command); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_SEND_TITLE_MESSAGE)){ + String title = config.getString("interact.actions." + keys + ".title").replaceAll("&", "§"); + String subtitle = config.getString("interact.actions." + keys + ".subtitle").replaceAll("&", "§"); + Integer fadeIn = config.getInt("interact.actions." + keys + ".fadeIn"); + Integer stay = config.getInt("interact.actions." + keys + ".stay"); + Integer fadeOut = config.getInt("interact.actions." + keys + ".fadeOut"); + clickAction = global.addTitleMessageClickAction(clickType, title, subtitle, fadeIn, stay, fadeOut); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_TELEPORT_TO_LOCATION)){ + Location location1 = config.getLocation("interact.actions." + keys + ".location"); + clickAction = global.addTeleportToLocationClickAction(clickType, location1); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_GIVE_ITEM)){ + ItemStack itemStack = config.getItemStack("interact.actions." + keys + ".item"); + clickAction = global.addGivePlayerItemClickAction(clickType, itemStack); + } + else if(actionType.equals(Interact.Actions.Type.NPC_SET_CUSTOM_DATA)){ + String key = config.getString("interact.actions." + keys + ".key"); + String value = config.getString("interact.actions." + keys + ".value"); + Boolean checkIfSame = config.getBoolean("interact.actions." + keys + ".checkIfSame"); + clickAction = global.addSetCustomDataClickAction(clickType, key, value); + ((Interact.Actions.SetCustomData) clickAction).setCheckIfSame(checkIfSame); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_OPEN_BOOK)){ + ItemStack itemStack = config.getItemStack("interact.actions." + keys + ".book"); + clickAction = global.addOpenBookClickAction(clickType, itemStack); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_OPEN_WORKBENCH)){ + clickAction = global.addOpenWorkbenchClickAction(clickType); + } + else if(actionType.equals(Interact.Actions.Type.PLAYER_OPEN_ENCHANTING)){ + clickAction = global.addOpenEnchantingClickAction(clickType); + } + else if(actionType.equals(Interact.Actions.Type.NPC_PLAY_ANIMATION)){ + Animation animation = Animation.valueOf(config.getString("interact.actions." + keys + ".animation")); + clickAction = global.addPlayAnimationClickAction(clickType, animation); + } + Long delayTicks = config.getLong("interact.actions." + keys + ".delayTicks"); + Long cooldownMilliseconds = config.getLong("interact.actions." + keys + ".cooldownMilliseconds"); + Boolean enabled = config.contains("interact.actions." + keys + ".enabled") ? config.getBoolean("interact.actions." + keys + ".enabled") : true; + clickAction.setEnabled(enabled); + clickAction.setDelayTicks(delayTicks); + clickAction.setCooldownMilliseconds(cooldownMilliseconds); + if(config.getConfigurationSection("interact.actions." + keys + ".condition") != null){ + for(String keysS : config.getConfigurationSection("interact.actions." + keys + ".condition").getKeys(false)){ + clickAction.addCondition((Conditions.Condition) config.get("interact.actions." + keys + ".condition." + keysS)); + } + } } + catch (Exception e) { NPCLib.printError(e); } } } // @@ -1952,96 +2069,139 @@ else if(actionType.equals(Interact.Actions.Type.TELEPORT_TO_LOCATION)){ public void save(){ if(global == null) global = NPCLib.getInstance().getGlobalNPC(plugin, id); if(global == null || !global.isPersistent()) return; - checkFileExists(); - if(config == null) config = YamlConfiguration.loadConfiguration(file); - // - if(config.contains("disableSaving") && config.getBoolean("disableSaving")) return; - config.options().setHeader(Arrays.asList("Persistent Global NPC " + global.getCode())); - config.set("location", global.getLocation()); - config.set("visibility.type", global.getVisibility().name()); - config.set("visibility.requirement", global.getVisibilityRequirement() != null && global.getCustomDataKeys().contains("visibilityrequirementpermission") ? global.getCustomData("visibilityrequirementpermission") : null); - if(global.getVisibility().equals(Visibility.SELECTED_PLAYERS)) config.set("visibility.selectedPlayers", global.selectedPlayers); - else config.set("visibility.selectedPlayers", null); - config.set("skin.player", global.getSkin().playerName); - if(!config.contains("skin.custom")){ - config.set("skin.custom.enabled", false); - config.set("skin.custom.texture", ""); - config.set("skin.custom.signature", ""); - } - config.setComments("skin.custom.enabled", Arrays.asList("If you want to use a custom texture, set enabled as true, if not, it will use the player name skin.", "To easily get texture and signature use '/npclib getskininfo (playerName)' or https://mineskin.org/")); - config.set("skin.ownPlayer", global.isOwnPlayerSkin()); - Arrays.stream(Skin.Part.values()).forEach(x-> config.set("skin.parts." + x.name().toLowerCase(), global.getSkinParts().isVisible(x))); - config.set("customData", null); - for(String keys : global.getCustomDataKeys()) config.set("customData." + keys, global.getCustomData(keys)); - List lines = global.getText(); - if(lines != null && lines.size() > 0){ - List coloredLines = new ArrayList<>(); - lines.forEach(x-> coloredLines.add(x.replaceAll("§", "&"))); - config.set("hologram.text", coloredLines); - } else config.set("hologram.text", lines); - config.set("hologram.lineSpacing", global.getLineSpacing()); - config.set("hologram.textOpacity", global.getTextOpacity().name()); - config.set("hologram.linesOpacity", null); - for(Integer line : global.getLinesOpacity().keySet()) config.set("hologram.linesOpacity." + line, global.getLineOpacity(line).name()); - config.set("hologram.alignment", global.getTextAlignment()); - config.set("gazeTracking.type", global.getGazeTrackingType().name()); - config.set("pose", global.getPose().name()); - config.set("collidable", global.isCollidable()); - config.set("distance.hide", global.getHideDistance()); - config.set("glow.enabled", global.isGlowing()); - config.set("glow.color", global.getGlowingColor().name()); - config.set("tabList.show", global.isShowOnTabList()); - config.set("tabList.name", global.getCustomTabListName().replaceAll("§", "&")); - config.set("move.speed", global.getMoveSpeed()); - Arrays.stream(Slot.values()).forEach(x-> config.set("slots." + x.name().toLowerCase(), global.getSlots().get(x))); - config.set("onFire", global.isOnFire()); - config.set("interact.cooldown", global.getInteractCooldown()); - config.set("interact.actions", null); - int clickActionID = 0; - for(Interact.ClickAction clickAction : global.getClickActions()){ - if(clickAction.getActionType().equals(Interact.Actions.Type.CUSTOM_ACTION)) continue; - clickActionID++; - config.set("interact.actions." + clickActionID + ".type", clickAction.actionType.name()); - config.set("interact.actions." + clickActionID + ".click", clickAction.clickType.name()); - if(clickAction instanceof Interact.Actions.Message){ - Interact.Actions.Message castAction = (Interact.Actions.Message) clickAction; - String[] messages = new String[castAction.getMessages().length]; - for(int i = 0; i < castAction.getMessages().length; i++) messages[i] = castAction.getMessages()[i].replaceAll("§", "&"); - config.set("interact.actions." + clickActionID + ".messages", messages); - } - else if(clickAction instanceof Interact.Actions.ActionBar){ - Interact.Actions.ActionBar castAction = (Interact.Actions.ActionBar) clickAction; - config.set("interact.actions." + clickActionID + ".message", castAction.getMessage().replaceAll("§", "&")); - } - else if(clickAction instanceof Interact.Actions.BungeeServer){ - Interact.Actions.BungeeServer castAction = (Interact.Actions.BungeeServer) clickAction; - config.set("interact.actions." + clickActionID + ".server", castAction.getServer()); - } - else if(clickAction instanceof Interact.Actions.ConsoleCommand){ - Interact.Actions.ConsoleCommand castAction = (Interact.Actions.ConsoleCommand) clickAction; - config.set("interact.actions." + clickActionID + ".command", castAction.getCommand()); - } - else if(clickAction instanceof Interact.Actions.PlayerCommand){ - Interact.Actions.PlayerCommand castAction = (Interact.Actions.PlayerCommand) clickAction; - config.set("interact.actions." + clickActionID + ".command", castAction.getCommand()); + try{ + checkFileExists(); + if(config == null) config = YamlConfiguration.loadConfiguration(file); + // + if(config.contains("disableSaving") && config.getBoolean("disableSaving")) return; + NMSFileConfiguration.setHeader(config, Arrays.asList("Persistent Global NPC " + global.getCode())); + config.set("location", global.getLocation()); + config.set("visibility.type", global.getVisibility().name()); + config.set("visibility.requirement", global.getVisibilityRequirement() != null && global.getCustomDataKeys().contains("visibilityrequirementpermission") ? global.getCustomData("visibilityrequirementpermission") : null); + if(global.getVisibility().equals(Visibility.SELECTED_PLAYERS)) config.set("visibility.selectedPlayers", global.selectedPlayers); + else config.set("visibility.selectedPlayers", null); + config.set("skin.player", global.getSkin().getType().equals(Skin.Type.MINECRAFT) ? ((Skin.Minecraft) global.getSkin()).getPlayerName() : null); + config.set("skin.mineskin", global.getSkin().getType().equals(Skin.Type.MINESKIN) ? ((Skin.MineSkin) global.getSkin()).getMineSkinURL() : null); + if(!config.contains("skin.custom")){ + config.set("skin.custom.enabled", false); + config.set("skin.custom.texture", ""); + config.set("skin.custom.signature", ""); + config.set("skin.custom.name", ""); } - else if(clickAction instanceof Interact.Actions.Title){ - Interact.Actions.Title castAction = (Interact.Actions.Title) clickAction; - config.set("interact.actions." + clickActionID + ".title", castAction.getTitle().replaceAll("§", "&")); - config.set("interact.actions." + clickActionID + ".subtitle", castAction.getSubtitle().replaceAll("§", "&")); - config.set("interact.actions." + clickActionID + ".fadeIn", castAction.getFadeIn()); - config.set("interact.actions." + clickActionID + ".stay", castAction.getStay()); - config.set("interact.actions." + clickActionID + ".fadeOut", castAction.getFadeOut()); + if(global.getSkin().getType().equals(Skin.Type.CUSTOM)){ + config.set("skin.custom.enabled", true); + config.set("skin.custom.texture", global.getSkin().getTexture()); + config.set("skin.custom.signature", global.getSkin().getSignature()); + config.set("skin.custom.name", ((NPC.Skin.Custom) global.getSkin()).getSkinName()); } - else if(clickAction instanceof Interact.Actions.TeleportToLocation){ - Interact.Actions.TeleportToLocation castAction = (Interact.Actions.TeleportToLocation) clickAction; - config.set("interact.actions." + clickActionID + ".location", castAction.getLocation()); + else config.set("skin.custom.enabled", false); + NMSFileConfiguration.setComments(config, "skin.custom.enabled", Arrays.asList("If you want to use a custom texture, set enabled as true, if not, it will use the player name skin.", "To easily get texture and signature use '/npclib getskininfo (type) (name)' or https://mineskin.org/")); + config.set("skin.ownPlayer", global.isOwnPlayerSkin()); + Arrays.stream(Skin.Part.values()).forEach(x-> config.set("skin.parts." + x.name().toLowerCase(), global.getSkinParts().isVisible(x))); + config.set("customData", null); + for(String keys : global.getCustomDataKeys()) config.set("customData." + keys, global.getCustomData(keys)); + List lines = global.getText(); + if(lines != null && lines.size() > 0){ + List coloredLines = new ArrayList<>(); + lines.forEach(x-> coloredLines.add(x.replaceAll("§", "&"))); + config.set("hologram.text", coloredLines); + } else config.set("hologram.text", lines); + config.set("hologram.lineSpacing", global.getLineSpacing()); + config.set("hologram.textOpacity", global.getTextOpacity().name()); + config.set("hologram.linesOpacity", null); + for(Integer line : global.getLinesOpacity().keySet()) config.set("hologram.linesOpacity." + line, global.getLineOpacity(line).name()); + config.set("hologram.alignment", global.getTextAlignment()); + config.set("gazeTracking.type", global.getGazeTrackingType().name()); + config.set("pose", global.getPose().name()); + config.set("collidable", global.isCollidable()); + config.set("distance.hide", global.getHideDistance()); + config.set("glow.enabled", global.isGlowing()); + config.set("glow.color", global.getGlowingColor().name()); + config.set("tabList.show", global.isShowOnTabList()); + config.set("tabList.name", global.getCustomTabListName().replaceAll("§", "&")); + config.set("move.speed", global.getMoveSpeed()); + Arrays.stream(Slot.values()).forEach(x-> config.set("slots." + x.name().toLowerCase(), global.getSlots().get(x))); + config.set("onFire", global.isOnFire()); + config.set("interact.cooldown", global.getInteractCooldown()); + config.set("interact.actions", null); + int clickActionID = 0; + for(Interact.ClickAction clickAction : global.getClickActions()){ + if(clickAction.getActionType().equals(Interact.Actions.Type.CUSTOM_ACTION)) continue; + clickActionID++; + config.set("interact.actions." + clickActionID + ".type", clickAction.actionType.name()); + config.set("interact.actions." + clickActionID + ".click", clickAction.clickType.name()); + config.set("interact.actions." + clickActionID + ".enabled", clickAction.isEnabled()); + config.set("interact.actions." + clickActionID + ".delayTicks", clickAction.delayTicks); + config.set("interact.actions." + clickActionID + ".cooldownMilliseconds", clickAction.cooldownMilliseconds); + if(clickAction instanceof Interact.Actions.Player.SendChatMessage){ + Interact.Actions.Player.SendChatMessage castAction = (Interact.Actions.Player.SendChatMessage) clickAction; + String[] messages = new String[castAction.getMessages().length]; + for(int i = 0; i < castAction.getMessages().length; i++) messages[i] = castAction.getMessages()[i].replaceAll("§", "&"); + config.set("interact.actions." + clickActionID + ".messages", messages); + } + else if(clickAction instanceof Interact.Actions.Player.SendActionBarMessage){ + Interact.Actions.Player.SendActionBarMessage castAction = (Interact.Actions.Player.SendActionBarMessage) clickAction; + config.set("interact.actions." + clickActionID + ".message", castAction.getMessage().replaceAll("§", "&")); + } + else if(clickAction instanceof Interact.Actions.Player.ConnectBungeeServer){ + Interact.Actions.Player.ConnectBungeeServer castAction = (Interact.Actions.Player.ConnectBungeeServer) clickAction; + config.set("interact.actions." + clickActionID + ".server", castAction.getServer()); + } + else if(clickAction instanceof Interact.Actions.Console.PerformCommand){ + Interact.Actions.Console.PerformCommand castAction = (Interact.Actions.Console.PerformCommand) clickAction; + config.set("interact.actions." + clickActionID + ".command", castAction.getCommand()); + } + else if(clickAction instanceof Interact.Actions.Player.PerformCommand){ + Interact.Actions.Player.PerformCommand castAction = (Interact.Actions.Player.PerformCommand) clickAction; + config.set("interact.actions." + clickActionID + ".command", castAction.getCommand()); + } + else if(clickAction instanceof Interact.Actions.Player.SendTitleMessage){ + Interact.Actions.Player.SendTitleMessage castAction = (Interact.Actions.Player.SendTitleMessage) clickAction; + config.set("interact.actions." + clickActionID + ".title", castAction.getTitle().replaceAll("§", "&")); + config.set("interact.actions." + clickActionID + ".subtitle", castAction.getSubtitle().replaceAll("§", "&")); + config.set("interact.actions." + clickActionID + ".fadeIn", castAction.getFadeIn()); + config.set("interact.actions." + clickActionID + ".stay", castAction.getStay()); + config.set("interact.actions." + clickActionID + ".fadeOut", castAction.getFadeOut()); + } + else if(clickAction instanceof Interact.Actions.Player.TeleportToLocation){ + Interact.Actions.Player.TeleportToLocation castAction = (Interact.Actions.Player.TeleportToLocation) clickAction; + config.set("interact.actions." + clickActionID + ".location", castAction.getLocation()); + } + else if(clickAction instanceof Interact.Actions.Player.GiveItem){ + Interact.Actions.Player.GiveItem castAction = (Interact.Actions.Player.GiveItem) clickAction; + config.set("interact.actions." + clickActionID + ".item", castAction.getItemStack()); + } + else if(clickAction instanceof Interact.Actions.Player.GiveKit){ + Interact.Actions.Player.GiveKit castAction = (Interact.Actions.Player.GiveKit) clickAction; + config.set("interact.actions." + clickActionID + ".kit", castAction.getKit()); + } + else if(clickAction instanceof Interact.Actions.SetCustomData){ + Interact.Actions.SetCustomData castAction = (Interact.Actions.SetCustomData) clickAction; + config.set("interact.actions." + clickActionID + ".key", castAction.getKey()); + config.set("interact.actions." + clickActionID + ".value", castAction.getValue()); + config.set("interact.actions." + clickActionID + ".checkIfSame", castAction.isCheckIfSame()); + } + else if(clickAction instanceof Interact.Actions.Player.OpenBook){ + Interact.Actions.Player.OpenBook castAction = (Interact.Actions.Player.OpenBook) clickAction; + config.set("interact.actions." + clickActionID + ".book", castAction.getBook()); + } + else if(clickAction instanceof Interact.Actions.PlayAnimation){ + Interact.Actions.PlayAnimation castAction = (Interact.Actions.PlayAnimation) clickAction; + config.set("interact.actions." + clickActionID + ".animation", castAction.getAnimation().name()); + } + for(int i = 0; i < clickAction.getConditions().size(); i++){ + config.set("interact.actions." + clickActionID + ".condition." + (i+1), clickAction.getConditions().get(i)); + } } + if(!config.contains("disableSaving")) config.set("disableSaving", false); + config.save(file); + this.lastUpdate.save(); + PlayerNPCPlugin.sendConsoleMessage("§7Persistent Global NPC §a" + global.getCode() + " §7has been saved."); + } + catch (Exception e){ + e.printStackTrace(); + PlayerNPCPlugin.sendConsoleMessage("§7There was an error while saving Persistent Global NPC §c" + global.getCode() ); } - if(!config.contains("disableSaving")) config.set("disableSaving", false); - try{ config.save(file); } catch (Exception ignored){} - this.lastUpdate.save(); - PlayerNPCPlugin.sendConsoleMessage("§7Persistent Global NPC §a" + global.getCode() + " §7has been saved."); } private void checkFileExists(){ @@ -2049,7 +2209,7 @@ private void checkFileExists(){ if(!exist) try{ file.createNewFile();} catch (Exception e){}; } - public void remove(){ + protected void remove(){ config = null; if(file.exists()) file.delete(); File folder = new File(getFolderPath()); @@ -2064,11 +2224,15 @@ public void setDisableSaving(boolean b){ try { config.save(file); } catch (Exception ignored) {} } - public String getFilePath(){ + public boolean isDisableSaving(){ + return (boolean) get("disableSaving"); + } + + protected String getFilePath(){ return getFolderPath() + "/data.yml"; } - public String getFolderPath(){ + protected String getFolderPath(){ return "plugins/PlayerNPC/persistent/global/" + plugin.getName().toLowerCase() + "/" + id; } @@ -2084,23 +2248,23 @@ public boolean isLoaded(){ return config != null; } - public Object get(String s){ - if(config.contains(s)){ + protected Object get(String s){ + if(config != null && config.contains(s)){ return config.get(s); } return null; } - public boolean containsKey(String s){ + protected boolean containsKey(String s){ if(config == null) return false; return config.contains(s); } - public FileConfiguration getConfig(){ + protected FileConfiguration getConfig(){ return this.config; } - public void set(String s, Object o){ + protected void set(String s, Object o){ if(config == null) return; config.set(s, o); } @@ -2357,68 +2521,113 @@ public static Animation getAnimation(int id){ } - public static class Skin { + public static abstract class Skin { - protected static final Skin STEVE; - protected static final Skin ALEX; - protected static final HashMap SKIN_CACHE; - protected static final List LOCAL_SKIN_NAMES; + protected static net.md_5.bungee.api.ChatColor[][] UNKNOWN_AVATAR; + protected static net.md_5.bungee.api.ChatColor MOST_COMMON_COLOR_UNKNOWN_AVATAR; static{ - SKIN_CACHE = new HashMap<>(); - STEVE = new Skin( - "ewogICJ0aW1lc3RhbXAiIDogMTY1NjUzMDcyOTgyNiwKICAicHJvZmlsZUlkIiA6ICJjMDZmODkwNjRjOGE0OTExOWMyOWVhMWRiZDFhYWI4MiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNSEZfU3RldmUiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWE0YWY3MTg0NTVkNGFhYjUyOGU3YTYxZjg2ZmEyNWU2YTM2OWQxNzY4ZGNiMTNmN2RmMzE5YTcxM2ViODEwYiIKICAgIH0KICB9Cn0=", - "D5KDlE7KmMYeo+n0bY7kRjxdoZ8ondpgLC0tVcDW/wER9tRAWGlkaUyC4cUjkiYtMFANOxnPNz42iWg+gKAX/qE3lKoJpFw8LmgC587QpEDZTsIwzrIriDDiUc+RQ83VNzy9lkrzm+/llFhuPmONhWIeoVgXQYnJXFXOjTA3uiqHq6IJR4fZzD+0lSpr8jm0X1B+XAiAV7xbzMjg2woC3ur7+81Ub27MNGdAmI5eh50rqqjIHx+kRHJPPB3klbAdkTkcnF2rhDuP9jLtJbb17L+40yR8MH3G1AsRBg+N9MlGb4qF3fK9m2lDNxrGpVe+5fj4ffHnTJ680X9O8cnGxtHFyHm3I65iIhVgFY/DQQ6XSxLgPrmdyVOV98OATc7g2/fFpiI6aRzFrXvCLzXcBzmcayhv8BgG8yBlHdYmMZScjslLKjgWB9mgtOh5ZFFb3ZRkwPvdKUqCQHDPovo9K3LwyAtg9QwJ7u+HN03tpDWllXIjT3mKrtsfWMorNNQ5Bh1St0If4Dg00tpW/DUwNs+oua0PhN/DbFEe3aog2jVfzy3IAXqW2cqiZlnRSm55vMrr1CI45PgjP2LS1c9OYJJ3k+ov4IdvBpDTiG9PfsPWcwtqm8ujxy/TqIWfSajL/RP+TFDoN/F8j8HhHU8wwA9JXJekmvUExEOxPWwisLA="); - STEVE.playerName = "MHF_Steve"; - STEVE.playerUUID = "c06f89064c8a49119c29ea1dbd1aab82"; - STEVE.obtainedFrom = ObtainedFrom.MINECRAFT_ORIGINAL; - SKIN_CACHE.put(STEVE.playerName.toLowerCase(), STEVE); - // - ALEX = new Skin( - "ewogICJ0aW1lc3RhbXAiIDogMTY1NjU3Nzg5MTQ2NywKICAicHJvZmlsZUlkIiA6ICI2YWI0MzE3ODg5ZmQ0OTA1OTdmNjBmNjdkOWQ3NmZkOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJNSEZfQWxleCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84M2NlZTVjYTZhZmNkYjE3MTI4NWFhMDBlODA0OWMyOTdiMmRiZWJhMGVmYjhmZjk3MGE1Njc3YTFiNjQ0MDMyIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=", - "d2dYqFQpP2ZjeUROSm23WTdWhWnuaW68v8Biw4towx04vJMRls95W/gmIFGa2Tq171yXHlE8kpP2KFe3jAC7qukkXjDiXSRdCSOYZPA7N91Uw6amyt7x5IKZ90QK8BxE1mCjV7KJNGZ28u8klbf1QUOB4fE27gEfQYGyEcSrkPa4e/QzmOGYbnyiIt36np/qBtWHf87brRdVeKRNfO/ExCJkKbwpKfyGf06luCAfUW9wuHkFURux9naU+ilk2ZHUsPVBdkmfOXZrdxxdpDE19W5VkFryMbtVP5XNEBVC7SAsllHXrf8nskgk+m57bCPMP6RF8k+h+mXIJMuQd7yd7azOAnyLlOoufyY1hs1Po+EGDOSQUUHQKTi7AEYp2C71DpkqpGuPCbL/DkxchblYW5iuIek+BmO3wXbmBPv+0gWkiP/c1n605X0g+h4oO5yQqyI8Fki9F2Hb8T5QeHmC3+yzVVf7gOQ6MB7bBt+uX9wcl5yYBDHbmYGZtbNko7dq584FZKRRWeVhxdcDUXfdfzKmNR73BUIEqzeyOh2hUrk47VHK5d5FajKzgi9j5U8D0EJKjVMPZiulcF0J/ZQ4EOxUkOTNPuphiu43j1C7NXZ4RaPFrSrg7QMsObitqLUP5Pmq15Edg7vpvYME8Fe5Ia8sXLbNDHd3AWuXnfpeAUE="); - ALEX.playerName = "MHF_Alex"; - ALEX.playerUUID = "6ab4317889fd490597f60f67d9d76fd9"; - ALEX.obtainedFrom = ObtainedFrom.MINECRAFT_ORIGINAL; - SKIN_CACHE.put(ALEX.playerName.toLowerCase(), ALEX); - // - LOCAL_SKIN_NAMES = new ArrayList<>(); - Bukkit.getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), () ->{ - File folder = new File(getSkinsFolderPath()); - if(!folder.exists() || !folder.isDirectory()) return; - for (File skin : folder.listFiles()) { - if (!skin.isDirectory()) continue; - LOCAL_SKIN_NAMES.add(skin.getName()); + try{ + String path = "plugins/PlayerNPC/resources/avatar"; + File avatarFolder = new File(path); + avatarFolder.mkdirs(); + File unknownAvatarFile = new File(path + "/unknown.png"); + if(!unknownAvatarFile.exists()){ + BufferedImage image = ImageIO.read(NPC.class.getResource("/resources/avatar/unknown.png")); + unknownAvatarFile.createNewFile(); + ImageIO.write(image, "png", unknownAvatarFile); } - }); + AvatarLoadData avatarData = loadAvatarPixels(unknownAvatarFile); + if(avatarData.success){ + UNKNOWN_AVATAR = avatarData.avatarData; + MOST_COMMON_COLOR_UNKNOWN_AVATAR = avatarData.mostCommonColor; + } + } + catch (Exception e) { NPCLib.printError(e); } } - private String texture; - private String signature; - private String textureID; - private String playerName; - private String playerUUID; - private net.md_5.bungee.api.ChatColor[][] avatar; - private net.md_5.bungee.api.ChatColor mostCommonColor; - private ObtainedFrom obtainedFrom; - private String lastUpdate; - - protected Skin(String texture, String signature){ - this.texture = texture; - this.signature = signature; - this.textureID = null; - this.playerName = null; - this.playerUUID = null; + protected Type type; + protected Texture texture; + protected String lastUpdate; + protected net.md_5.bungee.api.ChatColor[][] avatar; + protected net.md_5.bungee.api.ChatColor mostCommonColor; + + protected Skin(@Nonnull String texture, @Nonnull String signature){ + String textureID = getTextureID(texture); + Validate.notNull(textureID, "This texture is not valid"); + Validate.isTrue(signature.length() == 684, "This signature is not valid"); + this.texture = new Texture(texture, signature, textureID); this.avatar = null; this.mostCommonColor = null; - this.obtainedFrom = ObtainedFrom.NONE; resetLastUpdate(); } - protected Skin(String[] data){ + protected Skin(@Nonnull String[] data){ this(data[0], data[1]); } + protected record Texture(String value, String signature, String textureID){} + + protected abstract void save() throws IOException; + + protected abstract void delete(); + + protected abstract File getAvatarFile(); + + protected abstract File getTextureFile(); + + protected abstract File getDataFile(); + + protected abstract String getSkinFolderPath(); + + protected boolean needsToUpdate(Plugin plugin){ + return needsToUpdate(this.lastUpdate, plugin); + } + + protected static boolean needsToUpdate(String lastUpdate, Plugin plugin){ + NPCLib.SkinUpdateFrequency frequency = NPCLib.getInstance().getPluginManager(plugin).getSkinUpdateFrequency(); + return TimerUtils.getBetweenDatesString(lastUpdate, TimerUtils.getCurrentDate(), TimerUtils.DATE_FORMAT_LARGE, frequency.timeUnit()) > frequency.value(); + } + + protected void loadAvatar() { + if(!getAvatarFile().exists()) downloadImages(); + try { + AvatarLoadData avatarLoadData = Skin.loadAvatarPixels(getAvatarFile()); + if (avatarLoadData.success) { + this.avatar = avatarLoadData.avatarData; + this.mostCommonColor = avatarLoadData.mostCommonColor; + } + } catch (Exception e) { NPCLib.printError(e); } + } + + protected void downloadImages(){ + if(getTextureFile().exists() && getAvatarFile().exists()) return; + try{ + URL url = new URL(getTextureURL()); + BufferedImage bufferedImage = ImageIO.read(url); + getTextureFile().mkdirs(); + ImageIO.write(bufferedImage, "png", getTextureFile()); + // + BufferedImage bufferedImage2 = bufferedImage.getSubimage(8, 8, 8, 8); + BufferedImage bufferedImage3 = bufferedImage.getSubimage(40, 8, 8, 8); + + BufferedImage avatarResult = new BufferedImage(8, 8, BufferedImage.TYPE_INT_ARGB); + + Graphics g = avatarResult.getGraphics(); + g.drawImage(bufferedImage2, 0, 0, null); + g.drawImage(bufferedImage3, 0, 0, null); + + getAvatarFile().mkdirs(); + ImageIO.write(avatarResult, "png", getAvatarFile()); + } + catch (Exception e){ NPCLib.printError(e); } + } + + public net.md_5.bungee.api.ChatColor[][] getAvatar() { + if(avatar == null) loadAvatar(); + return avatar; + } + public void applyNPC(NPC npc){ applyNPC(npc, false); } @@ -2428,6 +2637,10 @@ public void applyNPC(NPC npc, boolean forceUpdate){ if(forceUpdate) npc.forceUpdate(); } + public net.md_5.bungee.api.ChatColor getMostCommonColor() { + return mostCommonColor; + } + public void applyNPCs(Collection npcs){ applyNPCs(npcs, false); } @@ -2437,399 +2650,815 @@ public void applyNPCs(Collection npcs, boolean forceUpdate){ } public String getTexture() { - return texture; + return texture.value(); } public String getSignature() { - return signature; - } - - public String getPlayerName() { - return playerName; - } - - public String getPlayerUUID() { - return playerUUID; - } - - public ObtainedFrom getObtainedFrom() { - return obtainedFrom; + return texture.signature(); } public String getLastUpdate() { return lastUpdate; } - public boolean canBeDeleted() { - return !isMinecraftOriginal(); + public String getTextureID() { + return texture.textureID(); } - public boolean canBeUpdated() { return !isMinecraftOriginal(); } - - public boolean isMinecraftOriginal() { - return obtainedFrom.equals(ObtainedFrom.MINECRAFT_ORIGINAL); + public Type getType(){ + return type; } - public Type getType(){ - return playerName != null ? Type.PLAYER_SKIN : Type.CUSTOM_TEXTURE; + protected String getTextureURL(){ + return "http://textures.minecraft.net/texture/" + getTextureID(); } - private void resetLastUpdate(){ + protected void resetLastUpdate(){ this.lastUpdate = TimerUtils.getCurrentDate(); } - private File getAvatarFile(){ - return getAvatarFile(this.playerName); + public enum Type{ + MINECRAFT, CUSTOM, MINESKIN; } - private File getTextureFile(){ - return getTextureFile(this.playerName); - } + public String[] getTextureData() { return new String[]{texture.value(), texture.signature()}; } - private File getDataFile(){ - return getDataFile(this.playerName); + private static String getSkinsFolderPath(Type type){ + return "plugins/PlayerNPC/skins/" + type.name().toLowerCase() + "/"; } - private String getSkinFolderPath(){ - return getSkinFolderPath(this.playerName); + public static net.md_5.bungee.api.ChatColor[][] getUnknownAvatar() { + return UNKNOWN_AVATAR; } - private static File getAvatarFile(String playerName){ - return new File(getSkinFolderPath(playerName) + "/avatar.png"); + public static net.md_5.bungee.api.ChatColor getMostCommonColorUnknownAvatar() { + return MOST_COMMON_COLOR_UNKNOWN_AVATAR; } - private static File getTextureFile(String playerName){ - return new File(getSkinFolderPath(playerName) + "/texture.png"); + protected static AvatarLoadData loadAvatarPixels(URL url) throws IOException { + return loadAvatarPixels(ImageIO.read(url)); } - private static File getDataFile(String playerName){ - return new File(getSkinFolderPath(playerName) + "/data.yml"); + protected static AvatarLoadData loadAvatarPixels(File file) throws IOException { + return loadAvatarPixels(ImageIO.read(file)); } - private static String getSkinFolderPath(String playerName){ - return getSkinsFolderPath() + playerName.toLowerCase(); + protected static AvatarLoadData loadAvatarPixels(BufferedImage bufferedImage){ + net.md_5.bungee.api.ChatColor[][] avatarData = new net.md_5.bungee.api.ChatColor[8][8]; + Map m = new HashMap(); + boolean loaded = false; + for(int y = 0; y < 8; y++) { + for (int x = 0; x < 8; x++) { + int color = bufferedImage.getRGB(x, y); + int[] rgb = ColorUtils.getRGB(color); + if(rgb[0] > 0 && rgb[1] > 0 && rgb[2] > 0) loaded = true; + avatarData[x][y] = net.md_5.bungee.api.ChatColor.of(ColorUtils.getColorFromRGB(rgb)); + if (!ColorUtils.isGray(rgb)) { + Integer counter = (Integer) m.get(color); + if (counter == null) + counter = 0; + counter++; + m.put(color, counter); + } + } + } + java.awt.Color mostCommon = ColorUtils.getMostCommonColour(m); + net.md_5.bungee.api.ChatColor mostCommonColor = null; + if(mostCommon != null) mostCommonColor = net.md_5.bungee.api.ChatColor.of(mostCommon); + return new AvatarLoadData(loaded, mostCommonColor, avatarData); } - private static String getSkinsFolderPath(){ - return "plugins/PlayerNPC/persistent/skins/"; - } + protected static record AvatarLoadData (boolean success, net.md_5.bungee.api.ChatColor mostCommonColor, net.md_5.bungee.api.ChatColor[][] avatarData){} - public enum Type{ - PLAYER_SKIN, CUSTOM_TEXTURE; + @Nullable + protected static String getTextureID(String texture){ + byte[] decodedBytes = Base64.getDecoder().decode(texture); + String decodedTexture = new String(decodedBytes); + JsonObject textureJSON = new JsonParser().parse(decodedTexture).getAsJsonObject(); + JsonObject textureElement = textureJSON.get("textures").getAsJsonObject(); + String textureURL = textureElement.get("SKIN").getAsJsonObject().get("url").getAsString(); + if(textureURL != null){ + String textureID = textureURL.replaceFirst("http://textures.minecraft.net/texture/", ""); + return textureID; + } + return null; } - public enum ObtainedFrom{ - MOJANG_API("§aMojang API"), - GAME_PROFILE("§aGame Profile"), - MINECRAFT_ORIGINAL("§aMinecraft"), - NONE("§cUnknown"), - ; + public static class Minecraft extends Skin{ + + protected static final Skin.Minecraft STEVE; + protected static final Skin.Minecraft ALEX; - private String title; + protected static final HashMap SKIN_CACHE; + protected static final List LOCAL_SKIN_NAMES; - ObtainedFrom(String title){ - this.title = title; + static{ + SKIN_CACHE = new HashMap<>(); + STEVE = new Skin.Minecraft( + "ewogICJ0aW1lc3RhbXAiIDogMTY1NjUzMDcyOTgyNiwKICAicHJvZmlsZUlkIiA6ICJjMDZmODkwNjRjOGE0OTExOWMyOWVhMWRiZDFhYWI4MiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNSEZfU3RldmUiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWE0YWY3MTg0NTVkNGFhYjUyOGU3YTYxZjg2ZmEyNWU2YTM2OWQxNzY4ZGNiMTNmN2RmMzE5YTcxM2ViODEwYiIKICAgIH0KICB9Cn0=", + "D5KDlE7KmMYeo+n0bY7kRjxdoZ8ondpgLC0tVcDW/wER9tRAWGlkaUyC4cUjkiYtMFANOxnPNz42iWg+gKAX/qE3lKoJpFw8LmgC587QpEDZTsIwzrIriDDiUc+RQ83VNzy9lkrzm+/llFhuPmONhWIeoVgXQYnJXFXOjTA3uiqHq6IJR4fZzD+0lSpr8jm0X1B+XAiAV7xbzMjg2woC3ur7+81Ub27MNGdAmI5eh50rqqjIHx+kRHJPPB3klbAdkTkcnF2rhDuP9jLtJbb17L+40yR8MH3G1AsRBg+N9MlGb4qF3fK9m2lDNxrGpVe+5fj4ffHnTJ680X9O8cnGxtHFyHm3I65iIhVgFY/DQQ6XSxLgPrmdyVOV98OATc7g2/fFpiI6aRzFrXvCLzXcBzmcayhv8BgG8yBlHdYmMZScjslLKjgWB9mgtOh5ZFFb3ZRkwPvdKUqCQHDPovo9K3LwyAtg9QwJ7u+HN03tpDWllXIjT3mKrtsfWMorNNQ5Bh1St0If4Dg00tpW/DUwNs+oua0PhN/DbFEe3aog2jVfzy3IAXqW2cqiZlnRSm55vMrr1CI45PgjP2LS1c9OYJJ3k+ov4IdvBpDTiG9PfsPWcwtqm8ujxy/TqIWfSajL/RP+TFDoN/F8j8HhHU8wwA9JXJekmvUExEOxPWwisLA="); + STEVE.playerName = "MHF_Steve"; + STEVE.playerUUID = "c06f89064c8a49119c29ea1dbd1aab82"; + STEVE.obtainedFrom = ObtainedFrom.MINECRAFT_ORIGINAL; + SKIN_CACHE.put(STEVE.playerName.toLowerCase(), STEVE); + // + ALEX = new Skin.Minecraft( + "ewogICJ0aW1lc3RhbXAiIDogMTY1NjU3Nzg5MTQ2NywKICAicHJvZmlsZUlkIiA6ICI2YWI0MzE3ODg5ZmQ0OTA1OTdmNjBmNjdkOWQ3NmZkOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJNSEZfQWxleCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84M2NlZTVjYTZhZmNkYjE3MTI4NWFhMDBlODA0OWMyOTdiMmRiZWJhMGVmYjhmZjk3MGE1Njc3YTFiNjQ0MDMyIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=", + "d2dYqFQpP2ZjeUROSm23WTdWhWnuaW68v8Biw4towx04vJMRls95W/gmIFGa2Tq171yXHlE8kpP2KFe3jAC7qukkXjDiXSRdCSOYZPA7N91Uw6amyt7x5IKZ90QK8BxE1mCjV7KJNGZ28u8klbf1QUOB4fE27gEfQYGyEcSrkPa4e/QzmOGYbnyiIt36np/qBtWHf87brRdVeKRNfO/ExCJkKbwpKfyGf06luCAfUW9wuHkFURux9naU+ilk2ZHUsPVBdkmfOXZrdxxdpDE19W5VkFryMbtVP5XNEBVC7SAsllHXrf8nskgk+m57bCPMP6RF8k+h+mXIJMuQd7yd7azOAnyLlOoufyY1hs1Po+EGDOSQUUHQKTi7AEYp2C71DpkqpGuPCbL/DkxchblYW5iuIek+BmO3wXbmBPv+0gWkiP/c1n605X0g+h4oO5yQqyI8Fki9F2Hb8T5QeHmC3+yzVVf7gOQ6MB7bBt+uX9wcl5yYBDHbmYGZtbNko7dq584FZKRRWeVhxdcDUXfdfzKmNR73BUIEqzeyOh2hUrk47VHK5d5FajKzgi9j5U8D0EJKjVMPZiulcF0J/ZQ4EOxUkOTNPuphiu43j1C7NXZ4RaPFrSrg7QMsObitqLUP5Pmq15Edg7vpvYME8Fe5Ia8sXLbNDHd3AWuXnfpeAUE="); + ALEX.playerName = "MHF_Alex"; + ALEX.playerUUID = "6ab4317889fd490597f60f67d9d76fd9"; + ALEX.obtainedFrom = ObtainedFrom.MINECRAFT_ORIGINAL; + SKIN_CACHE.put(ALEX.playerName.toLowerCase(), ALEX); + // + LOCAL_SKIN_NAMES = new ArrayList<>(); + Bukkit.getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), () ->{ + File folder = new File(getSkinsFolderPath(Type.MINECRAFT)); + if(!folder.exists() || !folder.isDirectory()) return; + for (File skin : folder.listFiles()) { + if (!skin.isDirectory()) continue; + LOCAL_SKIN_NAMES.add(skin.getName()); + } + }); } - public String getTitle() { - return title; + protected String playerName; + protected String playerUUID; + protected ObtainedFrom obtainedFrom; + + protected Minecraft(String texture, String signature) { + super(texture, signature); + this.type = Type.MINECRAFT; + this.playerName = null; + this.playerUUID = null; + this.obtainedFrom = ObtainedFrom.NONE; } - } - public net.md_5.bungee.api.ChatColor getMostCommonColor() { - return mostCommonColor; - } + protected Minecraft(String[] data) { + this(data[0], data[1]); + } - protected void loadAvatar(){ - if(playerName == null) return; - if(!getAvatarFile().exists()) downloadAvatar(true); - if(loadAvatarPixels()) return; - downloadAvatar(false); - loadAvatarPixels(); - } + public String getPlayerName() { + return playerName; + } - protected boolean loadAvatarPixels(){ - try{ - BufferedImage bufferedImage = ImageIO.read(getAvatarFile()); - net.md_5.bungee.api.ChatColor[][] avatarData = new net.md_5.bungee.api.ChatColor[8][8]; - Map m = new HashMap(); - boolean loaded = false; - for(int y = 0; y < 8; y++) { - for (int x = 0; x < 8; x++) { - int color = bufferedImage.getRGB(x, y); - int[] rgb = ColorUtils.getRGB(color); - if(rgb[0] > 0 && rgb[1] > 0 && rgb[2] > 0) loaded = true; - avatarData[x][y] = net.md_5.bungee.api.ChatColor.of(ColorUtils.getColorFromRGB(rgb)); - if (!ColorUtils.isGray(rgb)) { - Integer counter = (Integer) m.get(color); - if (counter == null) - counter = 0; - counter++; - m.put(color, counter); - } - } - } - this.avatar = avatarData; - java.awt.Color mostCommon = ColorUtils.getMostCommonColour(m); - if(mostCommon != null) this.mostCommonColor = net.md_5.bungee.api.ChatColor.of(mostCommon); - return loaded; + public String getPlayerUUID() { + return playerUUID; } - catch (Exception e){ - NPCLib.printError(e); - return false; + + public ObtainedFrom getObtainedFrom() { + return obtainedFrom; } - } - protected void downloadAvatar(boolean uuid){ - if(playerUUID == null || playerName == null) return; - try{ - URL url = new URL("https://minotar.net/helm/" + (uuid ? playerUUID : playerName) + "/8.png"); - BufferedImage bufferedImage = ImageIO.read(url); - getAvatarFile().mkdirs(); - ImageIO.write(bufferedImage, "png", getAvatarFile()); + public boolean canBeDeleted() { + return !isMinecraftOriginal(); } - catch (Exception e){ NPCLib.printError(e);; } - } - public net.md_5.bungee.api.ChatColor[][] getAvatar() { - if(avatar == null) loadAvatar(); - return avatar; - } + public boolean canBeUpdated() { return !isMinecraftOriginal(); } - public String[] getTextureData() { return new String[]{texture, signature}; } + public boolean isMinecraftOriginal() { + return obtainedFrom.equals(ObtainedFrom.MINECRAFT_ORIGINAL); + } - public String getTextureID() { - return textureID; - } + public NPC.Skin.Custom convertToCustomSkin(Plugin plugin, String skinName){ + return Custom.createCustomSkin(plugin, skinName, texture.value, texture.signature); + } - public static Skin createCustomTextureSkin(String texture, String value){ - return new Skin(texture, value); - } + public NPC.Skin.Custom convertToCustomSkin(Plugin plugin){ + return Custom.createCustomSkin(plugin,texture.value, texture.signature); + } - @Deprecated - public static void fetchSkinAsync(Player player, Consumer action){ - fetchSkinAsync(NPCLib.getInstance().getPlugin(), player.getName(), action); - } + @Override + protected File getAvatarFile(){ + return getAvatarFile(this.playerName); + } - @Deprecated - public static void fetchSkinAsync(String playerName, Consumer action){ - fetchSkinAsync(NPCLib.getInstance().getPlugin(), playerName, false, action); - } + @Override + protected File getTextureFile(){ + return getTextureFile(this.playerName); + } - @Deprecated - public static void fetchSkinAsync(String playerName, boolean forceDownload, Consumer action){ - fetchSkinAsync(NPCLib.getInstance().getPlugin(), playerName, forceDownload, action); - } + @Override + protected File getDataFile(){ + return getDataFile(this.playerName); + } - public static void fetchSkinAsync(Plugin plugin, Player player, Consumer action){ - fetchSkinAsync(plugin, player.getName(), action); - } + @Override + protected String getSkinFolderPath(){ + return getSkinFolderPath(this.playerName); + } - public static void fetchSkinAsync(Plugin plugin, String playerName, Consumer action){ - fetchSkinAsync(plugin, playerName, false, action); - } + private static File getAvatarFile(String playerName){ + return new File(getSkinFolderPath(playerName) + "/avatar.png"); + } - public static void fetchSkinAsync(Plugin plugin, String playerName, boolean forceDownload, Consumer action){ - final NPCLib.PluginManager pluginManager = NPCLib.getInstance().getPluginManager(plugin); - final String playerNameLowerCase = playerName.toLowerCase(); - final String possibleUUID = playerName.length() >= 32 ? playerName.replaceAll("-", "") : null; - plugin.getServer().getScheduler().runTaskAsynchronously(plugin, ()->{ - if(!forceDownload && possibleUUID == null){ - if(SKIN_CACHE.containsKey(playerNameLowerCase)) { - Skin skin = SKIN_CACHE.get(playerNameLowerCase); - NPCLib.SkinUpdateFrequency frequency = pluginManager.getSkinUpdateFrequency(); - if(TimerUtils.getBetweenDatesString(skin.getLastUpdate(), TimerUtils.getCurrentDate(), TimerUtils.DATE_FORMAT_LARGE, frequency.timeUnit()) < frequency.value()){ - action.accept(skin); - return; + private static File getTextureFile(String playerName){ + return new File(getSkinFolderPath(playerName) + "/texture.png"); + } + + private static File getDataFile(String playerName){ + return new File(getSkinFolderPath(playerName) + "/data.yml"); + } + + private static String getSkinFolderPath(String playerName){ + return getSkinsFolderPath(Type.MINECRAFT) + playerName.toLowerCase(); + } + + @Override + public void delete(){ + if(!canBeDeleted()) throw new IllegalStateException("This skin cannot be deleted."); + String playerNameLowerCase = playerName.toLowerCase(); + if(SKIN_CACHE.containsKey(playerNameLowerCase)) SKIN_CACHE.remove(playerNameLowerCase); + if(LOCAL_SKIN_NAMES.contains(playerNameLowerCase)) LOCAL_SKIN_NAMES.remove(playerNameLowerCase); + File folder = new File(getSkinFolderPath(playerNameLowerCase) + "/"); + if(!folder.exists()) return; + try { NMSFileUtils.deleteDirectory(folder); } catch (Exception e) { NPCLib.printError(e); } + } + + private static YamlConfiguration loadConfig(String playerName){ + File file = getDataFile(playerName); + boolean exist = file.exists(); + if(!exist) try{ file.createNewFile();} catch (Exception e){}; + YamlConfiguration config = YamlConfiguration.loadConfiguration(file); + return config; + } + + @Override + protected void save() throws IOException { + File file = getDataFile(); + boolean exist = file.exists(); + if(!exist) try{ file.createNewFile(); }catch (Exception e){} + YamlConfiguration config = YamlConfiguration.loadConfiguration(file); + config.set("player.name", this.playerName); + config.set("player.id", this.playerUUID); + config.set("texture.value", getTexture()); + config.set("texture.signature", getSignature()); + config.set("texture.id", getTextureID()); + NMSFileConfiguration.setComments(config, "texture.id", Arrays.asList("Minecraft texture: " + getTextureURL())); + config.set("obtainedFrom", this.obtainedFrom.name()); + super.resetLastUpdate(); + config.set("lastUpdate", this.lastUpdate); + config.save(file); + Bukkit.getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), () -> downloadImages()); + } + + public static void fetchSkinAsync(Plugin plugin, org.bukkit.entity.Player player, Consumer action){ + Skin.Minecraft.fetchSkinAsync(plugin, player.getName(), action); + } + + public static void fetchSkinAsync(Plugin plugin, String playerName, Consumer action){ + Skin.Minecraft.fetchSkinAsync(plugin, playerName, false, action); + } + + public static void fetchSkinAsync(Plugin plugin, String playerName, boolean forceDownload, Consumer action){ + final String playerNameLowerCase = playerName.toLowerCase(); + final String possibleUUID = playerName.length() >= 32 ? playerName.replaceAll("-", "") : null; + plugin.getServer().getScheduler().runTaskAsynchronously(plugin, ()->{ + if(!forceDownload && possibleUUID == null){ + if(SKIN_CACHE.containsKey(playerNameLowerCase)) { + Skin.Minecraft skin = SKIN_CACHE.get(playerNameLowerCase); + if(!skin.needsToUpdate(plugin)){ + action.accept(skin); + return; + } + else SKIN_CACHE.remove(playerNameLowerCase); } - else SKIN_CACHE.remove(playerNameLowerCase); - } - if(getDataFile(playerNameLowerCase).exists()){ - YamlConfiguration config = loadConfig(playerNameLowerCase); - String lastUpdate = config.getString("lastUpdate"); - NPCLib.SkinUpdateFrequency frequency = pluginManager.getSkinUpdateFrequency(); - if(TimerUtils.getBetweenDatesString(lastUpdate, TimerUtils.getCurrentDate(), TimerUtils.DATE_FORMAT_LARGE, frequency.timeUnit()) < frequency.value()){ - Skin skin = new Skin(config.getString("texture.value"), config.getString("texture.signature")); - skin.playerName = config.getString("player.name"); - skin.playerUUID = config.getString("player.id"); - skin.textureID = config.getString("texture.id"); - skin.obtainedFrom = ObtainedFrom.valueOf(config.getString("obtainedFrom")); - skin.lastUpdate = config.getString("lastUpdate"); - SKIN_CACHE.put(playerNameLowerCase, skin); - LOCAL_SKIN_NAMES.remove(playerName.toLowerCase()); - action.accept(skin); - return; + if(getDataFile(playerNameLowerCase).exists()){ + YamlConfiguration config = loadConfig(playerNameLowerCase); + String lastUpdate = config.getString("lastUpdate"); + if(!NPC.Skin.needsToUpdate(lastUpdate, plugin)){ + Skin.Minecraft skin = new Skin.Minecraft(config.getString("texture.value"), config.getString("texture.signature")); + skin.playerName = config.getString("player.name"); + skin.playerUUID = config.getString("player.id"); + skin.obtainedFrom = Minecraft.ObtainedFrom.valueOf(config.getString("obtainedFrom")); + skin.lastUpdate = lastUpdate; + SKIN_CACHE.put(playerNameLowerCase, skin); + LOCAL_SKIN_NAMES.remove(playerName.toLowerCase()); + action.accept(skin); + return; + } } } - } - Player player = possibleUUID == null ? Bukkit.getServer().getPlayerExact(playerName) : null; - if(Bukkit.getServer().getOnlineMode() && player != null){ - Skin skin = new Skin(getSkinGameProfile(player)); - skin.playerName = player.getName(); - skin.playerUUID = player.getUniqueId().toString().replaceAll("-", ""); - skin.obtainedFrom = ObtainedFrom.GAME_PROFILE; - try { skin.saveSkin(); } catch (IOException e) { NPCLib.printError(e); } - if(skin.getAvatarFile().exists()) skin.getAvatarFile().delete(); - SKIN_CACHE.put(playerNameLowerCase, skin); - action.accept(skin); - return; - } - else{ - try { - String uuid = possibleUUID == null ? getUUID(playerName) : possibleUUID; - HashMap data = getProfileMojangServer(uuid); - Skin skin = new Skin(data.get("texture.value"), data.get("texture.signature")); - skin.playerName = data.get("name"); - skin.playerUUID = data.get("id"); - skin.obtainedFrom = ObtainedFrom.MOJANG_API; - skin.saveSkin(); + org.bukkit.entity.Player player = possibleUUID == null ? Bukkit.getServer().getPlayerExact(playerName) : null; + if(Bukkit.getServer().getOnlineMode() && player != null){ + Skin.Minecraft skin = new Skin.Minecraft(getSkinGameProfile(player)); + skin.playerName = player.getName(); + skin.playerUUID = player.getUniqueId().toString().replaceAll("-", ""); + skin.obtainedFrom = ObtainedFrom.GAME_PROFILE; + try { skin.save(); } catch (IOException e) { NPCLib.printError(e); } if(skin.getAvatarFile().exists()) skin.getAvatarFile().delete(); SKIN_CACHE.put(playerNameLowerCase, skin); action.accept(skin); + return; } - catch (Exception e) { - NPCLib.printError(e); - action.accept(null); + else{ + try { + String uuid = possibleUUID == null ? getUUID(playerName) : possibleUUID; + HashMap data = getProfileMojangServer(uuid); + Skin.Minecraft skin = new Skin.Minecraft(data.get("texture.value"), data.get("texture.signature")); + skin.playerName = data.get("name"); + skin.playerUUID = data.get("id"); + skin.obtainedFrom = Minecraft.ObtainedFrom.MOJANG_API; + skin.save(); + skin.loadAvatar(); + SKIN_CACHE.put(playerNameLowerCase, skin); + action.accept(skin); + } + catch (Exception e) { + NPCLib.printError(e); + action.accept(null); + } } - } - }); - } + }); + } - public void delete(){ - if(!canBeDeleted()) throw new IllegalStateException("This skin cannot be deleted."); - String playerNameLowerCase = playerName.toLowerCase(); - if(SKIN_CACHE.containsKey(playerNameLowerCase)) SKIN_CACHE.remove(playerNameLowerCase); - File folder = new File(getSkinFolderPath(playerNameLowerCase) + "/"); - try { FileUtils.deleteDirectory(folder); } catch (IOException e) { NPCLib.printError(e); } - if(LOCAL_SKIN_NAMES.contains(playerNameLowerCase)) LOCAL_SKIN_NAMES.remove(playerNameLowerCase); - } - - private static YamlConfiguration loadConfig(String playerName){ - File file = getDataFile(playerName); - boolean exist = file.exists(); - if(!exist) try{ file.createNewFile();} catch (Exception e){}; - YamlConfiguration config = YamlConfiguration.loadConfiguration(file); - return config; - } - - private void saveSkin() throws IOException { - File file = getDataFile(); - boolean exist = file.exists(); - if(!exist) try{ file.createNewFile(); }catch (Exception e){} - YamlConfiguration config = YamlConfiguration.loadConfiguration(file); - config.set("player.name", this.playerName); - config.set("player.id", this.playerUUID); - config.set("texture.value", this.texture); - config.set("texture.signature", this.signature); - config.set("obtainedFrom", this.obtainedFrom.name()); - resetLastUpdate(); - config.set("lastUpdate", this.lastUpdate); - String textureURL = null; - try{ - byte[] decodedBytes = Base64.getDecoder().decode(this.texture); - String decodedTexture = new String(decodedBytes); - JsonObject textureJSON = new JsonParser().parse(decodedTexture).getAsJsonObject(); - JsonObject textureElement = textureJSON.get("textures").getAsJsonObject(); - textureURL = textureElement.get("SKIN").getAsJsonObject().get("url").getAsString(); - if(textureURL != null){ - String textureID = textureURL.replaceFirst("http://textures.minecraft.net/texture/", ""); - config.set("texture.id", textureID); - config.setComments("texture.id", Arrays.asList("Minecraft texture: " + textureURL)); - this.textureID = textureID; - } + public static List getSuggestedSkinNames(){ + List suggested = new ArrayList<>(); + Bukkit.getOnlinePlayers().forEach(x-> suggested.add(x.getName().toLowerCase())); + Skin.Minecraft.SKIN_CACHE.keySet().stream().filter(x -> !suggested.contains(x)).forEach(x-> suggested.add(SKIN_CACHE.get(x).getPlayerName().toLowerCase())); + Skin.Minecraft.LOCAL_SKIN_NAMES.stream().filter(x -> !suggested.contains(x)).forEach(x-> suggested.add(x.toLowerCase())); + if(!suggested.contains("sergiferry")) suggested.add("sergiferry"); + return suggested; } - catch (Exception e){ NPCLib.printError(e); } - config.save(file); - if(textureURL == null) return; - final String urlSkin = textureURL; - Bukkit.getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), () ->{ + + private static String[] getSkinGameProfile(org.bukkit.entity.Player player){ try{ - URL url = new URL(urlSkin); - BufferedImage bufferedImage = ImageIO.read(url); - getTextureFile().mkdirs(); - ImageIO.write(bufferedImage, "png", getTextureFile()); + EntityPlayer p = NMSCraftPlayer.getEntityPlayer(player); + GameProfile profile = NMSEntityPlayer.getGameProfile(p); + Property property = profile.getProperties().get("textures").iterator().next(); + String texture = property.getValue(); + String signature = property.getSignature(); + return new String[]{texture, signature}; } - catch (Exception e){ NPCLib.printError(e); } - }); - } - - public static List getSuggestedSkinNames(){ - List suggested = new ArrayList<>(); - Bukkit.getOnlinePlayers().forEach(x-> suggested.add(x.getName().toLowerCase())); - Skin.SKIN_CACHE.keySet().stream().filter(x -> !suggested.contains(x)).forEach(x-> suggested.add(SKIN_CACHE.get(x).getPlayerName().toLowerCase())); - Skin.LOCAL_SKIN_NAMES.stream().filter(x -> !suggested.contains(x)).forEach(x-> suggested.add(x.toLowerCase())); - return suggested; - } + catch (Exception e){ + NPCLib.printError(e); + return NPC.Skin.Minecraft.getSteveSkin().getTextureData(); + } + } - private static String[] getSkinGameProfile(Player player){ - try{ - EntityPlayer p = NMSCraftPlayer.getEntityPlayer(player); - GameProfile profile = NMSEntityPlayer.getGameProfile(p); - Property property = profile.getProperties().get("textures").iterator().next(); - String texture = property.getValue(); - String signature = property.getSignature(); - return new String[]{texture, signature}; + private static HashMap getProfileMojangServer(String uuid) throws IOException { + HashMap data = new HashMap<>(); + URL url2 = new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + uuid + "?unsigned=false"); + InputStreamReader reader2 = new InputStreamReader(url2.openStream()); + JsonObject profile = new JsonParser().parse(reader2).getAsJsonObject(); + JsonObject property = profile.get("properties").getAsJsonArray().get(0).getAsJsonObject(); + data.put("id", profile.get("id").getAsString()); + data.put("name", profile.get("name").getAsString()); + data.put("texture.value", property.get("value").getAsString()); + data.put("texture.signature", property.get("signature").getAsString()); + return data; } - catch (Exception e){ - NPCLib.printError(e); - return NPC.Skin.getSteveSkin().getTextureData(); + + private static String getUUID(String name) throws IOException { + URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + name); + InputStreamReader reader = new InputStreamReader(url.openStream()); + JsonObject property = new JsonParser().parse(reader).getAsJsonObject(); + return property.get("id").getAsString(); } - } - private static HashMap getProfileMojangServer(String uuid) throws IOException { - HashMap data = new HashMap<>(); - URL url2 = new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + uuid + "?unsigned=false"); - InputStreamReader reader2 = new InputStreamReader(url2.openStream()); - JsonObject profile = new JsonParser().parse(reader2).getAsJsonObject(); - JsonObject property = profile.get("properties").getAsJsonArray().get(0).getAsJsonObject(); - data.put("id", profile.get("id").getAsString()); - data.put("name", profile.get("name").getAsString()); - data.put("texture.value", property.get("value").getAsString()); - data.put("texture.signature", property.get("signature").getAsString()); - return data; - } + public enum ObtainedFrom{ + MOJANG_API("§aMojang API"), + GAME_PROFILE("§aGame Profile"), + MINECRAFT_ORIGINAL("§aMinecraft Original"), + NONE("§cUnknown"), + ; - private static String getUUID(String name) throws IOException { - URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + name); - InputStreamReader reader = new InputStreamReader(url.openStream()); - JsonObject property = new JsonParser().parse(reader).getAsJsonObject(); - return property.get("id").getAsString(); - } + private String title; - public static Skin getSteveSkin(){ return STEVE; } + ObtainedFrom(String title){ + this.title = title; + } - public static Skin getAlexSkin(){ return ALEX; } + public String getTitle() { + return title; + } + } - /** - * @since 2022.3 - */ - public enum Part{ - CAPE, - JACKET, - LEFT_SLEEVE, - RIGHT_SLEEVE, - LEFT_PANTS, - RIGHT_PANTS, - HAT, + public static Skin.Minecraft getSteveSkin(){ return STEVE; } + + public static Skin.Minecraft getAlexSkin(){ return ALEX; } } - /** - * @since 2022.2 - */ - public static class Parts implements Cloneable{ + public static class Custom extends Skin{ - private HashMap parts; + protected static final HashMap SKIN_CACHE; - protected Parts(){ - this.parts = new HashMap<>(); - enableAll(); + static{ + SKIN_CACHE = new HashMap<>(); } - public void enableAll(){ Arrays.stream(Part.values()).forEach(x-> parts.put(x, true)); } + private final String skinName; + private final Plugin plugin; - public void disableAll(){ Arrays.stream(Part.values()).forEach(x-> parts.put(x, false)); } + private Custom(@Nonnull Plugin plugin, String skinName, String texture, String signature) { + super(texture, signature); + Validate.notNull(plugin, "Plugin cannot be null."); + super.type = Type.CUSTOM; + this.plugin = plugin; + this.skinName = skinName; + } - public List getVisibleParts(){ + private Custom(Plugin plugin, String texture, String signature) { + this(plugin, null, texture, signature); + } + + public String getSkinName() { + return skinName; + } + + public String getFullSkinCode() { + if(skinName == null) return null; + return NPCLib.getFormattedName(plugin, skinName); + } + + public PluginDescriptionFile getPluginInfo(){ + return plugin.getDescription(); + } + + public void changeTexture(Plugin plugin, String texture, String signature){ + Validate.isTrue(plugin.equals(this.plugin), "This plugin is not the owner of this custom skin."); + String textureID = getTextureID(texture); + Validate.notNull(textureID, "This texture is not correct."); + this.texture = new Texture(texture, signature, textureID); + super.resetLastUpdate(); + if(getAvatarFile().exists()) getAvatarFile().delete(); + if(getTextureFile().exists()) getTextureFile().delete(); + try { save(); } catch (Exception e) { NPCLib.printError(e); } + } + + @Nullable + public static void fetchCustomSkinAsync(@Nonnull Plugin skinPlugin, @Nonnull String skinName, @Nonnull Consumer action){ + Validate.notNull(new Object[] {skinPlugin, skinName}); + String formattedName = NPCLib.getInstance().getFormattedName(skinPlugin, skinName); + fetchCustomSkinAsync(null, formattedName, action); + } + + @Nullable + @Deprecated + public static void fetchCustomSkinAsync(@Nonnull String complexSkinName, @Nonnull Consumer action){ + Validate.notNull(new Object[] {complexSkinName, action}); + Bukkit.getServer().getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), ()->{ + if(!SKIN_CACHE.containsKey(complexSkinName)) action.accept(null); + action.accept(SKIN_CACHE.get(complexSkinName)); + }); + } + + public static Skin.Custom getLoadedSkin(Plugin plugin, String skinName){ + return SKIN_CACHE.get(NPCLib.getFormattedName(plugin, skinName)); + } + + public static Skin.Custom createCustomSkin(Plugin plugin, String skinName, String texture, String value){ + Validate.isTrue(!SKIN_CACHE.containsKey(NPCLib.getInstance().getFormattedName(plugin, skinName)), "Custom texture skin with this name already exists."); + Skin.Custom custom = new Skin.Custom(plugin, skinName, texture, value); + SKIN_CACHE.put(NPCLib.getInstance().getFormattedName(plugin, skinName), custom); + return custom; + } + + public static Skin.Custom createCustomSkin(Plugin plugin, String texture, String value){ + return new Skin.Custom(plugin, null, texture, value); + } + + public static List getSuggestedSkinNames(){ + List suggested = new ArrayList<>(); + Skin.Custom.SKIN_CACHE.keySet().stream().filter(x -> !suggested.contains(x)).forEach(x-> suggested.add(x)); + return suggested; + } + + @Override + protected void save() throws IOException { + if(this.skinName == null) return; + File file = getDataFile(); + boolean exist = file.exists(); + if(!exist) try{ file.createNewFile(); }catch (Exception e){} + YamlConfiguration config = YamlConfiguration.loadConfiguration(file); + config.set("name", this.skinName); + config.set("plugin", this.plugin.getName()); + config.set("texture.value", this.texture.value()); + config.set("texture.signature", this.texture.signature()); + config.set("texture.id", this.texture.textureID()); + NMSFileConfiguration.setComments(config, "texture.id", Arrays.asList("Minecraft texture: " + getTextureURL())); + super.resetLastUpdate(); + config.set("lastUpdate", this.lastUpdate); + config.save(file); + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> downloadImages()); + } + + @Override + public void delete() { + if(skinName == null) return; + String formattedName = NPCLib.getInstance().getFormattedName(plugin, skinName); + if(SKIN_CACHE.containsKey(formattedName)) SKIN_CACHE.remove(formattedName); + File folder = new File(getSkinFolderPath(plugin, skinName) + "/"); + if(!folder.exists()) return; + try { NMSFileUtils.deleteDirectory(folder); } catch (Exception e) { NPCLib.printError(e); } + } + + @Override + protected void loadAvatar() { + if(this.skinName == null) return; + super.loadAvatar(); + } + + @Override + protected File getAvatarFile(){ + return getAvatarFile(this.plugin, this.skinName); + } + + @Override + protected File getTextureFile(){ + return getTextureFile(this.plugin, this.skinName); + } + + @Override + protected File getDataFile(){ + return getDataFile(this.plugin, this.skinName); + } + + @Override + protected String getSkinFolderPath(){ + return getSkinFolderPath(this.plugin, this.skinName); + } + + private static File getAvatarFile(Plugin plugin, String skinName){ + return new File(getSkinFolderPath(plugin, skinName) + "/avatar.png"); + } + + private static File getTextureFile(Plugin plugin, String skinName){ + return new File(getSkinFolderPath(plugin, skinName) + "/texture.png"); + } + + private static File getDataFile(Plugin plugin, String skinName){ + return new File(getSkinFolderPath(plugin, skinName) + "/data.yml"); + } + + private static String getSkinFolderPath(Plugin plugin, String skinName){ + return getSkinsFolderPath(Type.CUSTOM) + plugin.getName().toLowerCase() + "/" + skinName.toLowerCase(); + } + } + + public static class MineSkin extends Skin{ + + private static final HashMap SKIN_CACHE; + protected static final List LOCAL_SKIN_NAMES; + private static final MineskinClient MINESKIN_CLIENT; + + static{ + MINESKIN_CLIENT = new MineskinClient(); + SKIN_CACHE = new HashMap<>(); + LOCAL_SKIN_NAMES = new ArrayList<>(); + Bukkit.getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), () ->{ + File folder = new File(getSkinsFolderPath(Type.MINESKIN)); + if(!folder.exists() || !folder.isDirectory()) return; + for (File skin : folder.listFiles()) { + if (!skin.isDirectory()) continue; + LOCAL_SKIN_NAMES.add(skin.getName()); + } + }); + } + + public static List getSuggestedSkinNames(){ + List suggested = new ArrayList<>(); + SKIN_CACHE.keySet().stream().filter(x -> !suggested.contains(x)).forEach(x-> suggested.add(SKIN_CACHE.get(x).getId().toString())); + LOCAL_SKIN_NAMES.stream().filter(x -> !suggested.contains(x)).forEach(x-> suggested.add(x)); + return suggested; + } + + private String uuid; //UUID without "-" + private Integer id; + private Variant variant; + + private MineSkin(String uuid, Integer id, String texture, String signature, Variant variant) { + super(texture, signature); + super.type = Type.MINESKIN; + this.uuid = uuid; + this.id = id; + this.variant = variant; + } + + public static void generateSkinFromURLAsync(String url, BiConsumer action){ + Bukkit.getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), () -> { + try { + org.mineskin.data.Skin skin = MINESKIN_CLIENT.generateUrl(url, SkinOptions.none()).join(); + if(skin != null) fetchSkinAsync(PlayerNPCPlugin.getInstance(), "" + skin.id, false, mineSkin -> action.accept(mineSkin, null)); + } catch (Exception e){ + NPCLib.printError(e); + action.accept(null, e); + } + }); + } + + @Nullable + public static void fetchSkinAsync(Plugin plugin, String id, boolean forceDownload, Consumer action) { + plugin.getServer().getScheduler().runTaskAsynchronously(plugin, ()->{ + try { + String possibleUUID = id.length() >= 32 ? id.replaceAll("-", "") : null; + Integer possibleID = MathUtils.isInteger(id) ? Integer.valueOf(id) : null; + if(id.startsWith("https://minesk.in/")) possibleUUID = id.replaceFirst("https://minesk\\.in/", ""); + String apiLink = "https://api.mineskin.org/get/"; + if(possibleUUID != null) apiLink = apiLink + "uuid/" + possibleUUID; + else if(possibleID != null) apiLink = apiLink + "id/" + possibleID; + if(possibleID == null && possibleUUID == null){ + action.accept(null); + return; + } + // + if(!forceDownload && possibleID != null){ + if(SKIN_CACHE.containsKey(possibleID)) { + Skin.MineSkin skin = SKIN_CACHE.get(possibleID); + if(!skin.needsToUpdate(plugin)){ + action.accept(skin); + return; + } + else SKIN_CACHE.remove(possibleID); + } + if(getDataFile(possibleID).exists()){ + YamlConfiguration config = loadConfig(possibleID); + String lastUpdate = config.getString("lastUpdate"); + if(!NPC.Skin.needsToUpdate(lastUpdate, plugin)){ + Skin.MineSkin skin = new Skin.MineSkin( config.getString("mineskin.uuid"), config.getInt("mineskin.id"), config.getString("texture.value"), config.getString("texture.signature"), Variant.valueOf(config.getString("variant"))); + skin.lastUpdate = lastUpdate; + skin.loadAvatar(); + SKIN_CACHE.put(possibleID, skin); + if(LOCAL_SKIN_NAMES.contains(possibleID.toString())) LOCAL_SKIN_NAMES.remove(possibleID.toString()); + action.accept(skin); + return; + } + } + } + // + StringBuilder builder = new StringBuilder(); + HttpURLConnection httpURLConnection = (HttpURLConnection) (new URL(apiLink)).openConnection(); + httpURLConnection.setRequestMethod("GET"); + httpURLConnection.setDoOutput(true); + httpURLConnection.setDoInput(true); + httpURLConnection.connect(); + Scanner scanner = new Scanner(httpURLConnection.getInputStream()); + while (scanner.hasNextLine()) + builder.append(scanner.nextLine()); + scanner.close(); + httpURLConnection.disconnect(); + // + JsonObject jsonObject = (JsonObject)(new JsonParser()).parse(builder.toString()); + JsonObject data = jsonObject.get("data").getAsJsonObject(); + JsonObject textures = data.get("texture").getAsJsonObject(); + String value = textures.get("value").getAsString(); + String signature = textures.get("signature").getAsString(); + String mineskinUUID = jsonObject.get("uuid").getAsString(); + Integer mineskinID = jsonObject.get("id").getAsInt(); + Variant variant = Variant.valueOf(jsonObject.get("variant").getAsString().toUpperCase()); + MineSkin mineSkin = new MineSkin(mineskinUUID, mineskinID, value, signature, variant); + mineSkin.save(); + mineSkin.loadAvatar(); + SKIN_CACHE.put(mineskinID, mineSkin); + action.accept(mineSkin); + } catch (Exception exception) { + NPCLib.printError(exception); + action.accept(null); + } + }); + } + + private static YamlConfiguration loadConfig(Integer id){ + File file = getDataFile(id); + boolean exist = file.exists(); + if(!exist) try{ file.createNewFile();} catch (Exception e){}; + YamlConfiguration config = YamlConfiguration.loadConfiguration(file); + return config; + } + + public String getUUID() { + return uuid; + } + + public Integer getId() { + return id; + } + + public String getMineSkinURL(){ + return "https://minesk.in/" + uuid; + } + + public Variant getVariant() { + return variant; + } + + public NPC.Skin.Custom convertToCustomSkin(Plugin plugin, String skinName){ + return Custom.createCustomSkin(plugin, skinName, texture.value(), texture.signature()); + } + + public NPC.Skin.Custom convertToCustomSkin(Plugin plugin){ + return Custom.createCustomSkin(plugin,texture.value(), texture.signature()); + } + + @Override + protected void save() throws IOException { + File file = getDataFile(); + boolean exist = file.exists(); + if(!exist) try{ file.createNewFile(); }catch (Exception e){} + YamlConfiguration config = YamlConfiguration.loadConfiguration(file); + NMSFileConfiguration.setHeader(config, Arrays.asList(getMineSkinURL())); + config.set("mineskin.id", this.id); + config.set("mineskin.uuid", this.uuid); + config.set("texture.value", getTexture()); + config.set("texture.signature", getSignature()); + config.set("texture.id", getTextureID()); + NMSFileConfiguration.setComments(config, "texture.id", Arrays.asList("Minecraft texture: " + getTextureURL())); + config.set("variant", this.variant.name()); + super.resetLastUpdate(); + config.set("lastUpdate", this.lastUpdate); + config.save(file); + Bukkit.getScheduler().runTaskAsynchronously(PlayerNPCPlugin.getInstance(), () -> downloadImages()); + } + + @Override + public void delete() { + if(SKIN_CACHE.containsKey(id)) SKIN_CACHE.remove(id); + if(LOCAL_SKIN_NAMES.contains(id.toString())) LOCAL_SKIN_NAMES.remove(id.toString()); + File folder = new File(getSkinFolderPath(id) + "/"); + if(!folder.exists()) return; + try { NMSFileUtils.deleteDirectory(folder); } catch (Exception e) { NPCLib.printError(e); } + } + + @Override + protected File getAvatarFile(){ + return getAvatarFile(this.id); + } + + @Override + protected File getTextureFile(){ + return getTextureFile(this.id); + } + + @Override + protected File getDataFile(){ + return getDataFile(this.id); + } + + @Override + protected String getSkinFolderPath(){ + return getSkinFolderPath(this.id); + } + + private static File getAvatarFile(Integer id){ + return new File(getSkinFolderPath(id) + "/avatar.png"); + } + + private static File getTextureFile(Integer id){ + return new File(getSkinFolderPath(id) + "/texture.png"); + } + + private static File getDataFile(Integer id){ + return new File(getSkinFolderPath(id) + "/data.yml"); + } + + private static String getSkinFolderPath(Integer id){ + return getSkinsFolderPath(Type.MINESKIN) + id.toString(); + } + + public enum Variant{ + CLASSIC(4), SLIM(3); + + private int pixels; + + Variant(int pixels){ + this.pixels = pixels; + } + + public int getPixels() { + return pixels; + } + } + } + + /** + * @since 2022.3 + */ + public enum Part{ + CAPE, + JACKET, + LEFT_SLEEVE, + RIGHT_SLEEVE, + LEFT_PANTS, + RIGHT_PANTS, + HAT, + } + + /** + * @since 2022.2 + */ + public static class Parts implements Cloneable{ + + private HashMap parts; + + protected Parts(){ + this.parts = new HashMap<>(); + enableAll(); + } + + public void enableAll(){ Arrays.stream(Part.values()).forEach(x-> parts.put(x, true)); } + + public void disableAll(){ Arrays.stream(Part.values()).forEach(x-> parts.put(x, false)); } + + public List getVisibleParts(){ return Arrays.stream(Part.values()).filter(x-> isVisible(x)).collect(Collectors.toList()); } @@ -3324,7 +3953,7 @@ else if(npc.getPose().equals(Pose.SWIMMING)){ } if(false && npc instanceof NPC.Personal){ Personal personal = (Personal) npc; - personal.getPlayer().sendMessage("", "", "", "", "", "", "", "", ""); + NMSPlayer.sendMessage(personal.getPlayer(), "", "", "", "", "", "", "", "", ""); personal.getPlayer().sendMessage("Block in leg " + blockInLeg.getType() + " " + blockInLeg.getType().isSolid()); personal.getPlayer().sendMessage("Block in foot " + blockInFoot.getType() + " " + blockInFoot.getType().isSolid()); personal.getPlayer().sendMessage("moveY " + moveY); @@ -3746,18 +4375,33 @@ public static class Interact { private Interact(){} - public abstract static class ClickAction { + private static void test(ClickAction clickAction, Player player){ + clickAction.execute(player); + } - private final NPC npc; - private final NPC.Interact.Actions.Type actionType; + public abstract static class ClickAction{ + + protected final NPC npc; + protected final NPC.Interact.Actions.Type actionType; + protected final HashMap lastTimeExecuted; + protected boolean enabled; protected NPC.Interact.ClickType clickType; protected BiConsumer action; + protected Long delayTicks; + protected Long cooldownMilliseconds; + protected BukkitTask executingTask; + protected List conditions; protected ClickAction(NPC npc, NPC.Interact.Actions.Type actionType, NPC.Interact.ClickType clickType) { this.npc = npc; this.actionType = actionType; if(clickType == null) clickType = ClickType.EITHER; this.clickType = clickType; + this.delayTicks = 0L; + this.enabled = true; + this.cooldownMilliseconds = npc.getInteractCooldown(); + this.lastTimeExecuted = new HashMap<>(); + this.conditions = new ArrayList<>(); } public String getReplacedString(Player player, String s) { @@ -3778,170 +4422,465 @@ public NPC.Interact.ClickType getClickType() { } protected void execute(Player player){ + if(!enabled) return; + if(executingTask != null) return; + if(delayTicks >= 1) executingTask = Bukkit.getScheduler().runTaskLater(npc.getPlugin(), () -> executeAction(player), delayTicks); + else executeAction(player); + } + + private void executeAction(Player player){ + if(lastTimeExecuted.containsKey(player) && System.currentTimeMillis() - lastTimeExecuted.get(player) < cooldownMilliseconds) return; + for(Conditions.Condition condition : conditions){ + if(!condition.test(npc, player)) return; + } action.accept(npc, player); + lastTimeExecuted.put(player, System.currentTimeMillis()); + clearExecutingTask(); + } + + private void clearExecutingTask(){ + if(executingTask != null && !executingTask.isCancelled()) executingTask.cancel(); + executingTask = null; + } + + public Long getDelayTicks() { + return delayTicks; + } + + public void setDelayTicks(Long delayTicks) { + if(delayTicks < 0) delayTicks = 0L; + this.delayTicks = delayTicks; } + public Long getCooldownMilliseconds() { + return cooldownMilliseconds; + } + + public void setCooldownMilliseconds(Long cooldownMilliseconds) { + if(cooldownMilliseconds < npc.getInteractCooldown()) cooldownMilliseconds = npc.getInteractCooldown(); + this.cooldownMilliseconds = cooldownMilliseconds; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public void setClickType(@Nonnull ClickType clickType) { + Validate.notNull(clickType); + this.clickType = clickType; + } + + public List getConditions() { + return conditions; + } + + public void addCondition(Conditions.Condition condition){ + this.conditions.add(condition); + } } public static class Actions{ private Actions() {} - public enum Type{ + public enum Type { + CONSOLE_PERFORM_COMMAND, CUSTOM_ACTION, - SEND_MESSAGE, - SEND_ACTIONBAR_MESSAGE, - SEND_TITLE_MESSAGE, - RUN_PLAYER_COMMAND, - RUN_CONSOLE_COMMAND, - CONNECT_BUNGEE_SERVER, - TELEPORT_TO_LOCATION; + NPC_PLAY_ANIMATION, + NPC_SET_CUSTOM_DATA, + @Deprecated PLAYER_CLEAR_POTION_EFFECT, + PLAYER_CONNECT_BUNGEE_SERVER, + PLAYER_GIVE_ITEM, + @Deprecated PLAYER_GIVE_KIT, + @Deprecated PLAYER_GIVE_POTION_EFFECT, + PLAYER_OPEN_BOOK, + @Deprecated PLAYER_OPEN_ENCHANTING, //Not working + PLAYER_OPEN_WORKBENCH, + PLAYER_PERFORM_COMMAND, + PLAYER_PLAY_SOUND, //WIP + PLAYER_SEND_ACTIONBAR_MESSAGE, + PLAYER_SEND_CHAT_MESSAGE, + PLAYER_SEND_TITLE_MESSAGE, + PLAYER_TELEPORT_TO_LOCATION, + ; + + public boolean isDeprecated() { + try { + return NPC.Interact.Actions.Type.class.getField(this.name()).isAnnotationPresent(Deprecated.class); + } catch (NoSuchFieldException | SecurityException e) { + return false; + } + } + } + + @Deprecated + protected enum LegacyType { + CONNECT_BUNGEE_SERVER(Type.PLAYER_CONNECT_BUNGEE_SERVER), + CUSTOM_ACTION(Type.CUSTOM_ACTION), + GIVE_PLAYER_ITEM(Type.PLAYER_GIVE_ITEM), + RUN_CONSOLE_COMMAND(Type.CONSOLE_PERFORM_COMMAND), + RUN_PLAYER_COMMAND(Type.PLAYER_PERFORM_COMMAND), + SEND_ACTIONBAR_MESSAGE(Type.PLAYER_SEND_ACTIONBAR_MESSAGE), + SEND_CHAT_MESSAGE(Type.PLAYER_SEND_CHAT_MESSAGE), + SEND_TITLE_MESSAGE(Type.PLAYER_SEND_TITLE_MESSAGE), + SET_CUSTOM_DATA(Type.NPC_SET_CUSTOM_DATA), + TELEPORT_PLAYER_TO_LOCATION(Type.PLAYER_TELEPORT_TO_LOCATION), + ; + + protected final Type type; + + LegacyType(Type type){ + this.type = type; + } } - public static class Custom extends ClickAction{ + public static class CustomAction extends ClickAction{ - protected Custom(NPC npc, NPC.Interact.ClickType clickType, BiConsumer customAction) { + protected CustomAction(NPC npc, NPC.Interact.ClickType clickType, BiConsumer customAction) { super(npc, NPC.Interact.Actions.Type.CUSTOM_ACTION, clickType); super.action = customAction; } } - public static class Message extends ClickAction{ + public static class SetCustomData extends ClickAction{ + + private final String key; + private final String value; + private boolean checkIfSame; + + protected SetCustomData(NPC npc, NPC.Interact.ClickType clickType, String key, String value) { + super(npc, Type.NPC_SET_CUSTOM_DATA, clickType); + this.key = key; + this.value = value; + this.checkIfSame = false; + super.action = (npc1, player) -> { + String replacedKey = getReplacedString(player, getKey()); + String replacedValue = getReplacedString(player, getValue()); + if(checkIfSame && npc1.hasCustomData(replacedKey) && npc1.getCustomData(replacedKey).equals(replacedValue)) return; + npc1.setCustomData(getReplacedString(player, getKey()), getReplacedString(player, getValue())); + }; + } + + public boolean isCheckIfSame() { + return checkIfSame; + } - private final String[] messages; + public void setCheckIfSame(boolean checkIfSame) { + this.checkIfSame = checkIfSame; + } - protected Message(NPC npc, NPC.Interact.ClickType clickType, String... message) { - super(npc, NPC.Interact.Actions.Type.SEND_MESSAGE, clickType); - this.messages = message; - super.action = (npc1, player) -> Arrays.stream(getMessages()).toList().forEach(x-> player.sendMessage(getReplacedString(player,x))); + public String getKey() { + return key; } - public String[] getMessages() { - return messages; + public String getValue() { + return value; } } - public static abstract class Command extends ClickAction { + public static class PlayAnimation extends ClickAction{ - private final String command; + private final Animation animation; - protected Command(NPC npc, NPC.Interact.Actions.Type actionType, NPC.Interact.ClickType clickType, String command) { - super(npc, actionType, clickType); - this.command = command; + protected PlayAnimation(NPC npc, NPC.Interact.ClickType clickType, Animation animation) { + super(npc, Type.NPC_PLAY_ANIMATION, clickType); + this.animation = animation; + super.action = (npc1, player) -> npc1.playAnimation(getAnimation()); } - protected String getCommand() { - return command; + public Animation getAnimation() { + return animation; } + } - public static class PlayerCommand extends NPC.Interact.Actions.Command{ + public static class Player{ + + private Player(){} + + public static class PlaySound extends ClickAction{ + + private Sound sound; + private float volume; + private float pitch; - protected PlayerCommand(NPC npc, NPC.Interact.ClickType clickType, String command) { - super(npc, NPC.Interact.Actions.Type.RUN_PLAYER_COMMAND, clickType, command); - super.action = (npc1, player) -> Bukkit.getServer().dispatchCommand(player, getReplacedString(player, super.getCommand())); + protected PlaySound(NPC npc, ClickType clickType, Sound sound) { + super(npc, Type.PLAYER_PLAY_SOUND, clickType); + this.sound = sound; + super.action = (npc1, player) -> player.playSound(npc1.getLocation(), getSound(), getVolume(), getPitch()); + } + + public Sound getSound() { + return sound; + } + + public float getVolume() { + return volume; + } + + public float getPitch() { + return pitch; + } + + public void setVolume(Float soundVolume) { + if(soundVolume <= 0.1) soundVolume = 0.1F; + if(soundVolume >= 1.0) soundVolume = 1.0F; + this.volume = (float) (Math.round(soundVolume * 10.0) / 10.0); + } + + public void setPitch(Float soundPitch) { + if(soundPitch <= 0.5) soundPitch = 0.5F; + if(soundPitch >= 2.0) soundPitch = 2.0F; + this.pitch = (float) (Math.round(soundPitch * 10.0) / 10.0); + } } - } + public static class SendChatMessage extends ClickAction{ + + private final String[] messages; - public static class ConsoleCommand extends NPC.Interact.Actions.Command{ + protected SendChatMessage(NPC npc, NPC.Interact.ClickType clickType, String... message) { + super(npc, Type.PLAYER_SEND_CHAT_MESSAGE, clickType); + this.messages = message; + super.action = (npc1, player) -> Arrays.stream(getMessages()).toList().forEach(x-> player.sendMessage(getReplacedString(player,x))); + } + + public String[] getMessages() { + return messages; + } - protected ConsoleCommand(NPC npc, NPC.Interact.ClickType clickType, String command) { - super(npc, NPC.Interact.Actions.Type.RUN_CONSOLE_COMMAND, clickType, command); - super.action = (npc1, player) -> Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), getReplacedString(player, super.getCommand())); } - } + public static class PerformCommand extends NPC.Interact.Actions.Command{ + + protected PerformCommand(NPC npc, NPC.Interact.ClickType clickType, String command) { + super(npc, NPC.Interact.Actions.Type.PLAYER_PERFORM_COMMAND, clickType, command); + super.action = (npc1, player) -> Bukkit.getServer().dispatchCommand(player, getReplacedString(player, super.getCommand())); + } - public static class Title extends ClickAction{ + } - private final String title; - private final String subtitle; - private final Integer fadeIn; - private final Integer stay; - private final Integer fadeOut; + public static class SendTitleMessage extends ClickAction{ + + private final String title; + private final String subtitle; + private Integer fadeIn; + private Integer stay; + private Integer fadeOut; + + protected SendTitleMessage(NPC npc, NPC.Interact.ClickType clickType, String title, String subtitle, Integer fadeIn, Integer stay, Integer fadeOut) { + super(npc, Type.PLAYER_SEND_TITLE_MESSAGE, clickType); + this.title = title; + this.subtitle = subtitle; + this.fadeIn = fadeIn; + this.stay = stay; + this.fadeOut = fadeOut; + super.action = (npc1, player) -> player.sendTitle("§f" + getReplacedString(player,getTitle()), getReplacedString(player,getSubtitle()), getFadeIn(), getStay(), getFadeOut()); + } + + public String getTitle() { + return title; + } + + public String getSubtitle() { + return subtitle; + } + + public Integer getFadeIn() { + return fadeIn; + } + + public Integer getStay() { + return stay; + } + + public Integer getFadeOut() { + return fadeOut; + } + + public void setFadeIn(Integer fadeIn) { + this.fadeIn = fadeIn; + } + + public void setStay(Integer stay) { + this.stay = stay; + } + + public void setFadeOut(Integer fadeOut) { + this.fadeOut = fadeOut; + } - protected Title(NPC npc, NPC.Interact.ClickType clickType, String title, String subtitle, Integer fadeIn, Integer stay, Integer fadeOut) { - super(npc, NPC.Interact.Actions.Type.SEND_TITLE_MESSAGE, clickType); - this.title = title; - this.subtitle = subtitle; - this.fadeIn = fadeIn; - this.stay = stay; - this.fadeOut = fadeOut; - super.action = (npc1, player) -> player.sendTitle("§f" + getReplacedString(player,getTitle()), getReplacedString(player,getSubtitle()), getFadeIn(), getStay(), getFadeOut()); } - public String getTitle() { - return title; + public static class SendActionBarMessage extends ClickAction{ + + private final String message; + + protected SendActionBarMessage(NPC npc, NPC.Interact.ClickType clickType, String message) { + super(npc, Type.PLAYER_SEND_ACTIONBAR_MESSAGE, clickType); + this.message = message; + super.action = (npc1, player) -> player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(getReplacedString(player, getMessage()))); + } + + public String getMessage() { + return message; + } } - public String getSubtitle() { - return subtitle; + public static class ConnectBungeeServer extends ClickAction{ + + private final String server; + + protected ConnectBungeeServer(NPC npc, NPC.Interact.ClickType clickType, String server) { + super(npc, Type.PLAYER_CONNECT_BUNGEE_SERVER, clickType); + this.server = server; + super.action = (npc1, player) -> { + if(!Bukkit.getServer().getMessenger().isOutgoingChannelRegistered(npc1.getPlugin(), "BungeeCord")) Bukkit.getServer().getMessenger().registerOutgoingPluginChannel(npc1.getPlugin(), "BungeeCord"); + ByteArrayDataOutput out = ByteStreams.newDataOutput(); + out.writeUTF("Connect"); + out.writeUTF(getReplacedString(player, getServer())); + player.sendPluginMessage(npc1.getPlugin(), "BungeeCord", out.toByteArray()); + }; + } + + public String getServer() { + return server; + } } - public Integer getFadeIn() { - return fadeIn; + public static class TeleportToLocation extends ClickAction{ + + private final Location location; + + protected TeleportToLocation(NPC npc, NPC.Interact.ClickType clickType, Location location) { + super(npc, Type.PLAYER_TELEPORT_TO_LOCATION, clickType); + this.location = location; + super.action = (npc1, player) -> player.teleport(getLocation()); + } + + public Location getLocation() { + return location; + } } - public Integer getStay() { - return stay; + public static class GiveItem extends ClickAction{ + + private final ItemStack itemStack; + private GiveType giveType; + + protected GiveItem(NPC npc, NPC.Interact.ClickType clickType, ItemStack itemStack) { + super(npc, Type.PLAYER_GIVE_ITEM, clickType); + this.itemStack = itemStack; + setGiveType(GiveType.ADD_ITEM); + } + + public void setGiveType(GiveType giveType) { + if(giveType.equals(GiveType.ADD_ITEM)) super.action = (npc1, player) -> player.getInventory().addItem(getItemStack()); + if(giveType.equals(GiveType.SET_ITEM_MAIN_HAND)) super.action = (npc1, player) -> player.getInventory().setItemInMainHand(getItemStack()); + if(giveType.equals(GiveType.SET_ITEM_OFF_HAND)) super.action = (npc1, player) -> player.getInventory().setItemInOffHand(getItemStack()); + if(giveType.equals(GiveType.SET_EQUIPMENT)) super.action = (npc1, player) -> { + if(getItemStack().getType().name().contains("_HELMET")) player.getInventory().setHelmet(getItemStack()); + if(getItemStack().getType().name().contains("_CHESTPLATE")) player.getInventory().setChestplate(getItemStack()); + if(getItemStack().getType().name().contains("_LEGGINGS")) player.getInventory().setLeggings(getItemStack()); + if(getItemStack().getType().name().contains("_BOOTS")) player.getInventory().setBoots(getItemStack()); + }; + this.giveType = giveType; + } + + public ItemStack getItemStack() { + return itemStack; + } + + public GiveType getGiveType() { + return giveType; + } + + public enum GiveType{ + ADD_ITEM, SET_ITEM_MAIN_HAND, SET_ITEM_OFF_HAND, SET_EQUIPMENT; + } } - public Integer getFadeOut() { - return fadeOut; + public static class GiveKit extends ClickAction{ + + private final NPC.Inventory.Kit kit; + + protected GiveKit(NPC npc, NPC.Interact.ClickType clickType, NPC.Inventory.Kit kit) { + super(npc, Type.PLAYER_GIVE_KIT, clickType); + this.kit = kit; + super.action = (npc1, player) -> getKit().giveKit(player); + } + + public Inventory.Kit getKit() { + return kit; + } } - } + public static class OpenWorkbench extends ClickAction{ - public static class ActionBar extends ClickAction{ + protected OpenWorkbench(NPC npc, ClickType clickType) { + super(npc, Type.PLAYER_OPEN_WORKBENCH, clickType); + super.action = (npc1, player) -> player.openWorkbench(player.getLocation(), true); + } + + } + + @Deprecated + public static class OpenEnchanting extends ClickAction{ - private final String message; + protected OpenEnchanting(NPC npc, ClickType clickType) { + super(npc, Type.PLAYER_OPEN_ENCHANTING, clickType); + super.action = (npc1, player) -> player.openEnchanting(player.getLocation(), true); + } - public ActionBar(NPC npc, NPC.Interact.ClickType clickType, String message) { - super(npc, NPC.Interact.Actions.Type.SEND_ACTIONBAR_MESSAGE, clickType); - this.message = message; - super.action = (npc1, player) -> player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(getReplacedString(player, getMessage()))); } - public String getMessage() { - return message; + public static class OpenBook extends ClickAction{ + + protected ItemStack book; + + protected OpenBook(NPC npc, ClickType clickType, ItemStack book) { + super(npc, Type.PLAYER_OPEN_BOOK, clickType); + this.book = book; + super.action = (npc1, player) -> player.openBook(getBook()); + } + + public ItemStack getBook() { + return book; + } } + } - public static class BungeeServer extends ClickAction{ + public static class Console{ - private final String server; + private Console() {} - protected BungeeServer(NPC npc, NPC.Interact.ClickType clickType, String server) { - super(npc, NPC.Interact.Actions.Type.CONNECT_BUNGEE_SERVER, clickType); - this.server = server; - super.action = (npc1, player) -> { - if(!Bukkit.getServer().getMessenger().isOutgoingChannelRegistered(PlayerNPCPlugin.getInstance(), "BungeeCord")) Bukkit.getServer().getMessenger().registerOutgoingPluginChannel(PlayerNPCPlugin.getInstance(), "BungeeCord"); - ByteArrayDataOutput out = ByteStreams.newDataOutput(); - out.writeUTF("Connect"); - out.writeUTF(getReplacedString(player, server)); - player.sendPluginMessage(PlayerNPCPlugin.getInstance(), "BungeeCord", out.toByteArray()); - }; - } + public static class PerformCommand extends NPC.Interact.Actions.Command{ + + protected PerformCommand(NPC npc, NPC.Interact.ClickType clickType, String command) { + super(npc, Type.CONSOLE_PERFORM_COMMAND, clickType, command); + super.action = (npc1, player) -> Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), getReplacedString(player, super.getCommand())); + } - public String getServer() { - return server; } } - public static class TeleportToLocation extends ClickAction{ + public static abstract class Command extends ClickAction { - private final Location location; + private final String command; - public TeleportToLocation(NPC npc, NPC.Interact.ClickType clickType, Location location) { - super(npc, Type.TELEPORT_TO_LOCATION, clickType); - this.location = location; - super.action = (npc1, player) -> player.teleport(getLocation()); + protected Command(NPC npc, NPC.Interact.Actions.Type actionType, NPC.Interact.ClickType clickType, String command) { + super(npc, actionType, clickType); + this.command = command; } - public Location getLocation() { - return location; + public String getCommand() { + return command; } } @@ -3963,6 +4902,61 @@ public ClickType getInvert(){ } } + public static class Inventory{ + + private Inventory(){} + + public static class Kit implements ConfigurationSerializable { + + private HashMap items; + + public Kit() { + this.items = new HashMap<>(); + } + + public Kit(@Nonnull PlayerInventory playerInventory){ + this(); + for(int i = 0; i < 36; i++){ + ItemStack itemStack = playerInventory.getItem(i); + if(itemStack == null || itemStack.getType().equals(Material.AIR)) continue; + items.put(i, playerInventory.getItem(i)); + } + items.put(36, playerInventory.getItemInOffHand()); + items.put(37, playerInventory.getHelmet()); + items.put(38, playerInventory.getChestplate()); + items.put(39, playerInventory.getLeggings()); + items.put(40, playerInventory.getBoots()); + } + + public Kit(@Nonnull Player player){ + this(player.getInventory()); + } + + public void setItem(Integer slot, ItemStack itemStack){ + if(itemStack == null || itemStack.getType().equals(Material.AIR)) return; + items.put(slot, itemStack); + } + + public void giveKit(Player player){ + for(int i = 0; i < 36; i++){ + ItemStack itemStack = items.get(i); + if(itemStack == null || itemStack.getType().equals(Material.AIR)) continue; + player.getInventory().setItem(i, itemStack); + } + } + + public static void giveKit(Kit kit, Player player){ + kit.giveKit(player); + } + + @Override + public Map serialize() { + return null; + } + + } + } + public static class Hologram { private final NPC npc; private final Player player; @@ -4000,11 +4994,11 @@ protected void createLine() { List armorStands = new ArrayList<>(); for(int i = 1; i <= textOpacity.getTimes(); i++){ EntityArmorStand armor = new EntityArmorStand(world, location.getX(), location.getY() + (npc.getLineSpacing() * ((getText().size() - line))), location.getZ()); - armor.n(true); //setCustomNameVisible - armor.e(true); //setNoGravity + NMSEntity.setCustomNameVisible(armor, true); + NMSEntity.setNoGravity(armor, true); NMSEntity.setCustomName(armor, "§f"); - armor.j(true); //setInvisible - armor.t(true); //setMarker + NMSEntityArmorStand.setInvisible(armor, true); + NMSEntityArmorStand.setMarker(armor, true); armorStands.add(armor); } lines.put(line, armorStands); @@ -4014,17 +5008,18 @@ protected void createLine() { protected void setLine(int line, String text) { if(!lines.containsKey(line)) return; String replacedText = NPC.Placeholders.replace(npc, player, text); + replacedText = ColorUtils.formatHexColor(replacedText); for(EntityArmorStand as : lines.get(line)){ - as.e(true); //setNoGravity - as.j(true); //setInvisible + NMSEntity.setNoGravity(as, true); + NMSEntityArmorStand.setInvisible(as, true); NMSEntity.setCustomName(as, replacedText); - as.n(text != null && text != ""); //setCustomNameVisible + NMSEntity.setCustomNameVisible(as, text != null && text != ""); } } protected String getLine(int line) { if(!lines.containsKey(line)) return ""; - return lines.get(line).get(0).Z().getString(); //Z getCustomName + return NMSEntity.getCustomName(lines.get(line).get(0)).getString(); } protected boolean hasLine(int line){ @@ -4042,7 +5037,7 @@ protected void show(){ for(Integer line : lines.keySet()){ for(EntityArmorStand armor : lines.get(line)){ NMSPacketPlayOutSpawnEntity.sendPacket(getPlayer(), armor); - NMSCraftPlayer.sendPacket(getPlayer(), new PacketPlayOutEntityMetadata(armor.ae(), armor.ai(), true)); //ae getID //ai getDataWatcher + NMSCraftPlayer.sendPacket(getPlayer(), new PacketPlayOutEntityMetadata(NMSEntity.getEntityID(armor), NMSEntity.getDataWatcher(armor), true)); } } canSee = true; @@ -4052,7 +5047,7 @@ protected void hide(){ if(!canSee) return; for (Integer in : lines.keySet()) { for(EntityArmorStand armor : lines.get(in)){ - NMSCraftPlayer.sendPacket(getPlayer(), NMSPacketPlayOutEntityDestroy.createPacket(armor.ae())); //ae getID + NMSCraftPlayer.sendPacket(getPlayer(), NMSPacketPlayOutEntityDestroy.createPacket(NMSEntity.getEntityID(armor))); } } canSee = false; @@ -4068,7 +5063,7 @@ protected void move(Vector vector){ double fy = location.getY() + vector.getY(); double fz = location.getZ() + vector.getZ(); armor.g(fx, fy, fz); - playerConnection.a(new PacketPlayOutEntityTeleport(armor)); + NMSCraftPlayer.sendPacket(playerConnection, new PacketPlayOutEntityTeleport(armor)); } } } @@ -4140,7 +5135,7 @@ public enum Opacity { public static class Attributes { private static final Attributes DEFAULT = new Attributes( - NPC.Skin.getSteveSkin(), + NPC.Skin.Minecraft.getSteveSkin(), new Skin.Parts(), new ArrayList<>(), new HashMap<>(), @@ -4330,7 +5325,7 @@ public static NPC.Skin getDefaultSkin(){ } protected void setSkin(@Nullable NPC.Skin skin) { - if(skin == null) skin = NPC.Skin.getSteveSkin(); + if(skin == null) skin = NPC.Skin.Minecraft.getSteveSkin(); this.skin = skin; } @@ -4753,9 +5748,331 @@ public void resetLineOpacity(int line){ public void resetLinesOpacity(){ linesOpacity = new HashMap<>(); } } - /** - * @since 2022.2 - */ + public static class Conditions { + + public enum Type{ + PLAYER_HAS_PERMISSION, + COMPARATOR_SENTENCE, + @Deprecated COMPARATOR_NUMBER, + ; + + public boolean isDeprecated(){ + try { return NPC.Conditions.Type.class.getField(this.name()).isAnnotationPresent(Deprecated.class); } + catch (NoSuchFieldException | SecurityException e) { return false; } + } + } + + public static abstract class Condition implements ConfigurationSerializable{ + + protected final Type type; + protected BiFunction condition; + protected Boolean enabled; + protected ErrorResponse errorResponse; + + protected Condition(Type type) { + this.type = type; + this.errorResponse = new ErrorResponse(); + this.condition = null; + this.enabled = true; + } + + public boolean test(NPC npc, org.bukkit.entity.Player player) { + boolean result = testSilent(npc, player); + if(!result && errorResponse != null) errorResponse.play(npc, player); + return result; + } + + public boolean testSilent(NPC npc, org.bukkit.entity.Player player) { + if(!enabled) return true; + return condition.apply(npc, player); + } + + public ErrorResponse getErrorResponse() { + return errorResponse; + } + + protected void setErrorResponse(ErrorResponse errorResponse) { + this.errorResponse = errorResponse; + } + + public Boolean isEnabled() { + return enabled; + } + + public void setEnabled(Boolean enabled) { + if(enabled == null) enabled = true; + this.enabled = enabled; + } + + public Type getType() { + return type; + } + + protected Map generalSerialization(){ + Map data = new HashMap<>(); + data.put("enabled", isEnabled()); + if(errorResponse.getErrorMessage() == null) data.put("errorResponse.message", ""); + else data.put("errorResponse.message", getErrorResponse().getErrorMessage().replaceAll("§", "&")); + data.put("errorResponse.messageType", getErrorResponse().getChatMessageType().name()); + data.put("errorResponse.redAnimation", getErrorResponse().getPlayRedAnimation()); + data.put("errorResponse.sound", getErrorResponse().getSound() != null ? getErrorResponse().getSound().name() : "none"); + data.put("errorResponse.soundVolume", getErrorResponse().getSoundVolume().doubleValue()); + data.put("errorResponse.soundPitch", getErrorResponse().getSoundPitch().doubleValue()); + return data; + } + + protected static void generalDeserialization(Map map, Condition condition){ + if(map.containsKey("enabled")) condition.setEnabled((Boolean) map.get("enabled")); + ErrorResponse errorResponse = condition.getErrorResponse(); + if(map.containsKey("errorResponse.message")){ + String as = ((String) map.get("errorResponse.message")); + if(as.equals("")) errorResponse.setMessage(null); + else errorResponse.setMessage(as.replaceAll("&", "§")); + } + if(map.containsKey("errorResponse.messageType")) errorResponse.setChatMessageType(ChatMessageType.valueOf((String) map.get("errorResponse.messageType"))); + if(map.containsKey("errorResponse.redAnimation")) errorResponse.setPlayRedAnimation((Boolean) map.get("errorResponse.redAnimation")); + if(map.containsKey("errorResponse.sound")){ + if(map.get("errorResponse.sound").equals("none")) errorResponse.sound = null; + else errorResponse.sound = Sound.valueOf((String) map.get("errorResponse.sound")); + } + if(map.containsKey("errorResponse.soundVolume")) errorResponse.soundVolume = ((Double) map.get("errorResponse.soundVolume")).floatValue(); + if(map.containsKey("errorResponse.soundPitch")) errorResponse.soundPitch = ((Double) map.get("errorResponse.soundPitch")).floatValue(); + } + } + + public static class Comparator{ + + public static class Sentence extends Condition{ + + private String first; + private String second; + private Logic logic; + private Boolean logicNegative; + + public Sentence() { + super(Type.COMPARATOR_SENTENCE); + this.logic = Logic.EQUALS; + this.first = ""; + this.second = ""; + this.logicNegative = false; + super.condition = (npc, player) -> { + if(getFirst() == null || getSecond() == null || getLogic() == null) return true; + String firstSentence = NPC.Placeholders.replace(npc, player, getFirst()); + String secondSentence = NPC.Placeholders.replace(npc, player, getSecond()); + Boolean logicResult = true; + if(getLogic().equals(Logic.EQUALS)) logicResult = firstSentence.equals(secondSentence); + if(getLogic().equals(Logic.EQUALS_IGNORE_CASE)) logicResult = firstSentence.equalsIgnoreCase(secondSentence); + if(getLogic().equals(Logic.CONTAINS)) logicResult = firstSentence.contains(secondSentence); + if(getLogic().equals(Logic.CONTAINS_IGNORE_CASE)) logicResult = firstSentence.toLowerCase().contains(secondSentence.toLowerCase()); + if(getLogic().equals(Logic.STARTS_WITH)) logicResult = firstSentence.startsWith(secondSentence); + if(getLogic().equals(Logic.ENDS_WITH)) logicResult = firstSentence.endsWith(secondSentence); + if(isLogicNegative()) logicResult = !logicResult; + return logicResult; + }; + } + + @Nonnull + public String getFirst() { + return first; + } + + @Nonnull + public String getSecond() { + return second; + } + + @Nonnull + public Logic getLogic() { + return logic; + } + + public Boolean isLogicNegative() { + return logicNegative; + } + + public enum Logic{ + EQUALS, EQUALS_IGNORE_CASE, CONTAINS, CONTAINS_IGNORE_CASE, STARTS_WITH, ENDS_WITH; + } + + public void setFirst(@Nonnull String first) { + Validate.notNull(first); + this.first = first; + } + + public void setSecond(@Nonnull String second) { + Validate.notNull(second); + this.second = second; + } + + public void setLogic(@Nonnull Logic logic) { + Validate.notNull(logic); + this.logic = logic; + } + + public void setLogicNegative(@Nonnull Boolean logicNegative) { + Validate.notNull(logicNegative); + this.logicNegative = logicNegative; + } + + @Override + public Map serialize() { + Map data = new HashMap<>(); + data.put("first", getFirst()); + data.put("second", getSecond()); + data.put("logic", getLogic().name()); + data.putAll(generalSerialization()); + return data; + } + + public static Conditions.Comparator.Sentence deserialize(Map map){ + Conditions.Comparator.Sentence condition = new Conditions.Comparator.Sentence(); + if(map.containsKey("first")) condition.first = (String) map.get("first"); + if(map.containsKey("second")) condition.second = (String) map.get("second"); + if(map.containsKey("logic")) condition.logic = Logic.valueOf((String) map.get("logic")); + if(map.containsKey("logicNegative")) condition.logicNegative = (Boolean) map.get("logicNegative"); + generalDeserialization(map, condition); + return condition; + } + + } + + } + + public static class Player{ + + private Player(){} + + public static class Permission extends Condition{ + + private String permission; + + public Permission(String permission) { + super(Type.PLAYER_HAS_PERMISSION); + super.condition = (npc, player) -> player.hasPermission(NPC.Placeholders.replace(npc, player, getPermission())) || player.isOp(); + this.permission = permission; + } + + public String getPermission() { + return permission; + } + + public void setPermission(@Nonnull String permission) { + Validate.notNull(permission); + this.permission = permission; + } + + @Override + public Map serialize() { + Map data = new HashMap<>(); + data.put("permission", getPermission()); + data.putAll(generalSerialization()); + return data; + } + + public static Conditions.Player.Permission deserialize(Map map){ + Permission permission = new Permission((String) map.get("permission")); + generalDeserialization(map, permission); + return permission; + } + + } + + } + + public static class ErrorResponse{ + + private ChatMessageType chatMessageType; + private String errorMessage; + private Boolean playRedAnimation; + private Sound sound; + private Float soundVolume; + private Float soundPitch; + + public ErrorResponse() { + chatMessageType = ChatMessageType.CHAT; + errorMessage = null; + playRedAnimation = false; + sound = null; + soundVolume = 1.000000000F; + soundPitch = 1.0000000000F; + } + + protected void play(NPC npc, org.bukkit.entity.Player player){ + if(errorMessage != null) player.spigot().sendMessage(chatMessageType, new TextComponent(NPC.Placeholders.replace(npc, player, errorMessage))); + if(playRedAnimation){ + if(npc instanceof Global) ((Global) npc).playAnimation(player, Animation.TAKE_DAMAGE); + else npc.playAnimation(Animation.TAKE_DAMAGE); + } + if(sound != null) player.playSound(npc.getLocation(), sound, soundVolume, soundPitch); + } + + public void setMessage(String errorMessage){ + this.errorMessage = errorMessage; + } + + public void setChatMessageType(ChatMessageType chatMessageType) { + this.chatMessageType = chatMessageType; + } + + public void setMessage(ChatMessageType chatMessageType, String errorMessage){ + this.chatMessageType = chatMessageType; + this.errorMessage = errorMessage; + } + + public void setSound(Sound sound){ + this.sound = sound; + } + + public void setSound(Sound sound, Float volume, Float pitch){ + this.sound = sound; + setSoundVolume(volume); + setSoundPitch(pitch); + } + + public void setSoundVolume(Float soundVolume) { + if(soundVolume <= 0.1) soundVolume = 0.1F; + if(soundVolume >= 1.0) soundVolume = 1.0F; + this.soundVolume = (float) (Math.round(soundVolume * 10.0) / 10.0); + } + + public void setSoundPitch(Float soundPitch) { + if(soundPitch <= 0.5) soundPitch = 0.5F; + if(soundPitch >= 2.0) soundPitch = 2.0F; + this.soundPitch = (float) (Math.round(soundPitch * 10.0) / 10.0); + } + + public void setPlayRedAnimation(Boolean playRedAnimation) { + this.playRedAnimation = playRedAnimation; + } + + public ChatMessageType getChatMessageType() { + return chatMessageType; + } + + public String getErrorMessage() { + return errorMessage; + } + + public Boolean getPlayRedAnimation() { + return playRedAnimation; + } + + public Sound getSound() { + return sound; + } + + public Float getSoundVolume() { + return soundVolume; + } + + public Float getSoundPitch() { + return soundPitch; + } + + } + + } + public static class Placeholders { private static HashMap> placeholders; @@ -4804,6 +6121,13 @@ public static void addPlaceholder(@Nonnull String placeholder, @Nonnull BiFuncti placeholders.put(placeholder, replacement); } + public static void addPlaceholderIfNotExists(@Nonnull String placeholder, @Nonnull BiFunction replacement){ + Validate.notNull(placeholder, "Placeholder cannot be null."); + Validate.notNull(replacement, "Replacement cannot be null."); + if(placeholders.containsKey(placeholder)) return; + placeholders.put(placeholder, replacement); + } + public static boolean existsPlaceholder(@Nonnull String placeholder){ Validate.notNull(placeholder, "Placeholder cannot be null."); return placeholders.containsKey(placeholder); @@ -4821,6 +6145,7 @@ public static String replace(@Nonnull NPC npc, @Nonnull Player player, @Nonnull if(npc instanceof Personal){ Personal personal = (Personal) npc; if(personal.hasGlobal()) customDataNPC = personal.getGlobal(); + else customDataNPC = personal; } for(String key : customDataNPC.getCustomDataKeys()){ if(!string.contains("{customData:" + key + "}")) continue; diff --git a/src/dev/sergiferry/playernpc/api/NPCLib.java b/src/dev/sergiferry/playernpc/api/NPCLib.java index 8044cd9..6f76b02 100644 --- a/src/dev/sergiferry/playernpc/api/NPCLib.java +++ b/src/dev/sergiferry/playernpc/api/NPCLib.java @@ -3,22 +3,26 @@ import com.google.gson.JsonObject; import dev.sergiferry.playernpc.PlayerNPCPlugin; import dev.sergiferry.playernpc.command.NPCGlobalCommand; +import dev.sergiferry.playernpc.command.NPCLibCommand; +import dev.sergiferry.playernpc.nms.minecraft.NMSEntity; import dev.sergiferry.playernpc.nms.minecraft.NMSEntityPlayer; import dev.sergiferry.playernpc.nms.minecraft.NMSNetworkManager; +import dev.sergiferry.playernpc.nms.spigot.NMSFileConfiguration; import dev.sergiferry.playernpc.utils.StringUtils; +import dev.sergiferry.spigot.SpigotPlugin; import dev.sergiferry.spigot.nms.NMSUtils; import dev.sergiferry.spigot.nms.craftbukkit.NMSCraftPlayer; +import dev.sergiferry.spigot.server.ServerVersion; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; +import net.md_5.bungee.api.ChatMessageType; +import net.md_5.bungee.api.chat.TextComponent; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.PacketPlayInUseEntity; import net.minecraft.world.EnumHand; import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Location; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.serialization.ConfigurationSerializable; @@ -26,11 +30,10 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerChangedWorldEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.*; import org.bukkit.event.server.PluginDisableEvent; +import org.bukkit.persistence.PersistentDataType; import org.bukkit.plugin.Plugin; import javax.annotation.Nonnull; @@ -78,6 +81,12 @@ public PluginManager registerPlugin(@Nonnull Plugin plugin){ PluginManager pluginManager = new PluginManager(plugin, this); this.pluginManager.put(plugin, pluginManager); Bukkit.getConsoleSender().sendMessage(this.plugin.getPrefix() + "§7Registered §e" + plugin.getName() + " §7plugin on the NPCLib"); + if(plugin != PlayerNPCPlugin.getInstance()){ + if(config == null) return pluginManager; + if(plugin.getDescription().getAuthors().isEmpty()) return pluginManager; + if(!plugin.getDescription().getAuthors().get(0).equals(PlayerNPCPlugin.getInstance().getDescription().getAuthors().get(0))) + PlayerNPCPlugin.getInstance().cancelAutomaticDownload(); + } return pluginManager; } @@ -104,7 +113,7 @@ public NPC.Personal generatePersonalNPC(@Nonnull Player player, @Nonnull Plugin Validate.notNull(location.getWorld(), "You cannot create NPC with a null world"); Validate.isTrue(!code.toLowerCase().startsWith("global_"), "You cannot create NPC with global tag"); Validate.isTrue(isRegistered(plugin), "This plugin is not registered on NPCLib"); - return generatePlayerPersonalNPC(player, plugin, a(plugin, code), location); + return generatePlayerPersonalNPC(player, plugin, getFormattedName(plugin, code), location); } public NPC.Global generateGlobalNPC(@Nonnull Plugin plugin, @Nonnull String code, @Nonnull NPC.Global.Visibility visibility, @Nullable Predicate visibilityRequirement, @Nonnull Location location){ @@ -114,7 +123,7 @@ public NPC.Global generateGlobalNPC(@Nonnull Plugin plugin, @Nonnull String code Validate.notNull(location, "You cannot create an NPC with a null Location"); Validate.notNull(location.getWorld(), "You cannot create NPC with a null world"); Validate.isTrue(isRegistered(plugin), "This plugin is not registered on NPCLib"); - return generatePlayerGlobalNPC(plugin, a(plugin, code), visibility, visibilityRequirement, location); + return generatePlayerGlobalNPC(plugin, getFormattedName(plugin, code), visibility, visibilityRequirement, location); } public NPC.Global generateGlobalNPC(@Nonnull Plugin plugin, @Nonnull String code, @Nonnull NPC.Global.Visibility visibility, @Nonnull Location location){ @@ -146,26 +155,26 @@ public NPC.Personal getPersonalNPC(@Nonnull Player player, @Nonnull Plugin plugi Validate.notNull(player, "Player must not be null"); Validate.notNull(plugin, "Plugin must not be null"); Validate.notNull(id, "NPC id must not be null"); - return getNPCPlayerManager(player).getNPC(a(plugin, id)); + return getNPCPlayerManager(player).getNPC(getFormattedName(plugin, id)); } public NPC.Global getGlobalNPC(@Nonnull Plugin plugin, @Nonnull String id){ Validate.notNull(plugin, "Plugin must not be null"); Validate.notNull(id, "NPC id must not be null"); - return globalNPCs.get(a(plugin, id)); + return globalNPCs.get(getFormattedName(plugin, id)); } @Deprecated public NPC.Personal getPersonalNPC(@Nonnull Player player, @Nonnull String id){ Validate.notNull(player, "Player must not be null"); Validate.notNull(id, "NPC id must not be null"); - return getNPCPlayerManager(player).getNPC(id); + return getNPCPlayerManager(player).getNPC(id.toLowerCase()); } @Deprecated public NPC.Global getGlobalNPC(@Nonnull String id){ Validate.notNull(id, "NPC id must not be null"); - return globalNPCs.get(id); + return globalNPCs.get(id.toLowerCase()); } public Set getPersonalNPCs(@Nonnull Player player, @Nonnull Plugin plugin){ @@ -291,10 +300,10 @@ protected Plugin getPlugin() { return plugin; } - private String a(Plugin plugin, String code){ + protected static String getFormattedName(Plugin plugin, String code){ String b = plugin.getName().toLowerCase() + "."; if(code == null) return b; - return b + code; + return b + code.toLowerCase(); } private File checkFileExists(){ @@ -308,6 +317,7 @@ public void loadConfig(){ File file = checkFileExists(); this.config = YamlConfiguration.loadConfiguration(file); HashMap defaults = new HashMap<>(); + defaults.put("autoUpdate", true); defaults.put("debug", this.debug); defaults.put("gazeUpdate.ticks", getPluginManager(plugin).updateGazeTicks); defaults.put("gazeUpdate.type", getPluginManager(plugin).updateGazeType.name()); @@ -320,8 +330,8 @@ public void loadConfig(){ m = true; } } - config.setComments("gazeUpdate.type", Arrays.asList("GazeUpdateType: MOVE_EVENT, TICKS")); - config.setComments("skinUpdate.frequency", Arrays.asList("TimeUnit: SECONDS, MINUTES, HOURS, DAYS")); + NMSFileConfiguration.setComments(config, "gazeUpdate.type", Arrays.asList("GazeUpdateType: MOVE_EVENT, TICKS")); + NMSFileConfiguration.setComments(config, "skinUpdate.frequency", Arrays.asList("TimeUnit: SECONDS, MINUTES, HOURS, DAYS")); if(m) { try { config.save(file); } catch (IOException e) { printError(e); } } // this.debug = config.getBoolean("debug"); @@ -329,6 +339,7 @@ public void loadConfig(){ getPluginManager(plugin).skinUpdateFrequency = config.getObject("skinUpdate.frequency", SkinUpdateFrequency.class); getPluginManager(plugin).updateGazeTicks = config.getInt("gazeUpdate.ticks"); getPluginManager(plugin).updateGazeType = NPCLib.UpdateGazeType.valueOf(config.getString("gazeUpdate.type")); + if(config.contains("autoUpdate") && !config.getBoolean("autoUpdate")) PlayerNPCPlugin.getInstance().cancelAutomaticDownload(); getPluginManager(plugin).runGazeUpdate(); } @@ -415,11 +426,106 @@ private void onPluginDisable(PluginDisableEvent event){ if(!npc.isEmpty()) npc.forEach(x-> removePersonalNPC(x));; } + @EventHandler + public void onInteract(PlayerInteractEvent event){ + Player player = event.getPlayer(); + if(!event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) return; + if(!player.isSneaking()) return; + if(!player.isOp()) return; + if(event.getItem() == null) return; + if(!event.getItem().hasItemMeta()) return; + if(!event.getItem().getItemMeta().getPersistentDataContainer().has(NPCLibCommand.skinKey, PersistentDataType.STRING)) return; + String skinKey = event.getItem().getItemMeta().getPersistentDataContainer().get(NPCLibCommand.skinKey, PersistentDataType.STRING); + String npcCode = "preview_" + skinKey; + if(hasPersonalNPC(player, getFormattedName(plugin, npcCode))) return; + event.setCancelled(true); + // + NPC.Placeholders.addPlaceholderIfNotExists("previewSecondsDisappear", (x, y) -> { + if(!x.hasCustomData("previewSecondsDisappear")) return "§c0"; + Integer a = Integer.valueOf(x.getCustomData("previewSecondsDisappear")); + String color = "§a"; + if(a < 10) color = "§e"; + if(a < 5) color = "§c"; + return color + a; + }); + NPC.Personal preview = generatePersonalNPC(player, plugin, npcCode, event.getClickedBlock().getRelative(event.getBlockFace()).getLocation().add(0.5, 0, 0.5)); + preview.addCustomClickAction(NPC.Interact.ClickType.LEFT_CLICK, (npc, player1) -> npc.playAnimation(NPC.Animation.TAKE_DAMAGE)); + NPC.Interact.Actions.CustomAction customAction = preview.addCustomClickAction(NPC.Interact.ClickType.LEFT_CLICK, (npc, player1) -> cancelPreview(preview)); + customAction.setDelayTicks(3L); + preview.setLineOpacity(1, NPC.Hologram.Opacity.LOW); + player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent("§aPreviewing skin...")); + if(skinKey.startsWith(NPC.Skin.Type.MINECRAFT.name() + ":")){ + String skinName = skinKey.replaceFirst(NPC.Skin.Type.MINECRAFT.name() + ":", ""); + preview.setSkin(skinName, skin ->{ + if(skin == null){ + player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent("§cThere was an error fetching that skin.")); + removePersonalNPC(preview); + return; + } + preview.setText("§7Disappear in {previewSecondsDisappear} seconds...", "", "§6§lMinecraft Skin Preview", "§e" + skin.getPlayerName()); + preview.addRunPlayerCommandClickAction(NPC.Interact.ClickType.RIGHT_CLICK, "npclib getskininfo minecraft " + skin.getPlayerName()); + showPreview(preview); + }); + } + else if(skinKey.startsWith(NPC.Skin.Type.MINESKIN.name() + ":")){ + String skinName = skinKey.replaceFirst(NPC.Skin.Type.MINESKIN.name() + ":", ""); + preview.setMineSkin(skinName, skin ->{ + if(skin == null){ + player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent("§cThere was an error fetching that skin.")); + removePersonalNPC(preview); + return; + } + preview.setText("§7Disappear in {previewSecondsDisappear} seconds...", "", "§6§lMineSkin Preview", "§e" + skin.getId()); + preview.addRunPlayerCommandClickAction(NPC.Interact.ClickType.RIGHT_CLICK, "npclib getskininfo mineskin " + skin.getId()); + showPreview(preview); + }); + } + else if(skinKey.startsWith(NPC.Skin.Type.CUSTOM.name() + ":")){ + String skinName = skinKey.replaceFirst(NPC.Skin.Type.CUSTOM.name() + ":", ""); + NPC.Skin.Custom.fetchCustomSkinAsync(skinName, skin -> { + if(skin == null){ + player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent("§cThere was an error fetching that skin.")); + removePersonalNPC(preview); + return; + } + preview.setSkin(skin); + preview.setText("§7Disappear in {previewSecondsDisappear} seconds...", "", "§6§lCustom Skin Preview", "§e" + skin.getFullSkinCode()); + preview.addRunPlayerCommandClickAction(NPC.Interact.ClickType.RIGHT_CLICK, "npclib getskininfo custom " + skin.getFullSkinCode()); + Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> showPreview(preview)); + }); + } + preview.setCustomData("previewSecondsDisappear", "15"); + preview.setCustomData("bukkitTaskID", "" + Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, ()-> { + if(!hasPersonalNPC(player, plugin, npcCode)){ + cancelPreview(preview); + return; + } + Integer seconds = Integer.valueOf(preview.getCustomData("previewSecondsDisappear")); + seconds--; + preview.setCustomData("previewSecondsDisappear", "" + seconds); + preview.updateText(); + if(seconds == 0){ cancelPreview(preview); } + }, 20, 20)); + } + + private void showPreview(NPC.Personal preview){ + preview.create(); + preview.lookAt(preview.getPlayer()); + preview.show(); + } + + private void cancelPreview(NPC.Personal preview){ + preview.getPlayer().spawnParticle(Particle.CLOUD, preview.getLocation(), 3, 0.2, 0.5, 0.2, 0.1); + Bukkit.getScheduler().cancelTask(Integer.valueOf(preview.getCustomData("bukkitTaskID"))); + removePersonalNPC(preview); + } + private void savePersistentNPCs(){ NPC.Global.PersistentManager.forEachPersistentManager(x-> x.save()); } public static NPCLib getInstance(){ + Validate.notNull(instance, "NPCLib has not been started yet, make sure to have PlayerNPC.jar on your plugins folder, and to add dependency or softdependency to PlayerNPC on your plugin.yml"); return instance; } @@ -471,6 +577,14 @@ protected void onDisable(){ } + public NPC.Global getGlobalNPC(String simpleCode){ + return npcLib.getGlobalNPC(plugin, simpleCode); + } + + public NPC.Personal getPersonalNPC(Player player, String simpleCode){ + return npcLib.getPersonalNPC(player, plugin, simpleCode); + } + private void loadPersistentNPCs(){ Bukkit.getConsoleSender().sendMessage(PlayerNPCPlugin.getInstance().getPrefix() + "§7Loading Persistent Global NPCs for plugin §e" + plugin.getName()); File folder = new File("plugins/PlayerNPC/persistent/global/" + plugin.getName().toLowerCase() + "/"); @@ -658,7 +772,7 @@ protected void set(String s, NPC.Personal npc){ } protected NPC.Personal getNPC(Integer entityID){ - return npcs.values().stream().filter(x-> x.isCreated() && NMSEntityPlayer.getEntityID(x.getEntity()).equals(entityID)).findAny().orElse(null); + return npcs.values().stream().filter(x-> x.isCreated() && NMSEntity.getEntityID(x.getEntity()).equals(entityID)).findAny().orElse(null); } protected void removeNPC(String code){ @@ -792,9 +906,7 @@ private void interact(NPC.Personal npc, NPC.Interact.ClickType clickType){ if(npc == null) return; if(lastClick.containsKey(npc) && System.currentTimeMillis() - lastClick.get(npc) < npc.getInteractCooldown()) return; lastClick.put(npc, System.currentTimeMillis()); - Bukkit.getScheduler().scheduleSyncDelayedTask(npcPlayerManager.getNPCLib().getPlugin(), ()-> { - npc.interact(npcPlayerManager.getPlayer(), clickType); - }, 1); + Bukkit.getScheduler().runTask(npcPlayerManager.getNPCLib().getPlugin(), ()-> npc.interact(npcPlayerManager.getPlayer(), clickType)); } protected PlayerManager getPlayerManager() { From dc9fd2ac8e7d78b9b5f413a902ec94ab5a6d2dc0 Mon Sep 17 00:00:00 2001 From: SergiFerry Date: Sun, 19 Mar 2023 14:53:10 +0100 Subject: [PATCH 2/2] Player NPC 2023.4 RC --- docs/allclasses-index.html | 206 +- docs/allpackages-index.html | 4 +- docs/deprecated-list.html | 136 +- .../playernpc/api/NPC.Animation.html | 53 +- .../playernpc/api/NPC.Attributes.html | 735 ++- .../sergiferry/playernpc/api/NPC.Color.html | 190 +- .../playernpc/api/NPC.Events.FinishMove.html | 4 +- .../playernpc/api/NPC.Events.Hide.html | 4 +- .../playernpc/api/NPC.Events.Interact.html | 4 +- .../playernpc/api/NPC.Events.Move.html | 4 +- .../playernpc/api/NPC.Events.Show.html | 4 +- .../playernpc/api/NPC.Events.StartMove.html | 4 +- .../playernpc/api/NPC.Events.Teleport.html | 4 +- .../sergiferry/playernpc/api/NPC.Events.html | 4 +- .../playernpc/api/NPC.Hologram.Opacity.html | 24 +- .../playernpc/api/NPC.Hologram.html | 4 +- .../api/NPC.Interact.Actions.Command.html | 47 +- .../api/NPC.Interact.Actions.Type.html | 210 +- .../playernpc/api/NPC.Interact.Actions.html | 22 +- .../api/NPC.Interact.ClickAction.html | 96 +- .../playernpc/api/NPC.Interact.ClickType.html | 4 +- .../playernpc/api/NPC.Interact.html | 4 +- .../playernpc/api/NPC.Move.Speed.html | 8 +- .../api/NPC.Move.Task.CancelCause.html | 4 +- .../api/NPC.Move.Task.PerformanceOptions.html | 4 +- .../playernpc/api/NPC.Move.Task.html | 8 +- .../sergiferry/playernpc/api/NPC.Move.html | 8 +- .../sergiferry/playernpc/api/NPC.Pose.html | 59 +- .../sergiferry/playernpc/api/NPC.Skin.html | 389 +- .../sergiferry/playernpc/api/NPC.Slot.html | 105 +- docs/dev/sergiferry/playernpc/api/NPC.html | 1552 ++++- docs/dev/sergiferry/playernpc/api/NPCLib.html | 464 +- .../playernpc/api/package-summary.html | 171 +- .../playernpc/api/package-tree.html | 115 +- docs/help-doc.html | 4 +- docs/index-files/index-1.html | 80 +- docs/index-files/index-10.html | 10 +- docs/index-files/index-11.html | 52 +- docs/index-files/index-12.html | 52 +- docs/index-files/index-13.html | 160 +- docs/index-files/index-14.html | 286 +- docs/index-files/index-15.html | 48 +- docs/index-files/index-16.html | 134 +- docs/index-files/index-17.html | 333 +- docs/index-files/index-18.html | 561 +- docs/index-files/index-19.html | 80 +- docs/index-files/index-2.html | 20 +- docs/index-files/index-20.html | 216 +- docs/index-files/index-21.html | 312 +- docs/index-files/index-3.html | 98 +- docs/index-files/index-4.html | 30 +- docs/index-files/index-5.html | 38 +- docs/index-files/index-6.html | 178 +- docs/index-files/index-7.html | 450 +- docs/index-files/index-8.html | 68 +- docs/index-files/index-9.html | 100 +- docs/index.html | 4 +- docs/member-search-index.js | 2 +- docs/overview-tree.html | 115 +- docs/type-search-index.js | 2 +- src/dev/sergiferry/playernpc/api/NPC.java | 5440 ++++++++++------- src/dev/sergiferry/playernpc/api/NPCLib.java | 739 ++- 62 files changed, 9755 insertions(+), 4511 deletions(-) diff --git a/docs/allclasses-index.html b/docs/allclasses-index.html index cef7a51..6e3ff01 100644 --- a/docs/allclasses-index.html +++ b/docs/allclasses-index.html @@ -2,11 +2,11 @@ - + All Classes - + @@ -58,7 +58,7 @@

All Classes

-
+
Class
@@ -73,80 +73,136 @@

All Classes

 
NPC.Color
 
-
NPC.Events
+
NPC.Color.MaterialType
+
 
+
NPC.Conditions
+
 
+
NPC.Conditions.Comparator
 
-
NPC.Events.FinishMove
+
NPC.Conditions.Comparator.Sentence
+
 
+
NPC.Conditions.Comparator.Sentence.Logic
+
 
+
NPC.Conditions.Condition
 
-
NPC.Events.Hide
+
NPC.Conditions.ErrorResponse
 
-
NPC.Events.Interact
+
NPC.Conditions.Player
 
-
NPC.Events.Move
+
NPC.Conditions.Player.Balance
 
-
NPC.Events.Show
+
NPC.Conditions.Player.Permission
 
-
NPC.Events.StartMove
+
NPC.Conditions.Type
+
 
+
NPC.Events
+
 
+
NPC.Events.FinishMove
 
-
NPC.Events.Teleport
+
NPC.Events.Hide
 
-
NPC.GazeTrackingType
-
+
NPC.Events.Interact
+
 
+
NPC.Events.Move
+
 
+
NPC.Events.Show
+
 
+
NPC.Events.StartMove
+
 
+
NPC.Events.Teleport
+
 
+
NPC.GazeTrackingType
+
Set the follow look type to the NPC with NPC.setGazeTrackingType(GazeTrackingType)
-
NPC.Global
+
NPC.Global
+
 
+
NPC.Global.PersistentManager
 
-
NPC.Global.PersistentManager
+
NPC.Global.PersistentManager.LastUpdate.Type
+
 
+
NPC.Global.Visibility
+
 
+
NPC.Hologram
 
-
NPC.Global.PersistentManager.LastUpdate.Type
+
NPC.Hologram.Opacity
 
-
NPC.Global.Visibility
-
 
-
NPC.Hologram
+
NPC.Interact
+
 
+
NPC.Interact.Actions
 
-
NPC.Hologram.Opacity
-
 
-
NPC.Interact
+
NPC.Interact.Actions.Command
+
 
+
NPC.Interact.Actions.Console
 
-
NPC.Interact.Actions
+
NPC.Interact.Actions.Console.PerformCommand
 
-
NPC.Interact.Actions.ActionBar
+
NPC.Interact.Actions.CustomAction
 
-
NPC.Interact.Actions.BungeeServer
+
NPC.Interact.Actions.Money
 
-
NPC.Interact.Actions.Command
+
NPC.Interact.Actions.PlayAnimation
 
-
NPC.Interact.Actions.ConsoleCommand
+
NPC.Interact.Actions.Player
 
-
NPC.Interact.Actions.Custom
+
NPC.Interact.Actions.Player.ConnectBungeeServer
 
-
NPC.Interact.Actions.Message
+
NPC.Interact.Actions.Player.GiveItem
+
 
+
NPC.Interact.Actions.Player.GiveItem.GiveType
+
 
+
NPC.Interact.Actions.Player.GiveKit
 
-
NPC.Interact.Actions.PlayerCommand
+
NPC.Interact.Actions.Player.GiveMoney
 
-
NPC.Interact.Actions.TeleportToLocation
+
NPC.Interact.Actions.Player.OpenBook
+
 
+
NPC.Interact.Actions.Player.OpenEnchanting
+
Deprecated.
+
NPC.Interact.Actions.Player.OpenWorkbench
 
-
NPC.Interact.Actions.Title
+
NPC.Interact.Actions.Player.PerformCommand
 
-
NPC.Interact.Actions.Type
-
 
-
NPC.Interact.ClickAction
+
NPC.Interact.Actions.Player.PlaySound
+
 
+
NPC.Interact.Actions.Player.SendActionBarMessage
 
-
NPC.Interact.ClickType
-
 
-
NPC.Move
+
NPC.Interact.Actions.Player.SendChatMessage
+
 
+
NPC.Interact.Actions.Player.SendTitleMessage
+
 
+
NPC.Interact.Actions.Player.TeleportToLocation
+
 
+
NPC.Interact.Actions.Player.WithdrawMoney
 
-
NPC.Move.Behaviour
+
NPC.Interact.Actions.SetCustomData
 
-
NPC.Move.Behaviour.Type
+
NPC.Interact.Actions.Type
 
-
NPC.Move.Speed
-
 
-
NPC.Move.Task
+
NPC.Interact.ClickAction
+
 
+
NPC.Interact.ClickType
+
 
+
NPC.Inventory
+
 
+
NPC.Inventory.Kit
+
 
+
NPC.Move
+
 
+
NPC.Move.Behaviour
 
-
NPC.Move.Task.CancelCause
+
NPC.Move.Behaviour.Type
 
-
NPC.Move.Task.PerformanceOptions
+
NPC.Move.Speed
+
 
+
NPC.Move.Task
+
 
+
NPC.Move.Task.CancelCause
 
+
NPC.Move.Task.PerformanceOptions
+
 
+
NPC.NameTag
+
 
NPC.Personal
 
NPC.Placeholders
@@ -155,17 +211,57 @@

All Classes

Set the NPCPose of the NPC with NPC.setPose(Pose)
-
NPC.Skin
+
NPC.PotionParticlesType
+
 
+
NPC.Skin
+
 
+
NPC.Skin.Avatar
+
 
+
NPC.Skin.Cape
+
 
+
NPC.Skin.Custom
+
 
+
NPC.Skin.Custom.FetchResult
+
 
+
NPC.Skin.Custom.FetchResult.Error
+
 
+
NPC.Skin.FetchResult<S extends NPC.Skin,​E extends dev.sergiferry.playernpc.api.NPC.Skin.FetchResult.Error>
+
 
+
NPC.Skin.Layer
+
 
+
NPC.Skin.Minecraft
+
 
+
NPC.Skin.Minecraft.FetchResult
+
 
+
NPC.Skin.Minecraft.FetchResult.Error
+
 
+
NPC.Skin.Minecraft.ObtainedFrom
+
 
+
NPC.Skin.MineSkin
+
 
+
NPC.Skin.MineSkin.FetchResult
 
-
NPC.Skin.ObtainedFrom
+
NPC.Skin.MineSkin.FetchResult.Error
 
-
NPC.Skin.Part
+
NPC.Skin.MineSkin.ObtainedFrom
 
-
NPC.Skin.Parts
+
NPC.Skin.Model
+
 
+
NPC.Skin.SignedTexture
+
 
+
NPC.Skin.Textures
 
NPC.Skin.Type
 
-
NPC.Slot
+
NPC.Skin.VisibleLayers
+
 
+
NPC.Slot
+
 
+
NPC.TabListVisibility
+
 
+
NPC.Updatable<N extends NPC>
+
 
+
NPC.Updatable.Type
 
NPCLib
@@ -177,10 +273,14 @@

All Classes

 
NPCLib.PluginManager
 
-
NPCLib.SkinUpdateFrequency
+
NPCLib.Registry<V>
 
-
NPCLib.TabListIDType
-
 
+
NPCLib.Registry.ID
+
 
+
NPCLib.Registry.Identified
+
 
+
NPCLib.SkinUpdateFrequency
+
 
NPCLib.UpdateGazeType
 
diff --git a/docs/allpackages-index.html b/docs/allpackages-index.html index 3dcea2c..761885d 100644 --- a/docs/allpackages-index.html +++ b/docs/allpackages-index.html @@ -2,11 +2,11 @@ - + All Packages - + diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html index c253754..6de6d67 100644 --- a/docs/deprecated-list.html +++ b/docs/deprecated-list.html @@ -2,11 +2,11 @@ - + Deprecated List - + @@ -54,33 +54,135 @@

Deprecated API

Contents

+
diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Animation.html b/docs/dev/sergiferry/playernpc/api/NPC.Animation.html index cf49b81..a4af1ac 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Animation.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Animation.html @@ -2,11 +2,11 @@ - + NPC.Animation - + @@ -82,7 +82,7 @@

Enum Class NPC.Animation

All Implemented Interfaces:
-
Serializable, Comparable<NPC.Animation>, Constable
+
dev.sergiferry.playernpc.utils.EnumUtils.GetName, Serializable, Comparable<NPC.Animation>, Constable
Enclosing class:
@@ -90,7 +90,8 @@

Enum Class NPC.Animation

public static enum NPC.Animation -extends Enum<NPC.Animation>
+extends Enum<NPC.Animation> +implements dev.sergiferry.playernpc.utils.EnumUtils.GetName
Since:
2022.2
@@ -143,23 +144,26 @@

Method Summary

Modifier and Type
Method
Description
-
static NPC.Animation
-
getAnimation​(int id)
+
static Optional<NPC.Animation>
+
fromID​(int id)
 
-
int
-
getId()
-
 
-
boolean
-
isDeprecated()
+
static Optional<NPC.Animation>
+
fromName​(String name)
+
 
+
int
+
getId()
 
-
static NPC.Animation
-
valueOf​(String name)
-
+
boolean
+
isDeprecated()
+
 
+
static NPC.Animation
+
valueOf​(String name)
+
Returns the enum constant of this class with the specified name.
-
static NPC.Animation[]
-
values()
-
+
static NPC.Animation[]
+
values()
+
Returns an array containing the constants of this enum class, in the order they are declared.
@@ -172,6 +176,9 @@

Methods inherited from clas

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait
+
+

Methods inherited from interface dev.sergiferry.playernpc.utils.EnumUtils.GetName

+getName, getName
@@ -273,9 +280,15 @@

isDeprecated

  • -
    -

    getAnimation

    -
    public static NPC.Animation getAnimation​(int id)
    +
    +

    fromName

    +
    public static Optional<NPC.Animation> fromName​(String name)
    +
    +
    • +
  • +
    +

    fromID

    +
    public static Optional<NPC.Animation> fromID​(int id)
    • diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Attributes.html b/docs/dev/sergiferry/playernpc/api/NPC.Attributes.html index 63b457f..d314c43 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Attributes.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Attributes.html @@ -2,11 +2,11 @@ - + NPC.Attributes - + @@ -47,13 +47,13 @@
  • Summary: 
  • Nested | 
  • Field | 
    • -
  • Constr | 
    • +
  • Constr | 
  • Method
    • @@ -85,13 +85,53 @@

    Class NPC.Attributes

    public static class NPC.Attributes extends Object
    -
    -
    Since:
    -
    2022.1
    -
    @@ -344,6 +501,51 @@

    Methods inherited from cl
      + +
    • +
      +

      Constructor Details

      + +
      +
    • @@ -399,25 +601,12 @@

      getSkin

    • -
      -

      getSkinParts

      -
      public NPC.Skin.Parts getSkinParts()
      -
      -
      • -

    • getDefaultSkin

      public static NPC.Skin getDefaultSkin()
    • -
      -

      setDefaultSkinParts

      -
      public static void setDefaultSkinParts​(@Nullable - NPC.Skin.Parts skinParts)
      -
      -
      • -

    • setDefaultSkin

      public static void setDefaultSkin​(@Nullable @@ -425,6 +614,25 @@

      setDefaultSkin

    • +
      +

      getSkinVisibleLayers

      +
      public NPC.Skin.VisibleLayers getSkinVisibleLayers()
      +
      +
      • +
    • +
      +

      getDefaultSkinVisibleLayers

      +
      public NPC.Skin.VisibleLayers getDefaultSkinVisibleLayers()
      +
      +
      • +
    • +
      +

      setDefaultSkinVisibleLayers

      +
      public static void setDefaultSkinVisibleLayers​(@Nullable + NPC.Skin.VisibleLayers skinVisibleLayers)
      +
      +
      • +

    • getText

      public List<String> getText()
      @@ -444,6 +652,62 @@

      setDefaultText

    • +
      +

      getTextItem

      +
      public org.bukkit.inventory.ItemStack getTextItem()
      +
      +
      • +
    • +
      +

      getDefaultTextItem

      +
      public static org.bukkit.inventory.ItemStack getDefaultTextItem()
      +
      +
      • +
    • +
      +

      setDefaultTextItem

      +
      public static void setDefaultTextItem​(@Nullable + org.bukkit.inventory.ItemStack itemStack)
      +
      +
      • +
    • +
      +

      isTextItemGlowing

      +
      public Boolean isTextItemGlowing()
      +
      +
      • +
    • +
      +

      isDefaultTextItemGlowing

      +
      public static Boolean isDefaultTextItemGlowing()
      +
      +
      • +
    • +
      +

      setDefaultTextItemGlowing

      +
      public static void setDefaultTextItemGlowing​(boolean textItemGlowing)
      +
      +
      • +
    • +
      +

      getTextItemGlowingColor

      +
      public NPC.Color getTextItemGlowingColor()
      +
      +
      • +
    • +
      +

      getDefaultTextItemGlowingColor

      +
      public static NPC.Color getDefaultTextItemGlowingColor()
      +
      +
      • +
    • +
      +

      setDefaultTextItemGlowingColor

      +
      public static void setDefaultTextItemGlowingColor​(@Nullable + NPC.Color textItemGlowingColor)
      +
      +
      • +

    • getHelmet

      public org.bukkit.inventory.ItemStack getHelmet()
      @@ -463,21 +727,21 @@

      setDefaultHelmet

    • -
      -

      getChestPlate

      -
      public org.bukkit.inventory.ItemStack getChestPlate()
      +
      +

      getChestplate

      +
      public org.bukkit.inventory.ItemStack getChestplate()
    • -
      -

      getDefaultChestPlate

      -
      public static org.bukkit.inventory.ItemStack getDefaultChestPlate()
      +
      +

      getDefaultChestplate

      +
      public static org.bukkit.inventory.ItemStack getDefaultChestplate()
    • -
      -

      setDefaultChestPlate

      -
      public static void setDefaultChestPlate​(@Nullable +
      +

      setDefaultChestplate

      +
      public static void setDefaultChestplate​(@Nullable org.bukkit.inventory.ItemStack itemStack)
      • @@ -561,6 +825,24 @@

      setDefaultCollidable

  • +
    +

    isGroundParticles

    +
    public boolean isGroundParticles()
    +
    +
    • +
  • +
    +

    isDefaultGroundParticles

    +
    public static boolean isDefaultGroundParticles()
    +
    +
    • +
  • +
    +

    setDefaultGroundParticles

    +
    public static void setDefaultGroundParticles​(boolean groundParticles)
    +
    +
    • +

  • getHideDistance

    public Double getHideDistance()
    @@ -589,6 +871,24 @@

    setDefaultHideDistance

  • +
    +

    getTextHideDistance

    +
    public Double getTextHideDistance()
    +
    +
    • +
  • +
    +

    getDefaultTextHideDistance

    +
    public static Double getDefaultTextHideDistance()
    +
    +
    • +
  • +
    +

    setDefaultTextHideDistance

    +
    public static void setDefaultTextHideDistance​(double textHideDistance)
    +
    +
    • +

  • isGlowing

    public boolean isGlowing()
    @@ -619,10 +919,28 @@

    getDefaultGlowingColor

  • -
    +

    setDefaultGlowingColor

    public static void setDefaultGlowingColor​(@Nullable - org.bukkit.ChatColor color)
    + NPC.Color color) +
    +
    • +
  • +
    +

    isInvisible

    +
    public Boolean isInvisible()
    +
    +
    • +
  • +
    +

    isDefaultInvisible

    +
    public static Boolean isDefaultInvisible()
    +
    +
    • +
  • +
    +

    setDefaultInvisible

    +
    public static void setDefaultInvisible​(boolean invisible)
  • @@ -645,40 +963,60 @@

    setDefaultGazeTrackingType

  • -
    -

    getCustomTabListName

    -
    public String getCustomTabListName()
    +
    +

    getNameTag

    +
    public NPC.NameTag getNameTag()
    +
    +
    • +
  • +
    +

    getDefaultNameTag

    +
    public static NPC.NameTag getDefaultNameTag()
    +
    +
    • +
  • +
    +

    setDefaultNameTag

    +
    public static void setDefaultNameTag​(@Nullable + String prefix, + @Nullable + String suffix)
  • -
    -

    getDefaultTabListName

    -
    public static String getDefaultTabListName()
    +
    +

    getTabListName

    +
    public String getTabListName()
  • -
    -

    setDefaultCustomTabListName

    -
    public static void setDefaultCustomTabListName​(@Nonnull - String customTabListName)
    +
    +

    isShowNameTag

    +
    public Boolean isShowNameTag()
  • -
    -

    isShowOnTabList

    -
    public boolean isShowOnTabList()
    +
    +

    setShowNameTag

    +
    public NPC.Updatable.Type setShowNameTag​(boolean showNameTag)
  • -
    -

    isDefaultShowOnTabList

    -
    public boolean isDefaultShowOnTabList()
    +
    +

    getTabListVisibility

    +
    public NPC.TabListVisibility getTabListVisibility()
  • -
    -

    setDefaultShowOnTabList

    -
    public static void setDefaultShowOnTabList​(boolean showOnTabList)
    +
    +

    getDefaultTabListVisibility

    +
    public static NPC.TabListVisibility getDefaultTabListVisibility()
    +
    +
    • +
  • +
    +

    setDefaultTabListVisibility

    +
    public static void setDefaultTabListVisibility​(NPC.TabListVisibility tabListVisibility)
  • @@ -700,21 +1038,21 @@

    setDefaultInteractCooldown

  • -
    -

    getLineSpacing

    -
    public Double getLineSpacing()
    +
    +

    getTextLineSpacing

    +
    public Double getTextLineSpacing()
  • -
    -

    getDefaultLineSpacing

    -
    public static Double getDefaultLineSpacing()
    +
    +

    getDefaultTextLineSpacing

    +
    public static Double getDefaultTextLineSpacing()
  • -
    -

    setDefaultLineSpacing

    -
    public static void setDefaultLineSpacing​(double lineSpacing)
    +
    +

    setDefaultTextLineSpacing

    +
    public static void setDefaultTextLineSpacing​(double lineSpacing)
  • @@ -804,28 +1142,133 @@

    getDefaultMoveSpeed

  • -
    -

    setLineOpacity

    -
    public void setLineOpacity​(int line, - NPC.Hologram.Opacity opacity)
    +
    +

    getTextLineOpacity

    +
    public NPC.Hologram.Opacity getTextLineOpacity​(int line)
    +
    +
    • +
  • +
    +

    resetTextLineOpacity

    +
    public void resetTextLineOpacity​(int line)
    +
    +
    • +
  • +
    +

    resetTextLinesOpacity

    +
    public NPC.Updatable.Type resetTextLinesOpacity()
    +
    +
    • +
  • +
    +

    getPotionParticlesColor

    +
    public Color getPotionParticlesColor()
    +
    +
    • +
  • +
    +

    getDefaultPotionParticlesColor

    +
    public static Color getDefaultPotionParticlesColor()
    +
    +
    • +
  • +
    +

    setPotionParticlesColor

    +
    public NPC.Updatable.Type setPotionParticlesColor​(@Nullable + Color potionParticlesColor)
    +
    +
    • +
  • +
    +

    setDefaultPotionParticlesColor

    +
    public static void setDefaultPotionParticlesColor​(@Nullable + Color potionParticlesColor)
    +
    +
    • +
  • +
    +

    getPotionParticlesType

    +
    public NPC.PotionParticlesType getPotionParticlesType()
    +
    +
    • +
  • +
    +

    getDefaultPotionParticlesType

    +
    public static NPC.PotionParticlesType getDefaultPotionParticlesType()
    +
    +
    • +
  • +
    +

    setPotionParticlesType

    +
    public NPC.Updatable.Type setPotionParticlesType​(@Nullable + NPC.PotionParticlesType potionParticlesType)
    +
    +
    • +
  • +
    +

    setDefaultPotionParticlesType

    +
    public static void setDefaultPotionParticlesType​(@Nullable + NPC.PotionParticlesType potionParticlesType)
    +
    +
    • +
  • +
    +

    getArrowsInBody

    +
    public Integer getArrowsInBody()
    +
    +
    • +
  • +
    +

    getDefaultArrowsInBody

    +
    public static Integer getDefaultArrowsInBody()
    +
    +
    • +
  • +
    +

    setDefaultArrowsInBody

    +
    public void setDefaultArrowsInBody​(int arrowsInBody)
    +
    +
    • +
  • +
    +

    getBeeStingersInBody

    +
    public Integer getBeeStingersInBody()
    +
    +
    • +
  • +
    +

    getDefaultBeeStingersInBody

    +
    public static Integer getDefaultBeeStingersInBody()
    +
    +
    • +
  • +
    +

    setBeeStingersInBody

    +
    public NPC.Updatable.Type setBeeStingersInBody​(int beeStingersInBody)
    +
    +
    • +
  • +
    +

    setDefaultBeeStingersInBody

    +
    public void setDefaultBeeStingersInBody​(int beeStingersInBody)
  • -
    -

    getLineOpacity

    -
    public NPC.Hologram.Opacity getLineOpacity​(int line)
    +
    +

    isShaking

    +
    public Boolean isShaking()
  • -
    -

    resetLineOpacity

    -
    public void resetLineOpacity​(int line)
    +
    +

    isDefaultShaking

    +
    public static Boolean isDefaultShaking()
  • -
    -

    resetLinesOpacity

    -
    public void resetLinesOpacity()
    +
    +

    setDefaultShaking

    +
    public static void setDefaultShaking​(boolean shaking)
    • diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Color.html b/docs/dev/sergiferry/playernpc/api/NPC.Color.html index 076912e..a264a96 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Color.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Color.html @@ -2,11 +2,11 @@ - + NPC.Color - + @@ -82,7 +82,7 @@

    Enum Class NPC.Color

    All Implemented Interfaces:
    -
    Serializable, Comparable<NPC.Color>, Constable
    +
    dev.sergiferry.playernpc.utils.EnumUtils.GetName, Serializable, Comparable<NPC.Color>, Constable
    Enclosing class:
    @@ -90,7 +90,8 @@

    Enum Class NPC.Color

    public static enum NPC.Color -extends Enum<NPC.Color>
    +extends Enum<NPC.Color> +implements dev.sergiferry.playernpc.utils.EnumUtils.GetName
    Since:
    2022.2
    @@ -102,6 +103,15 @@

    Enum Class NPC.Color

  • Nested Class Summary

    +
    Nested Classes
    +
    +
    Modifier and Type
    +
    Class
    +
    Description
    +
    static class 
    +
    NPC.Color.MaterialType
    +
     
    +

    Nested classes/interfaces inherited from class java.lang.Enum

    Enum.EnumDesc<E extends Enum<E>>
    @@ -162,19 +172,59 @@

    Method Summary

    Method
    Description
    org.bukkit.ChatColor
    -
    getChatColor()
    +
    asBukkitChatColor()
     
    -
    static NPC.Color
    -
    getColor​(org.bukkit.ChatColor chatColor)
    +
    org.bukkit.Color
    +
    asBukkitColor()
    +
     
    +
    org.bukkit.DyeColor
    +
    asBukkitDyeColor()
    +
     
    +
    net.md_5.bungee.api.ChatColor
    +
    asBungeeChatColor()
    +
     
    +
    Color
    +
    asJavaColor()
    +
     
    +
    static Optional<NPC.Color>
    +
    fromName​(String name)
     
    -
    static NPC.Color
    -
    valueOf​(String name)
    -
    +
    org.bukkit.Material
    +
    getBukkitMaterial​(NPC.Color.MaterialType type)
    +
     
    +
    String
    +
    getName​(dev.sergiferry.playernpc.utils.EnumUtils.NameFormat nameFormat)
    +
     
    +
    String
    +
    getName​(dev.sergiferry.playernpc.utils.EnumUtils.NameFormat nameFormat, + boolean colored)
    +
     
    +
    static Optional<NPC.Color>
    +
    of​(Color color)
    +
     
    +
    static Optional<NPC.Color>
    +
    of​(net.md_5.bungee.api.ChatColor color)
    +
     
    +
    static Optional<NPC.Color>
    +
    of​(org.bukkit.ChatColor color)
    +
     
    +
    static Optional<NPC.Color>
    +
    of​(org.bukkit.Color color)
    +
     
    +
    static Optional<NPC.Color>
    +
    of​(org.bukkit.DyeColor color)
    +
     
    +
    static Optional<NPC.Color>
    +
    of​(org.bukkit.Material material)
    +
     
    +
    static NPC.Color
    +
    valueOf​(String name)
    +
    Returns the enum constant of this class with the specified name.
    -
    static NPC.Color[]
    -
    values()
    -
    +
    static NPC.Color[]
    +
    values()
    +
    Returns an array containing the constants of this enum class, in the order they are declared.
    @@ -187,6 +237,9 @@

    Methods inherited from clas

    Methods inherited from class java.lang.Object

    getClass, notify, notifyAll, wait, wait, wait
    +
    +

    Methods inherited from interface dev.sergiferry.playernpc.utils.EnumUtils.GetName

    +getName

    • @@ -334,15 +387,114 @@

    valueOf

  • -
    -

    getChatColor

    -
    public org.bukkit.ChatColor getChatColor()
    +
    +

    getName

    +
    @Nonnull +public String getName​(dev.sergiferry.playernpc.utils.EnumUtils.NameFormat nameFormat)
    +
    +
    Specified by:
    +
    getName in interface dev.sergiferry.playernpc.utils.EnumUtils.GetName
    +
    +
    +
    • +
  • +
    +

    getName

    +
    @Nonnull +public String getName​(dev.sergiferry.playernpc.utils.EnumUtils.NameFormat nameFormat, + boolean colored)
    +
    +
    • +
  • +
    +

    asBukkitChatColor

    +
    @Nonnull +public org.bukkit.ChatColor asBukkitChatColor()
    +
    +
    • +
  • +
    +

    asBungeeChatColor

    +
    @Nonnull +public net.md_5.bungee.api.ChatColor asBungeeChatColor()
    +
    +
    • +
  • +
    +

    asJavaColor

    +
    @Nonnull +public Color asJavaColor()
    +
    +
    • +
  • +
    +

    asBukkitColor

    +
    @Nonnull +public org.bukkit.Color asBukkitColor()
    +
    +
    • +
  • +
    +

    asBukkitDyeColor

    +
    @Nonnull +public org.bukkit.DyeColor asBukkitDyeColor()
    +
    +
    • +
  • +
    +

    getBukkitMaterial

    +
    @Nonnull +public org.bukkit.Material getBukkitMaterial​(@Nonnull + NPC.Color.MaterialType type)
    +
    +
    • +
  • +
    +

    fromName

    +
    public static Optional<NPC.Color> fromName​(@Nonnull + String name)
    +
    +
    • +
  • +
    +

    of

    +
    public static Optional<NPC.Color> of​(@Nonnull + org.bukkit.ChatColor color)
    +
    +
    • +
  • +
    +

    of

    +
    public static Optional<NPC.Color> of​(@Nonnull + net.md_5.bungee.api.ChatColor color)
    +
    +
    • +
  • +
    +

    of

    +
    public static Optional<NPC.Color> of​(@Nonnull + Color color)
    +
    +
    • +
  • +
    +

    of

    +
    public static Optional<NPC.Color> of​(@Nonnull + org.bukkit.Color color)
    +
    +
    • +
  • +
    +

    of

    +
    public static Optional<NPC.Color> of​(@Nonnull + org.bukkit.DyeColor color)
  • -
    -

    getColor

    -
    public static NPC.Color getColor​(org.bukkit.ChatColor chatColor)
    +
    +

    of

    +
    public static Optional<NPC.Color> of​(@Nonnull + org.bukkit.Material material)
    • diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.FinishMove.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.FinishMove.html index eda6a77..a88c464 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.FinishMove.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.FinishMove.html @@ -2,11 +2,11 @@ - + NPC.Events.FinishMove - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.Hide.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.Hide.html index 15c0dcb..7434608 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.Hide.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.Hide.html @@ -2,11 +2,11 @@ - + NPC.Events.Hide - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.Interact.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.Interact.html index 2cfc270..d481e8d 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.Interact.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.Interact.html @@ -2,11 +2,11 @@ - + NPC.Events.Interact - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.Move.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.Move.html index 21fba8a..1e2efd9 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.Move.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.Move.html @@ -2,11 +2,11 @@ - + NPC.Events.Move - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.Show.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.Show.html index c359e75..c6aed13 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.Show.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.Show.html @@ -2,11 +2,11 @@ - + NPC.Events.Show - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.StartMove.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.StartMove.html index d0e936d..fabf979 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.StartMove.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.StartMove.html @@ -2,11 +2,11 @@ - + NPC.Events.StartMove - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.Teleport.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.Teleport.html index 0182812..d0f85ad 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.Teleport.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.Teleport.html @@ -2,11 +2,11 @@ - + NPC.Events.Teleport - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Events.html b/docs/dev/sergiferry/playernpc/api/NPC.Events.html index 292c460..114bd22 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Events.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Events.html @@ -2,11 +2,11 @@ - + NPC.Events - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Hologram.Opacity.html b/docs/dev/sergiferry/playernpc/api/NPC.Hologram.Opacity.html index 42c3d9e..f68f1b7 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Hologram.Opacity.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Hologram.Opacity.html @@ -2,11 +2,11 @@ - + NPC.Hologram.Opacity - + @@ -82,7 +82,7 @@

    Enum Class NPC.Hologra
    All Implemented Interfaces:
    -
    Serializable, Comparable<NPC.Hologram.Opacity>, Constable
    +
    dev.sergiferry.playernpc.utils.EnumUtils.GetName, Serializable, Comparable<NPC.Hologram.Opacity>, Constable
    Enclosing class:
    @@ -90,11 +90,8 @@

    Enum Class NPC.Hologra

    public static enum NPC.Hologram.Opacity -extends Enum<NPC.Hologram.Opacity>
    -
    -
    Since:
    -
    2022.1
    -
    +extends Enum<NPC.Hologram.Opacity> +implements dev.sergiferry.playernpc.utils.EnumUtils.GetName
    @@ -251,9 +251,9 @@

    valueOf

  • -
    -

    getOpacity

    -
    public static NPC.Hologram.Opacity getOpacity​(String name)
    +
    +

    fromName

    +
    public static NPC.Hologram.Opacity fromName​(String name)
    • diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Hologram.html b/docs/dev/sergiferry/playernpc/api/NPC.Hologram.html index b620b1a..d9c5c0d 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Hologram.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Hologram.html @@ -2,11 +2,11 @@ - + NPC.Hologram - + diff --git a/docs/dev/sergiferry/playernpc/api/NPC.Interact.Actions.Command.html b/docs/dev/sergiferry/playernpc/api/NPC.Interact.Actions.Command.html index c141150..7cc14dc 100644 --- a/docs/dev/sergiferry/playernpc/api/NPC.Interact.Actions.Command.html +++ b/docs/dev/sergiferry/playernpc/api/NPC.Interact.Actions.Command.html @@ -2,11 +2,11 @@ - + NPC.Interact.Actions.Command - + @@ -17,7 +17,11 @@ -