mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2025-08-17 17:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

party command now registers + party classes renamed

Browse Source
This commit is contained in:
SuperRonanCraft 2022-03-12 18:05:49 -05:00
parent 870b60b245
commit 303fba912d
17 changed files with 52 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BetterRTPAddons/pom.xml
View File

@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId> <groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTPAddons</artifactId> <artifactId>BetterRTPAddons</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.8</version> <version>1.8.1</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>

3
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsHandler.java
View File

@ -8,13 +8,12 @@ import me.SuperRonanCraft.BetterRTPAddons.addons.extraEffects.AddonExtraEffects;
import me.SuperRonanCraft.BetterRTPAddons.addons.flashback.AddonFlashback; import me.SuperRonanCraft.BetterRTPAddons.addons.flashback.AddonFlashback;
import me.SuperRonanCraft.BetterRTPAddons.addons.logger.AddonLogger; import me.SuperRonanCraft.BetterRTPAddons.addons.logger.AddonLogger;
import me.SuperRonanCraft.BetterRTPAddons.addons.magicStick.AddonMagicStick; 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.portals.AddonPortals;
import me.SuperRonanCraft.BetterRTPAddons.addons.rtpmenu.AddonRTPMenu; import me.SuperRonanCraft.BetterRTPAddons.addons.rtpmenu.AddonRTPMenu;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level;
public class AddonsHandler { public class AddonsHandler {

13
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/AddonParty.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/AddonParty.java
View File

@ -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.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Command; import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Command;
import me.SuperRonanCraft.BetterRTPAddons.Addon; 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 me.SuperRonanCraft.BetterRTPAddons.util.Files;
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import java.util.ArrayList; import java.util.ArrayList;
@ -28,13 +30,14 @@ public class AddonParty implements Addon {
@Override @Override
public void load() { public void load() {
instance = this; instance = this;
PluginManager pm = BetterRTP.getInstance().getServer().getPluginManager(); PluginManager pm = Main.getInstance().getServer().getPluginManager();
pm.registerEvents(handler, BetterRTP.getInstance()); pm.registerEvents(handler, Main.getInstance());
HelperRTP_Command.registerCommand(cmd, false);
} }
@Override @Override
public void unload() { public void unload() {
HelperRTP_Command.registerCommand(cmd, false); HandlerList.unregisterAll(handler);
} }
public static AddonParty getInstance() { public static AddonParty getInstance() {

2
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/HelperParty.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/HelperParty.java
View File

@ -1,4 +1,4 @@
package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; package me.SuperRonanCraft.BetterRTPAddons.addons.parties;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

5
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyData.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyData.java
View File

@ -1,16 +1,13 @@
package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; package me.SuperRonanCraft.BetterRTPAddons.addons.parties;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import lombok.Getter; import lombok.Getter;
import me.SuperRonanCraft.BetterRTP.BetterRTP; 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.customEvents.RTP_TeleportPostEvent;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyHandler.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyHandler.java
View File

@ -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_SettingUpEvent;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportPostEvent; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportPostEvent;

4
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/PartyMessages.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyMessages.java
View File

@ -1,9 +1,7 @@
package me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp; package me.SuperRonanCraft.BetterRTPAddons.addons.parties;
import me.SuperRonanCraft.BetterRTPAddons.AddonsMessages; import me.SuperRonanCraft.BetterRTPAddons.AddonsMessages;
import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class PartyMessages implements AddonsMessages { public class PartyMessages implements AddonsMessages {
private static final String preM = "Party."; private static final String preM = "Party.";

4
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand.java
View File

@ -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.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable; 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 org.bukkit.command.CommandSender;
import java.util.ArrayList; import java.util.ArrayList;

10
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Accept.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Accept.java
View File

@ -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.parties.AddonParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData;
import me.SuperRonanCraft.BetterRTPAddons.addons.portals.region.PortalsRegionInfo;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

9
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Invite.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Invite.java
View File

@ -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.parties.AddonParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Kick.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Kick.java
View File

@ -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.parties.AddonParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyMessages; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyMessages;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

8
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_Leave.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_Leave.java
View File

@ -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.parties.AddonParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

8
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommand_ReadyUp.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand_ReadyUp.java
View File

@ -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.parties.AddonParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.HelperParty; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.HelperParty;
import me.SuperRonanCraft.BetterRTPAddons.addons.partyrtp.PartyData; import me.SuperRonanCraft.BetterRTPAddons.addons.parties.PartyData;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommands.java → BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommands.java
View File

@ -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; import org.bukkit.command.CommandSender;
public interface PartyCommands { public interface PartyCommands {

12
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommandsTabable.java Normal file
View File

@ -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<String> tabComplete(CommandSender sendi, String[] args, AddonParty addon);
}

13
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/partyrtp/cmds/PartyCommandsTabable.java
View File

@ -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<String> tabComplete(CommandSender sendi, String[] args, AddonParty addon);
}

2
pom.xml
View File

@ -216,7 +216,7 @@
<dependency> <dependency>
<groupId>com.massivecraft</groupId> <groupId>com.massivecraft</groupId>
<artifactId>Factions</artifactId> <artifactId>Factions</artifactId>
<version>1.6.9.5-U0.5.16</version> <version>1.6.9.5-U0.6.8</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Lands (https://www.spigotmc.org/resources/lands.53313/) --> <!-- Lands (https://www.spigotmc.org/resources/lands.53313/) -->