From 936c28d5a9911d2f0b5a0dbdf292ef54754164e2 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Tue, 9 Apr 2013 13:24:55 +0200 Subject: [PATCH] Move all in the struct package to main package. --- src/com/massivecraft/factions/Board.java | 1 - src/com/massivecraft/factions/ConfServer.java | 3 --- src/com/massivecraft/factions/{struct => }/FFlag.java | 3 +-- src/com/massivecraft/factions/{struct => }/FPerm.java | 10 +--------- src/com/massivecraft/factions/FPlayer.java | 3 --- src/com/massivecraft/factions/FPlayerColl.java | 1 - src/com/massivecraft/factions/Faction.java | 3 --- src/com/massivecraft/factions/FactionColl.java | 3 --- src/com/massivecraft/factions/Factions.java | 4 ---- src/com/massivecraft/factions/{struct => }/Rel.java | 3 +-- .../factions/{struct => }/TerritoryAccess.java | 7 +------ .../factions/adapters/FFlagTypeAdapter.java | 3 ++- .../factions/adapters/FPermTypeAdapter.java | 3 ++- .../massivecraft/factions/adapters/RelTypeAdapter.java | 3 ++- src/com/massivecraft/factions/cmd/CapeCommand.java | 2 +- src/com/massivecraft/factions/cmd/CmdAccess.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdAutoClaim.java | 2 +- src/com/massivecraft/factions/cmd/CmdConfig.java | 6 +++--- src/com/massivecraft/factions/cmd/CmdCreate.java | 2 +- src/com/massivecraft/factions/cmd/CmdDemote.java | 2 +- src/com/massivecraft/factions/cmd/CmdDisband.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFlag.java | 2 +- src/com/massivecraft/factions/cmd/CmdHome.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdInvite.java | 2 +- src/com/massivecraft/factions/cmd/CmdKick.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdLeader.java | 2 +- src/com/massivecraft/factions/cmd/CmdOfficer.java | 2 +- src/com/massivecraft/factions/cmd/CmdPerm.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdPromote.java | 2 +- src/com/massivecraft/factions/cmd/CmdRelationAlly.java | 2 +- .../massivecraft/factions/cmd/CmdRelationEnemy.java | 2 +- .../massivecraft/factions/cmd/CmdRelationNeutral.java | 2 +- .../massivecraft/factions/cmd/CmdRelationTruce.java | 2 +- src/com/massivecraft/factions/cmd/CmdSethome.java | 2 +- src/com/massivecraft/factions/cmd/CmdShow.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdUnclaim.java | 2 +- src/com/massivecraft/factions/cmd/FCommand.java | 6 +++--- .../massivecraft/factions/cmd/FRelationCommand.java | 4 ++-- .../factions/event/FactionRelationEvent.java | 2 +- .../factions/iface/RelationParticipator.java | 3 ++- src/com/massivecraft/factions/integration/Econ.java | 2 +- .../factions/integration/SpoutMainListener.java | 2 +- .../factions/integration/herochat/AlliesChannel.java | 2 +- .../factions/integration/herochat/FactionChannel.java | 2 +- .../integration/herochat/FactionsChannelAbstract.java | 2 +- .../factions/listeners/FactionsBlockListener.java | 4 ++-- .../factions/listeners/FactionsChatListener.java | 2 +- .../factions/listeners/FactionsEntityListener.java | 4 ++-- .../factions/listeners/FactionsPlayerListener.java | 8 ++++---- src/com/massivecraft/factions/util/RelationUtil.java | 4 ++-- 50 files changed, 64 insertions(+), 93 deletions(-) rename src/com/massivecraft/factions/{struct => }/FFlag.java (94%) rename src/com/massivecraft/factions/{struct => }/FPerm.java (91%) rename src/com/massivecraft/factions/{struct => }/Rel.java (93%) rename src/com/massivecraft/factions/{struct => }/TerritoryAccess.java (97%) diff --git a/src/com/massivecraft/factions/Board.java b/src/com/massivecraft/factions/Board.java index d02f2dbd..5c759abd 100644 --- a/src/com/massivecraft/factions/Board.java +++ b/src/com/massivecraft/factions/Board.java @@ -16,7 +16,6 @@ import org.bukkit.block.Block; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.iface.RelationParticipator; -import com.massivecraft.factions.struct.TerritoryAccess; import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.factions.zcore.util.DiscUtil; diff --git a/src/com/massivecraft/factions/ConfServer.java b/src/com/massivecraft/factions/ConfServer.java index df1df9ca..c7bdea9a 100644 --- a/src/com/massivecraft/factions/ConfServer.java +++ b/src/com/massivecraft/factions/ConfServer.java @@ -5,9 +5,6 @@ import java.util.*; import org.bukkit.*; import org.bukkit.entity.EntityType; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; public class ConfServer { diff --git a/src/com/massivecraft/factions/struct/FFlag.java b/src/com/massivecraft/factions/FFlag.java similarity index 94% rename from src/com/massivecraft/factions/struct/FFlag.java rename to src/com/massivecraft/factions/FFlag.java index 85fd301d..e0bae841 100644 --- a/src/com/massivecraft/factions/struct/FFlag.java +++ b/src/com/massivecraft/factions/FFlag.java @@ -1,6 +1,5 @@ -package com.massivecraft.factions.struct; +package com.massivecraft.factions; -import com.massivecraft.factions.ConfServer; /** * Flags that describe the nature of a faction and it's territory. diff --git a/src/com/massivecraft/factions/struct/FPerm.java b/src/com/massivecraft/factions/FPerm.java similarity index 91% rename from src/com/massivecraft/factions/struct/FPerm.java rename to src/com/massivecraft/factions/FPerm.java index 9033ca65..c238f288 100644 --- a/src/com/massivecraft/factions/struct/FPerm.java +++ b/src/com/massivecraft/factions/FPerm.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.struct; +package com.massivecraft.factions; import java.util.Arrays; import java.util.EnumSet; @@ -9,14 +9,6 @@ import org.bukkit.Location; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import com.massivecraft.factions.Board; -import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.FLocation; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayerColl; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.Perm; import com.massivecraft.factions.iface.RelationParticipator; /** diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java index 39d78613..35e1e17f 100644 --- a/src/com/massivecraft/factions/FPlayer.java +++ b/src/com/massivecraft/factions/FPlayer.java @@ -16,9 +16,6 @@ import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.Worldguard; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.zcore.persist.PlayerEntity; diff --git a/src/com/massivecraft/factions/FPlayerColl.java b/src/com/massivecraft/factions/FPlayerColl.java index 5417d212..40133ddf 100644 --- a/src/com/massivecraft/factions/FPlayerColl.java +++ b/src/com/massivecraft/factions/FPlayerColl.java @@ -7,7 +7,6 @@ import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.CopyOnWriteArrayList; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.zcore.persist.PlayerEntityCollection; public class FPlayerColl extends PlayerEntityCollection diff --git a/src/com/massivecraft/factions/Faction.java b/src/com/massivecraft/factions/Faction.java index 77e8b62b..ed233b47 100644 --- a/src/com/massivecraft/factions/Faction.java +++ b/src/com/massivecraft/factions/Faction.java @@ -10,9 +10,6 @@ import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.RelationParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.util.*; import com.massivecraft.factions.zcore.persist.Entity; diff --git a/src/com/massivecraft/factions/FactionColl.java b/src/com/massivecraft/factions/FactionColl.java index 703d14c6..3e32cd6d 100644 --- a/src/com/massivecraft/factions/FactionColl.java +++ b/src/com/massivecraft/factions/FactionColl.java @@ -12,9 +12,6 @@ import org.bukkit.ChatColor; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.zcore.persist.EntityCollection; import com.massivecraft.factions.zcore.util.TextUtil; diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index 3d156703..53ebcc83 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -30,10 +30,6 @@ import com.massivecraft.factions.listeners.FactionsExploitListener; import com.massivecraft.factions.listeners.FactionsAppearanceListener; import com.massivecraft.factions.listeners.FactionsPlayerListener; import com.massivecraft.factions.listeners.FactionsServerListener; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; -import com.massivecraft.factions.struct.TerritoryAccess; import com.massivecraft.factions.util.AutoLeaveTask; import com.massivecraft.factions.util.EconLandRewardTask; import com.massivecraft.factions.util.LazyLocation; diff --git a/src/com/massivecraft/factions/struct/Rel.java b/src/com/massivecraft/factions/Rel.java similarity index 93% rename from src/com/massivecraft/factions/struct/Rel.java rename to src/com/massivecraft/factions/Rel.java index 968e6044..c19cc83b 100644 --- a/src/com/massivecraft/factions/struct/Rel.java +++ b/src/com/massivecraft/factions/Rel.java @@ -1,8 +1,7 @@ -package com.massivecraft.factions.struct; +package com.massivecraft.factions; import org.bukkit.ChatColor; -import com.massivecraft.factions.ConfServer; public enum Rel { diff --git a/src/com/massivecraft/factions/struct/TerritoryAccess.java b/src/com/massivecraft/factions/TerritoryAccess.java similarity index 97% rename from src/com/massivecraft/factions/struct/TerritoryAccess.java rename to src/com/massivecraft/factions/TerritoryAccess.java index 65886212..8c0ca71b 100644 --- a/src/com/massivecraft/factions/struct/TerritoryAccess.java +++ b/src/com/massivecraft/factions/TerritoryAccess.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.struct; +package com.massivecraft.factions; import java.lang.reflect.Type; import java.util.Iterator; @@ -8,10 +8,6 @@ import java.util.logging.Level; import org.bukkit.entity.Player; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionColl; -import com.massivecraft.factions.Factions; import org.bukkit.craftbukkit.libs.com.google.gson.JsonArray; import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; @@ -22,7 +18,6 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import org.bukkit.craftbukkit.libs.com.google.gson.JsonPrimitive; import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext; import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer; -import com.massivecraft.factions.FPlayerColl; public class TerritoryAccess implements JsonDeserializer, JsonSerializer diff --git a/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java b/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java index d3bd70b4..64faabfb 100644 --- a/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java +++ b/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java @@ -6,7 +6,8 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer; import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; -import com.massivecraft.factions.struct.FFlag; + +import com.massivecraft.factions.FFlag; public class FFlagTypeAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java b/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java index ac719c71..de636c04 100644 --- a/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java +++ b/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java @@ -6,7 +6,8 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer; import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; -import com.massivecraft.factions.struct.FPerm; + +import com.massivecraft.factions.FPerm; public class FPermTypeAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/factions/adapters/RelTypeAdapter.java b/src/com/massivecraft/factions/adapters/RelTypeAdapter.java index e1edcb76..aecb1b1e 100644 --- a/src/com/massivecraft/factions/adapters/RelTypeAdapter.java +++ b/src/com/massivecraft/factions/adapters/RelTypeAdapter.java @@ -6,7 +6,8 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer; import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; -import com.massivecraft.factions.struct.Rel; + +import com.massivecraft.factions.Rel; public class RelTypeAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/factions/cmd/CapeCommand.java b/src/com/massivecraft/factions/cmd/CapeCommand.java index b43e071d..8597ecfe 100644 --- a/src/com/massivecraft/factions/cmd/CapeCommand.java +++ b/src/com/massivecraft/factions/cmd/CapeCommand.java @@ -4,8 +4,8 @@ import java.util.List; import org.bukkit.command.CommandSender; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Faction; -import com.massivecraft.factions.struct.FPerm; public abstract class CapeCommand extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdAccess.java b/src/com/massivecraft/factions/cmd/CmdAccess.java index 414229aa..a069efdd 100644 --- a/src/com/massivecraft/factions/cmd/CmdAccess.java +++ b/src/com/massivecraft/factions/cmd/CmdAccess.java @@ -1,13 +1,13 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Board; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Faction; import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.TerritoryAccess; import com.massivecraft.factions.zcore.util.TextUtil; diff --git a/src/com/massivecraft/factions/cmd/CmdAutoClaim.java b/src/com/massivecraft/factions/cmd/CmdAutoClaim.java index faeafe83..11cd70bd 100644 --- a/src/com/massivecraft/factions/cmd/CmdAutoClaim.java +++ b/src/com/massivecraft/factions/cmd/CmdAutoClaim.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.cmd; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.FPerm; public class CmdAutoClaim extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdConfig.java b/src/com/massivecraft/factions/cmd/CmdConfig.java index 1c9e8b71..23271eb6 100644 --- a/src/com/massivecraft/factions/cmd/CmdConfig.java +++ b/src/com/massivecraft/factions/cmd/CmdConfig.java @@ -13,12 +13,12 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FFlag; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; public class CmdConfig extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdCreate.java b/src/com/massivecraft/factions/cmd/CmdCreate.java index 4c6cb122..bda4dff6 100644 --- a/src/com/massivecraft/factions/cmd/CmdCreate.java +++ b/src/com/massivecraft/factions/cmd/CmdCreate.java @@ -11,9 +11,9 @@ import com.massivecraft.factions.Faction; import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.event.FPlayerJoinEvent; import com.massivecraft.factions.event.FactionCreateEvent; -import com.massivecraft.factions.struct.Rel; public class CmdCreate extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdDemote.java b/src/com/massivecraft/factions/cmd/CmdDemote.java index 353954e4..942c4cb0 100644 --- a/src/com/massivecraft/factions/cmd/CmdDemote.java +++ b/src/com/massivecraft/factions/cmd/CmdDemote.java @@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdDemote extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdDisband.java b/src/com/massivecraft/factions/cmd/CmdDisband.java index 8bdc35f2..5739f529 100644 --- a/src/com/massivecraft/factions/cmd/CmdDisband.java +++ b/src/com/massivecraft/factions/cmd/CmdDisband.java @@ -6,14 +6,14 @@ import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.event.FPlayerLeaveEvent; import com.massivecraft.factions.event.FactionDisbandEvent; import com.massivecraft.factions.integration.Econ; +import com.massivecraft.factions.FFlag; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; public class CmdDisband extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFlag.java b/src/com/massivecraft/factions/cmd/CmdFlag.java index b114982f..ab0471df 100644 --- a/src/com/massivecraft/factions/cmd/CmdFlag.java +++ b/src/com/massivecraft/factions/cmd/CmdFlag.java @@ -1,8 +1,8 @@ package com.massivecraft.factions.cmd; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.FFlag; public class CmdFlag extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdHome.java b/src/com/massivecraft/factions/cmd/CmdHome.java index e9fd11c9..ca08cc1c 100644 --- a/src/com/massivecraft/factions/cmd/CmdHome.java +++ b/src/com/massivecraft/factions/cmd/CmdHome.java @@ -9,14 +9,14 @@ import org.bukkit.entity.Player; import com.massivecraft.factions.Board; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.integration.EssentialsFeatures; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.zcore.util.SmokeUtil; diff --git a/src/com/massivecraft/factions/cmd/CmdInvite.java b/src/com/massivecraft/factions/cmd/CmdInvite.java index 7c9aa01e..582ab8b9 100644 --- a/src/com/massivecraft/factions/cmd/CmdInvite.java +++ b/src/com/massivecraft/factions/cmd/CmdInvite.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.FPerm; public class CmdInvite extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdKick.java b/src/com/massivecraft/factions/cmd/CmdKick.java index 94dd1b43..7233e201 100644 --- a/src/com/massivecraft/factions/cmd/CmdKick.java +++ b/src/com/massivecraft/factions/cmd/CmdKick.java @@ -3,13 +3,13 @@ package com.massivecraft.factions.cmd; import org.bukkit.Bukkit; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.event.FPlayerLeaveEvent; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; public class CmdKick extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdLeader.java b/src/com/massivecraft/factions/cmd/CmdLeader.java index 199b879c..b6873109 100644 --- a/src/com/massivecraft/factions/cmd/CmdLeader.java +++ b/src/com/massivecraft/factions/cmd/CmdLeader.java @@ -6,8 +6,8 @@ import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.event.FPlayerJoinEvent; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.util.RelationUtil; public class CmdLeader extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdOfficer.java b/src/com/massivecraft/factions/cmd/CmdOfficer.java index 7c798266..7866b5ed 100644 --- a/src/com/massivecraft/factions/cmd/CmdOfficer.java +++ b/src/com/massivecraft/factions/cmd/CmdOfficer.java @@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Faction; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdOfficer extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdPerm.java b/src/com/massivecraft/factions/cmd/CmdPerm.java index 162641fa..1563bfed 100644 --- a/src/com/massivecraft/factions/cmd/CmdPerm.java +++ b/src/com/massivecraft/factions/cmd/CmdPerm.java @@ -1,9 +1,9 @@ package com.massivecraft.factions.cmd; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdPerm extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdPromote.java b/src/com/massivecraft/factions/cmd/CmdPromote.java index 36a39e08..36332be3 100644 --- a/src/com/massivecraft/factions/cmd/CmdPromote.java +++ b/src/com/massivecraft/factions/cmd/CmdPromote.java @@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdPromote extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdRelationAlly.java b/src/com/massivecraft/factions/cmd/CmdRelationAlly.java index 5b93fcb6..c7b999aa 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationAlly.java +++ b/src/com/massivecraft/factions/cmd/CmdRelationAlly.java @@ -1,6 +1,6 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdRelationAlly extends FRelationCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdRelationEnemy.java b/src/com/massivecraft/factions/cmd/CmdRelationEnemy.java index 46e7a7e6..2d36f9f6 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationEnemy.java +++ b/src/com/massivecraft/factions/cmd/CmdRelationEnemy.java @@ -1,6 +1,6 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdRelationEnemy extends FRelationCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdRelationNeutral.java b/src/com/massivecraft/factions/cmd/CmdRelationNeutral.java index d683d5e4..833d5e3d 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationNeutral.java +++ b/src/com/massivecraft/factions/cmd/CmdRelationNeutral.java @@ -1,6 +1,6 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdRelationNeutral extends FRelationCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdRelationTruce.java b/src/com/massivecraft/factions/cmd/CmdRelationTruce.java index de58d4eb..6f366cb7 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationTruce.java +++ b/src/com/massivecraft/factions/cmd/CmdRelationTruce.java @@ -1,6 +1,6 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class CmdRelationTruce extends FRelationCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdSethome.java b/src/com/massivecraft/factions/cmd/CmdSethome.java index 330545cf..4ff05133 100644 --- a/src/com/massivecraft/factions/cmd/CmdSethome.java +++ b/src/com/massivecraft/factions/cmd/CmdSethome.java @@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Board; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.FPerm; public class CmdSethome extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdShow.java b/src/com/massivecraft/factions/cmd/CmdShow.java index 9ebd0d21..4581db90 100644 --- a/src/com/massivecraft/factions/cmd/CmdShow.java +++ b/src/com/massivecraft/factions/cmd/CmdShow.java @@ -7,11 +7,11 @@ import java.util.Map; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.integration.Econ; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.zcore.util.TextUtil; public class CmdShow extends FCommand diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/com/massivecraft/factions/cmd/CmdUnclaim.java index e1a40ec5..f83405a9 100644 --- a/src/com/massivecraft/factions/cmd/CmdUnclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdUnclaim.java @@ -8,10 +8,10 @@ import com.massivecraft.factions.event.LandUnclaimEvent; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; -import com.massivecraft.factions.struct.FPerm; public class CmdUnclaim extends FCommand { diff --git a/src/com/massivecraft/factions/cmd/FCommand.java b/src/com/massivecraft/factions/cmd/FCommand.java index 9d647406..7aea1009 100644 --- a/src/com/massivecraft/factions/cmd/FCommand.java +++ b/src/com/massivecraft/factions/cmd/FCommand.java @@ -7,14 +7,14 @@ import org.bukkit.entity.Player; import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.integration.Econ; +import com.massivecraft.factions.FFlag; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Factions; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.zcore.MCommand; diff --git a/src/com/massivecraft/factions/cmd/FRelationCommand.java b/src/com/massivecraft/factions/cmd/FRelationCommand.java index e48949a2..cc88d46c 100644 --- a/src/com/massivecraft/factions/cmd/FRelationCommand.java +++ b/src/com/massivecraft/factions/cmd/FRelationCommand.java @@ -3,12 +3,12 @@ package com.massivecraft.factions.cmd; import org.bukkit.Bukkit; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Perm; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.event.FactionRelationEvent; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.Rel; public abstract class FRelationCommand extends FCommand { diff --git a/src/com/massivecraft/factions/event/FactionRelationEvent.java b/src/com/massivecraft/factions/event/FactionRelationEvent.java index 8a4686b6..d07e5fb5 100644 --- a/src/com/massivecraft/factions/event/FactionRelationEvent.java +++ b/src/com/massivecraft/factions/event/FactionRelationEvent.java @@ -3,8 +3,8 @@ package com.massivecraft.factions.event; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Rel; public class FactionRelationEvent extends Event diff --git a/src/com/massivecraft/factions/iface/RelationParticipator.java b/src/com/massivecraft/factions/iface/RelationParticipator.java index 714bc90c..dd09cbfb 100644 --- a/src/com/massivecraft/factions/iface/RelationParticipator.java +++ b/src/com/massivecraft/factions/iface/RelationParticipator.java @@ -1,7 +1,8 @@ package com.massivecraft.factions.iface; import org.bukkit.ChatColor; -import com.massivecraft.factions.struct.Rel; + +import com.massivecraft.factions.Rel; public interface RelationParticipator { diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java index 11c3490b..c1a32dd8 100644 --- a/src/com/massivecraft/factions/integration/Econ.java +++ b/src/com/massivecraft/factions/integration/Econ.java @@ -8,12 +8,12 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Faction; import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.Factions; import com.massivecraft.factions.iface.EconomyParticipator; -import com.massivecraft.factions.struct.FPerm; import com.massivecraft.factions.util.RelationUtil; import net.milkbowl.vault.economy.Economy; diff --git a/src/com/massivecraft/factions/integration/SpoutMainListener.java b/src/com/massivecraft/factions/integration/SpoutMainListener.java index 784aa0cc..2e1aa0fc 100644 --- a/src/com/massivecraft/factions/integration/SpoutMainListener.java +++ b/src/com/massivecraft/factions/integration/SpoutMainListener.java @@ -15,7 +15,7 @@ import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; -import com.massivecraft.factions.struct.TerritoryAccess; +import com.massivecraft.factions.TerritoryAccess; import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; import org.getspout.spoutapi.gui.Color; diff --git a/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java b/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java index 7096e3c0..000e72c7 100644 --- a/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java +++ b/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java @@ -6,7 +6,7 @@ import java.util.Set; import org.bukkit.ChatColor; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class AlliesChannel extends FactionsChannelAbstract { diff --git a/src/com/massivecraft/factions/integration/herochat/FactionChannel.java b/src/com/massivecraft/factions/integration/herochat/FactionChannel.java index ef52e79e..d74dcc6b 100644 --- a/src/com/massivecraft/factions/integration/herochat/FactionChannel.java +++ b/src/com/massivecraft/factions/integration/herochat/FactionChannel.java @@ -7,7 +7,7 @@ import java.util.Set; import org.bukkit.ChatColor; import com.massivecraft.factions.ConfServer; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class FactionChannel extends FactionsChannelAbstract { diff --git a/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java b/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java index 3a255379..b13fe7e2 100644 --- a/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java +++ b/src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java @@ -25,7 +25,7 @@ import com.dthielke.herochat.util.Messaging; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public abstract class FactionsChannelAbstract implements Channel { diff --git a/src/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/com/massivecraft/factions/listeners/FactionsBlockListener.java index 2b75e397..757f5a28 100644 --- a/src/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -16,13 +16,13 @@ import org.bukkit.event.block.BlockSpreadEvent; import com.massivecraft.factions.Board; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; public class FactionsBlockListener implements Listener diff --git a/src/com/massivecraft/factions/listeners/FactionsChatListener.java b/src/com/massivecraft/factions/listeners/FactionsChatListener.java index aed1a68f..dcb10bb1 100644 --- a/src/com/massivecraft/factions/listeners/FactionsChatListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsChatListener.java @@ -25,7 +25,7 @@ import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Factions; -import com.massivecraft.factions.struct.Rel; +import com.massivecraft.factions.Rel; public class FactionsChatListener implements Listener { diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java index fb912be0..4fcfe011 100644 --- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -40,14 +40,14 @@ import org.bukkit.potion.PotionEffectType; import com.massivecraft.factions.Board; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.event.PowerLossEvent; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.util.MiscUtil; diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java index edeb4593..49caeca1 100644 --- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -26,15 +26,15 @@ import org.bukkit.util.NumberConversions; import com.massivecraft.factions.Board; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.Factions; +import com.massivecraft.factions.Rel; +import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.FPerm; -import com.massivecraft.factions.struct.Rel; -import com.massivecraft.factions.struct.TerritoryAccess; import com.massivecraft.factions.util.VisualizeUtil; diff --git a/src/com/massivecraft/factions/util/RelationUtil.java b/src/com/massivecraft/factions/util/RelationUtil.java index 1a41a1bd..67e773aa 100644 --- a/src/com/massivecraft/factions/util/RelationUtil.java +++ b/src/com/massivecraft/factions/util/RelationUtil.java @@ -3,11 +3,11 @@ package com.massivecraft.factions.util; import org.bukkit.ChatColor; import com.massivecraft.factions.ConfServer; +import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Rel; import com.massivecraft.factions.iface.RelationParticipator; -import com.massivecraft.factions.struct.FFlag; -import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.zcore.util.TextUtil; public class RelationUtil