From 15335c24f13f127b76fec5c1a11d62bc5bcfeaa2 Mon Sep 17 00:00:00 2001 From: JitseB Date: Sun, 20 May 2018 10:13:58 +0200 Subject: [PATCH] For v1.1.4. Fixed the usage of NPCLib as a plugin dependency without shading it. --- README.md | 3 +- api/pom.xml | 2 +- commons/pom.xml | 2 +- nms/pom.xml | 2 +- nms/v1_10_R1/pom.xml | 2 +- nms/v1_11_R1/pom.xml | 2 +- nms/v1_12_R1/pom.xml | 2 +- nms/v1_8_R1/pom.xml | 2 +- nms/v1_8_R2/pom.xml | 2 +- nms/v1_8_R3/pom.xml | 2 +- nms/v1_9_R1/pom.xml | 2 +- nms/v1_9_R2/pom.xml | 2 +- plugin/pom.xml | 2 +- .../net/jitse/npclib/plugin/NPCLibPlugin.java | 68 +------------------ .../npclib/plugin/listeners/NPCListener.java | 43 ------------ pom.xml | 2 +- 16 files changed, 18 insertions(+), 122 deletions(-) delete mode 100644 plugin/src/main/java/net/jitse/npclib/plugin/listeners/NPCListener.java diff --git a/README.md b/README.md index 84a8306..4aa5674 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Alternatively, you can help the project by starring the repository or telling ot ## Usage It is recommended to shade `NPCLib-API-v*.jar` into your plugin. +Alternatively, you may put `NPCLib-Plugin-v*.jar` under your `plugins` folder. By using this option, you do not need to shade the API JAR anymore. Though, do not forget to add `NPCLib` as a dependency in your `plugin.yml`! You can download the latest release [here](https://github.com/JitseB/NPCLib/releases/latest). @@ -41,7 +42,7 @@ You can download the latest release [here](https://github.com/JitseB/NPCLib/rele npc.show(player); npc.hide(player); - // If you don't use the NPC anymore, destroy the NPC accordingly. + // If you do not use the NPC anymore, destroy the NPC accordingly. npc.destroy(); ``` diff --git a/api/pom.xml b/api/pom.xml index 0a55449..fe1d660 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.1.3 + 1.1.4 npclib-api diff --git a/commons/pom.xml b/commons/pom.xml index f0172c5..0b9befa 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.1.3 + 1.1.4 npclib-commons diff --git a/nms/pom.xml b/nms/pom.xml index 82ecc84..1cf85e5 100644 --- a/nms/pom.xml +++ b/nms/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.1.3 + 1.1.4 npclib-nms diff --git a/nms/v1_10_R1/pom.xml b/nms/v1_10_R1/pom.xml index eff8f28..9a6ea59 100644 --- a/nms/v1_10_R1/pom.xml +++ b/nms/v1_10_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_10_R1 diff --git a/nms/v1_11_R1/pom.xml b/nms/v1_11_R1/pom.xml index c21c16a..79f9fe4 100644 --- a/nms/v1_11_R1/pom.xml +++ b/nms/v1_11_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_11_R1 diff --git a/nms/v1_12_R1/pom.xml b/nms/v1_12_R1/pom.xml index bc94a96..e89322a 100644 --- a/nms/v1_12_R1/pom.xml +++ b/nms/v1_12_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_12_R1 diff --git a/nms/v1_8_R1/pom.xml b/nms/v1_8_R1/pom.xml index 4c80971..f1d82e5 100644 --- a/nms/v1_8_R1/pom.xml +++ b/nms/v1_8_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_8_R1 diff --git a/nms/v1_8_R2/pom.xml b/nms/v1_8_R2/pom.xml index ca8eff1..7ab7db4 100644 --- a/nms/v1_8_R2/pom.xml +++ b/nms/v1_8_R2/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_8_R2 diff --git a/nms/v1_8_R3/pom.xml b/nms/v1_8_R3/pom.xml index 2d5c4d7..4eec20a 100644 --- a/nms/v1_8_R3/pom.xml +++ b/nms/v1_8_R3/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_8_R3 diff --git a/nms/v1_9_R1/pom.xml b/nms/v1_9_R1/pom.xml index be8ea00..f21ebdb 100644 --- a/nms/v1_9_R1/pom.xml +++ b/nms/v1_9_R1/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_9_R1 diff --git a/nms/v1_9_R2/pom.xml b/nms/v1_9_R2/pom.xml index f076dc7..0589dab 100644 --- a/nms/v1_9_R2/pom.xml +++ b/nms/v1_9_R2/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib-nms - 1.1.3 + 1.1.4 npclib-nms-v1_9_R2 diff --git a/plugin/pom.xml b/plugin/pom.xml index affab33..6fe7f00 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 1.1.3 + 1.1.4 npclib-plugin diff --git a/plugin/src/main/java/net/jitse/npclib/plugin/NPCLibPlugin.java b/plugin/src/main/java/net/jitse/npclib/plugin/NPCLibPlugin.java index f41e4a8..db84b22 100644 --- a/plugin/src/main/java/net/jitse/npclib/plugin/NPCLibPlugin.java +++ b/plugin/src/main/java/net/jitse/npclib/plugin/NPCLibPlugin.java @@ -4,82 +4,20 @@ package net.jitse.npclib.plugin; -import net.jitse.npclib.NPCLib; -import net.jitse.npclib.api.NPC; -import net.jitse.npclib.plugin.listeners.NPCListener; -import net.jitse.npclib.skin.MineSkinFetcher; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerToggleSneakEvent; import org.bukkit.plugin.java.JavaPlugin; -import java.util.Arrays; - /** * @author Jitse Boonstra */ -public class NPCLibPlugin extends JavaPlugin implements Listener { - - private NPCLib npcLib; - private NPC npc; +public class NPCLibPlugin extends JavaPlugin { @Override public void onEnable() { - this.npcLib = new NPCLib(this); - getServer().getConsoleSender().sendMessage(ChatColor.BLUE + "[NPCLib] " + ChatColor.WHITE + "plugin enabled."); - getServer().getConsoleSender().sendMessage(ChatColor.BLUE + "[NPCLib] " + - ChatColor.GRAY + "This is a test plugin usually used for development reasons. " + - "You can spawn NPCs by pressing [shift] in game."); - - - getServer().getPluginManager().registerEvents(this, this); - getServer().getPluginManager().registerEvents(new NPCListener(), this); + getLogger().info("NPC library loaded."); } @Override public void onDisable() { - if (npc != null) { - npc.destroy(false); - } - - getServer().getConsoleSender().sendMessage(ChatColor.BLUE + "[NPCLib] " + ChatColor.WHITE + "plugin disabled."); - } - - @EventHandler - public void onPlayerJoin(PlayerJoinEvent event) { - if (npc != null) { - npc.show(event.getPlayer()); - } - } - - @EventHandler - public void onPlayerShift(PlayerToggleSneakEvent event) { - if (event.isSneaking()) { - return; - } - - if (npc != null) { - if (npc.isActuallyShown(event.getPlayer())) { - npc.hide(event.getPlayer()); - } else { - npc.show(event.getPlayer()); - } - } else { - MineSkinFetcher.fetchSkinFromIdAsync(168841, skin -> { - npc = npcLib.createNPC(skin, Arrays.asList( - ChatColor.BOLD + "NPC Library", "", - "Create your own", "non-player characters", - "with the simplistic", "API of NPCLib!" - )); - npc.create(event.getPlayer().getLocation()); - - for (Player player : getServer().getOnlinePlayers()) { - npc.show(player); - } - }); - } + getLogger().info("NPC library unloaded."); } } diff --git a/plugin/src/main/java/net/jitse/npclib/plugin/listeners/NPCListener.java b/plugin/src/main/java/net/jitse/npclib/plugin/listeners/NPCListener.java deleted file mode 100644 index 1abccbe..0000000 --- a/plugin/src/main/java/net/jitse/npclib/plugin/listeners/NPCListener.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2018 Jitse Boonstra - */ - -package net.jitse.npclib.plugin.listeners; - -import net.jitse.npclib.events.NPCDestroyEvent; -import net.jitse.npclib.events.NPCInteractEvent; -import net.jitse.npclib.events.NPCSpawnEvent; -import net.jitse.npclib.events.trigger.TriggerType; -import org.bukkit.ChatColor; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; - -/** - * @author Jitse Boonstra - */ -public class NPCListener implements Listener { - - @EventHandler - public void onNPCSpawn(NPCSpawnEvent event) { - if (event.getTrigger() == TriggerType.AUTOMATIC) { - return; - } - - event.getPlayer().sendMessage(ChatColor.GREEN + "Spawned NPC " + event.getNPC().getEntityId()); - } - - @EventHandler - public void onNPCDestroy(NPCDestroyEvent event) { - if (event.getTrigger() == TriggerType.AUTOMATIC) { - return; - } - - event.getPlayer().sendMessage(ChatColor.RED + "Destroyed NPC " + event.getNPC().getEntityId()); - } - - @EventHandler - public void onNPCInteract(NPCInteractEvent event) { - event.getWhoClicked().sendMessage(ChatColor.BLUE + "Interacted with NPC " - + event.getNPC().getEntityId() + " type " + event.getClickType()); - } -} diff --git a/pom.xml b/pom.xml index 4de1898..e53f887 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib - 1.1.3 + 1.1.4 NPCLib https://github.com/JitseB/npclib