EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes package to net.knarcraft

Browse Source
This commit is contained in:
Kristian Knarvik 2022-08-05 01:17:53 +02:00
parent bb0be8a3f0
commit f8407a3692
307 changed files with 1211 additions and 1243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -2,14 +2,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- Parent -->
<!--<parent>
<groupId>com.massivecraft.massivesuper</groupId>
<artifactId>MassiveSuper</artifactId>
<version>3.3.3</version>
<relativePath>../MassiveSuper</relativePath>
</parent>-->
<!-- Basics -->
<groupId>net.knarcraft</groupId>
<artifactId>Factions</artifactId>
@ -67,7 +59,7 @@
<artifactId>MassiveCore</artifactId>
<version>RELEASE</version>
<scope>system</scope>
<systemPath>lib\MassiveCore.jar</systemPath>
<systemPath>${project.basedir}\lib\MassiveCore.jar</systemPath>
</dependency>
<!-- WorldEdit -->
<dependency>
@ -103,7 +95,7 @@
<artifactId>lwc</artifactId>
<version>RELEASE</version>
<scope>system</scope>
<systemPath>lib\LWC.jar</systemPath>
<systemPath>${project.basedir}\lib\LWC.jar</systemPath>
</dependency>
<!-- PlaceholderAPI -->
<dependency>
@ -118,7 +110,7 @@
<artifactId>VentureChat</artifactId>
<version>RELEASE</version>
<scope>system</scope>
<systemPath>lib\VentureChat.jar</systemPath>
<systemPath>${project.basedir}\lib\VentureChat.jar</systemPath>
</dependency>
<!-- Dynmap -->
<dependency>

2
src/main/java/com/massivecraft/factions/AccessStatus.java → src/main/java/net/knarcraft/factions/AccessStatus.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions;
package net.knarcraft.factions;
import com.massivecraft.massivecore.Colorized;

