diff --git a/BetterRTPAddons/pom.xml b/BetterRTPAddons/pom.xml index ff03a63..c996ac8 100644 --- a/BetterRTPAddons/pom.xml +++ b/BetterRTPAddons/pom.xml @@ -7,7 +7,7 @@ me.SuperRonanCraft BetterRTPAddons jar - 1.8 + 1.8.1 1.8 diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsHandler.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsHandler.java index afea8ba..a401efc 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsHandler.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsHandler.java @@ -8,13 +8,12 @@ import me.SuperRonanCraft.BetterRTPAddons.addons.extraEffects.AddonExtraEffects; import me.SuperRonanCraft.BetterRTPAddons.addons.flashback.AddonFlashback; import me.SuperRonanCraft.BetterRTPAddons.addons.logger.AddonLogger; import me.SuperRonanCraft.BetterRTPAddons.addons.magicStick.AddonMagicStick; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; import me.SuperRonanCraft.BetterRTPAddons.addons.portals.AddonPortals; import me.SuperRonanCraft.BetterRTPAddons.addons.rtpmenu.AddonRTPMenu; import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; public class AddonsHandler { diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/AddonParty.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/AddonParty.java similarity index 75% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/AddonParty.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/AddonParty.java index 02ef1a6..dca532d 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/AddonParty.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/AddonParty.java @@ -1,11 +1,13 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand; import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Command; import me.SuperRonanCraft.BetterRTPAddons.Addon; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds.PartyCommand; +import me.SuperRonanCraft.BetterRTPAddons.Main; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds.PartyCommand; import me.SuperRonanCraft.BetterRTPAddons.util.Files; +import org.bukkit.event.HandlerList; import org.bukkit.plugin.PluginManager; import java.util.ArrayList; @@ -28,13 +30,14 @@ public class AddonParty implements Addon { @Override public void load() { instance = this; - PluginManager pm = BetterRTP.getInstance().getServer().getPluginManager(); - pm.registerEvents(handler, BetterRTP.getInstance()); + PluginManager pm = Main.getInstance().getServer().getPluginManager(); + pm.registerEvents(handler, Main.getInstance()); + HelperRTP_Command.registerCommand(cmd, false); } @Override public void unload() { - HelperRTP_Command.registerCommand(cmd, false); + HandlerList.unregisterAll(handler); } public static AddonParty getInstance() { diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/HelperParty.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/HelperParty.java similarity index 91% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/HelperParty.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/HelperParty.java index aed0a96..9050e5c 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/HelperParty.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/HelperParty.java @@ -1,4 +1,4 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties; import org.bukkit.entity.Player; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyData.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyData.java similarity index 93% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyData.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyData.java index 18dc99f..b0244a6 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyData.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyData.java @@ -1,16 +1,13 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties; import io.papermc.lib.PaperLib; import lombok.Getter; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE; -import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportEvent; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportPostEvent; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.scheduler.BukkitRunnable; import java.util.ArrayList; import java.util.HashMap; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyHandler.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyHandler.java similarity index 96% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyHandler.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyHandler.java index 5bb0f9c..983f868 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyHandler.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyHandler.java @@ -1,4 +1,4 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_SettingUpEvent; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportPostEvent; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyMessages.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyMessages.java similarity index 97% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyMessages.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyMessages.java index 5e8b0dd..0b078be 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyMessages.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyMessages.java @@ -1,9 +1,7 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties; import me.SuperRonanCraft.BetterRTPAddons.AddonsMessages; -import org.bukkit.Location; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class PartyMessages implements AddonsMessages { private static final String preM = "Party."; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand.java similarity index 94% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand.java index 4c0cbf4..a13073c 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand.java @@ -1,9 +1,9 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; import org.bukkit.command.CommandSender; import java.util.ArrayList; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Accept.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Accept.java similarity index 88% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Accept.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Accept.java index 0e301fd..5e44754 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Accept.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Accept.java @@ -1,11 +1,9 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; -import me.SuperRonanCraft.BetterRTPAddons.addons.portals.region.PortalsRegionInfo; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Invite.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Invite.java similarity index 86% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Invite.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Invite.java index 7ab32aa..64fd9b6 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Invite.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Invite.java @@ -1,10 +1,9 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData; import org.bukkit.Bukkit; -import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Kick.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Kick.java similarity index 84% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Kick.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Kick.java index 00584b4..f9b47dd 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Kick.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Kick.java @@ -1,9 +1,9 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyMessages; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyMessages; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Leave.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Leave.java similarity index 76% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Leave.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Leave.java index 11f388c..ce48f44 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Leave.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Leave.java @@ -1,8 +1,8 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_ReadyUp.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_ReadyUp.java similarity index 74% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_ReadyUp.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_ReadyUp.java index 8d9b9fc..64b20e3 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_ReadyUp.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_ReadyUp.java @@ -1,8 +1,8 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommands.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommands.java similarity index 56% rename from BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommands.java rename to BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommands.java index 02f35a4..b50e3de 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommands.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommands.java @@ -1,6 +1,6 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; import org.bukkit.command.CommandSender; public interface PartyCommands { diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommandsTabable.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommandsTabable.java new file mode 100644 index 0000000..ffed248 --- /dev/null +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommandsTabable.java @@ -0,0 +1,12 @@ +package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds; + +import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty; +import org.bukkit.command.CommandSender; + +import java.util.List; + +public interface PartyCommandsTabable { + + List tabComplete(CommandSender sendi, String[] args, AddonParty addon); + +} diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommandsTabable.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommandsTabable.java deleted file mode 100644 index 4f3e1cd..0000000 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommandsTabable.java +++ /dev/null @@ -1,13 +0,0 @@ -package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.cmds; - -import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.AddonParty; -import me.SuperRonanCraft.BetterRTPAddons.addons.portals.AddonPortals; -import org.bukkit.command.CommandSender; - -import java.util.List; - -public interface PartyCommandsTabable { - - List tabComplete(CommandSender sendi, String[] args, AddonParty addon); - -} diff --git a/pom.xml b/pom.xml index 90e532f..ae7ee21 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ com.massivecraft Factions - 1.6.9.5-U0.5.16 + 1.6.9.5-U0.6.8 provided