changed namespace to com.massivecraft

This commit is contained in:
Olof Larsson 2011-07-18 22:06:02 +02:00
parent 60603892c6
commit 8aefae5679
151 changed files with 988 additions and 949 deletions

View File

@ -1,4 +1,4 @@
package org.mcteam.factions;
package com.massivecraft.factions;
import java.io.*;
import java.lang.reflect.Type;
@ -11,14 +11,15 @@ import java.util.Map.Entry;
import java.util.TreeMap;
import org.bukkit.ChatColor;
import org.mcteam.factions.gson.JsonArray;
import org.mcteam.factions.gson.JsonElement;
import org.mcteam.factions.gson.JsonObject;
import org.mcteam.factions.gson.JsonParser;
import org.mcteam.factions.gson.reflect.TypeToken;
import org.mcteam.factions.util.AsciiCompass;
import org.mcteam.factions.util.DiscUtil;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.gson.JsonArray;
import com.massivecraft.factions.gson.JsonElement;
import com.massivecraft.factions.gson.JsonObject;
import com.massivecraft.factions.gson.JsonParser;
import com.massivecraft.factions.gson.reflect.TypeToken;
import com.massivecraft.factions.util.AsciiCompass;
import com.massivecraft.factions.util.DiscUtil;
import com.massivecraft.factions.util.TextUtil;
public class Board {

View File

@ -1,10 +1,11 @@
package org.mcteam.factions;
package com.massivecraft.factions;
import java.io.File;
import java.util.*;
import org.bukkit.*;
import org.bukkit.entity.CreatureType;
import org.mcteam.factions.util.DiscUtil;
import com.massivecraft.factions.util.DiscUtil;
public class Conf {

View File

@ -1,11 +1,12 @@
package org.mcteam.factions;
package com.massivecraft.factions;
import java.util.HashSet;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.mcteam.factions.util.MiscUtil;
import com.massivecraft.factions.util.MiscUtil;
public class FLocation {

View File

@ -1,4 +1,4 @@
package org.mcteam.factions;
package com.massivecraft.factions;
import java.io.*;
import java.lang.reflect.Type;
@ -8,10 +8,11 @@ import java.util.Map.Entry;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.mcteam.factions.gson.reflect.TypeToken;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.DiscUtil;
import com.massivecraft.factions.gson.reflect.TypeToken;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.DiscUtil;
/**

View File

@ -1,4 +1,4 @@
package org.mcteam.factions;
package com.massivecraft.factions;
import java.io.*;
import java.lang.reflect.Type;
@ -9,10 +9,11 @@ import java.util.logging.Level;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.mcteam.factions.gson.reflect.TypeToken;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.*;
import com.massivecraft.factions.gson.reflect.TypeToken;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.*;
public class Faction {

View File

@ -1,4 +1,4 @@
package org.mcteam.factions;
package com.massivecraft.factions;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@ -19,14 +19,14 @@ import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import org.mcteam.factions.commands.*;
import org.mcteam.factions.gson.Gson;
import org.mcteam.factions.gson.GsonBuilder;
import org.mcteam.factions.listeners.FactionsBlockListener;
import org.mcteam.factions.listeners.FactionsEntityListener;
import org.mcteam.factions.listeners.FactionsPlayerListener;
import com.massivecraft.factions.commands.*;
import com.massivecraft.factions.gson.Gson;
import com.massivecraft.factions.gson.GsonBuilder;
import com.massivecraft.factions.listeners.FactionsBlockListener;
import com.massivecraft.factions.listeners.FactionsEntityListener;
import com.massivecraft.factions.listeners.FactionsPlayerListener;
import com.nijiko.permissions.PermissionHandler;
import com.nijikokun.bukkit.Permissions.Permissions;

View File

@ -1,17 +1,18 @@
package org.mcteam.factions;
package com.massivecraft.factions;
import java.lang.reflect.Type;
import java.util.logging.Level;
import org.bukkit.Location;
import org.bukkit.World;
import org.mcteam.factions.gson.JsonDeserializationContext;
import org.mcteam.factions.gson.JsonDeserializer;
import org.mcteam.factions.gson.JsonElement;
import org.mcteam.factions.gson.JsonObject;
import org.mcteam.factions.gson.JsonParseException;
import org.mcteam.factions.gson.JsonSerializationContext;
import org.mcteam.factions.gson.JsonSerializer;
import com.massivecraft.factions.gson.JsonDeserializationContext;
import com.massivecraft.factions.gson.JsonDeserializer;
import com.massivecraft.factions.gson.JsonElement;
import com.massivecraft.factions.gson.JsonObject;
import com.massivecraft.factions.gson.JsonParseException;
import com.massivecraft.factions.gson.JsonSerializationContext;
import com.massivecraft.factions.gson.JsonSerializer;
public class MyLocationTypeAdapter implements JsonDeserializer<Location>, JsonSerializer<Location> {

View File

@ -1,4 +1,4 @@
package org.mcteam.factions;
package com.massivecraft.factions;
public class SaveTask implements Runnable {

View File

@ -1,16 +1,17 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.TextUtil;
public class FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandAdmin extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandAutoClaim extends FBaseCommand {

View File

@ -1,10 +1,11 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandAutoSafeclaim extends FBaseCommand {

View File

@ -1,10 +1,11 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandAutoWarclaim extends FBaseCommand {

View File

@ -1,8 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Factions;
public class FCommandBypass extends FBaseCommand {

View File

@ -1,4 +1,4 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
public class FCommandChat extends FBaseCommand {

View File

@ -1,4 +1,4 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
public class FCommandClaim extends FBaseCommand {

View File

@ -1,13 +1,14 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import java.util.ArrayList;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Role;
public class FCommandCreate extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandDeinvite extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.TextUtil;
public class FCommandDescription extends FBaseCommand {

View File

@ -1,8 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandDisband extends FBaseCommand {

View File

@ -1,10 +1,11 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import java.util.ArrayList;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.util.TextUtil;
public class FCommandHelp extends FBaseCommand {

View File

@ -1,15 +1,16 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.mcteam.factions.Board;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
public class FCommandHome extends FBaseCommand {
@ -48,7 +49,7 @@ public class FCommandHome extends FBaseCommand {
return;
}
if (!Conf.homesTeleportAllowedFromDifferentWorld && player.getWorld().getId() != myFaction.getHome().getWorld().getId()) {
if (!Conf.homesTeleportAllowedFromDifferentWorld && player.getWorld().getUID() != myFaction.getHome().getWorld().getUID()) {
me.sendMessage("You cannot teleport to your faction home while in a different world.");
return;
}

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandInvite extends FBaseCommand {

View File

@ -1,7 +1,7 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
public class FCommandJoin extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandKick extends FBaseCommand {

View File

@ -1,4 +1,4 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;

View File

@ -1,13 +1,14 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.util.TextUtil;
public class FCommandList extends FBaseCommand {

View File

@ -1,7 +1,8 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Factions;
public class FCommandLock extends FBaseCommand {

View File

@ -1,8 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.FLocation;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation;
public class FCommandMap extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandMod extends FBaseCommand {

View File

@ -1,8 +1,8 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandOpen extends FBaseCommand {

View File

@ -1,6 +1,6 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.struct.Relation;
import com.massivecraft.factions.struct.Relation;
public class FCommandRelationAlly extends FRelationCommand {

View File

@ -1,6 +1,6 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.struct.Relation;
import com.massivecraft.factions.struct.Relation;
public class FCommandRelationEnemy extends FRelationCommand {

View File

@ -1,6 +1,6 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.struct.Relation;
import com.massivecraft.factions.struct.Relation;
public class FCommandRelationNeutral extends FRelationCommand {

View File

@ -1,11 +1,12 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandReload extends FBaseCommand {

View File

@ -1,10 +1,11 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandSafeclaim extends FBaseCommand {

View File

@ -1,9 +1,10 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandSafeunclaimall extends FBaseCommand {

View File

@ -1,7 +1,8 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Factions;
public class FCommandSaveAll extends FBaseCommand {

View File

@ -1,8 +1,8 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandSethome extends FBaseCommand {

View File

@ -1,14 +1,15 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import java.util.Collection;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.TextUtil;
public class FCommandShow extends FBaseCommand {

View File

@ -1,11 +1,11 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import java.util.ArrayList;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.TextUtil;
public class FCommandTag extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.util.TextUtil;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.util.TextUtil;
public class FCommandTitle extends FBaseCommand {

View File

@ -1,11 +1,11 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Board;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Role;
public class FCommandUnclaim extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.mcteam.factions.Board;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Role;
public class FCommandUnclaimall extends FBaseCommand {

View File

@ -1,7 +1,8 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Factions;
public class FCommandVersion extends FBaseCommand {

View File

@ -1,10 +1,11 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandWarclaim extends FBaseCommand {

View File

@ -1,9 +1,10 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
public class FCommandWarunclaimall extends FBaseCommand {

View File

@ -1,8 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Factions;
public class FCommandWorldNoClaim extends FBaseCommand {

View File

@ -1,8 +1,9 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Factions;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Factions;
public class FCommandWorldNoPowerLoss extends FBaseCommand {

View File

@ -1,11 +1,12 @@
package org.mcteam.factions.commands;
package com.massivecraft.factions.commands;
import org.bukkit.ChatColor;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
public class FRelationCommand extends FBaseCommand {

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* Strategy for excluding anonymous and local classes.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;
import java.util.Map;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* Defines generic cache interface.

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* Exception class to indicate a circular reference error.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Constructor;

View File

@ -14,9 +14,10 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import com.massivecraft.factions.gson.internal.$Gson$Types;
import org.mcteam.factions.gson.internal.$Gson$Types;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.math.BigDecimal;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.io.IOException;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.util.Collection;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.io.IOException;
import java.util.Collections;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* A strategy (or policy) definition that is used to decide whether or not a field or top-level

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.annotations.Expose;
import com.massivecraft.factions.gson.annotations.Expose;
/**
* Excludes fields that do not have the {@link Expose} annotation

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.annotations.Expose;
import com.massivecraft.factions.gson.annotations.Expose;
/**
* Excludes fields that do not have the {@link Expose} annotation

View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import org.mcteam.factions.gson.internal.$Gson$Types;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Types;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
@ -38,7 +38,7 @@ import java.util.Collections;
*/
public final class FieldAttributes {
private static final String MAX_CACHE_PROPERTY_NAME =
"org.mcteam.factions.gson.annotation_cache_size_hint";
"com.google.gson.annotation_cache_size_hint";
private static final Cache<Pair<Class<?>, String>, Collection<Annotation>> ANNOTATION_CACHE =
new LruCache<Pair<Class<?>,String>, Collection<Annotation>>(getMaxCacheSize());

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* An enumeration that defines a few standard naming conventions for JSON field names.
* This enumeration should be used in conjunction with {@link org.mcteam.factions.gson.GsonBuilder}
* to configure a {@link org.mcteam.factions.gson.Gson} instance to properly translate Java field
* This enumeration should be used in conjunction with {@link com.massivecraft.factions.gson.GsonBuilder}
* to configure a {@link com.massivecraft.factions.gson.Gson} instance to properly translate Java field
* names into the desired JSON field names.
*
* @author Inderjeet Singh

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Field;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* The new mechanism for providing custom field naming in Gson. This allows the client code

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
/**
* Adapts the old FieldNamingStrategy to the new {@link FieldNamingStrategy2}

View File

@ -14,12 +14,13 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import com.massivecraft.factions.gson.stream.JsonReader;
import com.massivecraft.factions.gson.stream.JsonToken;
import com.massivecraft.factions.gson.stream.JsonWriter;
import com.massivecraft.factions.gson.stream.MalformedJsonException;
import org.mcteam.factions.gson.stream.JsonReader;
import org.mcteam.factions.gson.stream.JsonToken;
import org.mcteam.factions.gson.stream.JsonWriter;
import org.mcteam.factions.gson.stream.MalformedJsonException;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@ -68,7 +69,7 @@ import java.util.Map;
* <p>See the <a href="https://sites.google.com/site/gson/gson-user-guide">Gson User Guide</a>
* for a more complete set of examples.</p>
*
* @see org.mcteam.factions.gson.reflect.TypeToken
* @see com.massivecraft.factions.gson.reflect.TypeToken
*
* @author Inderjeet Singh
* @author Joel Leitch
@ -130,10 +131,10 @@ public final class Gson {
* ignores the millisecond portion of the date during serialization. You can change
* this by invoking {@link GsonBuilder#setDateFormat(int)} or
* {@link GsonBuilder#setDateFormat(String)}. </li>
* <li>By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Expose} annotation.
* <li>By default, Gson ignores the {@link com.massivecraft.factions.gson.annotations.Expose} annotation.
* You can enable Gson to serialize/deserialize only those fields marked with this annotation
* through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}. </li>
* <li>By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Since} annotation. You
* <li>By default, Gson ignores the {@link com.massivecraft.factions.gson.annotations.Since} annotation. You
* can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.</li>
* <li>The default field naming policy for the output Json is same as in Java. So, a Java class
* field <code>versionNumber</code> will be output as <code>&quot;versionNumber@quot;</code> in
@ -205,7 +206,7 @@ public final class Gson {
*
* @param src the object for which JSON representation is to be created
* @param typeOfSrc The specific genericized type of src. You can obtain
* this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
* this type by using the {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example,
* to get the type for {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -248,7 +249,7 @@ public final class Gson {
*
* @param src the object for which JSON representation is to be created
* @param typeOfSrc The specific genericized type of src. You can obtain
* this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
* this type by using the {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example,
* to get the type for {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -290,7 +291,7 @@ public final class Gson {
*
* @param src the object for which JSON representation is to be created
* @param typeOfSrc The specific genericized type of src. You can obtain
* this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
* this type by using the {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example,
* to get the type for {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -399,7 +400,7 @@ public final class Gson {
* @param <T> the type of the desired object
* @param json the string from which the object is to be deserialized
* @param typeOfT The specific genericized type of src. You can obtain this type by using the
* {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -452,7 +453,7 @@ public final class Gson {
* @param <T> the type of the desired object
* @param json the reader producing Json from which the object is to be deserialized
* @param typeOfT The specific genericized type of src. You can obtain this type by using the
* {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -531,7 +532,7 @@ public final class Gson {
* @param json the root of the parse tree of {@link JsonElement}s from which the object is to
* be deserialized
* @param typeOfT The specific genericized type of src. You can obtain this type by using the
* {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();

View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.lang.reflect.Type;
import java.sql.Timestamp;
@ -174,7 +174,7 @@ public final class GsonBuilder {
/**
* Configures Gson to exclude all fields from consideration for serialization or deserialization
* that do not have the {@link org.mcteam.factions.gson.annotations.Expose} annotation.
* that do not have the {@link com.massivecraft.factions.gson.annotations.Expose} annotation.
*
* @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
*/

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Modifier;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.io.IOException;
import java.math.BigDecimal;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Types;
import com.massivecraft.factions.gson.internal.$Gson$Types;
import java.lang.reflect.Array;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.io.IOException;
import java.math.BigDecimal;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.io.IOException;

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* This exception is raised when Gson was unable to read an input stream

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.io.IOException;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.io.IOException;
import java.util.LinkedHashMap;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* This exception is raised if there is a serious issue that occurs during parsing of a Json

View File

@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import com.massivecraft.factions.gson.stream.JsonReader;
import com.massivecraft.factions.gson.stream.JsonToken;
import com.massivecraft.factions.gson.stream.MalformedJsonException;
import org.mcteam.factions.gson.stream.JsonReader;
import org.mcteam.factions.gson.stream.JsonToken;
import org.mcteam.factions.gson.stream.MalformedJsonException;
import java.io.EOFException;
import java.io.IOException;
import java.io.Reader;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import java.io.IOException;
import java.math.BigDecimal;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import org.mcteam.factions.gson.internal.$Gson$Types;
import org.mcteam.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
import com.massivecraft.factions.gson.internal.$Gson$Types;
import java.lang.reflect.Array;
import java.lang.reflect.Type;

View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.reflect.Type;
/**
* Interface representing a custom serializer for Json. You should write a custom serializer, if
* you are not happy with the default serialization done by Gson. You will also need to register
* this serializer through {@link org.mcteam.factions.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
* this serializer through {@link com.massivecraft.factions.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
*
* <p>Let us look at example where defining a serializer will be useful. The {@code Id} class
* defined below has two fields: {@code clazz} and {@code value}.</p>

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.io.EOFException;
import java.io.IOException;
@ -22,9 +22,9 @@ import java.io.StringReader;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.mcteam.factions.gson.stream.JsonReader;
import org.mcteam.factions.gson.stream.JsonToken;
import org.mcteam.factions.gson.stream.MalformedJsonException;
import com.massivecraft.factions.gson.stream.JsonReader;
import com.massivecraft.factions.gson.stream.JsonToken;
import com.massivecraft.factions.gson.stream.MalformedJsonException;
/**
* A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* This exception is raised when Gson attempts to read (or write) a malformed

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.io.IOException;
import java.util.Map;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* Defines the expected format for a {@code long} or {@code Long} type when its serialized.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
/**
* A {@link FieldNamingStrategy2} that ensures the JSON field names consist of only

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.mcteam.factions.gson;
package com.massivecraft.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

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