Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-16 15:25:23 +01:00
Code Issues Projects Releases Wiki Activity

Use xlib custom shaded.

Browse Source
This commit is contained in:
Olof Larsson 2014-09-13 10:24:49 +02:00
parent 13a4afdfb4
commit c0b7b783b2
12 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/massivecraft/factions/Factions.java
View File

@ -47,8 +47,8 @@ import com.massivecraft.massivecore.AspectColl;
import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.MassivePlugin;
import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.Multiverse;
import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.MUtil;
import com.google.gson.Gson; import com.massivecraft.massivecore.xlib.gson.Gson;
import com.google.gson.GsonBuilder; import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
public class Factions extends MassivePlugin public class Factions extends MassivePlugin

12
src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java
View File

@ -4,12 +4,12 @@ import java.lang.reflect.Type;
import java.util.Map; import java.util.Map;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.google.gson.JsonDeserializationContext; import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
import com.google.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.google.gson.JsonParseException; import com.massivecraft.massivecore.xlib.gson.JsonParseException;
import com.google.gson.JsonSerializationContext; import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.factions.entity.Board; import com.massivecraft.factions.entity.Board;

14
src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java
View File

@ -6,13 +6,13 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.google.gson.JsonDeserializationContext; import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
import com.google.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.google.gson.JsonObject; import com.massivecraft.massivecore.xlib.gson.JsonObject;
import com.google.gson.JsonParseException; import com.massivecraft.massivecore.xlib.gson.JsonParseException;
import com.google.gson.JsonSerializationContext; import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer; import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.TerritoryAccess;
public class BoardMapAdapter implements JsonDeserializer<Map<PS, TerritoryAccess>>, JsonSerializer<Map<PS, TerritoryAccess>> public class BoardMapAdapter implements JsonDeserializer<Map<PS, TerritoryAccess>>, JsonSerializer<Map<PS, TerritoryAccess>>

8
src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java
View File

@ -3,10 +3,10 @@ package com.massivecraft.factions.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FFlag;
import com.google.gson.JsonDeserializationContext; import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
import com.google.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.google.gson.JsonParseException; import com.massivecraft.massivecore.xlib.gson.JsonParseException;
public class FFlagAdapter implements JsonDeserializer<FFlag> public class FFlagAdapter implements JsonDeserializer<FFlag>
{ {

8
src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java
View File

@ -2,11 +2,11 @@ package com.massivecraft.factions.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPerm;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.massivecraft.massivecore.xlib.gson.JsonParseException;
public class FPermAdapter implements JsonDeserializer<FPerm> public class FPermAdapter implements JsonDeserializer<FPerm>
{ {

10
src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java
View File

@ -2,13 +2,13 @@ package com.massivecraft.factions.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.Faction;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.massivecraft.massivecore.xlib.gson.JsonObject;
import com.massivecraft.massivecore.xlib.gson.JsonParseException;
public class FactionPreprocessAdapter implements JsonDeserializer<Faction> public class FactionPreprocessAdapter implements JsonDeserializer<Faction>
{ {

9
src/main/java/com/massivecraft/factions/adapter/RelAdapter.java
View File

@ -2,11 +2,11 @@ package com.massivecraft.factions.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.massivecraft.factions.Rel; import com.massivecraft.factions.Rel;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.massivecraft.massivecore.xlib.gson.JsonParseException;
public class RelAdapter implements JsonDeserializer<Rel> public class RelAdapter implements JsonDeserializer<Rel>
{ {
@ -26,4 +26,5 @@ public class RelAdapter implements JsonDeserializer<Rel>
{ {
return Rel.parse(json.getAsString()); return Rel.parse(json.getAsString());
} }
} }

18
src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java
View File

@ -3,16 +3,16 @@ package com.massivecraft.factions.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.Set; import java.util.Set;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.massivecraft.massivecore.xlib.gson.JsonObject;
import com.massivecraft.massivecore.xlib.gson.JsonParseException;
import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
public class TerritoryAccessAdapter implements JsonDeserializer<TerritoryAccess>, JsonSerializer<TerritoryAccess> public class TerritoryAccessAdapter implements JsonDeserializer<TerritoryAccess>, JsonSerializer<TerritoryAccess>
{ {

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

@ -20,7 +20,7 @@ import com.massivecraft.factions.util.AsciiCompass;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
public class Board extends Entity<Board> implements BoardInterface public class Board extends Entity<Board> implements BoardInterface
{ {

2
src/main/java/com/massivecraft/factions/entity/BoardColls.java
View File

@ -16,7 +16,7 @@ import com.massivecraft.massivecore.Aspect;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.ps.PSBuilder; import com.massivecraft.massivecore.ps.PSBuilder;
import com.massivecraft.massivecore.util.DiscUtil; import com.massivecraft.massivecore.util.DiscUtil;
import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
public class BoardColls extends XColls<BoardColl, Board> implements BoardInterface public class BoardColls extends XColls<BoardColl, Board> implements BoardInterface
{ {

2
src/main/java/com/massivecraft/factions/entity/FactionColls.java
View File

@ -12,7 +12,7 @@ import com.massivecraft.massivecore.Aspect;
import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveCore;
import com.massivecraft.massivecore.util.DiscUtil; import com.massivecraft.massivecore.util.DiscUtil;
import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.MUtil;
import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
public class FactionColls extends XColls<FactionColl, Faction> public class FactionColls extends XColls<FactionColl, Faction>
{ {

2
src/main/java/com/massivecraft/factions/entity/UPlayerColls.java
View File

@ -10,7 +10,7 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.Aspect;
import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveCore;
import com.massivecraft.massivecore.util.DiscUtil; import com.massivecraft.massivecore.util.DiscUtil;
import com.google.gson.reflect.TypeToken; import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
public class UPlayerColls extends XColls<UPlayerColl, UPlayer> public class UPlayerColls extends XColls<UPlayerColl, UPlayer>
{ {