2
src/main/java/com/massivecraft/factions/EconomyParticipator.java → src/main/java/net/knarcraft/factions/EconomyParticipator.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions;
package net.knarcraft.factions;
public interface EconomyParticipator extends RelationParticipator {
boolean msg(String msg, Object... args);

4
src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java → src/main/java/net/knarcraft/factions/ExtractorFactionAccountId.java
View File

@ -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 {

152
src/main/java/com/massivecraft/factions/Factions.java → src/main/java/net/knarcraft/factions/Factions.java
View File

@ -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;

10
src/main/java/com/massivecraft/factions/FactionsIndex.java → src/main/java/net/knarcraft/factions/FactionsIndex.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/FactionsParticipator.java → src/main/java/net/knarcraft/factions/FactionsParticipator.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions;
package net.knarcraft.factions;
import com.massivecraft.massivecore.Named;

2
src/main/java/com/massivecraft/factions/Perm.java → src/main/java/net/knarcraft/factions/Perm.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions;
package net.knarcraft.factions;
import com.massivecraft.massivecore.Identified;
import com.massivecraft.massivecore.MassiveException;

2
src/main/java/com/massivecraft/factions/PowerBoosted.java → src/main/java/net/knarcraft/factions/PowerBoosted.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions;
package net.knarcraft.factions;
public interface PowerBoosted {
double getPowerBoost();

6
src/main/java/com/massivecraft/factions/Rel.java → src/main/java/net/knarcraft/factions/Rel.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/RelationParticipator.java → src/main/java/net/knarcraft/factions/RelationParticipator.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions;
package net.knarcraft.factions;
import org.bukkit.ChatColor;

17
src/main/java/com/massivecraft/factions/TerritoryAccess.java → src/main/java/net/knarcraft/factions/TerritoryAccess.java
View File

@ -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<MPermable> getGranteds() {
public Set<MPerm.MPermable> 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());
}

4
src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java → src/main/java/net/knarcraft/factions/adapter/BoardAdapter.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java → src/main/java/net/knarcraft/factions/adapter/BoardMapAdapter.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java → src/main/java/net/knarcraft/factions/adapter/TerritoryAccessAdapter.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/chat/ChatActive.java → src/main/java/net/knarcraft/factions/chat/ChatActive.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.chat;
package net.knarcraft.factions.chat;
import com.massivecraft.massivecore.Active;
import com.massivecraft.massivecore.Identified;

2
src/main/java/com/massivecraft/factions/chat/ChatFormatter.java → src/main/java/net/knarcraft/factions/chat/ChatFormatter.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.chat;
package net.knarcraft.factions.chat;
import org.bukkit.command.CommandSender;

2
src/main/java/com/massivecraft/factions/chat/ChatModifier.java → src/main/java/net/knarcraft/factions/chat/ChatModifier.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/chat/ChatTag.java → src/main/java/net/knarcraft/factions/chat/ChatTag.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java → src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLc.java
View File

@ -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 {

4
src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java → src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierLp.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java → src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierParse.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java → src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierRp.java
View File

@ -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 {

4
src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java → src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUc.java
View File

@ -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 {

4
src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java → src/main/java/net/knarcraft/factions/chat/modifier/ChatModifierUcf.java
View File

@ -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;

8
src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java → src/main/java/net/knarcraft/factions/chat/tag/ChatTagName.java
View File

@ -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 {

8
src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java → src/main/java/net/knarcraft/factions/chat/tag/ChatTagNameforce.java
View File

@ -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 {

6
src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java → src/main/java/net/knarcraft/factions/chat/tag/ChatTagRelcolor.java
View File

@ -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 {

6
src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java → src/main/java/net/knarcraft/factions/chat/tag/ChatTagRole.java
View File

@ -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;

8
src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java → src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefix.java
View File

@ -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 {

6
src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java → src/main/java/net/knarcraft/factions/chat/tag/ChatTagRoleprefixforce.java
View File

@ -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 {

6
src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java → src/main/java/net/knarcraft/factions/chat/tag/ChatTagTitle.java
View File

@ -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 {

6
src/main/java/com/massivecraft/factions/cmd/CmdFactions.java → src/main/java/net/knarcraft/factions/cmd/CmdFactions.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccess.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;

17
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessAbstract.java
View File

@ -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("<k>Granted to: %s", CmdFactionsPermShow.permablesToDisplayString(ta.getGranteds(), msender));
}
public void setAccess(Collection<PS> chunks, MPermable mpermable, boolean granted) {
public void setAccess(Collection<PS> 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();

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessDeny.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessDeny.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessGrant.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessGrant.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;

17
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessInspect.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessInspect.java
View File

@ -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();

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetCircle.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetCircle.java
View File

@ -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;

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetFill.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetFill.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetOne.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetOne.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetSquare.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetSquare.java
View File

@ -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;

12
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetX.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetX.java
View File

@ -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<PS> 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);
}

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXRadius.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXRadius.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessSetXSimple.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessSetXSimple.java
View File

@ -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 {
// -------------------------------------------- //

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessView.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsAccessView.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsAccessView extends CmdFactionsAccessAbstract {
// -------------------------------------------- //

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsChunkname.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsChunkname.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsClaim.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsClaim extends FactionsCommand {
// -------------------------------------------- //

22
src/main/java/com/massivecraft/factions/cmd/CmdFactionsClean.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsClean.java
View File

@ -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;

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsConfig.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsConfig.java
View File

@ -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;

21
src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsCreate.java
View File

@ -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

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDescription.java
View File

@ -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;

25
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDisband.java
View File

@ -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();
}

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentation.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentation.java
View File

@ -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 {

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationFlags.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationFlags.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPerms.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPerms.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
import com.massivecraft.massivecore.MassiveException;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationPower.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationPower.java
View File

@ -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 {

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationRanks.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationRanks.java
View File

@ -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;

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationTax.java
View File

@ -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;

11
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsDocumentationWarps.java
View File

@ -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<MPermable> set = msenderFaction.getPermittedPermables(MPerm.getPermWarp());
Set<MPerm.MPermable> set = msenderFaction.getPermittedPermables(MPerm.getPermWarp());
String permables = CmdFactionsPermShow.permablesToDisplayString(set, msender);
msgDoc("In your faction warps can be used by: %s<i>.", permables);
}

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsFaction.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlag.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlag.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsFlag extends FactionsCommand {
// -------------------------------------------- //

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagList.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagList.java
View File

@ -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;

14
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagSet.java
View File

@ -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;

8
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsFlagShow.java
View File

@ -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;

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsFly.java
View File

@ -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;

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsHome.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsHome.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsInvite.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsInvite extends FactionsCommand {
// -------------------------------------------- //

12
src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteAdd.java
View File

@ -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;

12
src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteList.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteList.java
View File

@ -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;

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsInviteRemove.java
View File

@ -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;

23
src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsJoin.java
View File

@ -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;

21
src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsKick.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsLeave.java
View File

@ -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 {
// -------------------------------------------- //

12
src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsList.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMap.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMap.java
View File

@ -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;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoney.java
View File

@ -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 {
// -------------------------------------------- //

12
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyBalance.java
View File

@ -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 {

14
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyDeposit.java
View File

@ -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;

14
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2f.java
View File

@ -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;

18
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferF2p.java
View File

@ -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;

18
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyTransferP2f.java
View File

@ -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;

16
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyWithdraw.java
View File

@ -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;

8
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMoneyconvert.java
View File

@ -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;

8
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMotd.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsMotd.java
View File

@ -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;

12
src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsName.java
View File

@ -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 {

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsOverride.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsOverride.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPerm.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPerm.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsPerm extends FactionsCommand {
// -------------------------------------------- //

8
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermList.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermList.java
View File

@ -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;

16
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermSet.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermSet.java
View File

@ -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;

17
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermShow.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermShow.java
View File

@ -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<String> permittedIds = faction.getPerms().get(mperm.getId());
List<MPermable> permables = new MassiveList<>();
List<MPerm.MPermable> 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<MPermable> permables, Object watcherObject) {
public static String permablesToDisplayString(Collection<MPerm.MPermable> permables, Object watcherObject) {
MPlayer mplayer = MPlayer.get(watcherObject);
Faction faction = mplayer.getFaction();

14
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermView.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermView.java
View File

@ -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;

19
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPermViewall.java
View File

@ -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<MPermable> permables = new MassiveList<>();
List<MPerm.MPermable> 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;
}

8
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPlayer.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboost.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboost.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsPowerboost extends FactionsCommand {
// -------------------------------------------- //

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostAbstract.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostAbstract.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFaction.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFaction.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsPowerboostFaction extends FactionsCommand {
// -------------------------------------------- //

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAbstract.java
View File

@ -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 {
// -------------------------------------------- //

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionAdd.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsPowerboostFactionAdd extends CmdFactionsPowerboostFactionAbstract {
// -------------------------------------------- //

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java → src/main/java/net/knarcraft/factions/cmd/CmdFactionsPowerboostFactionMultiply.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.factions.cmd;
package net.knarcraft.factions.cmd;
public class CmdFactionsPowerboostFactionMultiply extends CmdFactionsPowerboostFactionAbstract {
// -------------------------------------------- //

Some files were not shown because too many files have changed in this diff Show More