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

Add MCore as a dependency, remove CraftBukkit and use Bukkit. MCore and Bukkit libs should be manually maintained for now.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-10 10:18:34 +02:00
parent c6ea2016cb
commit 433d45ae4c
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugin.yml
View File

@@ -1,8 +1,9 @@
name: Factions name: Factions
version: 2.0.0_dev version: 2.0.0_dev
main: com.massivecraft.factions.Factions main: com.massivecraft.factions.Factions
authors: [Olof Cayorion Larsson, Brett Flannigan] 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] depend: [mcore]
softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag]
commands: commands:
factions: factions:
description: The Factions base command description: The Factions base command

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

@@ -13,7 +13,7 @@ import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; 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.integration.LWCFeatures;
import com.massivecraft.factions.iface.RelationParticipator; import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.factions.util.AsciiCompass;

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

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

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

@@ -9,7 +9,7 @@ import java.util.logging.Level;
import org.bukkit.ChatColor; 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.integration.Econ;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;

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

@@ -30,7 +30,7 @@ import com.massivecraft.factions.zcore.MPlugin;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; 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 public class Factions extends MPlugin

9
src/com/massivecraft/factions/adapters/FFlagAdapter.java
View File

@@ -2,12 +2,11 @@ package com.massivecraft.factions.adapters;
import java.lang.reflect.Type; 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.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> public class FFlagAdapter implements JsonDeserializer<FFlag>
{ {

8
src/com/massivecraft/factions/adapters/FPermAdapter.java
View File

@@ -2,10 +2,10 @@ package com.massivecraft.factions.adapters;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer; import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import com.massivecraft.mcore.xlib.gson.JsonElement;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import com.massivecraft.mcore.xlib.gson.JsonParseException;
import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPerm;

14
src/com/massivecraft/factions/adapters/LazyLocationAdapter.java
View File

@@ -6,13 +6,13 @@ import java.util.logging.Level;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.util.LazyLocation; import com.massivecraft.factions.util.LazyLocation;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer; import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import com.massivecraft.mcore.xlib.gson.JsonElement;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonObject; import com.massivecraft.mcore.xlib.gson.JsonObject;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import com.massivecraft.mcore.xlib.gson.JsonParseException;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext; import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer; import com.massivecraft.mcore.xlib.gson.JsonSerializer;
public class LazyLocationAdapter implements JsonDeserializer<LazyLocation>, JsonSerializer<LazyLocation> public class LazyLocationAdapter implements JsonDeserializer<LazyLocation>, JsonSerializer<LazyLocation>

8
src/com/massivecraft/factions/adapters/RelAdapter.java
View File

@@ -2,10 +2,10 @@ package com.massivecraft.factions.adapters;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer; import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import com.massivecraft.mcore.xlib.gson.JsonElement;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import com.massivecraft.mcore.xlib.gson.JsonParseException;
import com.massivecraft.factions.Rel; import com.massivecraft.factions.Rel;

18
src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java
View File

@@ -4,15 +4,15 @@ import java.lang.reflect.Type;
import java.util.Iterator; import java.util.Iterator;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonArray; import com.massivecraft.mcore.xlib.gson.JsonArray;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext; import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer; import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement; import com.massivecraft.mcore.xlib.gson.JsonElement;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonObject; import com.massivecraft.mcore.xlib.gson.JsonObject;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import com.massivecraft.mcore.xlib.gson.JsonParseException;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonPrimitive; import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext; import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer; import com.massivecraft.mcore.xlib.gson.JsonSerializer;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.TerritoryAccess;

6
src/com/massivecraft/factions/zcore/MPlugin.java
View File

@@ -9,15 +9,15 @@ import java.util.logging.Level;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin; 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.EM;
import com.massivecraft.factions.zcore.persist.SaveTask; import com.massivecraft.factions.zcore.persist.SaveTask;
import com.massivecraft.factions.zcore.util.LibLoader; import com.massivecraft.factions.zcore.util.LibLoader;
import com.massivecraft.factions.zcore.util.PermUtil; import com.massivecraft.factions.zcore.util.PermUtil;
import com.massivecraft.factions.zcore.util.Persist; import com.massivecraft.factions.zcore.util.Persist;
import com.massivecraft.factions.zcore.util.TextUtil; 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 public abstract class MPlugin extends JavaPlugin

4
src/com/massivecraft/factions/zcore/persist/EntityCollection.java
View File

@@ -7,10 +7,10 @@ import java.util.logging.Level;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.bukkit.Bukkit; 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.DiscUtil;
import com.massivecraft.factions.zcore.util.TextUtil; 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> public abstract class EntityCollection<E extends Entity>
{ {

2
src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java
View File

@@ -9,7 +9,7 @@ import java.util.Set;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; 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 * The PlayerEntityCollection is an EntityCollection with the extra features