Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-23 18:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Move all in the struct package to main package.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-09 13:24:55 +02:00
parent a726e1c49f
commit 936c28d5a9
50 changed files with 64 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/massivecraft/factions/Board.java
View File

@ -16,7 +16,6 @@ import org.bukkit.block.Block;
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.LWCFeatures;
import com.massivecraft.factions.iface.RelationParticipator; import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.struct.TerritoryAccess;
import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.factions.util.AsciiCompass;
import com.massivecraft.factions.zcore.util.DiscUtil; import com.massivecraft.factions.zcore.util.DiscUtil;

3
src/com/massivecraft/factions/ConfServer.java
View File

@ -5,9 +5,6 @@ import java.util.*;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.entity.EntityType; 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 public class ConfServer
{ {

3
src/com/massivecraft/factions/struct/FFlag.java → src/com/massivecraft/factions/FFlag.java
View File

@ -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. * Flags that describe the nature of a faction and it's territory.

10
src/com/massivecraft/factions/struct/FPerm.java → src/com/massivecraft/factions/FPerm.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.struct; package com.massivecraft.factions;
import java.util.Arrays; import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
@ -9,14 +9,6 @@ import org.bukkit.Location;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; 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; import com.massivecraft.factions.iface.RelationParticipator;
/** /**

3
src/com/massivecraft/factions/FPlayer.java
View File

@ -16,9 +16,6 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.LWCFeatures;
import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.integration.Worldguard; 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.util.RelationUtil;
import com.massivecraft.factions.zcore.persist.PlayerEntity; import com.massivecraft.factions.zcore.persist.PlayerEntity;

1
src/com/massivecraft/factions/FPlayerColl.java
View File

@ -7,7 +7,6 @@ import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.persist.PlayerEntityCollection; import com.massivecraft.factions.zcore.persist.PlayerEntityCollection;
public class FPlayerColl extends PlayerEntityCollection<FPlayer> public class FPlayerColl extends PlayerEntityCollection<FPlayer>

3
src/com/massivecraft/factions/Faction.java
View File

@ -10,9 +10,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.iface.RelationParticipator; import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.SpoutFeatures; 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.util.*;
import com.massivecraft.factions.zcore.persist.Entity; import com.massivecraft.factions.zcore.persist.Entity;

3
src/com/massivecraft/factions/FactionColl.java
View File

@ -12,9 +12,6 @@ import org.bukkit.ChatColor;
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.integration.Econ; 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.util.MiscUtil;
import com.massivecraft.factions.zcore.persist.EntityCollection; import com.massivecraft.factions.zcore.persist.EntityCollection;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;

4
src/com/massivecraft/factions/Factions.java
View File

@ -30,10 +30,6 @@ import com.massivecraft.factions.listeners.FactionsExploitListener;
import com.massivecraft.factions.listeners.FactionsAppearanceListener; import com.massivecraft.factions.listeners.FactionsAppearanceListener;
import com.massivecraft.factions.listeners.FactionsPlayerListener; import com.massivecraft.factions.listeners.FactionsPlayerListener;
import com.massivecraft.factions.listeners.FactionsServerListener; 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.AutoLeaveTask;
import com.massivecraft.factions.util.EconLandRewardTask; import com.massivecraft.factions.util.EconLandRewardTask;
import com.massivecraft.factions.util.LazyLocation; import com.massivecraft.factions.util.LazyLocation;

3
src/com/massivecraft/factions/struct/Rel.java → src/com/massivecraft/factions/Rel.java
View File

@ -1,8 +1,7 @@
package com.massivecraft.factions.struct; package com.massivecraft.factions;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.massivecraft.factions.ConfServer;
public enum Rel public enum Rel
{ {

7
src/com/massivecraft/factions/struct/TerritoryAccess.java → src/com/massivecraft/factions/TerritoryAccess.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.struct; package com.massivecraft.factions;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.Iterator; import java.util.Iterator;
@ -8,10 +8,6 @@ import java.util.logging.Level;
import org.bukkit.entity.Player; 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.JsonArray;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; 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.JsonPrimitive;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext; import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer; import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
import com.massivecraft.factions.FPlayerColl;
public class TerritoryAccess implements JsonDeserializer<TerritoryAccess>, JsonSerializer<TerritoryAccess> public class TerritoryAccess implements JsonDeserializer<TerritoryAccess>, JsonSerializer<TerritoryAccess>

3
src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java
View File

@ -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.JsonDeserializer;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; 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<FFlag> public class FFlagTypeAdapter implements JsonDeserializer<FFlag>
{ {

3
src/com/massivecraft/factions/adapters/FPermTypeAdapter.java
View File

@ -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.JsonDeserializer;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; 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<FPerm> public class FPermTypeAdapter implements JsonDeserializer<FPerm>
{ {

3
src/com/massivecraft/factions/adapters/RelTypeAdapter.java
View File

@ -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.JsonDeserializer;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; 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<Rel> public class RelTypeAdapter implements JsonDeserializer<Rel>
{ {

2
src/com/massivecraft/factions/cmd/CapeCommand.java
View File

@ -4,8 +4,8 @@ import java.util.List;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.FPerm;
public abstract class CapeCommand extends FCommand public abstract class CapeCommand extends FCommand
{ {

4
src/com/massivecraft/factions/cmd/CmdAccess.java
View File

@ -1,13 +1,13 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.factions.integration.SpoutFeatures; 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; import com.massivecraft.factions.zcore.util.TextUtil;

2
src/com/massivecraft/factions/cmd/CmdAutoClaim.java
View File

@ -1,8 +1,8 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FPerm;
public class CmdAutoClaim extends FCommand public class CmdAutoClaim extends FCommand
{ {

6
src/com/massivecraft/factions/cmd/CmdConfig.java
View File

@ -13,12 +13,12 @@ import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.integration.SpoutFeatures; 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 public class CmdConfig extends FCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdCreate.java
View File

@ -11,9 +11,9 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.event.FPlayerJoinEvent; import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.event.FactionCreateEvent; import com.massivecraft.factions.event.FactionCreateEvent;
import com.massivecraft.factions.struct.Rel;
public class CmdCreate extends FCommand public class CmdCreate extends FCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdDemote.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class CmdDemote extends FCommand public class CmdDemote extends FCommand
{ {

4
src/com/massivecraft/factions/cmd/CmdDisband.java
View File

@ -6,14 +6,14 @@ import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.event.FPlayerLeaveEvent; import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.event.FactionDisbandEvent; import com.massivecraft.factions.event.FactionDisbandEvent;
import com.massivecraft.factions.integration.Econ; 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.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.FPerm;
public class CmdDisband extends FCommand public class CmdDisband extends FCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdFlag.java
View File

@ -1,8 +1,8 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FFlag;
public class CmdFlag extends FCommand public class CmdFlag extends FCommand
{ {

4
src/com/massivecraft/factions/cmd/CmdHome.java
View File

@ -9,14 +9,14 @@ import org.bukkit.entity.Player;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.integration.EssentialsFeatures; 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; import com.massivecraft.factions.zcore.util.SmokeUtil;

2
src/com/massivecraft/factions/cmd/CmdInvite.java
View File

@ -1,9 +1,9 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FPerm;
public class CmdInvite extends FCommand public class CmdInvite extends FCommand
{ {

4
src/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -3,13 +3,13 @@ package com.massivecraft.factions.cmd;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.event.FPlayerLeaveEvent; import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.FPerm;
import com.massivecraft.factions.struct.Rel;
public class CmdKick extends FCommand public class CmdKick extends FCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdLeader.java
View File

@ -6,8 +6,8 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.event.FPlayerJoinEvent; import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.util.RelationUtil;
public class CmdLeader extends FCommand public class CmdLeader extends FCommand

2
src/com/massivecraft/factions/cmd/CmdOfficer.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class CmdOfficer extends FCommand public class CmdOfficer extends FCommand
{ {

4
src/com/massivecraft/factions/cmd/CmdPerm.java
View File

@ -1,9 +1,9 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FPerm; import com.massivecraft.factions.Rel;
import com.massivecraft.factions.struct.Rel;
public class CmdPerm extends FCommand public class CmdPerm extends FCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdPromote.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class CmdPromote extends FCommand public class CmdPromote extends FCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdRelationAlly.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class CmdRelationAlly extends FRelationCommand public class CmdRelationAlly extends FRelationCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdRelationEnemy.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class CmdRelationEnemy extends FRelationCommand public class CmdRelationEnemy extends FRelationCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdRelationNeutral.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class CmdRelationNeutral extends FRelationCommand public class CmdRelationNeutral extends FRelationCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdRelationTruce.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class CmdRelationTruce extends FRelationCommand public class CmdRelationTruce extends FRelationCommand
{ {

2
src/com/massivecraft/factions/cmd/CmdSethome.java
View File

@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FPerm;
public class CmdSethome extends FCommand public class CmdSethome extends FCommand
{ {

4
src/com/massivecraft/factions/cmd/CmdShow.java
View File

@ -7,11 +7,11 @@ import java.util.Map;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FFlag; import com.massivecraft.factions.Rel;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;
public class CmdShow extends FCommand public class CmdShow extends FCommand

2
src/com/massivecraft/factions/cmd/CmdUnclaim.java
View File

@ -8,10 +8,10 @@ import com.massivecraft.factions.event.LandUnclaimEvent;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FPerm;
public class CmdUnclaim extends FCommand public class CmdUnclaim extends FCommand
{ {

6
src/com/massivecraft/factions/cmd/FCommand.java
View File

@ -7,14 +7,14 @@ import org.bukkit.entity.Player;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.integration.Econ; 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.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.FFlag; import com.massivecraft.factions.Rel;
import com.massivecraft.factions.struct.FPerm;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.MCommand; import com.massivecraft.factions.zcore.MCommand;

4
src/com/massivecraft/factions/cmd/FRelationCommand.java
View File

@ -3,12 +3,12 @@ package com.massivecraft.factions.cmd;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.event.FactionRelationEvent; import com.massivecraft.factions.event.FactionRelationEvent;
import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.Rel;
public abstract class FRelationCommand extends FCommand public abstract class FRelationCommand extends FCommand
{ {

2
src/com/massivecraft/factions/event/FactionRelationEvent.java
View File

@ -3,8 +3,8 @@ package com.massivecraft.factions.event;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Rel;
public class FactionRelationEvent extends Event public class FactionRelationEvent extends Event

3
src/com/massivecraft/factions/iface/RelationParticipator.java
View File

@ -1,7 +1,8 @@
package com.massivecraft.factions.iface; package com.massivecraft.factions.iface;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.Rel;
public interface RelationParticipator public interface RelationParticipator
{ {

2
src/com/massivecraft/factions/integration/Econ.java
View File

@ -8,12 +8,12 @@ import org.bukkit.Bukkit;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl; import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.struct.FPerm;
import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.util.RelationUtil;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;

2
src/com/massivecraft/factions/integration/SpoutMainListener.java
View File

@ -15,7 +15,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; 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.event.spout.SpoutCraftEnableEvent;
import org.getspout.spoutapi.gui.Color; import org.getspout.spoutapi.gui.Color;

2
src/com/massivecraft/factions/integration/herochat/AlliesChannel.java
View File

@ -6,7 +6,7 @@ import java.util.Set;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class AlliesChannel extends FactionsChannelAbstract public class AlliesChannel extends FactionsChannelAbstract
{ {

2
src/com/massivecraft/factions/integration/herochat/FactionChannel.java
View File

@ -7,7 +7,7 @@ import java.util.Set;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class FactionChannel extends FactionsChannelAbstract public class FactionChannel extends FactionsChannelAbstract
{ {

2
src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java
View File

@ -25,7 +25,7 @@ import com.dthielke.herochat.util.Messaging;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public abstract class FactionsChannelAbstract implements Channel public abstract class FactionsChannelAbstract implements Channel
{ {

4
src/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@ -16,13 +16,13 @@ import org.bukkit.event.block.BlockSpreadEvent;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.FPerm;
public class FactionsBlockListener implements Listener public class FactionsBlockListener implements Listener

2
src/com/massivecraft/factions/listeners/FactionsChatListener.java
View File

@ -25,7 +25,7 @@ import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.Rel;
public class FactionsChatListener implements Listener public class FactionsChatListener implements Listener
{ {

4
src/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -40,14 +40,14 @@ import org.bukkit.potion.PotionEffectType;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.event.PowerLossEvent; import com.massivecraft.factions.event.PowerLossEvent;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;

8
src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -26,15 +26,15 @@ import org.bukkit.util.NumberConversions;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl; import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Factions; 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.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; import com.massivecraft.factions.util.VisualizeUtil;

4
src/com/massivecraft/factions/util/RelationUtil.java
View File

@ -3,11 +3,11 @@ package com.massivecraft.factions.util;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.iface.RelationParticipator; 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; import com.massivecraft.factions.zcore.util.TextUtil;
public class RelationUtil public class RelationUtil