From d0b405c1f7e4ff8ae636188e9b2aa04f6320d499 Mon Sep 17 00:00:00 2001 From: Retrontology Date: Sun, 28 Jun 2020 18:04:23 -0500 Subject: [PATCH 1/6] Converted to maven --- pom.xml | 51 +++++++++++++++++++ .../github/aasmus/pvptoggle/PvPCommand.java | 0 .../github/aasmus/pvptoggle/PvPToggle.java | 0 .../listeners/PlayerChangeWorld.java | 0 .../pvptoggle/listeners/PlayerJoin.java | 0 .../pvptoggle/listeners/PlayerLeave.java | 0 .../aasmus/pvptoggle/listeners/PvP.java | 0 .../github/aasmus/pvptoggle/utils/Chat.java | 0 .../pvptoggle/utils/PersistentData.java | 0 .../pvptoggle/utils/PlaceholderAPIHook.java | 0 .../github/aasmus/pvptoggle/utils/Util.java | 0 src/{ => main}/resources/config.yml | 0 src/{ => main}/resources/plugin.yml | 0 13 files changed, 51 insertions(+) create mode 100644 pom.xml rename src/{ => main/java}/com/github/aasmus/pvptoggle/PvPCommand.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/PvPToggle.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/listeners/PlayerJoin.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/listeners/PlayerLeave.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/listeners/PvP.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/utils/Chat.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/utils/PersistentData.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/utils/PlaceholderAPIHook.java (100%) rename src/{ => main/java}/com/github/aasmus/pvptoggle/utils/Util.java (100%) rename src/{ => main}/resources/config.yml (100%) rename src/{ => main}/resources/plugin.yml (100%) diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..901036a --- /dev/null +++ b/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + com.github.aasmus + 1.7 + 1.0-SNAPSHOT + + + 11 + 11 + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + placeholderapi + http://repo.extendedclip.com/content/repositories/placeholderapi/ + + + jitpack.io + https://jitpack.io + + + + + + org.spigotmc + spigot-api + 1.16.1-R0.1-SNAPSHOT + provided + + + me.clip + placeholderapi + 2.10.6 + provided + + + com.github.sgtcaze + NametagEdit + master-SNAPSHOT + + + + \ No newline at end of file diff --git a/src/com/github/aasmus/pvptoggle/PvPCommand.java b/src/main/java/com/github/aasmus/pvptoggle/PvPCommand.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/PvPCommand.java rename to src/main/java/com/github/aasmus/pvptoggle/PvPCommand.java diff --git a/src/com/github/aasmus/pvptoggle/PvPToggle.java b/src/main/java/com/github/aasmus/pvptoggle/PvPToggle.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/PvPToggle.java rename to src/main/java/com/github/aasmus/pvptoggle/PvPToggle.java diff --git a/src/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java b/src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java rename to src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java diff --git a/src/com/github/aasmus/pvptoggle/listeners/PlayerJoin.java b/src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerJoin.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/listeners/PlayerJoin.java rename to src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerJoin.java diff --git a/src/com/github/aasmus/pvptoggle/listeners/PlayerLeave.java b/src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerLeave.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/listeners/PlayerLeave.java rename to src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerLeave.java diff --git a/src/com/github/aasmus/pvptoggle/listeners/PvP.java b/src/main/java/com/github/aasmus/pvptoggle/listeners/PvP.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/listeners/PvP.java rename to src/main/java/com/github/aasmus/pvptoggle/listeners/PvP.java diff --git a/src/com/github/aasmus/pvptoggle/utils/Chat.java b/src/main/java/com/github/aasmus/pvptoggle/utils/Chat.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/utils/Chat.java rename to src/main/java/com/github/aasmus/pvptoggle/utils/Chat.java diff --git a/src/com/github/aasmus/pvptoggle/utils/PersistentData.java b/src/main/java/com/github/aasmus/pvptoggle/utils/PersistentData.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/utils/PersistentData.java rename to src/main/java/com/github/aasmus/pvptoggle/utils/PersistentData.java diff --git a/src/com/github/aasmus/pvptoggle/utils/PlaceholderAPIHook.java b/src/main/java/com/github/aasmus/pvptoggle/utils/PlaceholderAPIHook.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/utils/PlaceholderAPIHook.java rename to src/main/java/com/github/aasmus/pvptoggle/utils/PlaceholderAPIHook.java diff --git a/src/com/github/aasmus/pvptoggle/utils/Util.java b/src/main/java/com/github/aasmus/pvptoggle/utils/Util.java similarity index 100% rename from src/com/github/aasmus/pvptoggle/utils/Util.java rename to src/main/java/com/github/aasmus/pvptoggle/utils/Util.java diff --git a/src/resources/config.yml b/src/main/resources/config.yml similarity index 100% rename from src/resources/config.yml rename to src/main/resources/config.yml diff --git a/src/resources/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from src/resources/plugin.yml rename to src/main/resources/plugin.yml From be4590b7ad30918bac6afa8da0cec53c4b30292f Mon Sep 17 00:00:00 2001 From: Retrontology Date: Sun, 28 Jun 2020 19:00:33 -0500 Subject: [PATCH 2/6] Added PVPToggleEvent --- .../github/aasmus/pvptoggle/PvPCommand.java | 13 +++++++ .../github/aasmus/pvptoggle/PvPToggle.java | 1 + .../pvptoggle/events/PVPToggleEvent.java | 35 +++++++++++++++++++ .../listeners/PlayerChangeWorld.java | 4 +++ 4 files changed, 53 insertions(+) create mode 100644 src/main/java/com/github/aasmus/pvptoggle/events/PVPToggleEvent.java diff --git a/src/main/java/com/github/aasmus/pvptoggle/PvPCommand.java b/src/main/java/com/github/aasmus/pvptoggle/PvPCommand.java index 5c0465c..ed71a48 100644 --- a/src/main/java/com/github/aasmus/pvptoggle/PvPCommand.java +++ b/src/main/java/com/github/aasmus/pvptoggle/PvPCommand.java @@ -1,5 +1,6 @@ package com.github.aasmus.pvptoggle; +import com.github.aasmus.pvptoggle.events.PVPToggleEvent; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -32,6 +33,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } else if(args[0].equals("toggle")) { if(current == true) { if (Util.setPlayerState(other, false, console)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, true)); Chat.send(other, "PVP_STATE_ENABLED"); if (PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { Util.particleEffect(other.getPlayer()); @@ -42,11 +44,13 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } } else { if (Util.setPlayerState(other, true, console)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, false)); Chat.send(other, "PVP_STATE_DISABLED"); } } } else if(args[0].equalsIgnoreCase("on")) { if (Util.setPlayerState(other, false, console)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, true)); Chat.send(other, "PVP_STATE_ENABLED"); if (current == true) { if(PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { @@ -59,6 +63,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } } else if(args[0].equalsIgnoreCase("off")) { if (Util.setPlayerState(other, true, console)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, false)); Chat.send(other, "PVP_STATE_DISABLED"); if(PvPToggle.instance.getConfig().getBoolean("SETTINGS.NAMETAG")) { Util.ChangeNametag(other.getPlayer(), "reset"); @@ -96,6 +101,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String if(current == true) { Util.setCooldownTime(p); if (Util.setPlayerState(p, false, p)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(p, true)); Chat.send(p, "PVP_STATE_ENABLED"); if (PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { Util.particleEffect(p.getPlayer()); @@ -105,12 +111,14 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } } else { if (Util.setPlayerState(p, true, p)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(p, false)); Chat.send(p, "PVP_STATE_DISABLED"); } } } else if(args[0].equalsIgnoreCase("on")) { Util.setCooldownTime(p); if (Util.setPlayerState(p, false, p)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(p, true)); Chat.send(p, "PVP_STATE_ENABLED"); if (current == true) { if(PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { @@ -123,6 +131,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } } else if(args[0].equalsIgnoreCase("off")) { if (Util.setPlayerState(p, true, p)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(p, false)); Chat.send(p, "PVP_STATE_DISABLED"); if(PvPToggle.instance.getConfig().getBoolean("SETTINGS.NAMETAG")) { Util.ChangeNametag(p.getPlayer(), "reset"); @@ -158,6 +167,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String if(args[0].equals("toggle")) { if(current == true) { if (Util.setPlayerState(other, false, sender)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, true)); Chat.send(other, "PVP_STATE_ENABLED"); if (PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { Util.particleEffect(other.getPlayer()); @@ -168,11 +178,13 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } } else { if (Util.setPlayerState(other, true, sender)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, false)); Chat.send(other, "PVP_STATE_DISABLED"); } } } else if(args[0].equalsIgnoreCase("on")) { if (Util.setPlayerState(other, false, sender)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, true)); if (current == true) { if(PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { Util.particleEffect(other.getPlayer()); @@ -185,6 +197,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } } else if(args[0].equalsIgnoreCase("off")) { if (Util.setPlayerState(other, true, sender)) { + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(other, false)); Chat.send(other, "PVP_STATE_DISABLED"); if(PvPToggle.instance.getConfig().getBoolean("SETTINGS.NAMETAG")) { Util.ChangeNametag(other.getPlayer(), "reset"); diff --git a/src/main/java/com/github/aasmus/pvptoggle/PvPToggle.java b/src/main/java/com/github/aasmus/pvptoggle/PvPToggle.java index d07db60..48d8d56 100644 --- a/src/main/java/com/github/aasmus/pvptoggle/PvPToggle.java +++ b/src/main/java/com/github/aasmus/pvptoggle/PvPToggle.java @@ -11,6 +11,7 @@ import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; +import com.github.aasmus.pvptoggle.events.PVPToggleEvent; import com.github.aasmus.pvptoggle.listeners.PlayerJoin; import com.github.aasmus.pvptoggle.listeners.PlayerLeave; import com.github.aasmus.pvptoggle.listeners.PvP; diff --git a/src/main/java/com/github/aasmus/pvptoggle/events/PVPToggleEvent.java b/src/main/java/com/github/aasmus/pvptoggle/events/PVPToggleEvent.java new file mode 100644 index 0000000..2c32fac --- /dev/null +++ b/src/main/java/com/github/aasmus/pvptoggle/events/PVPToggleEvent.java @@ -0,0 +1,35 @@ +package com.github.aasmus.pvptoggle.events; + +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.bukkit.entity.Player; + +public class PVPToggleEvent extends Event { + + private final Player player; + private final boolean pvp; + + public PVPToggleEvent(Player player, boolean pvp) { + this.player = player; + this.pvp = pvp; + } + + private static final HandlerList HANDLERS = new HandlerList(); + + public HandlerList getHandlers() { + return HANDLERS; + } + + public static HandlerList getHandlerList() { + return HANDLERS; + } + + public Player getPlayer() { + return this.player; + } + + public boolean getPVP() { + return this.pvp; + } + +} \ No newline at end of file diff --git a/src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java b/src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java index d41ca1f..7e9207e 100644 --- a/src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java +++ b/src/main/java/com/github/aasmus/pvptoggle/listeners/PlayerChangeWorld.java @@ -1,8 +1,10 @@ package com.github.aasmus.pvptoggle.listeners; import com.github.aasmus.pvptoggle.PvPToggle; +import com.github.aasmus.pvptoggle.events.PVPToggleEvent; import com.github.aasmus.pvptoggle.utils.Chat; import com.github.aasmus.pvptoggle.utils.Util; +import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -19,6 +21,7 @@ public void onChangeWorld(PlayerChangedWorldEvent event) { // If PVP isn't enabled in the world but the player has it enabled, disable it. if (!world.getPVP() && playerPvpEnabled) { Util.setPlayerState(player.getUniqueId(), true); + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(player, false)); Chat.send(player, "PVP_WORLD_CHANGE_DISABLED"); /*if (PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { Util.particleEffect(player); @@ -32,6 +35,7 @@ public void onChangeWorld(PlayerChangedWorldEvent event) { // If PVP is required (i.e. the world has PVP enabled and it is in the blocked worlds) and the player has it disabled, enable it. if (player.getWorld().getPVP() && PvPToggle.blockedWorlds.contains(world.getName()) && !playerPvpEnabled) { Util.setPlayerState(player.getUniqueId(), false); + Bukkit.getPluginManager().callEvent(new PVPToggleEvent(player, true)); Chat.send(player, "PVP_WORLD_CHANGE_REQUIRED"); if (PvPToggle.instance.getConfig().getBoolean("SETTINGS.PARTICLES")) { Util.particleEffect(player); From d5fa6602c12336af2f0226abd25e0255a944c9ea Mon Sep 17 00:00:00 2001 From: Retrontology Date: Sun, 28 Jun 2020 19:28:26 -0500 Subject: [PATCH 3/6] updated version to 1.8 --- pom.xml | 2 +- src/main/resources/plugin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 901036a..70640bd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.github.aasmus - 1.7 + 1.8 1.0-SNAPSHOT diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 40c764d..166a89e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ main: com.github.aasmus.pvptoggle.PvPToggle softdepend: [PlaceholderAPI, NametagEdit] name: PvPToggle -version: 1.7 +version: 1.8 api-version: 1.13 author: aasmus (with modifications by the Red Fusion Team) description: Plugin that allows players to toggle PvP state From 494207a7d973b68ec2f7e562c82e02427465a83b Mon Sep 17 00:00:00 2001 From: Retrontology Date: Sun, 28 Jun 2020 19:32:36 -0500 Subject: [PATCH 4/6] fixed artifactID and version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 70640bd..9763d35 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,8 @@ 4.0.0 com.github.aasmus - 1.8 - 1.0-SNAPSHOT + PVPToggle + 1.8 11 From 6f4e1df27e0f7f27df9c53d5f74c6b7f3427b3c5 Mon Sep 17 00:00:00 2001 From: Retrontology Date: Sun, 28 Jun 2020 19:35:31 -0500 Subject: [PATCH 5/6] fix nametagedit scope --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 9763d35..4ba6207 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ com.github.sgtcaze NametagEdit master-SNAPSHOT + provided From 34895d200b5c8dcad23319e84dd9e8d7f2e4eacc Mon Sep 17 00:00:00 2001 From: Retrontology Date: Sun, 26 Feb 2023 03:11:18 -0600 Subject: [PATCH 6/6] add nametagedit repo --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 4ba6207..b59d4e4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,10 @@ jitpack.io https://jitpack.io + + nametagedit-repo + http://ci.nametagedit.com/plugin/repository/everything/ +