From 433d45ae4c54df44a3f47cc7f69e7cbdfcc33b49 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 10 Apr 2013 10:18:34 +0200 Subject: [PATCH] Add MCore as a dependency, remove CraftBukkit and use Bukkit. MCore and Bukkit libs should be manually maintained for now. --- plugin.yml | 5 +++-- src/com/massivecraft/factions/Board.java | 2 +- src/com/massivecraft/factions/FPlayerColl.java | 2 +- src/com/massivecraft/factions/FactionColl.java | 2 +- src/com/massivecraft/factions/Factions.java | 2 +- .../factions/adapters/FFlagAdapter.java | 9 ++++----- .../factions/adapters/FPermAdapter.java | 8 ++++---- .../factions/adapters/LazyLocationAdapter.java | 14 +++++++------- .../factions/adapters/RelAdapter.java | 8 ++++---- .../adapters/TerritoryAccessAdapter.java | 18 +++++++++--------- .../massivecraft/factions/zcore/MPlugin.java | 6 +++--- .../zcore/persist/EntityCollection.java | 4 ++-- .../zcore/persist/PlayerEntityCollection.java | 2 +- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/plugin.yml b/plugin.yml index c8b6d462..eb30322e 100644 --- a/plugin.yml +++ b/plugin.yml @@ -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 diff --git a/src/com/massivecraft/factions/Board.java b/src/com/massivecraft/factions/Board.java index 07cf7764..6514aeb9 100644 --- a/src/com/massivecraft/factions/Board.java +++ b/src/com/massivecraft/factions/Board.java @@ -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; diff --git a/src/com/massivecraft/factions/FPlayerColl.java b/src/com/massivecraft/factions/FPlayerColl.java index febd0811..18f93e8e 100644 --- a/src/com/massivecraft/factions/FPlayerColl.java +++ b/src/com/massivecraft/factions/FPlayerColl.java @@ -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 diff --git a/src/com/massivecraft/factions/FactionColl.java b/src/com/massivecraft/factions/FactionColl.java index 080e97c4..f0e83cfd 100644 --- a/src/com/massivecraft/factions/FactionColl.java +++ b/src/com/massivecraft/factions/FactionColl.java @@ -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; diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index c2447ebf..da7dcb41 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -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 diff --git a/src/com/massivecraft/factions/adapters/FFlagAdapter.java b/src/com/massivecraft/factions/adapters/FFlagAdapter.java index 35757af8..20884aa2 100644 --- a/src/com/massivecraft/factions/adapters/FFlagAdapter.java +++ b/src/com/massivecraft/factions/adapters/FFlagAdapter.java @@ -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 { diff --git a/src/com/massivecraft/factions/adapters/FPermAdapter.java b/src/com/massivecraft/factions/adapters/FPermAdapter.java index 98db9708..f619ee19 100644 --- a/src/com/massivecraft/factions/adapters/FPermAdapter.java +++ b/src/com/massivecraft/factions/adapters/FPermAdapter.java @@ -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; diff --git a/src/com/massivecraft/factions/adapters/LazyLocationAdapter.java b/src/com/massivecraft/factions/adapters/LazyLocationAdapter.java index 9211ffea..bf8449ac 100644 --- a/src/com/massivecraft/factions/adapters/LazyLocationAdapter.java +++ b/src/com/massivecraft/factions/adapters/LazyLocationAdapter.java @@ -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, JsonSerializer diff --git a/src/com/massivecraft/factions/adapters/RelAdapter.java b/src/com/massivecraft/factions/adapters/RelAdapter.java index 70214fb6..621132d8 100644 --- a/src/com/massivecraft/factions/adapters/RelAdapter.java +++ b/src/com/massivecraft/factions/adapters/RelAdapter.java @@ -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; diff --git a/src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java b/src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java index 761800a5..4c6c74ac 100644 --- a/src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java +++ b/src/com/massivecraft/factions/adapters/TerritoryAccessAdapter.java @@ -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; diff --git a/src/com/massivecraft/factions/zcore/MPlugin.java b/src/com/massivecraft/factions/zcore/MPlugin.java index 7c87088a..84bda59f 100644 --- a/src/com/massivecraft/factions/zcore/MPlugin.java +++ b/src/com/massivecraft/factions/zcore/MPlugin.java @@ -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 diff --git a/src/com/massivecraft/factions/zcore/persist/EntityCollection.java b/src/com/massivecraft/factions/zcore/persist/EntityCollection.java index 265118e0..dcab2904 100644 --- a/src/com/massivecraft/factions/zcore/persist/EntityCollection.java +++ b/src/com/massivecraft/factions/zcore/persist/EntityCollection.java @@ -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 { diff --git a/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java b/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java index 41278225..82f43ef1 100644 --- a/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java +++ b/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java @@ -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