From ee7dab194a96d50a1b1542e2a2f39ab12127a310 Mon Sep 17 00:00:00 2001 From: taoneill Date: Sun, 22 Jan 2012 22:05:34 -0500 Subject: [PATCH] Just moving classes around again. --- war/src/main/java/com/tommytony/war/Team.java | 3 ++- war/src/main/java/com/tommytony/war/War.java | 6 ++++-- war/src/main/java/com/tommytony/war/Warzone.java | 1 + .../war/command/AbstractWarAdminCommand.java | 1 - .../war/command/AbstractWarCommand.java | 1 - .../war/command/AbstractZoneMakerCommand.java | 1 - .../tommytony/war/command/DeleteBombCommand.java | 1 - .../tommytony/war/command/DeleteCakeCommand.java | 1 - .../war/command/DeleteMonumentCommand.java | 1 - .../tommytony/war/command/DeleteTeamCommand.java | 3 +-- .../war/command/DeleteTeamFlagCommand.java | 1 - .../war/command/DeleteWarhubCommand.java | 1 - .../tommytony/war/command/DeleteZoneCommand.java | 1 - .../com/tommytony/war/command/JoinCommand.java | 3 +-- .../com/tommytony/war/command/LeaveCommand.java | 1 - .../tommytony/war/command/LoadWarCommand.java | 1 - .../tommytony/war/command/NextBattleCommand.java | 1 - .../tommytony/war/command/RenameZoneCommand.java | 1 - .../tommytony/war/command/ResetZoneCommand.java | 1 - .../tommytony/war/command/SaveZoneCommand.java | 1 - .../tommytony/war/command/SetBombCommand.java | 1 - .../tommytony/war/command/SetCakeCommand.java | 1 - .../war/command/SetMonumentCommand.java | 1 - .../tommytony/war/command/SetTeamCommand.java | 3 +-- .../war/command/SetTeamConfigCommand.java | 3 +-- .../war/command/SetTeamFlagCommand.java | 3 +-- .../war/command/SetWarConfigCommand.java | 1 - .../tommytony/war/command/SetWarHubCommand.java | 1 - .../tommytony/war/command/SetZoneCommand.java | 2 -- .../war/command/SetZoneConfigCommand.java | 1 - .../war/command/SetZoneLobbyCommand.java | 1 - .../com/tommytony/war/command/TeamCommand.java | 1 - .../com/tommytony/war/command/TeamsCommand.java | 1 - .../tommytony/war/command/UnloadWarCommand.java | 1 - .../war/{ => command}/WarCommandHandler.java | 3 ++- .../com/tommytony/war/command/WarhubCommand.java | 1 - .../tommytony/war/command/WarzoneCommand.java | 1 - .../tommytony/war/command/WarzonesCommand.java | 1 - .../tommytony/war/command/ZoneMakerCommand.java | 1 - .../tommytony/war/{ => command}/ZoneSetter.java | 4 +++- .../war/{structure => config}/FlagReturn.java | 2 +- .../com/tommytony/war/config/TeamConfig.java | 2 -- .../com/tommytony/war/config/TeamConfigBag.java | 2 -- .../com/tommytony/war/{ => config}/TeamKind.java | 2 +- .../{structure => config}/TeamSpawnStyle.java | 2 +- .../tommytony/war/event/WarBlockListener.java | 2 +- .../tommytony/war/event/WarPlayerListener.java | 4 ++-- .../tommytony/war/job/HelmetProtectionTask.java | 2 +- .../com/tommytony/war/mapper/WarTxtMapper.java | 4 ++-- .../tommytony/war/mapper/WarzoneTxtMapper.java | 6 +++--- .../tommytony/war/mapper/WarzoneYmlMapper.java | 2 +- .../com/tommytony/war/spout/SpoutMessenger.java | 2 +- .../com/tommytony/war/structure/ZoneLobby.java | 16 +++++++++++++--- 53 files changed, 44 insertions(+), 67 deletions(-) rename war/src/main/java/com/tommytony/war/{ => command}/WarCommandHandler.java (98%) rename war/src/main/java/com/tommytony/war/{ => command}/ZoneSetter.java (99%) rename war/src/main/java/com/tommytony/war/{structure => config}/FlagReturn.java (90%) rename war/src/main/java/com/tommytony/war/{ => config}/TeamKind.java (98%) rename war/src/main/java/com/tommytony/war/{structure => config}/TeamSpawnStyle.java (92%) diff --git a/war/src/main/java/com/tommytony/war/Team.java b/war/src/main/java/com/tommytony/war/Team.java index 9046d91..5fbb022 100644 --- a/war/src/main/java/com/tommytony/war/Team.java +++ b/war/src/main/java/com/tommytony/war/Team.java @@ -18,9 +18,10 @@ import org.getspout.spoutapi.player.SpoutPlayer; import com.tommytony.war.config.InventoryBag; import com.tommytony.war.config.TeamConfig; import com.tommytony.war.config.TeamConfigBag; +import com.tommytony.war.config.TeamKind; +import com.tommytony.war.config.TeamSpawnStyle; import com.tommytony.war.structure.Bomb; import com.tommytony.war.structure.Cake; -import com.tommytony.war.structure.TeamSpawnStyle; import com.tommytony.war.utility.SignHelper; import com.tommytony.war.volume.Volume; diff --git a/war/src/main/java/com/tommytony/war/War.java b/war/src/main/java/com/tommytony/war/War.java index 08eb8bf..ac28a88 100644 --- a/war/src/main/java/com/tommytony/war/War.java +++ b/war/src/main/java/com/tommytony/war/War.java @@ -20,9 +20,13 @@ import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import com.tommytony.war.command.WarCommandHandler; +import com.tommytony.war.config.FlagReturn; import com.tommytony.war.config.InventoryBag; import com.tommytony.war.config.TeamConfig; import com.tommytony.war.config.TeamConfigBag; +import com.tommytony.war.config.TeamKind; +import com.tommytony.war.config.TeamSpawnStyle; import com.tommytony.war.config.WarConfig; import com.tommytony.war.config.WarConfigBag; import com.tommytony.war.config.WarzoneConfig; @@ -36,8 +40,6 @@ import com.tommytony.war.job.SpoutFadeOutMessageJob; import com.tommytony.war.mapper.WarYmlMapper; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.spout.SpoutMessenger; -import com.tommytony.war.structure.FlagReturn; -import com.tommytony.war.structure.TeamSpawnStyle; import com.tommytony.war.structure.WarHub; import com.tommytony.war.structure.ZoneLobby; import com.tommytony.war.utility.ChatFixUtil; diff --git a/war/src/main/java/com/tommytony/war/Warzone.java b/war/src/main/java/com/tommytony/war/Warzone.java index ccea03a..c1605ba 100644 --- a/war/src/main/java/com/tommytony/war/Warzone.java +++ b/war/src/main/java/com/tommytony/war/Warzone.java @@ -27,6 +27,7 @@ import org.getspout.spoutapi.player.SpoutPlayer; import com.tommytony.war.config.InventoryBag; import com.tommytony.war.config.TeamConfig; import com.tommytony.war.config.TeamConfigBag; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.config.WarzoneConfig; import com.tommytony.war.config.WarzoneConfigBag; import com.tommytony.war.job.InitZoneJob; diff --git a/war/src/main/java/com/tommytony/war/command/AbstractWarAdminCommand.java b/war/src/main/java/com/tommytony/war/command/AbstractWarAdminCommand.java index 6e50ed6..727298c 100644 --- a/war/src/main/java/com/tommytony/war/command/AbstractWarAdminCommand.java +++ b/war/src/main/java/com/tommytony/war/command/AbstractWarAdminCommand.java @@ -5,7 +5,6 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; /** diff --git a/war/src/main/java/com/tommytony/war/command/AbstractWarCommand.java b/war/src/main/java/com/tommytony/war/command/AbstractWarCommand.java index 851b5ca..9574805 100644 --- a/war/src/main/java/com/tommytony/war/command/AbstractWarCommand.java +++ b/war/src/main/java/com/tommytony/war/command/AbstractWarCommand.java @@ -3,7 +3,6 @@ package com.tommytony.war.command; import org.bukkit.command.CommandSender; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; /** diff --git a/war/src/main/java/com/tommytony/war/command/AbstractZoneMakerCommand.java b/war/src/main/java/com/tommytony/war/command/AbstractZoneMakerCommand.java index 713d58c..15bc3ea 100644 --- a/war/src/main/java/com/tommytony/war/command/AbstractZoneMakerCommand.java +++ b/war/src/main/java/com/tommytony/war/command/AbstractZoneMakerCommand.java @@ -5,7 +5,6 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; diff --git a/war/src/main/java/com/tommytony/war/command/DeleteBombCommand.java b/war/src/main/java/com/tommytony/war/command/DeleteBombCommand.java index 0a03673..17411b6 100644 --- a/war/src/main/java/com/tommytony/war/command/DeleteBombCommand.java +++ b/war/src/main/java/com/tommytony/war/command/DeleteBombCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.Bomb; diff --git a/war/src/main/java/com/tommytony/war/command/DeleteCakeCommand.java b/war/src/main/java/com/tommytony/war/command/DeleteCakeCommand.java index 51a162a..2bf0d74 100644 --- a/war/src/main/java/com/tommytony/war/command/DeleteCakeCommand.java +++ b/war/src/main/java/com/tommytony/war/command/DeleteCakeCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.Cake; diff --git a/war/src/main/java/com/tommytony/war/command/DeleteMonumentCommand.java b/war/src/main/java/com/tommytony/war/command/DeleteMonumentCommand.java index fddb1d6..a636839 100644 --- a/war/src/main/java/com/tommytony/war/command/DeleteMonumentCommand.java +++ b/war/src/main/java/com/tommytony/war/command/DeleteMonumentCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.Monument; diff --git a/war/src/main/java/com/tommytony/war/command/DeleteTeamCommand.java b/war/src/main/java/com/tommytony/war/command/DeleteTeamCommand.java index 2904d3e..1ff86ff 100644 --- a/war/src/main/java/com/tommytony/war/command/DeleteTeamCommand.java +++ b/war/src/main/java/com/tommytony/war/command/DeleteTeamCommand.java @@ -5,9 +5,8 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/DeleteTeamFlagCommand.java b/war/src/main/java/com/tommytony/war/command/DeleteTeamFlagCommand.java index ea85722..c7600d8 100644 --- a/war/src/main/java/com/tommytony/war/command/DeleteTeamFlagCommand.java +++ b/war/src/main/java/com/tommytony/war/command/DeleteTeamFlagCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/DeleteWarhubCommand.java b/war/src/main/java/com/tommytony/war/command/DeleteWarhubCommand.java index 082dddb..90ae40e 100644 --- a/war/src/main/java/com/tommytony/war/command/DeleteWarhubCommand.java +++ b/war/src/main/java/com/tommytony/war/command/DeleteWarhubCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.VolumeMapper; import com.tommytony.war.mapper.WarYmlMapper; diff --git a/war/src/main/java/com/tommytony/war/command/DeleteZoneCommand.java b/war/src/main/java/com/tommytony/war/command/DeleteZoneCommand.java index 1e53bfc..8eba4ef 100644 --- a/war/src/main/java/com/tommytony/war/command/DeleteZoneCommand.java +++ b/war/src/main/java/com/tommytony/war/command/DeleteZoneCommand.java @@ -6,7 +6,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarYmlMapper; import com.tommytony.war.mapper.WarzoneYmlMapper; diff --git a/war/src/main/java/com/tommytony/war/command/JoinCommand.java b/war/src/main/java/com/tommytony/war/command/JoinCommand.java index ba3c4c5..8e96b95 100644 --- a/war/src/main/java/com/tommytony/war/command/JoinCommand.java +++ b/war/src/main/java/com/tommytony/war/command/JoinCommand.java @@ -7,11 +7,10 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.config.TeamConfig; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.config.WarzoneConfig; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/LeaveCommand.java b/war/src/main/java/com/tommytony/war/command/LeaveCommand.java index f3ef209..490fa6b 100644 --- a/war/src/main/java/com/tommytony/war/command/LeaveCommand.java +++ b/war/src/main/java/com/tommytony/war/command/LeaveCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; /** diff --git a/war/src/main/java/com/tommytony/war/command/LoadWarCommand.java b/war/src/main/java/com/tommytony/war/command/LoadWarCommand.java index 77c2556..c51e736 100644 --- a/war/src/main/java/com/tommytony/war/command/LoadWarCommand.java +++ b/war/src/main/java/com/tommytony/war/command/LoadWarCommand.java @@ -3,7 +3,6 @@ package com.tommytony.war.command; import org.bukkit.command.CommandSender; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; /** diff --git a/war/src/main/java/com/tommytony/war/command/NextBattleCommand.java b/war/src/main/java/com/tommytony/war/command/NextBattleCommand.java index 49b3f6a..99a00cd 100644 --- a/war/src/main/java/com/tommytony/war/command/NextBattleCommand.java +++ b/war/src/main/java/com/tommytony/war/command/NextBattleCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java b/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java index b1499e6..140a104 100644 --- a/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java +++ b/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java @@ -8,7 +8,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.config.WarzoneConfig; import com.tommytony.war.mapper.PropertiesFile; diff --git a/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java b/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java index 5ed1ef9..a0d3d9c 100644 --- a/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java +++ b/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/SaveZoneCommand.java b/war/src/main/java/com/tommytony/war/command/SaveZoneCommand.java index b055ca3..faf8f70 100644 --- a/war/src/main/java/com/tommytony/war/command/SaveZoneCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SaveZoneCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/SetBombCommand.java b/war/src/main/java/com/tommytony/war/command/SetBombCommand.java index 1804b3b..86f8689 100644 --- a/war/src/main/java/com/tommytony/war/command/SetBombCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetBombCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.Bomb; diff --git a/war/src/main/java/com/tommytony/war/command/SetCakeCommand.java b/war/src/main/java/com/tommytony/war/command/SetCakeCommand.java index a51155b..0f507b1 100644 --- a/war/src/main/java/com/tommytony/war/command/SetCakeCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetCakeCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.Cake; diff --git a/war/src/main/java/com/tommytony/war/command/SetMonumentCommand.java b/war/src/main/java/com/tommytony/war/command/SetMonumentCommand.java index b4e8b79..57d6e09 100644 --- a/war/src/main/java/com/tommytony/war/command/SetMonumentCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetMonumentCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.Monument; diff --git a/war/src/main/java/com/tommytony/war/command/SetTeamCommand.java b/war/src/main/java/com/tommytony/war/command/SetTeamCommand.java index 93ca35e..1b3bbc7 100644 --- a/war/src/main/java/com/tommytony/war/command/SetTeamCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetTeamCommand.java @@ -5,10 +5,9 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.config.TeamConfig; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.mapper.WarzoneYmlMapper; /** diff --git a/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java b/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java index 16728be..5a60b0f 100644 --- a/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java @@ -5,10 +5,9 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/SetTeamFlagCommand.java b/war/src/main/java/com/tommytony/war/command/SetTeamFlagCommand.java index d35259c..36d2b0e 100644 --- a/war/src/main/java/com/tommytony/war/command/SetTeamFlagCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetTeamFlagCommand.java @@ -6,9 +6,8 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.mapper.WarzoneYmlMapper; /** diff --git a/war/src/main/java/com/tommytony/war/command/SetWarConfigCommand.java b/war/src/main/java/com/tommytony/war/command/SetWarConfigCommand.java index b1308d9..7de3e5e 100644 --- a/war/src/main/java/com/tommytony/war/command/SetWarConfigCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetWarConfigCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.mapper.WarYmlMapper; public class SetWarConfigCommand extends AbstractWarAdminCommand { diff --git a/war/src/main/java/com/tommytony/war/command/SetWarHubCommand.java b/war/src/main/java/com/tommytony/war/command/SetWarHubCommand.java index 67aba5d..c9ea837 100644 --- a/war/src/main/java/com/tommytony/war/command/SetWarHubCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetWarHubCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarYmlMapper; import com.tommytony.war.structure.WarHub; diff --git a/war/src/main/java/com/tommytony/war/command/SetZoneCommand.java b/war/src/main/java/com/tommytony/war/command/SetZoneCommand.java index 4d64fb3..63f12ac 100644 --- a/war/src/main/java/com/tommytony/war/command/SetZoneCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetZoneCommand.java @@ -4,8 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; -import com.tommytony.war.ZoneSetter; public class SetZoneCommand extends AbstractZoneMakerCommand { diff --git a/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java b/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java index b8380d8..ad37811 100644 --- a/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/SetZoneLobbyCommand.java b/war/src/main/java/com/tommytony/war/command/SetZoneLobbyCommand.java index d4bd4af..75c37d8 100644 --- a/war/src/main/java/com/tommytony/war/command/SetZoneLobbyCommand.java +++ b/war/src/main/java/com/tommytony/war/command/SetZoneLobbyCommand.java @@ -6,7 +6,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.mapper.WarzoneYmlMapper; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/TeamCommand.java b/war/src/main/java/com/tommytony/war/command/TeamCommand.java index a4f4471..387ade0 100644 --- a/war/src/main/java/com/tommytony/war/command/TeamCommand.java +++ b/war/src/main/java/com/tommytony/war/command/TeamCommand.java @@ -6,7 +6,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.WarCommandHandler; /** * Sends a message to all team-members diff --git a/war/src/main/java/com/tommytony/war/command/TeamsCommand.java b/war/src/main/java/com/tommytony/war/command/TeamsCommand.java index f84f053..1e23c92 100644 --- a/war/src/main/java/com/tommytony/war/command/TeamsCommand.java +++ b/war/src/main/java/com/tommytony/war/command/TeamsCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; import com.tommytony.war.structure.ZoneLobby; diff --git a/war/src/main/java/com/tommytony/war/command/UnloadWarCommand.java b/war/src/main/java/com/tommytony/war/command/UnloadWarCommand.java index 62ceff5..7920f10 100644 --- a/war/src/main/java/com/tommytony/war/command/UnloadWarCommand.java +++ b/war/src/main/java/com/tommytony/war/command/UnloadWarCommand.java @@ -3,7 +3,6 @@ package com.tommytony.war.command; import org.bukkit.command.CommandSender; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; /** diff --git a/war/src/main/java/com/tommytony/war/WarCommandHandler.java b/war/src/main/java/com/tommytony/war/command/WarCommandHandler.java similarity index 98% rename from war/src/main/java/com/tommytony/war/WarCommandHandler.java rename to war/src/main/java/com/tommytony/war/command/WarCommandHandler.java index 16d2818..89b85d7 100644 --- a/war/src/main/java/com/tommytony/war/WarCommandHandler.java +++ b/war/src/main/java/com/tommytony/war/command/WarCommandHandler.java @@ -1,10 +1,11 @@ -package com.tommytony.war; +package com.tommytony.war.command; import java.util.logging.Level; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import com.tommytony.war.War; import com.tommytony.war.command.*; diff --git a/war/src/main/java/com/tommytony/war/command/WarhubCommand.java b/war/src/main/java/com/tommytony/war/command/WarhubCommand.java index 222e782..1e9190e 100644 --- a/war/src/main/java/com/tommytony/war/command/WarhubCommand.java +++ b/war/src/main/java/com/tommytony/war/command/WarhubCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; /** diff --git a/war/src/main/java/com/tommytony/war/command/WarzoneCommand.java b/war/src/main/java/com/tommytony/war/command/WarzoneCommand.java index 0451dc6..ae3424b 100644 --- a/war/src/main/java/com/tommytony/war/command/WarzoneCommand.java +++ b/war/src/main/java/com/tommytony/war/command/WarzoneCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; /** diff --git a/war/src/main/java/com/tommytony/war/command/WarzonesCommand.java b/war/src/main/java/com/tommytony/war/command/WarzonesCommand.java index 313acd9..938daee 100644 --- a/war/src/main/java/com/tommytony/war/command/WarzonesCommand.java +++ b/war/src/main/java/com/tommytony/war/command/WarzonesCommand.java @@ -6,7 +6,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.Warzone; /** diff --git a/war/src/main/java/com/tommytony/war/command/ZoneMakerCommand.java b/war/src/main/java/com/tommytony/war/command/ZoneMakerCommand.java index dade72e..d5d2e96 100644 --- a/war/src/main/java/com/tommytony/war/command/ZoneMakerCommand.java +++ b/war/src/main/java/com/tommytony/war/command/ZoneMakerCommand.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import com.tommytony.war.War; -import com.tommytony.war.WarCommandHandler; import com.tommytony.war.mapper.WarYmlMapper; /** diff --git a/war/src/main/java/com/tommytony/war/ZoneSetter.java b/war/src/main/java/com/tommytony/war/command/ZoneSetter.java similarity index 99% rename from war/src/main/java/com/tommytony/war/ZoneSetter.java rename to war/src/main/java/com/tommytony/war/command/ZoneSetter.java index 6a49c88..ebcb938 100644 --- a/war/src/main/java/com/tommytony/war/ZoneSetter.java +++ b/war/src/main/java/com/tommytony/war/command/ZoneSetter.java @@ -1,10 +1,12 @@ -package com.tommytony.war; +package com.tommytony.war.command; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; +import com.tommytony.war.War; +import com.tommytony.war.Warzone; import com.tommytony.war.config.WarConfig; import com.tommytony.war.mapper.WarYmlMapper; import com.tommytony.war.mapper.WarzoneYmlMapper; diff --git a/war/src/main/java/com/tommytony/war/structure/FlagReturn.java b/war/src/main/java/com/tommytony/war/config/FlagReturn.java similarity index 90% rename from war/src/main/java/com/tommytony/war/structure/FlagReturn.java rename to war/src/main/java/com/tommytony/war/config/FlagReturn.java index 126ea39..14c261d 100644 --- a/war/src/main/java/com/tommytony/war/structure/FlagReturn.java +++ b/war/src/main/java/com/tommytony/war/config/FlagReturn.java @@ -1,4 +1,4 @@ -package com.tommytony.war.structure; +package com.tommytony.war.config; public enum FlagReturn { BOTH, diff --git a/war/src/main/java/com/tommytony/war/config/TeamConfig.java b/war/src/main/java/com/tommytony/war/config/TeamConfig.java index 51a79a5..86ef09e 100644 --- a/war/src/main/java/com/tommytony/war/config/TeamConfig.java +++ b/war/src/main/java/com/tommytony/war/config/TeamConfig.java @@ -1,7 +1,5 @@ package com.tommytony.war.config; -import com.tommytony.war.structure.FlagReturn; -import com.tommytony.war.structure.TeamSpawnStyle; public enum TeamConfig { FLAGMUSTBEHOME (Boolean.class), diff --git a/war/src/main/java/com/tommytony/war/config/TeamConfigBag.java b/war/src/main/java/com/tommytony/war/config/TeamConfigBag.java index aeff4e0..ba25fa7 100644 --- a/war/src/main/java/com/tommytony/war/config/TeamConfigBag.java +++ b/war/src/main/java/com/tommytony/war/config/TeamConfigBag.java @@ -8,8 +8,6 @@ import org.bukkit.configuration.ConfigurationSection; import com.tommytony.war.War; import com.tommytony.war.Warzone; -import com.tommytony.war.structure.FlagReturn; -import com.tommytony.war.structure.TeamSpawnStyle; public class TeamConfigBag { diff --git a/war/src/main/java/com/tommytony/war/TeamKind.java b/war/src/main/java/com/tommytony/war/config/TeamKind.java similarity index 98% rename from war/src/main/java/com/tommytony/war/TeamKind.java rename to war/src/main/java/com/tommytony/war/config/TeamKind.java index fbb6fbe..5010c7b 100644 --- a/war/src/main/java/com/tommytony/war/TeamKind.java +++ b/war/src/main/java/com/tommytony/war/config/TeamKind.java @@ -1,4 +1,4 @@ -package com.tommytony.war; +package com.tommytony.war.config; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/war/src/main/java/com/tommytony/war/structure/TeamSpawnStyle.java b/war/src/main/java/com/tommytony/war/config/TeamSpawnStyle.java similarity index 92% rename from war/src/main/java/com/tommytony/war/structure/TeamSpawnStyle.java rename to war/src/main/java/com/tommytony/war/config/TeamSpawnStyle.java index fb1756b..d7039fb 100644 --- a/war/src/main/java/com/tommytony/war/structure/TeamSpawnStyle.java +++ b/war/src/main/java/com/tommytony/war/config/TeamSpawnStyle.java @@ -1,4 +1,4 @@ -package com.tommytony.war.structure; +package com.tommytony.war.config; /** * diff --git a/war/src/main/java/com/tommytony/war/event/WarBlockListener.java b/war/src/main/java/com/tommytony/war/event/WarBlockListener.java index 0ebe613..3e6d5d0 100644 --- a/war/src/main/java/com/tommytony/war/event/WarBlockListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarBlockListener.java @@ -22,12 +22,12 @@ import org.getspout.spoutapi.player.SpoutPlayer; import com.tommytony.war.Team; import com.tommytony.war.War; import com.tommytony.war.Warzone; +import com.tommytony.war.config.FlagReturn; import com.tommytony.war.config.WarConfig; import com.tommytony.war.config.WarzoneConfig; import com.tommytony.war.spout.SpoutMessenger; import com.tommytony.war.structure.Bomb; import com.tommytony.war.structure.Cake; -import com.tommytony.war.structure.FlagReturn; import com.tommytony.war.structure.Monument; /** diff --git a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java index 8e6d6ab..920f8e1 100644 --- a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java @@ -32,13 +32,13 @@ import org.getspout.spoutapi.player.SpoutPlayer; import com.tommytony.war.Team; import com.tommytony.war.War; import com.tommytony.war.Warzone; -import com.tommytony.war.ZoneSetter; +import com.tommytony.war.command.ZoneSetter; +import com.tommytony.war.config.FlagReturn; import com.tommytony.war.config.TeamConfig; import com.tommytony.war.config.WarzoneConfig; import com.tommytony.war.spout.SpoutMessenger; import com.tommytony.war.structure.Bomb; import com.tommytony.war.structure.Cake; -import com.tommytony.war.structure.FlagReturn; import com.tommytony.war.structure.WarHub; import com.tommytony.war.structure.ZoneLobby; import com.tommytony.war.utility.LoadoutSelection; diff --git a/war/src/main/java/com/tommytony/war/job/HelmetProtectionTask.java b/war/src/main/java/com/tommytony/war/job/HelmetProtectionTask.java index 6f7eebe..21953eb 100644 --- a/war/src/main/java/com/tommytony/war/job/HelmetProtectionTask.java +++ b/war/src/main/java/com/tommytony/war/job/HelmetProtectionTask.java @@ -7,9 +7,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; import com.tommytony.war.War; import com.tommytony.war.Warzone; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.config.WarzoneConfig; diff --git a/war/src/main/java/com/tommytony/war/mapper/WarTxtMapper.java b/war/src/main/java/com/tommytony/war/mapper/WarTxtMapper.java index 2f052b6..09a688a 100644 --- a/war/src/main/java/com/tommytony/war/mapper/WarTxtMapper.java +++ b/war/src/main/java/com/tommytony/war/mapper/WarTxtMapper.java @@ -9,13 +9,13 @@ import org.bukkit.inventory.ItemStack; import com.tommytony.war.War; +import com.tommytony.war.config.FlagReturn; import com.tommytony.war.config.TeamConfig; +import com.tommytony.war.config.TeamSpawnStyle; import com.tommytony.war.config.WarConfig; import com.tommytony.war.config.WarzoneConfig; import com.tommytony.war.job.RestoreWarhubJob; import com.tommytony.war.job.RestoreWarzonesJob; -import com.tommytony.war.structure.FlagReturn; -import com.tommytony.war.structure.TeamSpawnStyle; /** * diff --git a/war/src/main/java/com/tommytony/war/mapper/WarzoneTxtMapper.java b/war/src/main/java/com/tommytony/war/mapper/WarzoneTxtMapper.java index 827c0f6..e4db443 100644 --- a/war/src/main/java/com/tommytony/war/mapper/WarzoneTxtMapper.java +++ b/war/src/main/java/com/tommytony/war/mapper/WarzoneTxtMapper.java @@ -12,14 +12,14 @@ import org.bukkit.inventory.ItemStack; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; import com.tommytony.war.War; import com.tommytony.war.Warzone; +import com.tommytony.war.config.FlagReturn; import com.tommytony.war.config.TeamConfig; +import com.tommytony.war.config.TeamKind; +import com.tommytony.war.config.TeamSpawnStyle; import com.tommytony.war.config.WarzoneConfig; -import com.tommytony.war.structure.FlagReturn; import com.tommytony.war.structure.Monument; -import com.tommytony.war.structure.TeamSpawnStyle; import com.tommytony.war.structure.ZoneLobby; import com.tommytony.war.volume.Volume; import com.tommytony.war.volume.ZoneVolume; diff --git a/war/src/main/java/com/tommytony/war/mapper/WarzoneYmlMapper.java b/war/src/main/java/com/tommytony/war/mapper/WarzoneYmlMapper.java index b60c06c..8ace8b9 100644 --- a/war/src/main/java/com/tommytony/war/mapper/WarzoneYmlMapper.java +++ b/war/src/main/java/com/tommytony/war/mapper/WarzoneYmlMapper.java @@ -16,10 +16,10 @@ import org.bukkit.inventory.ItemStack; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; import com.tommytony.war.War; import com.tommytony.war.Warzone; import com.tommytony.war.config.TeamConfig; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.structure.Bomb; import com.tommytony.war.structure.Cake; import com.tommytony.war.structure.Monument; diff --git a/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java b/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java index a88d9f5..6b582c9 100644 --- a/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java +++ b/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java @@ -16,10 +16,10 @@ import org.getspout.spoutapi.player.SpoutPlayer; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; import com.tommytony.war.War; import com.tommytony.war.Warzone; import com.tommytony.war.config.TeamConfig; +import com.tommytony.war.config.TeamKind; public class SpoutMessenger { diff --git a/war/src/main/java/com/tommytony/war/structure/ZoneLobby.java b/war/src/main/java/com/tommytony/war/structure/ZoneLobby.java index 1430ffb..78dee68 100644 --- a/war/src/main/java/com/tommytony/war/structure/ZoneLobby.java +++ b/war/src/main/java/com/tommytony/war/structure/ZoneLobby.java @@ -13,10 +13,10 @@ import org.bukkit.entity.Player; import com.tommytony.war.Team; -import com.tommytony.war.TeamKind; import com.tommytony.war.War; import com.tommytony.war.Warzone; import com.tommytony.war.config.TeamConfig; +import com.tommytony.war.config.TeamKind; import com.tommytony.war.config.WarzoneConfig; import com.tommytony.war.utility.SignHelper; import com.tommytony.war.volume.BlockInfo; @@ -509,13 +509,18 @@ public class ZoneLobby { return true; } } + return false; } public boolean isAutoAssignGate(Location location) { - if (this.autoAssignGate != null && (location.getBlockX() == this.autoAssignGate.getX() && location.getBlockY() == this.autoAssignGate.getY() && location.getBlockZ() == this.autoAssignGate.getZ())) { + if (this.autoAssignGate != null + && (location.getBlockX() == this.autoAssignGate.getX() + && location.getBlockY() == this.autoAssignGate.getY() + && location.getBlockZ() == this.autoAssignGate.getZ())) { return true; } + return false; } @@ -532,9 +537,13 @@ public class ZoneLobby { } public boolean isInWarHubLinkGate(Location location) { - if (this.warHubLinkGate != null && location.getBlockX() == this.warHubLinkGate.getX() && location.getBlockY() == this.warHubLinkGate.getY() && location.getBlockZ() == this.warHubLinkGate.getZ()) { + if (this.warHubLinkGate != null + && location.getBlockX() == this.warHubLinkGate.getX() + && location.getBlockY() == this.warHubLinkGate.getY() + && location.getBlockZ() == this.warHubLinkGate.getZ()) { return true; } + return false; } @@ -546,6 +555,7 @@ public class ZoneLobby { return true; } } + if (this.autoAssignGate != null && this.isPartOfGate(BlockInfo.getBlock(this.volume.getWorld(), this.autoAssignGate), block)) { // auto assign return true;