SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The latest CraftBukkit builds have changed their compiled-in GSON lib's package name. Rather than us switching back to using a separate GSON lib again (with two effectively identical copies of GSON ending up loaded and wasting server resources), I'm simply switching Factions to point to CraftBukkit's refactored GSON package name instead.

Browse Source 
In line with that, I've removed the Bukkit and GSON libs and added in CraftBukkit as a lib.
This commit is contained in:
Brettflan 2012-08-26 01:02:21 -05:00
parent b27cb6a7fb
commit 3bcdb87bf3
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/bukkit.jar
View File

Binary file not shown.

BIN
lib/craftbukkit.jar Normal file
View File

Binary file not shown.

BIN
lib/gson.jar
View File

Binary file not shown.

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

@ -10,7 +10,7 @@ import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.google.gson.reflect.TypeToken; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.LWCFeatures;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.factions.util.AsciiCompass;

2
src/com/massivecraft/factions/FPlayers.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 com.google.gson.reflect.TypeToken; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.persist.PlayerEntityCollection; import com.massivecraft.factions.zcore.persist.PlayerEntityCollection;

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

@ -9,7 +9,7 @@ import java.util.logging.Level;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.google.gson.reflect.TypeToken; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.zcore.persist.EntityCollection; import com.massivecraft.factions.zcore.persist.EntityCollection;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;

4
src/com/massivecraft/factions/P.java
View File

@ -37,8 +37,8 @@ import com.massivecraft.factions.util.MyLocationTypeAdapter;
import com.massivecraft.factions.zcore.MPlugin; import com.massivecraft.factions.zcore.MPlugin;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;
import com.google.gson.GsonBuilder; import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
public class P extends MPlugin public class P extends MPlugin

18
src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java
View File

@ -9,15 +9,15 @@ import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.google.gson.JsonArray; import org.bukkit.craftbukkit.libs.com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext; import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement; import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
import com.google.gson.JsonObject; import org.bukkit.craftbukkit.libs.com.google.gson.JsonObject;
import com.google.gson.JsonParseException; import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive; import org.bukkit.craftbukkit.libs.com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext; import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer; import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;

14
src/com/massivecraft/factions/util/MyLocationTypeAdapter.java
View File

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

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

@ -10,9 +10,9 @@ import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.google.gson.Gson; import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
import com.google.gson.GsonBuilder; import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken; 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;

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

@ -5,7 +5,7 @@ import java.lang.reflect.Type;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.google.gson.Gson; import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
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;

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 com.google.gson.Gson; import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
/** /**
* The PlayerEntityCollection is an EntityCollection with the extra features * The PlayerEntityCollection is an EntityCollection with the extra features