diff --git a/pom.xml b/pom.xml index 53c38a3b..216a6295 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - - net.knarcraft Factions @@ -67,7 +59,7 @@ MassiveCore RELEASE system - lib\MassiveCore.jar + ${project.basedir}\lib\MassiveCore.jar @@ -103,7 +95,7 @@ lwc RELEASE system - lib\LWC.jar + ${project.basedir}\lib\LWC.jar @@ -118,7 +110,7 @@ VentureChat RELEASE system - lib\VentureChat.jar + ${project.basedir}\lib\VentureChat.jar diff --git a/src/main/java/com/massivecraft/factions/AccessStatus.java b/src/main/java/net/knarcraft/factions/AccessStatus.java similarity index 97% rename from src/main/java/com/massivecraft/factions/AccessStatus.java rename to src/main/java/net/knarcraft/factions/AccessStatus.java index 2bde40b5..59cb2e3a 100644 --- a/src/main/java/com/massivecraft/factions/AccessStatus.java +++ b/src/main/java/net/knarcraft/factions/AccessStatus.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; import com.massivecraft.massivecore.Colorized; diff --git a/src/main/java/com/massivecraft/factions/EconomyParticipator.java b/src/main/java/net/knarcraft/factions/EconomyParticipator.java similarity index 76% rename from src/main/java/com/massivecraft/factions/EconomyParticipator.java rename to src/main/java/net/knarcraft/factions/EconomyParticipator.java index 4de52cc5..cd8c3d20 100644 --- a/src/main/java/com/massivecraft/factions/EconomyParticipator.java +++ b/src/main/java/net/knarcraft/factions/EconomyParticipator.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; public interface EconomyParticipator extends RelationParticipator { boolean msg(String msg, Object... args); diff --git a/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java b/src/main/java/net/knarcraft/factions/ExtractorFactionAccountId.java similarity index 91% rename from src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java rename to src/main/java/net/knarcraft/factions/ExtractorFactionAccountId.java index eea6977c..0cee67ef 100644 --- a/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java +++ b/src/main/java/net/knarcraft/factions/ExtractorFactionAccountId.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.util.extractor.Extractor; public class ExtractorFactionAccountId implements Extractor { diff --git a/src/main/java/com/massivecraft/factions/Factions.java b/src/main/java/net/knarcraft/factions/Factions.java similarity index 61% rename from src/main/java/com/massivecraft/factions/Factions.java rename to src/main/java/net/knarcraft/factions/Factions.java index 43fc36e1..c5e5fb3c 100644 --- a/src/main/java/com/massivecraft/factions/Factions.java +++ b/src/main/java/net/knarcraft/factions/Factions.java @@ -1,81 +1,81 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; import com.google.gson.GsonBuilder; -import com.massivecraft.factions.adapter.BoardAdapter; -import com.massivecraft.factions.adapter.BoardMapAdapter; -import com.massivecraft.factions.adapter.TerritoryAccessAdapter; -import com.massivecraft.factions.chat.modifier.ChatModifierLc; -import com.massivecraft.factions.chat.modifier.ChatModifierLp; -import com.massivecraft.factions.chat.modifier.ChatModifierParse; -import com.massivecraft.factions.chat.modifier.ChatModifierRp; -import com.massivecraft.factions.chat.modifier.ChatModifierUc; -import com.massivecraft.factions.chat.modifier.ChatModifierUcf; -import com.massivecraft.factions.chat.tag.ChatTagName; -import com.massivecraft.factions.chat.tag.ChatTagNameforce; -import com.massivecraft.factions.chat.tag.ChatTagRelcolor; -import com.massivecraft.factions.chat.tag.ChatTagRole; -import com.massivecraft.factions.chat.tag.ChatTagRoleprefix; -import com.massivecraft.factions.chat.tag.ChatTagRoleprefixforce; -import com.massivecraft.factions.chat.tag.ChatTagTitle; -import com.massivecraft.factions.cmd.CmdFactions; -import com.massivecraft.factions.cmd.type.TypeFactionChunkChangeType; -import com.massivecraft.factions.cmd.type.TypeRel; -import com.massivecraft.factions.engine.EngineCanCombatHappen; -import com.massivecraft.factions.engine.EngineChat; -import com.massivecraft.factions.engine.EngineChunkChange; -import com.massivecraft.factions.engine.EngineCleanInactivity; -import com.massivecraft.factions.engine.EngineDenyCommands; -import com.massivecraft.factions.engine.EngineDenyTeleport; -import com.massivecraft.factions.engine.EngineEcon; -import com.massivecraft.factions.engine.EngineExploit; -import com.massivecraft.factions.engine.EngineFlagEndergrief; -import com.massivecraft.factions.engine.EngineFlagExplosion; -import com.massivecraft.factions.engine.EngineFlagFireSpread; -import com.massivecraft.factions.engine.EngineFlagSpawn; -import com.massivecraft.factions.engine.EngineFlagZombiegrief; -import com.massivecraft.factions.engine.EngineFly; -import com.massivecraft.factions.engine.EngineLastActivity; -import com.massivecraft.factions.engine.EngineMotd; -import com.massivecraft.factions.engine.EngineMoveChunk; -import com.massivecraft.factions.engine.EnginePermBuild; -import com.massivecraft.factions.engine.EnginePlayerData; -import com.massivecraft.factions.engine.EnginePower; -import com.massivecraft.factions.engine.EngineSeeChunk; -import com.massivecraft.factions.engine.EngineShow; -import com.massivecraft.factions.engine.EngineTeleportHomeOnDeath; -import com.massivecraft.factions.engine.EngineTerritoryShield; -import com.massivecraft.factions.engine.EngineVisualizations; -import com.massivecraft.factions.entity.Board; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConfColl; -import com.massivecraft.factions.entity.MFlagColl; -import com.massivecraft.factions.entity.MPermColl; -import com.massivecraft.factions.entity.MPlayerColl; -import com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations; -import com.massivecraft.factions.entity.migrator.MigratorFaction002Ranks; -import com.massivecraft.factions.entity.migrator.MigratorFaction003Warps; -import com.massivecraft.factions.entity.migrator.MigratorFaction004WarpsPerms; -import com.massivecraft.factions.entity.migrator.MigratorMConf001EnumerationUtil; -import com.massivecraft.factions.entity.migrator.MigratorMConf002CleanInactivity; -import com.massivecraft.factions.entity.migrator.MigratorMConf003CleanInactivity; -import com.massivecraft.factions.entity.migrator.MigratorMConf004Rank; -import com.massivecraft.factions.entity.migrator.MigratorMConf005Warps; -import com.massivecraft.factions.entity.migrator.MigratorMPerm001Warps; -import com.massivecraft.factions.entity.migrator.MigratorMPerm002MoveStandard; -import com.massivecraft.factions.entity.migrator.MigratorMPlayer001Ranks; -import com.massivecraft.factions.entity.migrator.MigratorMPlayer002UsingAdminMode; -import com.massivecraft.factions.entity.migrator.MigratorTerritoryAccess001Restructure; -import com.massivecraft.factions.event.EventFactionsChunkChangeType; -import com.massivecraft.factions.integration.dynmap.IntegrationDynmap; -import com.massivecraft.factions.integration.lwc.IntegrationLwc; -import com.massivecraft.factions.integration.placeholderapi.IntegrationPlaceholderAPI; -import com.massivecraft.factions.integration.venturechat.IntegrationVentureChat; -import com.massivecraft.factions.integration.worldguard.IntegrationWorldGuard; -import com.massivecraft.factions.mixin.PowerMixin; -import com.massivecraft.factions.task.TaskFlagPermCreate; -import com.massivecraft.factions.task.TaskPlayerPowerUpdate; -import com.massivecraft.factions.task.TaskTax; +import net.knarcraft.factions.adapter.BoardAdapter; +import net.knarcraft.factions.adapter.BoardMapAdapter; +import net.knarcraft.factions.adapter.TerritoryAccessAdapter; +import net.knarcraft.factions.chat.modifier.ChatModifierLc; +import net.knarcraft.factions.chat.modifier.ChatModifierLp; +import net.knarcraft.factions.chat.modifier.ChatModifierParse; +import net.knarcraft.factions.chat.modifier.ChatModifierRp; +import net.knarcraft.factions.chat.modifier.ChatModifierUc; +import net.knarcraft.factions.chat.modifier.ChatModifierUcf; +import net.knarcraft.factions.chat.tag.ChatTagName; +import net.knarcraft.factions.chat.tag.ChatTagNameforce; +import net.knarcraft.factions.chat.tag.ChatTagRelcolor; +import net.knarcraft.factions.chat.tag.ChatTagRole; +import net.knarcraft.factions.chat.tag.ChatTagRoleprefix; +import net.knarcraft.factions.chat.tag.ChatTagRoleprefixforce; +import net.knarcraft.factions.chat.tag.ChatTagTitle; +import net.knarcraft.factions.cmd.CmdFactions; +import net.knarcraft.factions.cmd.type.TypeFactionChunkChangeType; +import net.knarcraft.factions.cmd.type.TypeRel; +import net.knarcraft.factions.engine.EngineCanCombatHappen; +import net.knarcraft.factions.engine.EngineChat; +import net.knarcraft.factions.engine.EngineChunkChange; +import net.knarcraft.factions.engine.EngineCleanInactivity; +import net.knarcraft.factions.engine.EngineDenyCommands; +import net.knarcraft.factions.engine.EngineDenyTeleport; +import net.knarcraft.factions.engine.EngineEcon; +import net.knarcraft.factions.engine.EngineExploit; +import net.knarcraft.factions.engine.EngineFlagEndergrief; +import net.knarcraft.factions.engine.EngineFlagExplosion; +import net.knarcraft.factions.engine.EngineFlagFireSpread; +import net.knarcraft.factions.engine.EngineFlagSpawn; +import net.knarcraft.factions.engine.EngineFlagZombiegrief; +import net.knarcraft.factions.engine.EngineFly; +import net.knarcraft.factions.engine.EngineLastActivity; +import net.knarcraft.factions.engine.EngineMotd; +import net.knarcraft.factions.engine.EngineMoveChunk; +import net.knarcraft.factions.engine.EnginePermBuild; +import net.knarcraft.factions.engine.EnginePlayerData; +import net.knarcraft.factions.engine.EnginePower; +import net.knarcraft.factions.engine.EngineSeeChunk; +import net.knarcraft.factions.engine.EngineShow; +import net.knarcraft.factions.engine.EngineTeleportHomeOnDeath; +import net.knarcraft.factions.engine.EngineTerritoryShield; +import net.knarcraft.factions.engine.EngineVisualizations; +import net.knarcraft.factions.entity.Board; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConfColl; +import net.knarcraft.factions.entity.MFlagColl; +import net.knarcraft.factions.entity.MPermColl; +import net.knarcraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.migrator.MigratorFaction001Invitations; +import net.knarcraft.factions.entity.migrator.MigratorFaction002Ranks; +import net.knarcraft.factions.entity.migrator.MigratorFaction003Warps; +import net.knarcraft.factions.entity.migrator.MigratorFaction004WarpsPerms; +import net.knarcraft.factions.entity.migrator.MigratorMConf001EnumerationUtil; +import net.knarcraft.factions.entity.migrator.MigratorMConf002CleanInactivity; +import net.knarcraft.factions.entity.migrator.MigratorMConf003CleanInactivity; +import net.knarcraft.factions.entity.migrator.MigratorMConf004Rank; +import net.knarcraft.factions.entity.migrator.MigratorMConf005Warps; +import net.knarcraft.factions.entity.migrator.MigratorMPerm001Warps; +import net.knarcraft.factions.entity.migrator.MigratorMPerm002MoveStandard; +import net.knarcraft.factions.entity.migrator.MigratorMPlayer001Ranks; +import net.knarcraft.factions.entity.migrator.MigratorMPlayer002UsingAdminMode; +import net.knarcraft.factions.entity.migrator.MigratorTerritoryAccess001Restructure; +import net.knarcraft.factions.event.EventFactionsChunkChangeType; +import net.knarcraft.factions.integration.dynmap.IntegrationDynmap; +import net.knarcraft.factions.integration.lwc.IntegrationLwc; +import net.knarcraft.factions.integration.placeholderapi.IntegrationPlaceholderAPI; +import net.knarcraft.factions.integration.venturechat.IntegrationVentureChat; +import net.knarcraft.factions.integration.worldguard.IntegrationWorldGuard; +import net.knarcraft.factions.mixin.PowerMixin; +import net.knarcraft.factions.task.TaskFlagPermCreate; +import net.knarcraft.factions.task.TaskPlayerPowerUpdate; +import net.knarcraft.factions.task.TaskTax; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.command.type.RegistryType; import com.massivecraft.massivecore.store.migrator.MigratorUtil; diff --git a/src/main/java/com/massivecraft/factions/FactionsIndex.java b/src/main/java/net/knarcraft/factions/FactionsIndex.java similarity index 95% rename from src/main/java/com/massivecraft/factions/FactionsIndex.java rename to src/main/java/net/knarcraft/factions/FactionsIndex.java index d98c5c0c..076cbfa8 100644 --- a/src/main/java/com/massivecraft/factions/FactionsIndex.java +++ b/src/main/java/net/knarcraft/factions/FactionsIndex.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.collections.MassiveSet; import java.util.Collections; diff --git a/src/main/java/com/massivecraft/factions/FactionsParticipator.java b/src/main/java/net/knarcraft/factions/FactionsParticipator.java similarity index 79% rename from src/main/java/com/massivecraft/factions/FactionsParticipator.java rename to src/main/java/net/knarcraft/factions/FactionsParticipator.java index 6474d22e..42215f20 100644 --- a/src/main/java/com/massivecraft/factions/FactionsParticipator.java +++ b/src/main/java/net/knarcraft/factions/FactionsParticipator.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; import com.massivecraft.massivecore.Named; diff --git a/src/main/java/com/massivecraft/factions/Perm.java b/src/main/java/net/knarcraft/factions/Perm.java similarity index 98% rename from src/main/java/com/massivecraft/factions/Perm.java rename to src/main/java/net/knarcraft/factions/Perm.java index 09b68b71..52923674 100644 --- a/src/main/java/com/massivecraft/factions/Perm.java +++ b/src/main/java/net/knarcraft/factions/Perm.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.MassiveException; diff --git a/src/main/java/com/massivecraft/factions/PowerBoosted.java b/src/main/java/net/knarcraft/factions/PowerBoosted.java similarity index 75% rename from src/main/java/com/massivecraft/factions/PowerBoosted.java rename to src/main/java/net/knarcraft/factions/PowerBoosted.java index 27353cd0..8a8e8a8d 100644 --- a/src/main/java/com/massivecraft/factions/PowerBoosted.java +++ b/src/main/java/net/knarcraft/factions/PowerBoosted.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; public interface PowerBoosted { double getPowerBoost(); diff --git a/src/main/java/com/massivecraft/factions/Rel.java b/src/main/java/net/knarcraft/factions/Rel.java similarity index 97% rename from src/main/java/com/massivecraft/factions/Rel.java rename to src/main/java/net/knarcraft/factions/Rel.java index 9a79c0b1..9047691a 100644 --- a/src/main/java/com/massivecraft/factions/Rel.java +++ b/src/main/java/net/knarcraft/factions/Rel.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.Colorized; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.collections.MassiveSet; diff --git a/src/main/java/com/massivecraft/factions/RelationParticipator.java b/src/main/java/net/knarcraft/factions/RelationParticipator.java similarity index 91% rename from src/main/java/com/massivecraft/factions/RelationParticipator.java rename to src/main/java/net/knarcraft/factions/RelationParticipator.java index 0515d6d5..df2db90b 100644 --- a/src/main/java/com/massivecraft/factions/RelationParticipator.java +++ b/src/main/java/net/knarcraft/factions/RelationParticipator.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/TerritoryAccess.java b/src/main/java/net/knarcraft/factions/TerritoryAccess.java similarity index 93% rename from src/main/java/com/massivecraft/factions/TerritoryAccess.java rename to src/main/java/net/knarcraft/factions/TerritoryAccess.java index 63b74b46..9a0c09ea 100644 --- a/src/main/java/com/massivecraft/factions/TerritoryAccess.java +++ b/src/main/java/net/knarcraft/factions/TerritoryAccess.java @@ -1,10 +1,9 @@ -package com.massivecraft.factions; +package net.knarcraft.factions; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPerm.MPermable; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.util.RelationUtil; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.util.RelationUtil; import com.massivecraft.massivecore.collections.MassiveSet; import java.util.Collection; @@ -72,7 +71,7 @@ public class TerritoryAccess { } // The intermediate ones - public TerritoryAccess withGranted(MPermable mpermable, boolean with) { + public TerritoryAccess withGranted(MPerm.MPermable mpermable, boolean with) { return withGrantedId(mpermable.getId(), with); } @@ -100,7 +99,7 @@ public class TerritoryAccess { return Faction.get(this.getHostFactionId()); } - public Set getGranteds() { + public Set getGranteds() { return MPerm.idsToMPermables(this.getGrantedIds()); } @@ -162,7 +161,7 @@ public class TerritoryAccess { // INSTANCE METHODS // -------------------------------------------- // - public boolean isGranted(MPermable permable) { + public boolean isGranted(MPerm.MPermable permable) { return isGranted(permable.getId()); } diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java b/src/main/java/net/knarcraft/factions/adapter/BoardAdapter.java similarity index 93% rename from src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java rename to src/main/java/net/knarcraft/factions/adapter/BoardAdapter.java index c8354aa5..c8b77d0e 100644 --- a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java +++ b/src/main/java/net/knarcraft/factions/adapter/BoardAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapter; +package net.knarcraft.factions.adapter; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -6,7 +6,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.massivecraft.factions.entity.Board; +import net.knarcraft.factions.entity.Board; import java.lang.reflect.Type; diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java b/src/main/java/net/knarcraft/factions/adapter/BoardMapAdapter.java similarity index 96% rename from src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java rename to src/main/java/net/knarcraft/factions/adapter/BoardMapAdapter.java index 728b156c..6872bef7 100644 --- a/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java +++ b/src/main/java/net/knarcraft/factions/adapter/BoardMapAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapter; +package net.knarcraft.factions.adapter; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -7,7 +7,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.massivecraft.factions.TerritoryAccess; +import net.knarcraft.factions.TerritoryAccess; import com.massivecraft.massivecore.ps.PS; import java.lang.reflect.Type; diff --git a/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java b/src/main/java/net/knarcraft/factions/adapter/TerritoryAccessAdapter.java similarity index 97% rename from src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java rename to src/main/java/net/knarcraft/factions/adapter/TerritoryAccessAdapter.java index 8802b8db..fa738f08 100644 --- a/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java +++ b/src/main/java/net/knarcraft/factions/adapter/TerritoryAccessAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.adapter; +package net.knarcraft.factions.adapter; import com.google.gson.JsonDeserializationContext; @@ -10,7 +10,7 @@ import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import com.google.gson.reflect.TypeToken; -import com.massivecraft.factions.TerritoryAccess; +import net.knarcraft.factions.TerritoryAccess; import com.massivecraft.massivecore.store.migrator.MigratorUtil; import java.lang.reflect.Type; diff --git a/src/main/java/com/massivecraft/factions/chat/ChatActive.java b/src/main/java/net/knarcraft/factions/chat/ChatActive.java similarity index 97% rename from src/main/java/com/massivecraft/factions/chat/ChatActive.java rename to src/main/java/net/knarcraft/factions/chat/ChatActive.java index 0952f4e8..ecb2ba2f 100644 --- a/src/main/java/com/massivecraft/factions/chat/ChatActive.java +++ b/src/main/java/net/knarcraft/factions/chat/ChatActive.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.chat; +package net.knarcraft.factions.chat; import com.massivecraft.massivecore.Active; import com.massivecraft.massivecore.Identified; diff --git a/src/main/java/com/massivecraft/factions/chat/ChatFormatter.java b/src/main/java/net/knarcraft/factions/chat/ChatFormatter.java similarity index 98% rename from src/main/java/com/massivecraft/factions/chat/ChatFormatter.java rename to src/main/java/net/knarcraft/factions/chat/ChatFormatter.java index a74218fe..5dc769f2 100644 --- a/src/main/java/com/massivecraft/factions/chat/ChatFormatter.java +++ b/src/main/java/net/knarcraft/factions/chat/ChatFormatter.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.chat; +package net.knarcraft.factions.chat; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/chat/ChatModifier.java b/src/main/java/net/knarcraft/factions/chat/ChatModifier.java similarity index 97% rename from src/main/java/com/massivecraft/factions/chat/ChatModifier.java rename to src/main/java/net/knarcraft/factions/chat/ChatModifier.java index be6deb32..3bfba493 100644 --- a/src/main/java/com/massivecraft/factions/chat/ChatModifier.java +++ b/src/main/java/net/knarcraft/factions/chat/ChatModifier.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.chat; +package net.knarcraft.factions.chat; import com.massivecraft.massivecore.collections.MassiveMap; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/chat/ChatTag.java b/src/main/java/net/knarcraft/factions/chat/ChatTag.java similarity index 97% rename from src/main/java/com/massivecraft/factions/chat/ChatTag.java rename to src/main/java/net/knarcraft/factions/chat/ChatTag.java index e80732c0..f49bafeb 100644 --- a/src/main/java/com/massivecraft/factions/chat/ChatTag.java +++ b/src/main/java/net/knarcraft/factions/chat/ChatTag.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.chat; +package net.knarcraft.factions.chat; import com.massivecraft.massivecore.collections.MassiveMap; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLc.java similarity index 87% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java rename to src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLc.java index 869b584e..69c9e772 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java +++ b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLc.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.chat.modifier; +package net.knarcraft.factions.chat.modifier; -import com.massivecraft.factions.chat.ChatModifier; +import net.knarcraft.factions.chat.ChatModifier; import org.bukkit.command.CommandSender; public class ChatModifierLc extends ChatModifier { diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLp.java similarity index 88% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java rename to src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLp.java index c5f20ef5..f06290af 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java +++ b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLp.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.chat.modifier; +package net.knarcraft.factions.chat.modifier; -import com.massivecraft.factions.chat.ChatModifier; +import net.knarcraft.factions.chat.ChatModifier; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierParse.java similarity index 88% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java rename to src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierParse.java index abd2c382..64559a10 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java +++ b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierParse.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.chat.modifier; +package net.knarcraft.factions.chat.modifier; -import com.massivecraft.factions.chat.ChatModifier; +import net.knarcraft.factions.chat.ChatModifier; import com.massivecraft.massivecore.util.Txt; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierRp.java similarity index 88% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java rename to src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierRp.java index 072aecab..ef78ae58 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java +++ b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierRp.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.chat.modifier; +package net.knarcraft.factions.chat.modifier; -import com.massivecraft.factions.chat.ChatModifier; +import net.knarcraft.factions.chat.ChatModifier; import org.bukkit.command.CommandSender; public class ChatModifierRp extends ChatModifier { diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUc.java similarity index 87% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java rename to src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUc.java index 4a23a1ba..9c927a19 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java +++ b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUc.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.chat.modifier; +package net.knarcraft.factions.chat.modifier; -import com.massivecraft.factions.chat.ChatModifier; +import net.knarcraft.factions.chat.ChatModifier; import org.bukkit.command.CommandSender; public class ChatModifierUc extends ChatModifier { diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUcf.java similarity index 88% rename from src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java rename to src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUcf.java index 459f045c..dfe2b140 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java +++ b/src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUcf.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.chat.modifier; +package net.knarcraft.factions.chat.modifier; -import com.massivecraft.factions.chat.ChatModifier; +import net.knarcraft.factions.chat.ChatModifier; import com.massivecraft.massivecore.util.Txt; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagName.java similarity index 82% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java rename to src/main/java/net/knarcraft/factions/chat/tag/ChatTagName.java index 8bffe129..2c093c83 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java +++ b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagName.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.chat.tag; +package net.knarcraft.factions.chat.tag; -import com.massivecraft.factions.chat.ChatTag; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.chat.ChatTag; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; public class ChatTagName extends ChatTag { diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagNameforce.java similarity index 81% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java rename to src/main/java/net/knarcraft/factions/chat/tag/ChatTagNameforce.java index f1aee0a6..8a0612a1 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java +++ b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagNameforce.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.chat.tag; +package net.knarcraft.factions.chat.tag; -import com.massivecraft.factions.chat.ChatTag; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.chat.ChatTag; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; public class ChatTagNameforce extends ChatTag { diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRelcolor.java similarity index 87% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java rename to src/main/java/net/knarcraft/factions/chat/tag/ChatTagRelcolor.java index 6bd754a2..00935d2b 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java +++ b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRelcolor.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.chat.tag; +package net.knarcraft.factions.chat.tag; -import com.massivecraft.factions.chat.ChatTag; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.chat.ChatTag; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; public class ChatTagRelcolor extends ChatTag { diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRole.java similarity index 85% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java rename to src/main/java/net/knarcraft/factions/chat/tag/ChatTagRole.java index 79c98fc1..9e721146 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java +++ b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRole.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.chat.tag; +package net.knarcraft.factions.chat.tag; -import com.massivecraft.factions.chat.ChatTag; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.chat.ChatTag; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.util.Txt; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefix.java similarity index 83% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java rename to src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefix.java index 380e79db..4f7a8838 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java +++ b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefix.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.chat.tag; +package net.knarcraft.factions.chat.tag; -import com.massivecraft.factions.chat.ChatTag; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.chat.ChatTag; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; public class ChatTagRoleprefix extends ChatTag { diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefixforce.java similarity index 85% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java rename to src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefixforce.java index ed63210c..d617d681 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java +++ b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefixforce.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.chat.tag; +package net.knarcraft.factions.chat.tag; -import com.massivecraft.factions.chat.ChatTag; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.chat.ChatTag; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; public class ChatTagRoleprefixforce extends ChatTag { diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagTitle.java similarity index 85% rename from src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java rename to src/main/java/net/knarcraft/factions/chat/tag/ChatTagTitle.java index 037ec2d2..41f66c39 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java +++ b/src/main/java/net/knarcraft/factions/chat/tag/ChatTagTitle.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.chat.tag; +package net.knarcraft.factions.chat.tag; -import com.massivecraft.factions.chat.ChatTag; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.chat.ChatTag; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; public class ChatTagTitle extends ChatTag { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactions.java similarity index 97% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactions.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactions.java index c222da1f..ab3f5a99 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactions.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.command.MassiveCommandDeprecated; import com.massivecraft.massivecore.command.MassiveCommandVersion; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccess.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccess.java index fccb0ca2..265aa853 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccess.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessAbstract.java similarity index 84% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessAbstract.java index f64ef010..ecd9e5c7 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessAbstract.java @@ -1,11 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPerm.MPermable; -import com.massivecraft.factions.util.AsciiMap; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.util.AsciiMap; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.Txt; @@ -61,11 +60,11 @@ public abstract class CmdFactionsAccessAbstract extends FactionsCommand { msg("Granted to: %s", CmdFactionsPermShow.permablesToDisplayString(ta.getGranteds(), msender)); } - public void setAccess(Collection chunks, MPermable mpermable, boolean granted) { + public void setAccess(Collection chunks, MPerm.MPermable mpermable, boolean granted) { chunks.forEach(chunk -> setAccess(chunk, mpermable, granted)); } - public void setAccess(PS chunk, MPermable mpermable, boolean granted) { + public void setAccess(PS chunk, MPerm.MPermable mpermable, boolean granted) { TerritoryAccess ta = BoardColl.get().getTerritoryAccessAt(chunk); Faction faction = ta.getHostFaction(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessDeny.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessDeny.java similarity index 96% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessDeny.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessDeny.java index 7f8d550d..c2567750 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessDeny.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessDeny.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessGrant.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessGrant.java similarity index 96% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessGrant.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessGrant.java index 1077f72f..ee2fda14 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessGrant.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessGrant.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessInspect.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessInspect.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessInspect.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessInspect.java index 09613314..636aa443 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessInspect.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessInspect.java @@ -1,12 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPermable; -import com.massivecraft.factions.entity.Board; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPerm.MPermable; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPermable; +import net.knarcraft.factions.entity.Board; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.mixin.MixinWorld; @@ -39,7 +38,7 @@ public class CmdFactionsAccessInspect extends FactionsCommand { public void perform() throws MassiveException { // Parameter Faction faction = this.readArgAt(1, msenderFaction); - MPermable mpermable = TypeMPermable.get(faction).read(this.argAt(0), sender); + MPerm.MPermable mpermable = TypeMPermable.get(faction).read(this.argAt(0), sender); String factionId = faction.getId(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetCircle.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetCircle.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetCircle.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetCircle.java index 63d68a43..c126a6f1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetCircle.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetCircle.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; +import net.knarcraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetFill.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetFill.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetFill.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetFill.java index 7696a6ff..6a69874d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetFill.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetFill.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetOne.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetOne.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetOne.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetOne.java index 60ff5077..de7025df 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetOne.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetOne.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; +import net.knarcraft.factions.Perm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetSquare.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetSquare.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetSquare.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetSquare.java index b5515732..1cd51f4c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetSquare.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetSquare.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; +import net.knarcraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetX.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetX.java similarity index 84% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetX.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetX.java index 3ddac6c4..87432100 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetX.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetX.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPermable; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm.MPermable; +import net.knarcraft.factions.cmd.type.TypeMPermable; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.ps.PS; +import net.knarcraft.factions.entity.MPerm; import java.util.Set; @@ -49,7 +49,7 @@ public abstract class CmdFactionsAccessSetX extends CmdFactionsAccessAbstract { @Override public void perform() throws MassiveException { // Args - final MPermable mpermable = this.getMPermable(hostFaction); + final MPerm.MPermable mpermable = this.getMPermable(hostFaction); final Set chunks = this.getChunks(); if (chunks == null) { @@ -70,7 +70,7 @@ public abstract class CmdFactionsAccessSetX extends CmdFactionsAccessAbstract { // EXTRAS // -------------------------------------------- // - public MPermable getMPermable(Faction faction) throws MassiveException { + public MPerm.MPermable getMPermable(Faction faction) throws MassiveException { String arg = this.argAt(this.getMPermableArgIndex()); return TypeMPermable.get(faction).read(arg, sender); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXRadius.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXRadius.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXRadius.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXRadius.java index b84b6684..db656c76 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXRadius.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXRadius.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPermable; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.cmd.type.TypeMPermable; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXSimple.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXSimple.java similarity index 82% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXSimple.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXSimple.java index e6acfcec..216a7858 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXSimple.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXSimple.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPermable; +import net.knarcraft.factions.cmd.type.TypeMPermable; public abstract class CmdFactionsAccessSetXSimple extends CmdFactionsAccessSetX { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessView.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessView.java index a2e646ee..4a833f2d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessView.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsAccessView extends CmdFactionsAccessAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsChunkname.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsChunkname.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsChunkname.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsChunkname.java index 096631d9..ff52bffb 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsChunkname.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsChunkname.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.util.AsciiMap; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.util.AsciiMap; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.command.type.TypeNullable; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsClaim.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsClaim.java index 364db894..8956a5b2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsClaim.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsClaim extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsClean.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsClean.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsClean.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsClean.java index e4882e02..30da8493 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsClean.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsClean.java @@ -1,15 +1,15 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.Board; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.Invitation; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.entity.Board; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.Invitation; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsConfig.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsConfig.java similarity index 80% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsConfig.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsConfig.java index 5c454631..fb1bef81 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsConfig.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsConfig.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.command.editor.CommandEditSingleton; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsCreate.java similarity index 74% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsCreate.java index 59f694ce..f040083f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsCreate.java @@ -1,14 +1,13 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.req.ReqHasntFaction; -import com.massivecraft.factions.cmd.type.TypeFactionNameStrict; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.event.EventFactionsCreate; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.req.ReqHasntFaction; +import net.knarcraft.factions.cmd.type.TypeFactionNameStrict; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.event.EventFactionsCreate; +import net.knarcraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.store.MStore; @@ -56,7 +55,7 @@ public class CmdFactionsCreate extends FactionsCommand { msender.setRank(faction.getLeaderRank()); msender.setFaction(faction); - EventFactionsMembershipChange joinEvent = new EventFactionsMembershipChange(sender, msender, faction, MembershipChangeReason.CREATE); + EventFactionsMembershipChange joinEvent = new EventFactionsMembershipChange(sender, msender, faction, EventFactionsMembershipChange.MembershipChangeReason.CREATE); joinEvent.run(); // NOTE: join event cannot be cancelled or you'll have an empty faction diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDescription.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDescription.java index e70fa5f6..eb3d1546 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDescription.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqHasFaction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsDescriptionChange; +import net.knarcraft.factions.cmd.req.ReqHasFaction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsDescriptionChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.mixin.MixinDisplayName; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDisband.java similarity index 78% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDisband.java index d0df6d30..0550dd73 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDisband.java @@ -1,16 +1,15 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsDisband; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsDisband; +import net.knarcraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeStringConfirmation; import com.massivecraft.massivecore.util.ConfirmationUtil; @@ -63,7 +62,7 @@ public class CmdFactionsDisband extends FactionsCommand { // Run event for each player in the faction for (MPlayer mplayer : faction.getMPlayers()) { - EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, mplayer, FactionColl.get().getNone(), MembershipChangeReason.DISBAND); + EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, mplayer, FactionColl.get().getNone(), EventFactionsMembershipChange.MembershipChangeReason.DISBAND); membershipChangeEvent.run(); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentation.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentation.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentation.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentation.java index c4790e51..5f941635 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentation.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentation.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; +import net.knarcraft.factions.Factions; import org.bukkit.ChatColor; public class CmdFactionsDocumentation extends FactionsCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationFlags.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationFlags.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationFlags.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationFlags.java index 81a8a795..97229b30 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationFlags.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationFlags.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MFlagColl; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MFlagColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPerms.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPerms.java similarity index 97% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPerms.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPerms.java index 16a02350..84b6cb62 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPerms.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPerms.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; import com.massivecraft.massivecore.MassiveException; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPower.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPower.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPower.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPower.java index 41c6ce70..84006e55 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPower.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPower.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; public class CmdFactionsDocumentationPower extends FactionsCommandDocumentation { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationRanks.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationRanks.java similarity index 96% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationRanks.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationRanks.java index c81ecee9..cf3a297d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationRanks.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationRanks.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationTax.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationTax.java index fee90621..4f8c2f80 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationTax.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqTaxEnabled; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.cmd.req.ReqTaxEnabled; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.util.TimeDiffUtil; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationWarps.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationWarps.java index 9e72b95f..fe960907 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationWarps.java @@ -1,9 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPerm.MPermable; +import net.knarcraft.factions.cmd.req.ReqFactionWarpsEnabled; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.MassiveException; import java.util.Set; @@ -58,7 +57,7 @@ public class CmdFactionsDocumentationWarps extends FactionsCommandDocumentation } if (msenderFaction.isNormal()) { - Set set = msenderFaction.getPermittedPermables(MPerm.getPermWarp()); + Set set = msenderFaction.getPermittedPermables(MPerm.getPermWarp()); String permables = CmdFactionsPermShow.permablesToDisplayString(set, msender); msgDoc("In your faction warps can be used by: %s.", permables); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFaction.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsFaction.java index 500ecb6e..6b5ac26e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFaction.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.event.EventFactionsFactionShowAsync; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.event.EventFactionsFactionShowAsync; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.PriorityLines; import com.massivecraft.massivecore.mixin.MixinMessage; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlag.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlag.java index 863fd57e..9d5802ae 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlag.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsFlag extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagList.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagList.java index 881d0063..fb1437d0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagList.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MFlagColl; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MFlagColl; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagSet.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagSet.java index e29cddf0..cf6bf7ea 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagSet.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMFlag; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.event.EventFactionsFlagChange; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMFlag; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.event.EventFactionsFlagChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagShow.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagShow.java index a33eb816..22967b8c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagShow.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.Parameter; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFly.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsFly.java index 58e57dd6..c5bd7d67 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsFly.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.engine.EngineFly; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.engine.EngineFly; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.MassiveCommandToggle; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsHome.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsHome.java index 629f3058..2daee424 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsHome.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInvite.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsInvite.java index adacd5c4..ad287ce5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInvite.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsInvite extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteAdd.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteAdd.java index a59af1c0..0bebb44c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteAdd.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.Invitation; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsInvitedChange; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.Invitation; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsInvitedChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.container.TypeSet; import com.massivecraft.massivecore.mson.Mson; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteList.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteList.java index 62270407..594aea61 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteList.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Invitation; -import com.massivecraft.factions.entity.MPerm; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Invitation; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.Parameter; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteRemove.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteRemove.java index c47ed221..1eda9229 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteRemove.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsInvitedChange; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsInvitedChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.container.TypeSet; import com.massivecraft.massivecore.mson.Mson; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsJoin.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsJoin.java index 96856458..550ee076 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsJoin.java @@ -1,15 +1,14 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; @@ -91,7 +90,7 @@ public class CmdFactionsJoin extends FactionsCommand { } // Event - EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, msender, faction, MembershipChangeReason.JOIN); + EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, msender, faction, EventFactionsMembershipChange.MembershipChangeReason.JOIN); membershipChangeEvent.run(); if (membershipChangeEvent.isCancelled()) { return; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsKick.java similarity index 82% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsKick.java index 534aed3d..1539cce2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsKick.java @@ -1,14 +1,13 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.util.IdUtil; import org.bukkit.ChatColor; @@ -63,7 +62,7 @@ public class CmdFactionsKick extends FactionsCommand { } // Event - EventFactionsMembershipChange event = new EventFactionsMembershipChange(sender, mplayer, FactionColl.get().getNone(), MembershipChangeReason.KICK); + EventFactionsMembershipChange event = new EventFactionsMembershipChange(sender, mplayer, FactionColl.get().getNone(), EventFactionsMembershipChange.MembershipChangeReason.KICK); event.run(); if (event.isCancelled()) { return; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsLeave.java similarity index 84% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsLeave.java index dd775b10..339cf991 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsLeave.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqHasFaction; +import net.knarcraft.factions.cmd.req.ReqHasFaction; public class CmdFactionsLeave extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsList.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsList.java index 09f1f12b..60831648 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsList.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.comparator.ComparatorFactionList; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.comparator.ComparatorFactionList; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMap.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMap.java index a16e8bb4..2ffb4236 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMap.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.util.AsciiMap; +import net.knarcraft.factions.util.AsciiMap; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoney.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoney.java index f62bc9ea..2be36740 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoney.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; +import net.knarcraft.factions.cmd.req.ReqBankCommandsEnabled; public class CmdFactionsMoney extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyBalance.java similarity index 75% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyBalance.java index 8e3f7fef..7c08d9fe 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyBalance.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.cmd.req.ReqBankCommandsEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.MassiveException; public class CmdFactionsMoneyBalance extends FactionsCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyDeposit.java similarity index 80% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyDeposit.java index 4eff9095..6c75014c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyDeposit.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.req.ReqBankCommandsEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2f.java similarity index 82% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2f.java index a4f67f59..69e3db47 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2f.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.req.ReqBankCommandsEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2p.java similarity index 78% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2p.java index f11d9fb0..efd46c5e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2p.java @@ -1,13 +1,13 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.req.ReqBankCommandsEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferP2f.java similarity index 78% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferP2f.java index 240f0456..f7c21d4e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferP2f.java @@ -1,13 +1,13 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.req.ReqBankCommandsEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyWithdraw.java similarity index 78% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyWithdraw.java index 1525866a..f116aad9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyWithdraw.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.req.ReqBankCommandsEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyconvert.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyconvert.java index 9e9c95ed..a4e5a55e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyconvert.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.command.type.primitive.TypeStringConfirmation; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMotd.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMotd.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsMotd.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsMotd.java index ada49808..4ba82840 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMotd.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsMotd.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsMotdChange; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsMotdChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.TypeNullable; import com.massivecraft.massivecore.command.type.primitive.TypeString; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsName.java similarity index 82% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsName.java index 6220d9fb..65eb50c8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsName.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeFactionNameLenient; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.event.EventFactionsNameChange; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeFactionNameLenient; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.event.EventFactionsNameChange; import com.massivecraft.massivecore.MassiveException; public class CmdFactionsName extends FactionsCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsOverride.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsOverride.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsOverride.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsOverride.java index 8d448136..8e645cb5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsOverride.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsOverride.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; +import net.knarcraft.factions.Factions; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes; import com.massivecraft.massivecore.util.IdUtil; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPerm.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPerm.java index 1be3ec07..0c56683d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPerm.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPerm extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermList.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermList.java index 41d02aa4..a1eb15c1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermList.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPermColl; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPermColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermSet.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermSet.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermSet.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermSet.java index 5d43cc7b..1e305391 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermSet.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermSet.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPerm; -import com.massivecraft.factions.cmd.type.TypeMPermable; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.event.EventFactionsPermChange; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPerm; +import net.knarcraft.factions.cmd.type.TypeMPermable; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.event.EventFactionsPermChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermShow.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermShow.java similarity index 84% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermShow.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermShow.java index f8b93306..9c695aa3 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermShow.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermShow.java @@ -1,11 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPerm; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPerm.MPermable; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPerm; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.util.Txt; @@ -37,7 +36,7 @@ public class CmdFactionsPermShow extends FactionsCommand { Faction faction = this.readArg(msenderFaction); Set permittedIds = faction.getPerms().get(mperm.getId()); - List permables = new MassiveList<>(); + List permables = new MassiveList<>(); for (String permitted : permittedIds) { permables.add(MPerm.idToMPermable(permitted)); @@ -59,7 +58,7 @@ public class CmdFactionsPermShow extends FactionsCommand { return MPerm.idToMPermable(id); } - public static String permablesToDisplayString(Collection permables, Object watcherObject) { + public static String permablesToDisplayString(Collection permables, Object watcherObject) { MPlayer mplayer = MPlayer.get(watcherObject); Faction faction = mplayer.getFaction(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermView.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermView.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermView.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermView.java index 5c049f41..d4f88a49 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermView.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermView.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPermable; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPermable; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.mson.Mson; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermViewall.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermViewall.java index c01d47b8..aa912e16 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermViewall.java @@ -1,12 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPermable; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPerm.MPermable; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPermable; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.util.Txt; @@ -42,7 +41,7 @@ public class CmdFactionsPermViewall extends FactionsCommand { } // Create list of all applicable permables - List permables = new MassiveList<>(); + List permables = new MassiveList<>(); permables.add(permable); if (permable instanceof MPlayer) { @@ -69,7 +68,7 @@ public class CmdFactionsPermViewall extends FactionsCommand { for (MPerm mperm : MPerm.getAll()) { String mpermId = mperm.getId(); permable: - for (MPermable mpa : permables) { + for (MPerm.MPermable mpa : permables) { if (!faction.isPermitted(mpa.getId(), mperm.getId())) { continue permable; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPlayer.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPlayer.java index f48328a2..2ccc6066 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPlayer.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.Progressbar; import com.massivecraft.massivecore.event.EventMassiveCorePlayerCleanInactivityToleranceMillis; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboost.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboost.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboost.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboost.java index f40cbec8..9020cdfe 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboost.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboost.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboost extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostAbstract.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostAbstract.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostAbstract.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostAbstract.java index 7543af4e..1c556e5c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostAbstract.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostAbstract.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.FactionsParticipator; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.FactionsParticipator; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.Type; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFaction.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFaction.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFaction.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFaction.java index 5e040dc5..9c62a183 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFaction.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFaction.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostFaction extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java similarity index 78% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java index f14f3c31..d7501a8f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeFaction; public abstract class CmdFactionsPowerboostFactionAbstract extends CmdFactionsPowerboostAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java index f94a6481..6b823a74 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostFactionAdd extends CmdFactionsPowerboostFactionAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java index 97412da4..0e9db906 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostFactionMultiply extends CmdFactionsPowerboostFactionAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionSet.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionSet.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionSet.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionSet.java index becaf232..f669e0f8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionSet.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionSet.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostFactionSet extends CmdFactionsPowerboostFactionAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionShow.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionShow.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionShow.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionShow.java index 026ca6e9..c4f49794 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionShow.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionShow.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostFactionShow extends CmdFactionsPowerboostFactionAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionTake.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionTake.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionTake.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionTake.java index 4afabe17..81eabf86 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionTake.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionTake.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostFactionTake extends CmdFactionsPowerboostFactionAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayer.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayer.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayer.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayer.java index 2eeceed2..625f9561 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayer.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayer.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostPlayer extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerAbstract.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerAbstract.java similarity index 77% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerAbstract.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerAbstract.java index 6aba707d..31315a94 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerAbstract.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerAbstract.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.cmd.type.TypeMPlayer; public abstract class CmdFactionsPowerboostPlayerAbstract extends CmdFactionsPowerboostAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerAdd.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerAdd.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerAdd.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerAdd.java index c6ed6964..9a6c6f99 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerAdd.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerAdd.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostPlayerAdd extends CmdFactionsPowerboostPlayerAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerMultiply.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerMultiply.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerMultiply.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerMultiply.java index acb918a2..c2ebd970 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerMultiply.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerMultiply.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostPlayerMultiply extends CmdFactionsPowerboostPlayerAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerSet.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerSet.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerSet.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerSet.java index 55d2d818..ec6de55e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerSet.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerSet.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostPlayerSet extends CmdFactionsPowerboostPlayerAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerShow.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerShow.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerShow.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerShow.java index 51edfba1..e601ae63 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerShow.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerShow.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostPlayerShow extends CmdFactionsPowerboostPlayerAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerTake.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerTake.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerTake.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerTake.java index adb6c812..ba9ff84a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostPlayerTake.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostPlayerTake.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsPowerboostPlayerTake extends CmdFactionsPowerboostPlayerAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRank.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRank.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRank.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRank.java index ec78c717..d40b6646 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRank.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRank.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsRank extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEdit.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEdit.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEdit.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEdit.java index 420fd9be..92bdd101 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEdit.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEdit.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; public class CmdFactionsRankEdit extends FactionsCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditCreate.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditCreate.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditCreate.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditCreate.java index b91c7616..0b76b10e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditCreate.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditCreate.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.command.type.primitive.TypeString; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditDelete.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditDelete.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditDelete.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditDelete.java index 63cd0148..1140186b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditDelete.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditDelete.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeRank; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeRank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditName.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditName.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditName.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditName.java index ceeaa5ed..f5aaa5c7 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditName.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditName.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeRank; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeRank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditPrefix.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditPrefix.java similarity index 84% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditPrefix.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditPrefix.java index 75ad71ff..2b3c42b0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditPrefix.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditPrefix.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeRank; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeRank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditPriority.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditPriority.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditPriority.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditPriority.java index 2329f209..4f169edb 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankEditPriority.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankEditPriority.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeRank; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeRank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankList.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankList.java index ba6b136d..2cdbe718 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankList.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankOld.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankOld.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankOld.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankOld.java index 517c12e2..3798eb63 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankOld.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankOld.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.cmd.type.TypeMPlayer; import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankSet.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankSet.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankSet.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankSet.java index 42a1b039..ebb71f23 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankSet.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankSet.java @@ -1,19 +1,18 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.cmd.type.TypeRank; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; -import com.massivecraft.factions.entity.Rank; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; -import com.massivecraft.factions.event.EventFactionsRankChange; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.cmd.type.TypeRank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.Rank; +import net.knarcraft.factions.event.EventFactionsMembershipChange; +import net.knarcraft.factions.event.EventFactionsRankChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.util.Txt; @@ -203,7 +202,7 @@ public class CmdFactionsRankSet extends FactionsCommand { } // Event - EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, msender, endFaction, MembershipChangeReason.RANK); + EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, msender, endFaction, EventFactionsMembershipChange.MembershipChangeReason.RANK); membershipChangeEvent.run(); if (membershipChangeEvent.isCancelled()) { throw new MassiveException(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankShow.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankShow.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankShow.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankShow.java index f2ec83d5..ee703c70 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRankShow.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRankShow.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelation.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelation.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelation.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelation.java index 4e7eda2d..20922eb9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelation.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelation.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsRelation extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationList.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationList.java index 59beaba1..bd563151 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationList.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeRelation; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeRelation; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveSet; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationOld.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationOld.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationOld.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationOld.java index 9f697844..f7e446d8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationOld.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationOld.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationSet.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationSet.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationSet.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationSet.java index 72a36dd5..2af42866 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationSet.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationSet.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeRelation; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.event.EventFactionsRelationChange; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeRelation; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.event.EventFactionsRelationChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.mson.Mson; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationWishes.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationWishes.java index 7ea67021..40ca126e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsRelationWishes.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.command.Parameter; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSeeChunk.java similarity index 97% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSeeChunk.java index b0e53c0f..4cadaebe 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSeeChunk.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSeeChunkOld.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSeeChunkOld.java index c8e6dba8..b75b0de1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSeeChunkOld.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.util.AsciiMap; -import com.massivecraft.factions.util.VisualizeUtil; +import net.knarcraft.factions.util.AsciiMap; +import net.knarcraft.factions.util.VisualizeUtil; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSFormatHumanSpace; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetAll.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetAll.java index 561a92ad..0fa1429b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetAll.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.entity.Board; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.entity.Board; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.mixin.MixinWorld; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetAuto.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetAuto.java index d20bb1eb..1c1fdc2b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetAuto.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPerm; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetCircle.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetCircle.java index f439d40a..8bbb770b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetCircle.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; +import net.knarcraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetFill.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetFill.java index f13729b0..cef30c27 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetFill.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOne.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetOne.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOne.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetOne.java index 269795a7..7409965b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOne.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetOne.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; +import net.knarcraft.factions.Perm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetSquare.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetSquare.java index af8e94b8..9019d69b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetSquare.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; +import net.knarcraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetX.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetX.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetX.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetX.java index 3262b9fc..85642a8d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetX.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetX.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXAll.java similarity index 86% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXAll.java index 6253e816..d6196043 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXAll.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXRadius.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXRadius.java index 39d06e63..5835229e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXRadius.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXSimple.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXSimple.java similarity index 83% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXSimple.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXSimple.java index 320ebb03..e6d47f4c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetXSimple.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetXSimple.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeFaction; public abstract class CmdFactionsSetXSimple extends CmdFactionsSetX { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSethome.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSethome.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSethome.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSethome.java index 3bfc760b..b27fdafe 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSethome.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSethome.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetpower.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetpower.java similarity index 83% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetpower.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetpower.java index 32ff57cf..807883f9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetpower.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsSetpower.java @@ -1,10 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsPowerChange; -import com.massivecraft.factions.event.EventFactionsPowerChange.PowerChangeReason; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsPowerChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; @@ -48,7 +47,7 @@ public class CmdFactionsSetpower extends FactionsCommand { } // Event - EventFactionsPowerChange event = new EventFactionsPowerChange(sender, mplayer, PowerChangeReason.COMMAND, newPower); + EventFactionsPowerChange event = new EventFactionsPowerChange(sender, mplayer, EventFactionsPowerChange.PowerChangeReason.COMMAND, newPower); event.run(); if (event.isCancelled()) { return; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsStatus.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsStatus.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsStatus.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsStatus.java index f48d6e9e..9d563b39 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsStatus.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsStatus.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeSortMPlayer; -import com.massivecraft.factions.comparator.ComparatorMPlayerInactivity; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeSortMPlayer; +import net.knarcraft.factions.comparator.ComparatorMPlayerInactivity; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTax.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTax.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTax.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTax.java index 7421d8af..3cc90fb5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTax.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTax.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsTax extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxFaction.java similarity index 85% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxFaction.java index ee254c67..3f28a304 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxFaction.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqTaxEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.req.ReqTaxEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxPlayer.java similarity index 85% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxPlayer.java index a2d132af..892c05db 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxPlayer.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqTaxEnabled; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.cmd.req.ReqTaxEnabled; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.mson.Mson; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxRun.java similarity index 80% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxRun.java index 9892007d..6e8f8090 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxRun.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqTaxEnabled; -import com.massivecraft.factions.task.TaskTax; +import net.knarcraft.factions.cmd.req.ReqTaxEnabled; +import net.knarcraft.factions.task.TaskTax; import com.massivecraft.massivecore.MassiveException; public class CmdFactionsTaxRun extends FactionsCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxSet.java similarity index 85% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxSet.java index 771d10b4..b7546966 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTaxSet.java @@ -1,14 +1,14 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqTaxEnabled; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeTaxable; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.cmd.req.ReqTaxEnabled; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeTaxable; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTerritorytitles.java similarity index 97% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTerritorytitles.java index 3962eba5..a62d02ec 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTerritorytitles.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Visibility; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTitle.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTitle.java index 9b9ad927..c8c4196e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTitle.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.cmd.type.TypeMPlayer; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsTitleChange; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.cmd.type.TypeMPlayer; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsTitleChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTop.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTop.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsTop.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsTop.java index f58dc3f0..f2a01c14 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTop.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsTop.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.command.type.enumeration.TypeEnum; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnclaim.java similarity index 94% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnclaim.java index 1196694f..dadc2970 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnclaim.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsUnclaim extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnsethome.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnsethome.java index 428122b0..5d8da840 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnsethome.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnstuck.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnstuck.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnstuck.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnstuck.java index 7073cf23..dda92da5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnstuck.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsUnstuck.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.mixin.MixinTeleport; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVote.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVote.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsVote.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsVote.java index 410ec86a..dfcd7c14 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVote.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVote.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsVote extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteCreate.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteCreate.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteCreate.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteCreate.java index f95973eb..b15a3dde 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteCreate.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteCreate.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.Vote; -import com.massivecraft.factions.event.EventFactionsVoteAdd; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Vote; +import net.knarcraft.factions.event.EventFactionsVoteAdd; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.type.container.TypeList; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteDo.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteDo.java similarity index 87% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteDo.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteDo.java index f7ce9142..cd229a9e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteDo.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteDo.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeVote; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.Vote; +import net.knarcraft.factions.cmd.type.TypeVote; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Vote; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteList.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteList.java index 3ce464d3..be31fbfc 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteList.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.Vote; +import net.knarcraft.factions.entity.Vote; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteRemove.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteRemove.java similarity index 82% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteRemove.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteRemove.java index c688cd4b..21a2ba80 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteRemove.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteRemove.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeVote; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.Vote; -import com.massivecraft.factions.event.EventFactionsVoteRemove; +import net.knarcraft.factions.cmd.type.TypeVote; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Vote; +import net.knarcraft.factions.event.EventFactionsVoteRemove; import com.massivecraft.massivecore.MassiveException; public class CmdFactionsVoteRemove extends FactionsCommandWarp { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteShow.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteShow.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteShow.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteShow.java index 24f310dc..a16eb88b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsVoteShow.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsVoteShow.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeVote; -import com.massivecraft.factions.entity.Vote; +import net.knarcraft.factions.cmd.type.TypeVote; +import net.knarcraft.factions.entity.Vote; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarp.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarp.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarp.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarp.java index f893507c..983cd4b1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarp.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarp.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; public class CmdFactionsWarp extends FactionsCommand { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpAdd.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpAdd.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpAdd.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpAdd.java index 464a2a36..3a643e60 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpAdd.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpAdd.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.Warp; -import com.massivecraft.factions.event.EventFactionsWarpAdd; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Warp; +import net.knarcraft.factions.event.EventFactionsWarpAdd; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.command.type.primitive.TypeString; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpGo.java similarity index 89% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpGo.java index b2765c18..5f2bd11d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpGo.java @@ -1,16 +1,16 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeWarp; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Warp; -import com.massivecraft.factions.event.EventFactionsWarpTeleport; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeWarp; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Warp; +import net.knarcraft.factions.event.EventFactionsWarpTeleport; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.mixin.MixinMessage; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpList.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpList.java similarity index 85% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpList.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpList.java index a6337df0..148690f6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpList.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpList.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.Warp; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Warp; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpRemove.java b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpRemove.java similarity index 80% rename from src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpRemove.java rename to src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpRemove.java index acde2ed2..61f7c64e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpRemove.java +++ b/src/main/java/net/knarcraft/factions/cmd/CmdFactionsWarpRemove.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.type.TypeFaction; -import com.massivecraft.factions.cmd.type.TypeWarp; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.Warp; -import com.massivecraft.factions.event.EventFactionsWarpRemove; +import net.knarcraft.factions.cmd.type.TypeFaction; +import net.knarcraft.factions.cmd.type.TypeWarp; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Warp; +import net.knarcraft.factions.event.EventFactionsWarpRemove; import com.massivecraft.massivecore.MassiveException; public class CmdFactionsWarpRemove extends FactionsCommandWarp { diff --git a/src/main/java/com/massivecraft/factions/cmd/FactionsCommand.java b/src/main/java/net/knarcraft/factions/cmd/FactionsCommand.java similarity index 85% rename from src/main/java/com/massivecraft/factions/cmd/FactionsCommand.java rename to src/main/java/net/knarcraft/factions/cmd/FactionsCommand.java index 3e69c93b..fee3c555 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FactionsCommand.java +++ b/src/main/java/net/knarcraft/factions/cmd/FactionsCommand.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.MassiveCommand; public class FactionsCommand extends MassiveCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java b/src/main/java/net/knarcraft/factions/cmd/FactionsCommandDocumentation.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java rename to src/main/java/net/knarcraft/factions/cmd/FactionsCommandDocumentation.java index b2ba5b99..216301c8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java +++ b/src/main/java/net/knarcraft/factions/cmd/FactionsCommandDocumentation.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled; +import net.knarcraft.factions.cmd.req.ReqFactionWarpsEnabled; import com.massivecraft.massivecore.mson.Mson; public class FactionsCommandDocumentation extends FactionsCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java b/src/main/java/net/knarcraft/factions/cmd/FactionsCommandWarp.java similarity index 80% rename from src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java rename to src/main/java/net/knarcraft/factions/cmd/FactionsCommandWarp.java index 81a4e808..a7a1c3cd 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java +++ b/src/main/java/net/knarcraft/factions/cmd/FactionsCommandWarp.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd; +package net.knarcraft.factions.cmd; -import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.cmd.req.ReqFactionWarpsEnabled; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.command.Visibility; public class FactionsCommandWarp extends FactionsCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/main/java/net/knarcraft/factions/cmd/req/ReqBankCommandsEnabled.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java rename to src/main/java/net/knarcraft/factions/cmd/req/ReqBankCommandsEnabled.java index e5bf8d1d..7d8806b5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java +++ b/src/main/java/net/knarcraft/factions/cmd/req/ReqBankCommandsEnabled.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.req; +package net.knarcraft.factions.cmd.req; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java b/src/main/java/net/knarcraft/factions/cmd/req/ReqFactionWarpsEnabled.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java rename to src/main/java/net/knarcraft/factions/cmd/req/ReqFactionWarpsEnabled.java index b321a5ab..db6ee513 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java +++ b/src/main/java/net/knarcraft/factions/cmd/req/ReqFactionWarpsEnabled.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd.req; +package net.knarcraft.factions.cmd.req; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/main/java/net/knarcraft/factions/cmd/req/ReqHasFaction.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java rename to src/main/java/net/knarcraft/factions/cmd/req/ReqHasFaction.java index b34ed30f..c3e89129 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java +++ b/src/main/java/net/knarcraft/factions/cmd/req/ReqHasFaction.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd.req; +package net.knarcraft.factions.cmd.req; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/main/java/net/knarcraft/factions/cmd/req/ReqHasntFaction.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java rename to src/main/java/net/knarcraft/factions/cmd/req/ReqHasntFaction.java index 58ae6862..29ab08fa 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java +++ b/src/main/java/net/knarcraft/factions/cmd/req/ReqHasntFaction.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd.req; +package net.knarcraft.factions.cmd.req; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java b/src/main/java/net/knarcraft/factions/cmd/req/ReqRankIsAtLeast.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java rename to src/main/java/net/knarcraft/factions/cmd/req/ReqRankIsAtLeast.java index 32919e4a..671411da 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java +++ b/src/main/java/net/knarcraft/factions/cmd/req/ReqRankIsAtLeast.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.req; +package net.knarcraft.factions.cmd.req; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java b/src/main/java/net/knarcraft/factions/cmd/req/ReqTaxEnabled.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java rename to src/main/java/net/knarcraft/factions/cmd/req/ReqTaxEnabled.java index 7dae5623..027ca8dc 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java +++ b/src/main/java/net/knarcraft/factions/cmd/req/ReqTaxEnabled.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd.req; +package net.knarcraft.factions.cmd.req; -import com.massivecraft.factions.task.TaskTax; +import net.knarcraft.factions.task.TaskTax; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeEntityInternalFaction.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeEntityInternalFaction.java similarity index 93% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeEntityInternalFaction.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeEntityInternalFaction.java index ab100b3c..299fce3f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeEntityInternalFaction.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeEntityInternalFaction.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.command.type.TypeAbstractChoice; import com.massivecraft.massivecore.store.EntityInternal; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeFaction.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeFaction.java index 453a4f0a..2643c7be 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeFaction.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.TypeAbstract; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionChunkChangeType.java similarity index 83% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeFactionChunkChangeType.java index 207149f5..6271a0e8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionChunkChangeType.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.event.EventFactionsChunkChangeType; +import net.knarcraft.factions.event.EventFactionsChunkChangeType; import com.massivecraft.massivecore.command.type.enumeration.TypeEnum; public class TypeFactionChunkChangeType extends TypeEnum { diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameAbstract.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameAbstract.java similarity index 83% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameAbstract.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameAbstract.java index 0da32a9a..fbe0b8d9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameAbstract.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameAbstract.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.util.MiscUtil; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.util.MiscUtil; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.command.type.TypeNameAbstract; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameLenient.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameLenient.java index c042fef1..05ed788e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameLenient.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; public class TypeFactionNameLenient extends TypeFactionNameAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameStrict.java similarity index 90% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameStrict.java index 5b790c97..85864d2b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeFactionNameStrict.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; public class TypeFactionNameStrict extends TypeFactionNameAbstract { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeMFlag.java similarity index 84% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeMFlag.java index 97bbcb4f..ecb3e86e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeMFlag.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MFlagColl; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MFlagColl; import com.massivecraft.massivecore.command.type.store.TypeEntity; import java.util.Collection; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeMPerm.java similarity index 84% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeMPerm.java index 8e857bad..6a36fbe2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeMPerm.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPermColl; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPermColl; import com.massivecraft.massivecore.command.type.store.TypeEntity; import java.util.Collection; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeMPermable.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeMPermable.java index c27c1ae3..8cc68b6d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeMPermable.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.type.TypeAbstract; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPlayer.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeMPlayer.java similarity index 67% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeMPlayer.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeMPlayer.java index 7e4d648a..42d97f1c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPlayer.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeMPlayer.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.command.type.Type; public class TypeMPlayer { diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeRank.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeRank.java index 2cb01c7e..69acaf7d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeRank.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveSet; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeRel.java similarity index 91% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeRel.java index 0db61a3a..1f3c2cf0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeRel.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.Rel; +import net.knarcraft.factions.Rel; import com.massivecraft.massivecore.command.type.enumeration.TypeEnum; import java.util.Set; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeRelation.java similarity index 88% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeRelation.java index 2694a7b4..b820d712 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeRelation.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.Rel; +import net.knarcraft.factions.Rel; public class TypeRelation extends TypeRel { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeSortMPlayer.java similarity index 75% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeSortMPlayer.java index b1cf74fa..28b14788 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeSortMPlayer.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.comparator.ComparatorMPlayerInactivity; -import com.massivecraft.factions.comparator.ComparatorMPlayerPower; -import com.massivecraft.factions.comparator.ComparatorMPlayerRole; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.comparator.ComparatorMPlayerInactivity; +import net.knarcraft.factions.comparator.ComparatorMPlayerPower; +import net.knarcraft.factions.comparator.ComparatorMPlayerRole; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.type.TypeAbstractChoice; import java.util.Comparator; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeTaxable.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeTaxable.java index a7810190..1087a218 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeTaxable.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.type.TypeAbstract; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeVote.java similarity index 85% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeVote.java index 6b9b9076..98e3c281 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeVote.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Vote; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Vote; import java.util.Collection; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java b/src/main/java/net/knarcraft/factions/cmd/type/TypeWarp.java similarity index 85% rename from src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java rename to src/main/java/net/knarcraft/factions/cmd/type/TypeWarp.java index f6246d6b..d03d93c5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java +++ b/src/main/java/net/knarcraft/factions/cmd/type/TypeWarp.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.cmd.type; +package net.knarcraft.factions.cmd.type; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Warp; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Warp; import java.util.Collection; diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorFactionList.java b/src/main/java/net/knarcraft/factions/comparator/ComparatorFactionList.java similarity index 94% rename from src/main/java/com/massivecraft/factions/comparator/ComparatorFactionList.java rename to src/main/java/net/knarcraft/factions/comparator/ComparatorFactionList.java index fc812853..3e753d67 100644 --- a/src/main/java/com/massivecraft/factions/comparator/ComparatorFactionList.java +++ b/src/main/java/net/knarcraft/factions/comparator/ComparatorFactionList.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.comparator; +package net.knarcraft.factions.comparator; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.comparator.ComparatorAbstract; import com.massivecraft.massivecore.comparator.ComparatorComparable; import com.massivecraft.massivecore.util.IdUtil; diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java b/src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerInactivity.java similarity index 92% rename from src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java rename to src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerInactivity.java index 6612e06d..301fad23 100644 --- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java +++ b/src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerInactivity.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.comparator; +package net.knarcraft.factions.comparator; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.comparator.ComparatorAbstract; diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java b/src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerPower.java similarity index 91% rename from src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java rename to src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerPower.java index 2ddc6805..d2673c6e 100644 --- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java +++ b/src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerPower.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.comparator; +package net.knarcraft.factions.comparator; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.comparator.ComparatorAbstract; diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java b/src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerRole.java similarity index 87% rename from src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java rename to src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerRole.java index 71199bc1..b35812c6 100644 --- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java +++ b/src/main/java/net/knarcraft/factions/comparator/ComparatorMPlayerRole.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.comparator; +package net.knarcraft.factions.comparator; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.comparator.ComparatorAbstract; diff --git a/src/main/java/com/massivecraft/factions/engine/DisallowCause.java b/src/main/java/net/knarcraft/factions/engine/DisallowCause.java similarity index 85% rename from src/main/java/com/massivecraft/factions/engine/DisallowCause.java rename to src/main/java/net/knarcraft/factions/engine/DisallowCause.java index 033e7154..bfc82ea4 100644 --- a/src/main/java/com/massivecraft/factions/engine/DisallowCause.java +++ b/src/main/java/net/knarcraft/factions/engine/DisallowCause.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; public enum DisallowCause { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java b/src/main/java/net/knarcraft/factions/engine/EngineCanCombatHappen.java similarity index 96% rename from src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java rename to src/main/java/net/knarcraft/factions/engine/EngineCanCombatHappen.java index e6a654dc..c24ac052 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineCanCombatHappen.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsPvpDisallowed; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsPvpDisallowed; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineChat.java b/src/main/java/net/knarcraft/factions/engine/EngineChat.java similarity index 93% rename from src/main/java/com/massivecraft/factions/engine/EngineChat.java rename to src/main/java/net/knarcraft/factions/engine/EngineChat.java index 0b2dfff9..7ca6fbb7 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineChat.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineChat.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.RelationParticipator; -import com.massivecraft.factions.chat.ChatFormatter; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.RelationParticipator; +import net.knarcraft.factions.chat.ChatFormatter; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.event.EventMassiveCorePlayerToRecipientChat; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java b/src/main/java/net/knarcraft/factions/engine/EngineChunkChange.java similarity index 96% rename from src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java rename to src/main/java/net/knarcraft/factions/engine/EngineChunkChange.java index 0e36976e..4be881fd 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineChunkChange.java @@ -1,14 +1,14 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsChunksChange; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsChunksChange; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveSet; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java b/src/main/java/net/knarcraft/factions/engine/EngineCleanInactivity.java similarity index 91% rename from src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java rename to src/main/java/net/knarcraft/factions/engine/EngineCleanInactivity.java index cc275e0e..a80dc1ed 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineCleanInactivity.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.event.EventMassiveCorePlayerCleanInactivityToleranceMillis; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java b/src/main/java/net/knarcraft/factions/engine/EngineDenyCommands.java similarity index 92% rename from src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java rename to src/main/java/net/knarcraft/factions/engine/EngineDenyCommands.java index 8b362eb5..2d6d9a7e 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineDenyCommands.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java b/src/main/java/net/knarcraft/factions/engine/EngineDenyTeleport.java similarity index 94% rename from src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java rename to src/main/java/net/knarcraft/factions/engine/EngineDenyTeleport.java index b43cca1d..8614ef06 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineDenyTeleport.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Couple; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.mixin.MixinMessage; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineEcon.java b/src/main/java/net/knarcraft/factions/engine/EngineEcon.java similarity index 85% rename from src/main/java/com/massivecraft/factions/engine/EngineEcon.java rename to src/main/java/net/knarcraft/factions/engine/EngineEcon.java index c1b8d490..b064705a 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineEcon.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineEcon.java @@ -1,27 +1,27 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.cmd.CmdFactions; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsAbstractSender; -import com.massivecraft.factions.event.EventFactionsChunkChangeType; -import com.massivecraft.factions.event.EventFactionsChunksChange; -import com.massivecraft.factions.event.EventFactionsCreate; -import com.massivecraft.factions.event.EventFactionsDescriptionChange; -import com.massivecraft.factions.event.EventFactionsDisband; -import com.massivecraft.factions.event.EventFactionsFlagChange; -import com.massivecraft.factions.event.EventFactionsInvitedChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; -import com.massivecraft.factions.event.EventFactionsNameChange; -import com.massivecraft.factions.event.EventFactionsRelationChange; -import com.massivecraft.factions.event.EventFactionsTitleChange; -import com.massivecraft.factions.event.EventFactionsWarpAdd; -import com.massivecraft.factions.event.EventFactionsWarpRemove; -import com.massivecraft.factions.event.EventFactionsWarpTeleport; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.cmd.CmdFactions; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsAbstractSender; +import net.knarcraft.factions.event.EventFactionsChunkChangeType; +import net.knarcraft.factions.event.EventFactionsChunksChange; +import net.knarcraft.factions.event.EventFactionsCreate; +import net.knarcraft.factions.event.EventFactionsDescriptionChange; +import net.knarcraft.factions.event.EventFactionsDisband; +import net.knarcraft.factions.event.EventFactionsFlagChange; +import net.knarcraft.factions.event.EventFactionsInvitedChange; +import net.knarcraft.factions.event.EventFactionsMembershipChange; +import net.knarcraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; +import net.knarcraft.factions.event.EventFactionsNameChange; +import net.knarcraft.factions.event.EventFactionsRelationChange; +import net.knarcraft.factions.event.EventFactionsTitleChange; +import net.knarcraft.factions.event.EventFactionsWarpAdd; +import net.knarcraft.factions.event.EventFactionsWarpRemove; +import net.knarcraft.factions.event.EventFactionsWarpTeleport; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineExploit.java b/src/main/java/net/knarcraft/factions/engine/EngineExploit.java similarity index 98% rename from src/main/java/com/massivecraft/factions/engine/EngineExploit.java rename to src/main/java/net/knarcraft/factions/engine/EngineExploit.java index bc2ea5d0..857ecd70 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineExploit.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineExploit.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java b/src/main/java/net/knarcraft/factions/engine/EngineFlagEndergrief.java similarity index 87% rename from src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java rename to src/main/java/net/knarcraft/factions/engine/EngineFlagEndergrief.java index 023acb44..9790df27 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineFlagEndergrief.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import org.bukkit.entity.Enderman; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java b/src/main/java/net/knarcraft/factions/engine/EngineFlagExplosion.java similarity index 96% rename from src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java rename to src/main/java/net/knarcraft/factions/engine/EngineFlagExplosion.java index d9f1ec81..60290755 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineFlagExplosion.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.util.EnumerationUtil; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.util.EnumerationUtil; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import org.bukkit.Location; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java b/src/main/java/net/knarcraft/factions/engine/EngineFlagFireSpread.java similarity index 92% rename from src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java rename to src/main/java/net/knarcraft/factions/engine/EngineFlagFireSpread.java index f075d238..218c97bc 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineFlagFireSpread.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import org.bukkit.Material; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java b/src/main/java/net/knarcraft/factions/engine/EngineFlagSpawn.java similarity index 91% rename from src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java rename to src/main/java/net/knarcraft/factions/engine/EngineFlagSpawn.java index 15dc09f4..6b568fed 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineFlagSpawn.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.util.EnumerationUtil; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.util.EnumerationUtil; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.collections.BackstringSet; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java b/src/main/java/net/knarcraft/factions/engine/EngineFlagZombiegrief.java similarity index 87% rename from src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java rename to src/main/java/net/knarcraft/factions/engine/EngineFlagZombiegrief.java index 1834028c..319fff21 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineFlagZombiegrief.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import org.bukkit.entity.Entity; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFly.java b/src/main/java/net/knarcraft/factions/engine/EngineFly.java similarity index 93% rename from src/main/java/com/massivecraft/factions/engine/EngineFly.java rename to src/main/java/net/knarcraft/factions/engine/EngineFly.java index da6fcfac..a9662606 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFly.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineFly.java @@ -1,15 +1,15 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.cmd.CmdFactions; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MFlagColl; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsFlagChange; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.cmd.CmdFactions; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MFlagColl; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsFlagChange; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.event.EventMassiveCorePlayerUpdate; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java b/src/main/java/net/knarcraft/factions/engine/EngineLastActivity.java similarity index 94% rename from src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java rename to src/main/java/net/knarcraft/factions/engine/EngineLastActivity.java index ead82ec2..926e8ab3 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineLastActivity.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineMotd.java b/src/main/java/net/knarcraft/factions/engine/EngineMotd.java similarity index 93% rename from src/main/java/com/massivecraft/factions/engine/EngineMotd.java rename to src/main/java/net/knarcraft/factions/engine/EngineMotd.java index a5af3d92..22ada40d 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineMotd.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineMotd.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.mixin.MixinActual; import com.massivecraft.massivecore.mixin.MixinMessage; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java b/src/main/java/net/knarcraft/factions/engine/EngineMoveChunk.java similarity index 92% rename from src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java rename to src/main/java/net/knarcraft/factions/engine/EngineMoveChunk.java index b7ca383a..73cde117 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineMoveChunk.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.AccessStatus; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.util.AsciiMap; +import net.knarcraft.factions.AccessStatus; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.util.AsciiMap; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java b/src/main/java/net/knarcraft/factions/engine/EnginePermBuild.java similarity index 97% rename from src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java rename to src/main/java/net/knarcraft/factions/engine/EnginePermBuild.java index e801a8ea..fcfdc866 100644 --- a/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java +++ b/src/main/java/net/knarcraft/factions/engine/EnginePermBuild.java @@ -1,15 +1,15 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.Board; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.util.EnumerationUtil; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.entity.Board; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.util.EnumerationUtil; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java b/src/main/java/net/knarcraft/factions/engine/EnginePlayerData.java similarity index 88% rename from src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java rename to src/main/java/net/knarcraft/factions/engine/EnginePlayerData.java index 7e9cf54d..c25d646a 100644 --- a/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java +++ b/src/main/java/net/knarcraft/factions/engine/EnginePlayerData.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.Engine; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePower.java b/src/main/java/net/knarcraft/factions/engine/EnginePower.java similarity index 84% rename from src/main/java/com/massivecraft/factions/engine/EnginePower.java rename to src/main/java/net/knarcraft/factions/engine/EnginePower.java index 26d151c5..128435ca 100644 --- a/src/main/java/com/massivecraft/factions/engine/EnginePower.java +++ b/src/main/java/net/knarcraft/factions/engine/EnginePower.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsPowerChange; -import com.massivecraft.factions.event.EventFactionsPowerChange.PowerChangeReason; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsPowerChange; +import net.knarcraft.factions.event.EventFactionsPowerChange.PowerChangeReason; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java b/src/main/java/net/knarcraft/factions/engine/EngineSeeChunk.java similarity index 98% rename from src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java rename to src/main/java/net/knarcraft/factions/engine/EngineSeeChunk.java index f8f01cac..dbe6850a 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineSeeChunk.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineShow.java b/src/main/java/net/knarcraft/factions/engine/EngineShow.java similarity index 95% rename from src/main/java/com/massivecraft/factions/engine/EngineShow.java rename to src/main/java/net/knarcraft/factions/engine/EngineShow.java index 349a4bf8..52f58d00 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineShow.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineShow.java @@ -1,13 +1,13 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.comparator.ComparatorMPlayerRole; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsChunkChangeType; -import com.massivecraft.factions.event.EventFactionsFactionShowAsync; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.comparator.ComparatorMPlayerRole; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsChunkChangeType; +import net.knarcraft.factions.event.EventFactionsFactionShowAsync; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.PriorityLines; import com.massivecraft.massivecore.money.Money; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java b/src/main/java/net/knarcraft/factions/engine/EngineTeleportHomeOnDeath.java similarity index 93% rename from src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java rename to src/main/java/net/knarcraft/factions/engine/EngineTeleportHomeOnDeath.java index 6986bb03..123de061 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineTeleportHomeOnDeath.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Warp; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Warp; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Location; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java b/src/main/java/net/knarcraft/factions/engine/EngineTerritoryShield.java similarity index 93% rename from src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java rename to src/main/java/net/knarcraft/factions/engine/EngineTerritoryShield.java index b75aa1f3..2aaf8db1 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineTerritoryShield.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.util.MUtil; import org.bukkit.entity.Entity; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java b/src/main/java/net/knarcraft/factions/engine/EngineVisualizations.java similarity index 90% rename from src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java rename to src/main/java/net/knarcraft/factions/engine/EngineVisualizations.java index 907e54fe..b5f709c7 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java +++ b/src/main/java/net/knarcraft/factions/engine/EngineVisualizations.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.util.VisualizeUtil; +import net.knarcraft.factions.util.VisualizeUtil; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.util.MUtil; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/massivecraft/factions/engine/ProtectCase.java b/src/main/java/net/knarcraft/factions/engine/ProtectCase.java similarity index 94% rename from src/main/java/com/massivecraft/factions/engine/ProtectCase.java rename to src/main/java/net/knarcraft/factions/engine/ProtectCase.java index d74f3a94..9a5d6fd2 100644 --- a/src/main/java/com/massivecraft/factions/engine/ProtectCase.java +++ b/src/main/java/net/knarcraft/factions/engine/ProtectCase.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.engine; +package net.knarcraft.factions.engine; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.util.EnumerationUtil; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.util.EnumerationUtil; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; diff --git a/src/main/java/com/massivecraft/factions/entity/Board.java b/src/main/java/net/knarcraft/factions/entity/Board.java similarity index 98% rename from src/main/java/com/massivecraft/factions/entity/Board.java rename to src/main/java/net/knarcraft/factions/entity/Board.java index 21fbb3bf..9a724146 100644 --- a/src/main/java/com/massivecraft/factions/entity/Board.java +++ b/src/main/java/net/knarcraft/factions/entity/Board.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.google.gson.reflect.TypeToken; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.TerritoryAccess; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.TerritoryAccess; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.store.Entity; diff --git a/src/main/java/com/massivecraft/factions/entity/BoardColl.java b/src/main/java/net/knarcraft/factions/entity/BoardColl.java similarity index 99% rename from src/main/java/com/massivecraft/factions/entity/BoardColl.java rename to src/main/java/net/knarcraft/factions/entity/BoardColl.java index 4dc3fe17..699389a3 100644 --- a/src/main/java/com/massivecraft/factions/entity/BoardColl.java +++ b/src/main/java/net/knarcraft/factions/entity/BoardColl.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.TerritoryAccess; +import net.knarcraft.factions.TerritoryAccess; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.collections.MassiveSet; diff --git a/src/main/java/com/massivecraft/factions/entity/BoardInterface.java b/src/main/java/net/knarcraft/factions/entity/BoardInterface.java similarity index 92% rename from src/main/java/com/massivecraft/factions/entity/BoardInterface.java rename to src/main/java/net/knarcraft/factions/entity/BoardInterface.java index 5cb35a7f..ec7a7e43 100644 --- a/src/main/java/com/massivecraft/factions/entity/BoardInterface.java +++ b/src/main/java/net/knarcraft/factions/entity/BoardInterface.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.TerritoryAccess; +import net.knarcraft.factions.TerritoryAccess; import com.massivecraft.massivecore.ps.PS; import java.util.Map; diff --git a/src/main/java/com/massivecraft/factions/entity/Faction.java b/src/main/java/net/knarcraft/factions/entity/Faction.java similarity index 98% rename from src/main/java/com/massivecraft/factions/entity/Faction.java rename to src/main/java/net/knarcraft/factions/entity/Faction.java index 0c502a5e..9434e29f 100644 --- a/src/main/java/com/massivecraft/factions/entity/Faction.java +++ b/src/main/java/net/knarcraft/factions/entity/Faction.java @@ -1,16 +1,16 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.FactionsIndex; -import com.massivecraft.factions.FactionsParticipator; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.RelationParticipator; -import com.massivecraft.factions.entity.MPerm.MPermable; -import com.massivecraft.factions.predicate.PredicateCommandSenderFaction; -import com.massivecraft.factions.predicate.PredicateMPlayerRank; -import com.massivecraft.factions.util.MiscUtil; -import com.massivecraft.factions.util.RelationUtil; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.FactionsIndex; +import net.knarcraft.factions.FactionsParticipator; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.RelationParticipator; +import net.knarcraft.factions.entity.MPerm.MPermable; +import net.knarcraft.factions.predicate.PredicateCommandSenderFaction; +import net.knarcraft.factions.predicate.PredicateMPlayerRank; +import net.knarcraft.factions.util.MiscUtil; +import net.knarcraft.factions.util.RelationUtil; import com.massivecraft.massivecore.Couple; import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.collections.MassiveList; diff --git a/src/main/java/com/massivecraft/factions/entity/FactionColl.java b/src/main/java/net/knarcraft/factions/entity/FactionColl.java similarity index 97% rename from src/main/java/com/massivecraft/factions/entity/FactionColl.java rename to src/main/java/net/knarcraft/factions/entity/FactionColl.java index 1304a116..2d36cb68 100644 --- a/src/main/java/com/massivecraft/factions/entity/FactionColl.java +++ b/src/main/java/net/knarcraft/factions/entity/FactionColl.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.util.MiscUtil; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.util.MiscUtil; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.store.Coll; import com.massivecraft.massivecore.util.Txt; diff --git a/src/main/java/com/massivecraft/factions/entity/Invitation.java b/src/main/java/net/knarcraft/factions/entity/Invitation.java similarity index 97% rename from src/main/java/com/massivecraft/factions/entity/Invitation.java rename to src/main/java/net/knarcraft/factions/entity/Invitation.java index 9a1a6efb..54de3590 100644 --- a/src/main/java/com/massivecraft/factions/entity/Invitation.java +++ b/src/main/java/net/knarcraft/factions/entity/Invitation.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.massivecraft.massivecore.store.EntityInternal; diff --git a/src/main/java/com/massivecraft/factions/entity/MConf.java b/src/main/java/net/knarcraft/factions/entity/MConf.java similarity index 98% rename from src/main/java/com/massivecraft/factions/entity/MConf.java rename to src/main/java/net/knarcraft/factions/entity/MConf.java index 89ca195e..de470722 100644 --- a/src/main/java/com/massivecraft/factions/entity/MConf.java +++ b/src/main/java/net/knarcraft/factions/entity/MConf.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.engine.EngineChat; -import com.massivecraft.factions.event.EventFactionsChunkChangeType; -import com.massivecraft.factions.integration.dynmap.DynmapStyle; -import com.massivecraft.factions.integration.dynmap.IntegrationDynmap; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.engine.EngineChat; +import net.knarcraft.factions.event.EventFactionsChunkChangeType; +import net.knarcraft.factions.integration.dynmap.DynmapStyle; +import net.knarcraft.factions.integration.dynmap.IntegrationDynmap; import com.massivecraft.massivecore.collections.BackstringSet; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.collections.WorldExceptionSet; diff --git a/src/main/java/com/massivecraft/factions/entity/MConfColl.java b/src/main/java/net/knarcraft/factions/entity/MConfColl.java similarity index 95% rename from src/main/java/com/massivecraft/factions/entity/MConfColl.java rename to src/main/java/net/knarcraft/factions/entity/MConfColl.java index c44a5cd2..7aed5590 100644 --- a/src/main/java/com/massivecraft/factions/entity/MConfColl.java +++ b/src/main/java/net/knarcraft/factions/entity/MConfColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.store.Coll; diff --git a/src/main/java/com/massivecraft/factions/entity/MFlag.java b/src/main/java/net/knarcraft/factions/entity/MFlag.java similarity index 99% rename from src/main/java/com/massivecraft/factions/entity/MFlag.java rename to src/main/java/net/knarcraft/factions/entity/MFlag.java index b22fc11c..c437a2b0 100644 --- a/src/main/java/com/massivecraft/factions/entity/MFlag.java +++ b/src/main/java/net/knarcraft/factions/entity/MFlag.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.event.EventFactionsCreateFlags; +import net.knarcraft.factions.event.EventFactionsCreateFlags; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.Prioritized; import com.massivecraft.massivecore.Registerable; diff --git a/src/main/java/com/massivecraft/factions/entity/MFlagColl.java b/src/main/java/net/knarcraft/factions/entity/MFlagColl.java similarity index 97% rename from src/main/java/com/massivecraft/factions/entity/MFlagColl.java rename to src/main/java/net/knarcraft/factions/entity/MFlagColl.java index 9b5bb712..933f300d 100644 --- a/src/main/java/com/massivecraft/factions/entity/MFlagColl.java +++ b/src/main/java/net/knarcraft/factions/entity/MFlagColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.massivecraft.massivecore.store.Coll; diff --git a/src/main/java/com/massivecraft/factions/entity/MPerm.java b/src/main/java/net/knarcraft/factions/entity/MPerm.java similarity index 98% rename from src/main/java/com/massivecraft/factions/entity/MPerm.java rename to src/main/java/net/knarcraft/factions/entity/MPerm.java index 29243515..da7a7df8 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPerm.java +++ b/src/main/java/net/knarcraft/factions/entity/MPerm.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.AccessStatus; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.cmd.CmdFactions; -import com.massivecraft.factions.event.EventFactionsCreatePerms; +import net.knarcraft.factions.AccessStatus; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.cmd.CmdFactions; +import net.knarcraft.factions.event.EventFactionsCreatePerms; import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.Prioritized; diff --git a/src/main/java/com/massivecraft/factions/entity/MPermColl.java b/src/main/java/net/knarcraft/factions/entity/MPermColl.java similarity index 98% rename from src/main/java/com/massivecraft/factions/entity/MPermColl.java rename to src/main/java/net/knarcraft/factions/entity/MPermColl.java index f6be6ab3..3bdb8f76 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPermColl.java +++ b/src/main/java/net/knarcraft/factions/entity/MPermColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.google.gson.JsonObject; import com.massivecraft.massivecore.store.Coll; diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayer.java b/src/main/java/net/knarcraft/factions/entity/MPlayer.java similarity index 96% rename from src/main/java/com/massivecraft/factions/entity/MPlayer.java rename to src/main/java/net/knarcraft/factions/entity/MPlayer.java index a72fd0f1..380ddda5 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPlayer.java +++ b/src/main/java/net/knarcraft/factions/entity/MPlayer.java @@ -1,19 +1,19 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.FactionsIndex; -import com.massivecraft.factions.FactionsParticipator; -import com.massivecraft.factions.Perm; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.RelationParticipator; -import com.massivecraft.factions.event.EventFactionsChunkChangeType; -import com.massivecraft.factions.event.EventFactionsChunksChange; -import com.massivecraft.factions.event.EventFactionsDisband; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; -import com.massivecraft.factions.mixin.PowerMixin; -import com.massivecraft.factions.util.AsciiMap; -import com.massivecraft.factions.util.RelationUtil; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.FactionsIndex; +import net.knarcraft.factions.FactionsParticipator; +import net.knarcraft.factions.Perm; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.RelationParticipator; +import net.knarcraft.factions.event.EventFactionsChunkChangeType; +import net.knarcraft.factions.event.EventFactionsChunksChange; +import net.knarcraft.factions.event.EventFactionsDisband; +import net.knarcraft.factions.event.EventFactionsMembershipChange; +import net.knarcraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; +import net.knarcraft.factions.mixin.PowerMixin; +import net.knarcraft.factions.util.AsciiMap; +import net.knarcraft.factions.util.RelationUtil; import com.massivecraft.massivecore.mixin.MixinSenderPs; import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java b/src/main/java/net/knarcraft/factions/entity/MPlayerColl.java similarity index 95% rename from src/main/java/com/massivecraft/factions/entity/MPlayerColl.java rename to src/main/java/net/knarcraft/factions/entity/MPlayerColl.java index 097db452..dc8b94b5 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java +++ b/src/main/java/net/knarcraft/factions/entity/MPlayerColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.massivecraft.massivecore.store.SenderColl; diff --git a/src/main/java/com/massivecraft/factions/entity/Rank.java b/src/main/java/net/knarcraft/factions/entity/Rank.java similarity index 99% rename from src/main/java/com/massivecraft/factions/entity/Rank.java rename to src/main/java/net/knarcraft/factions/entity/Rank.java index cffd14b4..f655c65c 100644 --- a/src/main/java/com/massivecraft/factions/entity/Rank.java +++ b/src/main/java/net/knarcraft/factions/entity/Rank.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.massivecraft.massivecore.store.EntityInternal; import com.massivecraft.massivecore.store.EntityInternalMap; diff --git a/src/main/java/com/massivecraft/factions/entity/Vote.java b/src/main/java/net/knarcraft/factions/entity/Vote.java similarity index 98% rename from src/main/java/com/massivecraft/factions/entity/Vote.java rename to src/main/java/net/knarcraft/factions/entity/Vote.java index aa54c58d..5888abd4 100644 --- a/src/main/java/com/massivecraft/factions/entity/Vote.java +++ b/src/main/java/net/knarcraft/factions/entity/Vote.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.collections.MassiveMap; diff --git a/src/main/java/com/massivecraft/factions/entity/Warp.java b/src/main/java/net/knarcraft/factions/entity/Warp.java similarity index 98% rename from src/main/java/com/massivecraft/factions/entity/Warp.java rename to src/main/java/net/knarcraft/factions/entity/Warp.java index 4e6bcfb3..1b62bd16 100644 --- a/src/main/java/com/massivecraft/factions/entity/Warp.java +++ b/src/main/java/net/knarcraft/factions/entity/Warp.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.entity; +package net.knarcraft.factions.entity; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction001Invitations.java similarity index 84% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction001Invitations.java index e8aabfd9..26f6d986 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction001Invitations.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.store.migrator.MigratorFieldConvert; import com.massivecraft.massivecore.store.migrator.MigratorFieldRename; import com.massivecraft.massivecore.store.migrator.MigratorRoot; @@ -12,9 +12,9 @@ public class MigratorFaction001Invitations extends MigratorRoot { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations i = new com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations(); + private static MigratorFaction001Invitations i = new MigratorFaction001Invitations(); - public static com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations get() { + public static MigratorFaction001Invitations get() { return i; } diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction002Ranks.java similarity index 94% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction002Ranks.java index 97312488..fc07a854 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction002Ranks.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.collections.MassiveSet; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction003Warps.java similarity index 91% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction003Warps.java index 59272ba8..337833cd 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction003Warps.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Warp; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Warp; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java similarity index 92% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java index 9e763f94..522e92f1 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.store.migrator.MigratorRoot; public class MigratorFaction004WarpsPerms extends MigratorRoot { diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java similarity index 94% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java index c1a730c2..d3a84d2a 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.util.EnumerationUtil; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.util.EnumerationUtil; import com.massivecraft.massivecore.store.migrator.MigratorRoot; import java.util.Collection; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java similarity index 91% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java index c3c8518e..7d7daf42 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.store.migrator.MigratorFieldRename; import com.massivecraft.massivecore.store.migrator.MigratorRoot; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java similarity index 91% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java index 60bde75a..fe2eee6a 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.store.migrator.MigratorFieldRename; import com.massivecraft.massivecore.store.migrator.MigratorRoot; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf004Rank.java similarity index 96% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf004Rank.java index 8367a2a4..33c2411b 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf004Rank.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.store.migrator.MigratorRoot; import java.util.Iterator; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf005Warps.java similarity index 94% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf005Warps.java index b02eb3bf..0891ee7c 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMConf005Warps.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.store.migrator.MigratorFieldRename; import com.massivecraft.massivecore.store.migrator.MigratorRoot; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPerm001Warps.java similarity index 93% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPerm001Warps.java index 00efb49f..7a57d5de 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPerm001Warps.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.massivecraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.store.migrator.MigratorRoot; public class MigratorMPerm001Warps extends MigratorRoot { diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java similarity index 90% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java index 59b1c347..5c4d5b22 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.store.migrator.MigratorRoot; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPlayer001Ranks.java similarity index 87% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPlayer001Ranks.java index 2c2f96a9..6d9f8b5c 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPlayer001Ranks.java @@ -1,13 +1,13 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import com.massivecraft.massivecore.store.migrator.MigratorRoot; import java.util.Collection; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java similarity index 87% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java index 0e68df23..c2089f7a 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.store.migrator.MigratorFieldRename; import com.massivecraft.massivecore.store.migrator.MigratorRoot; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java similarity index 90% rename from src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java rename to src/main/java/net/knarcraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java index 8dfb81eb..110a1bc8 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java +++ b/src/main/java/net/knarcraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.entity.migrator; +package net.knarcraft.factions.entity.migrator; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.adapter.TerritoryAccessAdapter; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.adapter.TerritoryAccessAdapter; import com.massivecraft.massivecore.store.migrator.MigratorRoot; public class MigratorTerritoryAccess001Restructure extends MigratorRoot { diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsAbstract.java b/src/main/java/net/knarcraft/factions/event/EventFactionsAbstract.java similarity index 90% rename from src/main/java/com/massivecraft/factions/event/EventFactionsAbstract.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsAbstract.java index b7a49104..5c5255ff 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsAbstract.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; import com.massivecraft.massivecore.event.EventMassiveCore; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java b/src/main/java/net/knarcraft/factions/event/EventFactionsAbstractSender.java similarity index 90% rename from src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsAbstractSender.java index 620ee866..4259bbe4 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsAbstractSender.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.event.EventMassiveCore; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsChunkChangeType.java b/src/main/java/net/knarcraft/factions/event/EventFactionsChunkChangeType.java similarity index 95% rename from src/main/java/com/massivecraft/factions/event/EventFactionsChunkChangeType.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsChunkChangeType.java index 2b54d35c..cc0a219e 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsChunkChangeType.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsChunkChangeType.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.Colorized; import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsChunksChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsChunksChange.java similarity index 94% rename from src/main/java/com/massivecraft/factions/event/EventFactionsChunksChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsChunksChange.java index 8c20f3fb..52a6a79b 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsChunksChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsChunksChange.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java b/src/main/java/net/knarcraft/factions/event/EventFactionsCreate.java similarity index 96% rename from src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsCreate.java index 99f15381..4b187384 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsCreate.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsCreateFlags.java b/src/main/java/net/knarcraft/factions/event/EventFactionsCreateFlags.java similarity index 95% rename from src/main/java/com/massivecraft/factions/event/EventFactionsCreateFlags.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsCreateFlags.java index ef6c29ff..7feb5fe7 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsCreateFlags.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsCreateFlags.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsCreatePerms.java b/src/main/java/net/knarcraft/factions/event/EventFactionsCreatePerms.java similarity index 93% rename from src/main/java/com/massivecraft/factions/event/EventFactionsCreatePerms.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsCreatePerms.java index 154f26d2..df8198d5 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsCreatePerms.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsCreatePerms.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsDescriptionChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsDescriptionChange.java similarity index 93% rename from src/main/java/com/massivecraft/factions/event/EventFactionsDescriptionChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsDescriptionChange.java index 797eee57..e6340632 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsDescriptionChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsDescriptionChange.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsDisband.java b/src/main/java/net/knarcraft/factions/event/EventFactionsDisband.java similarity index 92% rename from src/main/java/com/massivecraft/factions/event/EventFactionsDisband.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsDisband.java index e03af957..1993b8b1 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsDisband.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsDisband.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsExpansions.java b/src/main/java/net/knarcraft/factions/event/EventFactionsExpansions.java similarity index 97% rename from src/main/java/com/massivecraft/factions/event/EventFactionsExpansions.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsExpansions.java index 2a38f652..7051dc2e 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsExpansions.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsExpansions.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; import com.massivecraft.massivecore.collections.MassiveTreeMap; import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java b/src/main/java/net/knarcraft/factions/event/EventFactionsFactionShowAsync.java similarity index 93% rename from src/main/java/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsFactionShowAsync.java index 63f06eb3..0b434ea0 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsFactionShowAsync.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.PriorityLines; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsFlagChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsFlagChange.java similarity index 91% rename from src/main/java/com/massivecraft/factions/event/EventFactionsFlagChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsFlagChange.java index 49b0ed8d..c5151ef4 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsFlagChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsFlagChange.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MFlag; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsInvitedChange.java similarity index 91% rename from src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsInvitedChange.java index cb805990..37b86654 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsInvitedChange.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsMembershipChange.java similarity index 94% rename from src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsMembershipChange.java index 9a010ab3..5118c3ba 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsMembershipChange.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsMotdChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsMotdChange.java similarity index 93% rename from src/main/java/com/massivecraft/factions/event/EventFactionsMotdChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsMotdChange.java index 96060c0f..7a8ab667 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsMotdChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsMotdChange.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsNameChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsNameChange.java similarity index 93% rename from src/main/java/com/massivecraft/factions/event/EventFactionsNameChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsNameChange.java index e0464dc4..6773be41 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsNameChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsNameChange.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsPermChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsPermChange.java similarity index 92% rename from src/main/java/com/massivecraft/factions/event/EventFactionsPermChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsPermChange.java index 93c8d9a5..7b486e91 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsPermChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsPermChange.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPerm; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsPowerChange.java similarity index 95% rename from src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsPowerChange.java index cc960a81..2a076a22 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsPowerChange.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java b/src/main/java/net/knarcraft/factions/event/EventFactionsPvpDisallowed.java similarity index 93% rename from src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsPvpDisallowed.java index d86e1c96..9e2f16c6 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsPvpDisallowed.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.engine.DisallowCause; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.engine.DisallowCause; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.entity.EntityDamageByEntityEvent; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsRankChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsRankChange.java similarity index 90% rename from src/main/java/com/massivecraft/factions/event/EventFactionsRankChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsRankChange.java index 7905b5a2..2024fd40 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsRankChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsRankChange.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsRelationChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsRelationChange.java similarity index 92% rename from src/main/java/com/massivecraft/factions/event/EventFactionsRelationChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsRelationChange.java index a36ace7a..d4ddb258 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsRelationChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsRelationChange.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.java b/src/main/java/net/knarcraft/factions/event/EventFactionsTitleChange.java similarity index 93% rename from src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsTitleChange.java index 6de85a85..6d9dbfff 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsTitleChange.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsVoteAdd.java b/src/main/java/net/knarcraft/factions/event/EventFactionsVoteAdd.java similarity index 89% rename from src/main/java/com/massivecraft/factions/event/EventFactionsVoteAdd.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsVoteAdd.java index b2cb8564..4b5d0f3e 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsVoteAdd.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsVoteAdd.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Vote; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Vote; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsVoteRemove.java b/src/main/java/net/knarcraft/factions/event/EventFactionsVoteRemove.java similarity index 89% rename from src/main/java/com/massivecraft/factions/event/EventFactionsVoteRemove.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsVoteRemove.java index 56edd7cd..41fb3d5d 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsVoteRemove.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsVoteRemove.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Vote; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Vote; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsWarpAdd.java b/src/main/java/net/knarcraft/factions/event/EventFactionsWarpAdd.java similarity index 89% rename from src/main/java/com/massivecraft/factions/event/EventFactionsWarpAdd.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsWarpAdd.java index 09645497..ddcbe756 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsWarpAdd.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsWarpAdd.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Warp; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Warp; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsWarpRemove.java b/src/main/java/net/knarcraft/factions/event/EventFactionsWarpRemove.java similarity index 89% rename from src/main/java/com/massivecraft/factions/event/EventFactionsWarpRemove.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsWarpRemove.java index 725cfa38..0503249a 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsWarpRemove.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsWarpRemove.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.Warp; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.Warp; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/event/EventFactionsWarpTeleport.java b/src/main/java/net/knarcraft/factions/event/EventFactionsWarpTeleport.java similarity index 92% rename from src/main/java/com/massivecraft/factions/event/EventFactionsWarpTeleport.java rename to src/main/java/net/knarcraft/factions/event/EventFactionsWarpTeleport.java index 713543eb..870f71d2 100644 --- a/src/main/java/com/massivecraft/factions/event/EventFactionsWarpTeleport.java +++ b/src/main/java/net/knarcraft/factions/event/EventFactionsWarpTeleport.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.event; +package net.knarcraft.factions.event; -import com.massivecraft.factions.entity.Warp; +import net.knarcraft.factions.entity.Warp; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/massivecraft/factions/integration/Econ.java b/src/main/java/net/knarcraft/factions/integration/Econ.java similarity index 96% rename from src/main/java/com/massivecraft/factions/integration/Econ.java rename to src/main/java/net/knarcraft/factions/integration/Econ.java index eddb5067..9cc7e71b 100644 --- a/src/main/java/com/massivecraft/factions/integration/Econ.java +++ b/src/main/java/net/knarcraft/factions/integration/Econ.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.integration; +package net.knarcraft.factions.integration; -import com.massivecraft.factions.EconomyParticipator; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.util.RelationUtil; +import net.knarcraft.factions.EconomyParticipator; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.util.RelationUtil; import com.massivecraft.massivecore.money.Money; import java.util.HashSet; diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/AreaMarkerValues.java b/src/main/java/net/knarcraft/factions/integration/dynmap/AreaMarkerValues.java similarity index 99% rename from src/main/java/com/massivecraft/factions/integration/dynmap/AreaMarkerValues.java rename to src/main/java/net/knarcraft/factions/integration/dynmap/AreaMarkerValues.java index d90baed3..247d84ca 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/AreaMarkerValues.java +++ b/src/main/java/net/knarcraft/factions/integration/dynmap/AreaMarkerValues.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.dynmap; +package net.knarcraft.factions.integration.dynmap; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/DynmapStyle.java b/src/main/java/net/knarcraft/factions/integration/dynmap/DynmapStyle.java similarity index 97% rename from src/main/java/com/massivecraft/factions/integration/dynmap/DynmapStyle.java rename to src/main/java/net/knarcraft/factions/integration/dynmap/DynmapStyle.java index d6d84b7b..e2bfb7fe 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/DynmapStyle.java +++ b/src/main/java/net/knarcraft/factions/integration/dynmap/DynmapStyle.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.integration.dynmap; +package net.knarcraft.factions.integration.dynmap; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; public class DynmapStyle { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java b/src/main/java/net/knarcraft/factions/integration/dynmap/EngineDynmap.java similarity index 98% rename from src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java rename to src/main/java/net/knarcraft/factions/integration/dynmap/EngineDynmap.java index 9be0d82b..098105b0 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java +++ b/src/main/java/net/knarcraft/factions/integration/dynmap/EngineDynmap.java @@ -1,12 +1,12 @@ -package com.massivecraft.factions.integration.dynmap; +package net.knarcraft.factions.integration.dynmap; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveMap; diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java b/src/main/java/net/knarcraft/factions/integration/dynmap/IntegrationDynmap.java similarity index 97% rename from src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java rename to src/main/java/net/knarcraft/factions/integration/dynmap/IntegrationDynmap.java index a148a998..309accf0 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java +++ b/src/main/java/net/knarcraft/factions/integration/dynmap/IntegrationDynmap.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.dynmap; +package net.knarcraft.factions.integration.dynmap; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.Integration; diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/LayerValues.java b/src/main/java/net/knarcraft/factions/integration/dynmap/LayerValues.java similarity index 98% rename from src/main/java/com/massivecraft/factions/integration/dynmap/LayerValues.java rename to src/main/java/net/knarcraft/factions/integration/dynmap/LayerValues.java index 6128cae9..f62ce5ff 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/LayerValues.java +++ b/src/main/java/net/knarcraft/factions/integration/dynmap/LayerValues.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.dynmap; +package net.knarcraft.factions.integration.dynmap; import com.massivecraft.massivecore.util.MUtil; import org.dynmap.markers.MarkerAPI; diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/MarkerValues.java b/src/main/java/net/knarcraft/factions/integration/dynmap/MarkerValues.java similarity index 98% rename from src/main/java/com/massivecraft/factions/integration/dynmap/MarkerValues.java rename to src/main/java/net/knarcraft/factions/integration/dynmap/MarkerValues.java index b6a5bc1a..50496bc6 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/MarkerValues.java +++ b/src/main/java/net/knarcraft/factions/integration/dynmap/MarkerValues.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.dynmap; +package net.knarcraft.factions.integration.dynmap; import com.massivecraft.massivecore.util.MUtil; import org.dynmap.markers.Marker; diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java b/src/main/java/net/knarcraft/factions/integration/lwc/EngineLwc.java similarity index 92% rename from src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java rename to src/main/java/net/knarcraft/factions/integration/lwc/EngineLwc.java index 77fafbe5..c97fed54 100644 --- a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java +++ b/src/main/java/net/knarcraft/factions/integration/lwc/EngineLwc.java @@ -1,14 +1,14 @@ -package com.massivecraft.factions.integration.lwc; +package net.knarcraft.factions.integration.lwc; import com.griefcraft.lwc.LWC; import com.griefcraft.model.Protection; import com.griefcraft.sql.PhysDB; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsChunkChangeType; -import com.massivecraft.factions.event.EventFactionsChunksChange; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsChunkChangeType; +import net.knarcraft.factions.event.EventFactionsChunksChange; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.IdUtil; diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java b/src/main/java/net/knarcraft/factions/integration/lwc/FactionsLwcModule.java similarity index 93% rename from src/main/java/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java rename to src/main/java/net/knarcraft/factions/integration/lwc/FactionsLwcModule.java index 812b6528..c258ab50 100644 --- a/src/main/java/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java +++ b/src/main/java/net/knarcraft/factions/integration/lwc/FactionsLwcModule.java @@ -1,14 +1,14 @@ -package com.massivecraft.factions.integration.lwc; +package net.knarcraft.factions.integration.lwc; import com.griefcraft.lwc.LWC; import com.griefcraft.model.Protection; import com.griefcraft.scripting.JavaModule; import com.griefcraft.scripting.event.LWCProtectionInteractEvent; import com.griefcraft.scripting.event.LWCProtectionRegisterEvent; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.engine.EnginePermBuild; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.engine.EnginePermBuild; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.SoundEffect; import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java b/src/main/java/net/knarcraft/factions/integration/lwc/IntegrationLwc.java similarity index 93% rename from src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java rename to src/main/java/net/knarcraft/factions/integration/lwc/IntegrationLwc.java index e313a1db..84ce88cf 100644 --- a/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java +++ b/src/main/java/net/knarcraft/factions/integration/lwc/IntegrationLwc.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.lwc; +package net.knarcraft.factions.integration.lwc; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.Integration; diff --git a/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java b/src/main/java/net/knarcraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java similarity index 96% rename from src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java rename to src/main/java/net/knarcraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java index 8871b7cd..f38c92a0 100644 --- a/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java +++ b/src/main/java/net/knarcraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.placeholderapi; +package net.knarcraft.factions.integration.placeholderapi; import com.massivecraft.massivecore.Integration; import org.bukkit.Bukkit; diff --git a/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java b/src/main/java/net/knarcraft/factions/integration/placeholderapi/PlaceholderFactions.java similarity index 91% rename from src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java rename to src/main/java/net/knarcraft/factions/integration/placeholderapi/PlaceholderFactions.java index 5b7d59d2..cb19ea3a 100644 --- a/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java +++ b/src/main/java/net/knarcraft/factions/integration/placeholderapi/PlaceholderFactions.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.integration.placeholderapi; +package net.knarcraft.factions.integration.placeholderapi; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.MPlayer; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.entity.Player; diff --git a/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java b/src/main/java/net/knarcraft/factions/integration/venturechat/EngineVentureChat.java similarity index 90% rename from src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java rename to src/main/java/net/knarcraft/factions/integration/venturechat/EngineVentureChat.java index a25ce811..1c1a6391 100644 --- a/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java +++ b/src/main/java/net/knarcraft/factions/integration/venturechat/EngineVentureChat.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.integration.venturechat; +package net.knarcraft.factions.integration.venturechat; -import com.massivecraft.factions.engine.EngineChat; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.engine.EngineChat; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; diff --git a/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java b/src/main/java/net/knarcraft/factions/integration/venturechat/IntegrationVentureChat.java similarity index 92% rename from src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java rename to src/main/java/net/knarcraft/factions/integration/venturechat/IntegrationVentureChat.java index f6321926..7892aa05 100644 --- a/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java +++ b/src/main/java/net/knarcraft/factions/integration/venturechat/IntegrationVentureChat.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.venturechat; +package net.knarcraft.factions.integration.venturechat; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.Integration; diff --git a/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java b/src/main/java/net/knarcraft/factions/integration/worldguard/EngineWorldGuard.java similarity index 94% rename from src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java rename to src/main/java/net/knarcraft/factions/integration/worldguard/EngineWorldGuard.java index 49fb3211..25cefda3 100644 --- a/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java +++ b/src/main/java/net/knarcraft/factions/integration/worldguard/EngineWorldGuard.java @@ -1,9 +1,9 @@ -package com.massivecraft.factions.integration.worldguard; +package net.knarcraft.factions.integration.worldguard; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsChunksChange; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsChunksChange; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.sk89q.worldedit.bukkit.BukkitWorld; diff --git a/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java b/src/main/java/net/knarcraft/factions/integration/worldguard/IntegrationWorldGuard.java similarity index 92% rename from src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java rename to src/main/java/net/knarcraft/factions/integration/worldguard/IntegrationWorldGuard.java index c22ce014..b7664160 100644 --- a/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java +++ b/src/main/java/net/knarcraft/factions/integration/worldguard/IntegrationWorldGuard.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.integration.worldguard; +package net.knarcraft.factions.integration.worldguard; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.Integration; diff --git a/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java b/src/main/java/net/knarcraft/factions/mixin/PowerMixin.java similarity index 87% rename from src/main/java/com/massivecraft/factions/mixin/PowerMixin.java rename to src/main/java/net/knarcraft/factions/mixin/PowerMixin.java index 79aaae9d..4097e432 100644 --- a/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java +++ b/src/main/java/net/knarcraft/factions/mixin/PowerMixin.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.mixin; +package net.knarcraft.factions.mixin; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.mixin.Mixin; public class PowerMixin extends Mixin { diff --git a/src/main/java/com/massivecraft/factions/predicate/PredicateCommandSenderFaction.java b/src/main/java/net/knarcraft/factions/predicate/PredicateCommandSenderFaction.java similarity index 88% rename from src/main/java/com/massivecraft/factions/predicate/PredicateCommandSenderFaction.java rename to src/main/java/net/knarcraft/factions/predicate/PredicateCommandSenderFaction.java index 27ef8465..50ac70f2 100644 --- a/src/main/java/com/massivecraft/factions/predicate/PredicateCommandSenderFaction.java +++ b/src/main/java/net/knarcraft/factions/predicate/PredicateCommandSenderFaction.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.predicate; +package net.knarcraft.factions.predicate; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.util.MUtil; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/massivecraft/factions/predicate/PredicateMPlayerRank.java b/src/main/java/net/knarcraft/factions/predicate/PredicateMPlayerRank.java similarity index 85% rename from src/main/java/com/massivecraft/factions/predicate/PredicateMPlayerRank.java rename to src/main/java/net/knarcraft/factions/predicate/PredicateMPlayerRank.java index 3082d158..156a2c5a 100644 --- a/src/main/java/com/massivecraft/factions/predicate/PredicateMPlayerRank.java +++ b/src/main/java/net/knarcraft/factions/predicate/PredicateMPlayerRank.java @@ -1,8 +1,8 @@ -package com.massivecraft.factions.predicate; +package net.knarcraft.factions.predicate; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Rank; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.Rank; import java.util.function.Predicate; diff --git a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java b/src/main/java/net/knarcraft/factions/task/TaskFlagPermCreate.java similarity index 88% rename from src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java rename to src/main/java/net/knarcraft/factions/task/TaskFlagPermCreate.java index 2765deb8..5c244d0f 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java +++ b/src/main/java/net/knarcraft/factions/task/TaskFlagPermCreate.java @@ -1,7 +1,7 @@ -package com.massivecraft.factions.task; +package net.knarcraft.factions.task; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPerm; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPerm; import com.massivecraft.massivecore.ModuloRepeatTask; import com.massivecraft.massivecore.util.TimeUnit; diff --git a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/main/java/net/knarcraft/factions/task/TaskPlayerPowerUpdate.java similarity index 82% rename from src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java rename to src/main/java/net/knarcraft/factions/task/TaskPlayerPowerUpdate.java index bd055721..b7e6cf52 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java +++ b/src/main/java/net/knarcraft/factions/task/TaskPlayerPowerUpdate.java @@ -1,12 +1,11 @@ -package com.massivecraft.factions.task; +package net.knarcraft.factions.task; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsPowerChange; -import com.massivecraft.factions.event.EventFactionsPowerChange.PowerChangeReason; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.event.EventFactionsPowerChange; import com.massivecraft.massivecore.ModuloRepeatTask; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; @@ -67,7 +66,7 @@ public class TaskPlayerPowerUpdate extends ModuloRepeatTask { double newPower = mplayer.getPower() + mplayer.getPowerPerHour() * millis / TimeUnit.MILLIS_PER_HOUR; // ... and if other plugins don't object ... - EventFactionsPowerChange event = new EventFactionsPowerChange(null, mplayer, PowerChangeReason.TIME, newPower); + EventFactionsPowerChange event = new EventFactionsPowerChange(null, mplayer, EventFactionsPowerChange.PowerChangeReason.TIME, newPower); event.run(); if (event.isCancelled()) { continue; diff --git a/src/main/java/com/massivecraft/factions/task/TaskTax.java b/src/main/java/net/knarcraft/factions/task/TaskTax.java similarity index 91% rename from src/main/java/com/massivecraft/factions/task/TaskTax.java rename to src/main/java/net/knarcraft/factions/task/TaskTax.java index 4bd54e85..9cb55a19 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskTax.java +++ b/src/main/java/net/knarcraft/factions/task/TaskTax.java @@ -1,15 +1,14 @@ -package com.massivecraft.factions.task; +package net.knarcraft.factions.task; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.MPlayerColl; -import com.massivecraft.factions.event.EventFactionsMembershipChange; -import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; -import com.massivecraft.factions.integration.Econ; +import net.knarcraft.factions.Factions; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.FactionColl; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; +import net.knarcraft.factions.entity.MPlayerColl; +import net.knarcraft.factions.event.EventFactionsMembershipChange; +import net.knarcraft.factions.integration.Econ; import com.massivecraft.massivecore.Couple; import com.massivecraft.massivecore.Task; import com.massivecraft.massivecore.collections.MassiveMap; @@ -197,7 +196,7 @@ public class TaskTax extends Task { return false; } - EventFactionsMembershipChange event = new EventFactionsMembershipChange(null, mplayer, FactionColl.get().getNone(), MembershipChangeReason.KICK); + EventFactionsMembershipChange event = new EventFactionsMembershipChange(null, mplayer, FactionColl.get().getNone(), EventFactionsMembershipChange.MembershipChangeReason.KICK); event.run(); if (event.isCancelled()) { return false; diff --git a/src/main/java/com/massivecraft/factions/util/AsciiCompass.java b/src/main/java/net/knarcraft/factions/util/AsciiCompass.java similarity index 59% rename from src/main/java/com/massivecraft/factions/util/AsciiCompass.java rename to src/main/java/net/knarcraft/factions/util/AsciiCompass.java index 98b2dd21..72d78a9e 100644 --- a/src/main/java/com/massivecraft/factions/util/AsciiCompass.java +++ b/src/main/java/net/knarcraft/factions/util/AsciiCompass.java @@ -1,19 +1,9 @@ -package com.massivecraft.factions.util; +package net.knarcraft.factions.util; import com.massivecraft.massivecore.collections.MassiveList; import java.util.List; -import static com.massivecraft.factions.util.AsciiCompassDirection.E; -import static com.massivecraft.factions.util.AsciiCompassDirection.N; -import static com.massivecraft.factions.util.AsciiCompassDirection.NE; -import static com.massivecraft.factions.util.AsciiCompassDirection.NONE; -import static com.massivecraft.factions.util.AsciiCompassDirection.NW; -import static com.massivecraft.factions.util.AsciiCompassDirection.S; -import static com.massivecraft.factions.util.AsciiCompassDirection.SE; -import static com.massivecraft.factions.util.AsciiCompassDirection.SW; -import static com.massivecraft.factions.util.AsciiCompassDirection.W; - public class AsciiCompass { // -------------------------------------------- // // COMPASS @@ -28,9 +18,9 @@ public class AsciiCompass { List ret = new MassiveList<>(); // Fill - ret.add(visualizeRow(directionFacing, NW, N, NE)); - ret.add(visualizeRow(directionFacing, W, NONE, E)); - ret.add(visualizeRow(directionFacing, SW, S, SE)); + ret.add(visualizeRow(directionFacing, AsciiCompassDirection.NW, AsciiCompassDirection.N, AsciiCompassDirection.NE)); + ret.add(visualizeRow(directionFacing, AsciiCompassDirection.W, AsciiCompassDirection.NONE, AsciiCompassDirection.E)); + ret.add(visualizeRow(directionFacing, AsciiCompassDirection.SW, AsciiCompassDirection.S, AsciiCompassDirection.SE)); // Return return ret; diff --git a/src/main/java/com/massivecraft/factions/util/AsciiCompassDirection.java b/src/main/java/net/knarcraft/factions/util/AsciiCompassDirection.java similarity index 98% rename from src/main/java/com/massivecraft/factions/util/AsciiCompassDirection.java rename to src/main/java/net/knarcraft/factions/util/AsciiCompassDirection.java index 22bdf6ed..224ba854 100644 --- a/src/main/java/com/massivecraft/factions/util/AsciiCompassDirection.java +++ b/src/main/java/net/knarcraft/factions/util/AsciiCompassDirection.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.util; +package net.knarcraft.factions.util; import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/util/AsciiMap.java b/src/main/java/net/knarcraft/factions/util/AsciiMap.java similarity index 96% rename from src/main/java/com/massivecraft/factions/util/AsciiMap.java rename to src/main/java/net/knarcraft/factions/util/AsciiMap.java index 385bccb4..d78c02e5 100644 --- a/src/main/java/com/massivecraft/factions/util/AsciiMap.java +++ b/src/main/java/net/knarcraft/factions/util/AsciiMap.java @@ -1,10 +1,10 @@ -package com.massivecraft.factions.util; +package net.knarcraft.factions.util; -import com.massivecraft.factions.RelationParticipator; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.Board; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; +import net.knarcraft.factions.RelationParticipator; +import net.knarcraft.factions.TerritoryAccess; +import net.knarcraft.factions.entity.Board; +import net.knarcraft.factions.entity.BoardColl; +import net.knarcraft.factions.entity.Faction; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.ps.PS; diff --git a/src/main/java/com/massivecraft/factions/util/EnumerationUtil.java b/src/main/java/net/knarcraft/factions/util/EnumerationUtil.java similarity index 99% rename from src/main/java/com/massivecraft/factions/util/EnumerationUtil.java rename to src/main/java/net/knarcraft/factions/util/EnumerationUtil.java index 83d37c9b..d7cf1c9c 100644 --- a/src/main/java/com/massivecraft/factions/util/EnumerationUtil.java +++ b/src/main/java/net/knarcraft/factions/util/EnumerationUtil.java @@ -1,6 +1,6 @@ -package com.massivecraft.factions.util; +package net.knarcraft.factions.util; -import com.massivecraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MConf; import com.massivecraft.massivecore.collections.BackstringSet; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/src/main/java/com/massivecraft/factions/util/MiscUtil.java b/src/main/java/net/knarcraft/factions/util/MiscUtil.java similarity index 97% rename from src/main/java/com/massivecraft/factions/util/MiscUtil.java rename to src/main/java/net/knarcraft/factions/util/MiscUtil.java index 01f4090b..3cc41c6f 100644 --- a/src/main/java/com/massivecraft/factions/util/MiscUtil.java +++ b/src/main/java/net/knarcraft/factions/util/MiscUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.util; +package net.knarcraft.factions.util; import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/util/RelationUtil.java b/src/main/java/net/knarcraft/factions/util/RelationUtil.java similarity index 92% rename from src/main/java/com/massivecraft/factions/util/RelationUtil.java rename to src/main/java/net/knarcraft/factions/util/RelationUtil.java index 0e41d337..01ef4f7e 100644 --- a/src/main/java/com/massivecraft/factions/util/RelationUtil.java +++ b/src/main/java/net/knarcraft/factions/util/RelationUtil.java @@ -1,11 +1,11 @@ -package com.massivecraft.factions.util; +package net.knarcraft.factions.util; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.RelationParticipator; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; +import net.knarcraft.factions.Rel; +import net.knarcraft.factions.RelationParticipator; +import net.knarcraft.factions.entity.Faction; +import net.knarcraft.factions.entity.MConf; +import net.knarcraft.factions.entity.MFlag; +import net.knarcraft.factions.entity.MPlayer; import com.massivecraft.massivecore.util.Txt; import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/util/VisualizeUtil.java b/src/main/java/net/knarcraft/factions/util/VisualizeUtil.java similarity index 98% rename from src/main/java/com/massivecraft/factions/util/VisualizeUtil.java rename to src/main/java/net/knarcraft/factions/util/VisualizeUtil.java index 9f4715c2..f69c3c5e 100644 --- a/src/main/java/com/massivecraft/factions/util/VisualizeUtil.java +++ b/src/main/java/net/knarcraft/factions/util/VisualizeUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.factions.util; +package net.knarcraft.factions.util; import org.bukkit.Location; import org.bukkit.Material;