Add MCore as a dependency, remove CraftBukkit and use Bukkit. MCore and Bukkit libs should be manually maintained for now.
This commit is contained in:
parent
c6ea2016cb
commit
433d45ae4c
@ -1,8 +1,9 @@
|
||||
name: Factions
|
||||
version: 2.0.0_dev
|
||||
main: com.massivecraft.factions.Factions
|
||||
authors: [Olof Cayorion Larsson, Brett Flannigan]
|
||||
softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag]
|
||||
authors: [Olof "Cayorion" Larsson, Brett Flannigan]
|
||||
depend: [mcore]
|
||||
softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag]
|
||||
commands:
|
||||
factions:
|
||||
description: The Factions base command
|
||||
|
@ -13,7 +13,7 @@ import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.block.Block;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
|
||||
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
|
||||
import com.massivecraft.factions.integration.LWCFeatures;
|
||||
import com.massivecraft.factions.iface.RelationParticipator;
|
||||
import com.massivecraft.factions.util.AsciiCompass;
|
||||
|
@ -6,7 +6,7 @@ import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentSkipListMap;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
|
||||
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
|
||||
import com.massivecraft.factions.zcore.persist.PlayerEntityCollection;
|
||||
|
||||
public class FPlayerColl extends PlayerEntityCollection<FPlayer>
|
||||
|
@ -9,7 +9,7 @@ import java.util.logging.Level;
|
||||
|
||||
import org.bukkit.ChatColor;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
|
||||
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
|
||||
|
||||
import com.massivecraft.factions.integration.Econ;
|
||||
import com.massivecraft.factions.util.MiscUtil;
|
||||
|
@ -30,7 +30,7 @@ import com.massivecraft.factions.zcore.MPlugin;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
|
||||
import com.massivecraft.mcore.xlib.gson.GsonBuilder;
|
||||
|
||||
|
||||
public class Factions extends MPlugin
|
||||
|
@ -2,12 +2,11 @@ package com.massivecraft.factions.adapters;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
|
||||
|
||||
import com.massivecraft.factions.FFlag;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonElement;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonParseException;
|
||||
|
||||
public class FFlagAdapter implements JsonDeserializer<FFlag>
|
||||
{
|
||||
|
@ -2,10 +2,10 @@ package com.massivecraft.factions.adapters;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonElement;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonParseException;
|
||||
|
||||
import com.massivecraft.factions.FPerm;
|
||||
|
||||
|
@ -6,13 +6,13 @@ import java.util.logging.Level;
|
||||
import com.massivecraft.factions.Factions;
|
||||
import com.massivecraft.factions.util.LazyLocation;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonObject;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonElement;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonObject;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonParseException;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonSerializer;
|
||||
|
||||
|
||||
public class LazyLocationAdapter implements JsonDeserializer<LazyLocation>, JsonSerializer<LazyLocation>
|
||||
|
@ -2,10 +2,10 @@ package com.massivecraft.factions.adapters;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonElement;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonParseException;
|
||||
|
||||
import com.massivecraft.factions.Rel;
|
||||
|
||||
|
@ -4,15 +4,15 @@ import java.lang.reflect.Type;
|
||||
import java.util.Iterator;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonArray;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonObject;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonPrimitive;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonArray;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonElement;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonObject;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonParseException;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonSerializer;
|
||||
|
||||
import com.massivecraft.factions.Factions;
|
||||
import com.massivecraft.factions.TerritoryAccess;
|
||||
|
@ -9,15 +9,15 @@ import java.util.logging.Level;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
|
||||
import com.massivecraft.factions.zcore.persist.EM;
|
||||
import com.massivecraft.factions.zcore.persist.SaveTask;
|
||||
import com.massivecraft.factions.zcore.util.LibLoader;
|
||||
import com.massivecraft.factions.zcore.util.PermUtil;
|
||||
import com.massivecraft.factions.zcore.util.Persist;
|
||||
import com.massivecraft.factions.zcore.util.TextUtil;
|
||||
import com.massivecraft.mcore.xlib.gson.Gson;
|
||||
import com.massivecraft.mcore.xlib.gson.GsonBuilder;
|
||||
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
|
||||
|
||||
|
||||
public abstract class MPlugin extends JavaPlugin
|
||||
|
@ -7,10 +7,10 @@ import java.util.logging.Level;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSyntaxException;
|
||||
import com.massivecraft.factions.zcore.util.DiscUtil;
|
||||
import com.massivecraft.factions.zcore.util.TextUtil;
|
||||
import com.massivecraft.mcore.xlib.gson.Gson;
|
||||
import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
|
||||
|
||||
public abstract class EntityCollection<E extends Entity>
|
||||
{
|
||||
|
@ -9,7 +9,7 @@ import java.util.Set;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
|
||||
import com.massivecraft.mcore.xlib.gson.Gson;
|
||||
|
||||
/**
|
||||
* The PlayerEntityCollection is an EntityCollection with the extra features
|
||||
|
Loading…
Reference in New Issue
Block a user